Version bump, remove old.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

3 files changed, 20 insertions, 102 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 638db90f6248..bb125bf2439e 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.146 2012/04/19 20:39:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.147 2012/04/28 18:53:15 pacho Exp $
+
+*gthumb-3.0.0 (28 Apr 2012)
+
+  28 Apr 2012; Pacho Ramos <pacho@gentoo.org> +gthumb-3.0.0.ebuild,
+  -gthumb-2.14.2.ebuild, -gthumb-2.14.3-r300.ebuild:
+  Version bump, remove old.
 
   19 Apr 2012; Brent Baude <ranger@gentoo.org> gthumb-2.14.3.ebuild:
   Marking gthumb-2.14.3 ppc64 stable for bug 410611
diff --git a/media-gfx/gthumb/gthumb-2.14.2.ebuild b/media-gfx/gthumb/gthumb-2.14.2.ebuild
deleted file mode 100644
index 48aa8f45116a..000000000000
--- a/media-gfx/gthumb/gthumb-2.14.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.2.ebuild,v 1.1 2012/01/25 10:52:05 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://live.gnome.org/gthumb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"
-
-# We can't link against libbrasero-burn3
-RDEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=gnome-base/gconf-2.6
-	>=dev-libs/libunique-1.1.2:1
-
-	media-libs/libpng:0
-	x11-libs/libSM
-
-	cdr? ( >=app-cdr/brasero-2.28
-		   <app-cdr/brasero-2.90 )
-	exif? ( >=media-gfx/exiv2-0.18 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	http? (
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4 )
-	jpeg? ( virtual/jpeg:0 )
-	slideshow? (
-		>=media-libs/clutter-1:1.0
-		>=media-libs/clutter-gtk-0.10:0.10 )
-	tiff? ( media-libs/tiff )
-	raw? ( >=media-libs/libopenraw-0.0.8 )
-	!raw? ( media-gfx/dcraw )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	app-text/gnome-doc-utils
-	sys-devel/bison
-	sys-devel/flex
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-# Upstream says in configure help that libchamplain support crashes
-# frequently
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-libchamplain
-		--enable-unique
-		--disable-gnome-3
-		$(use_enable cdr libbrasero)
-		$(use_enable exif exiv2)
-		$(use_enable gstreamer)
-		$(use_enable gnome-keyring)
-		$(use_enable http libsoup)
-		$(use_enable jpeg)
-		$(use_enable raw libopenraw)
-		$(use_enable slideshow clutter)
-		$(use_enable test test-suite)
-		$(use_enable tiff)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove unwanted CFLAGS added with USE=debug
-	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac -i configure || die
-
-	# GSeal doesn't get disabled with --disable-gseal
-	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
-}
diff --git a/media-gfx/gthumb/gthumb-2.14.3-r300.ebuild b/media-gfx/gthumb/gthumb-3.0.0.ebuild
index 7975b4838e85..5f2a9f983acf 100644
--- a/media-gfx/gthumb/gthumb-2.14.3-r300.ebuild
+++ b/media-gfx/gthumb/gthumb-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.3-r300.ebuild,v 1.2 2012/04/13 15:10:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.0.0.ebuild,v 1.1 2012/04/28 18:53:15 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,33 +13,30 @@ HOMEPAGE="https://live.gnome.org/gthumb"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow svg tiff test"
 
-# We can't link against libbrasero-burn3
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=gnome-base/gconf-2.6
-	>=dev-libs/libunique-1.1.2:1
+	>=x11-libs/gtk+-3.2.0:3
 
 	media-libs/libpng:0
 	sys-libs/zlib
 	x11-libs/libSM
 
-	cdr? ( >=app-cdr/brasero-2.28
-		   <app-cdr/brasero-2.90 )
-	exif? ( >=media-gfx/exiv2-0.18 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	exif? ( >=media-gfx/exiv2-0.21 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-3.2.0 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10 )
 	http? (
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4 )
+		>=net-libs/libsoup-2.36:2.4
+		>=net-libs/libsoup-gnome-2.36:2.4 )
 	jpeg? ( virtual/jpeg:0 )
 	slideshow? (
 		>=media-libs/clutter-1:1.0
-		>=media-libs/clutter-gtk-0.10:0.10 )
+		>=media-libs/clutter-gtk-1.0.0:1.0 )
+	svg? ( >=gnome-base/librsvg-2.34.0 )
 	tiff? ( media-libs/tiff )
 	raw? ( >=media-libs/libopenraw-0.0.8 )
 	!raw? ( media-gfx/dcraw )"
@@ -62,7 +59,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-libchamplain
-		--enable-unique
 		$(use_enable cdr libbrasero)
 		$(use_enable exif exiv2)
 		$(use_enable gstreamer)
@@ -71,6 +67,7 @@ pkg_setup() {
 		$(use_enable jpeg)
 		$(use_enable raw libopenraw)
 		$(use_enable slideshow clutter)
+		$(use_enable svg librsvg)
 		$(use_enable test test-suite)
 		$(use_enable tiff)"
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -83,5 +80,5 @@ src_prepare() {
 	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac -i configure || die
 
 	# GSeal doesn't get disabled with --disable-gseal
-	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
+#	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
 }