Drop slideshow USE flag for gthumb-2 due to pending clutter-gtk-0.10 removal (bug #435164). Drop old. Update to EAPI5.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 36 insertions, 138 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 5409de0db947..3fa392d02796 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.157 2012/10/25 20:24:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.158 2012/12/05 22:18:46 tetromino Exp $
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gthumb-no-brasero3.patch, gthumb-2.14.4.ebuild, -gthumb-3.0.0.ebuild,
+  gthumb-3.0.2.ebuild:
+  Drop slideshow USE flag for gthumb-2 due to pending clutter-gtk-0.10 removal
+  (bug #435164). Drop old. Update to EAPI5.
 
 *gthumb-3.0.2 (25 Oct 2012)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 7d05a4f84188..0fbdd0cb62c9 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gthumb-no-brasero3.patch 842 SHA256 56797239a57366ca2397af1523374019fc99bc0765cb31c3ca3fc1a669004806 SHA512 c6372989368152f8517384176491364633dc60e7451894a01af1fdd02c390f2302bf5537547c592fe94ce06821f6bef627a6cf39d5c1eb7c12be59f8b70b21ab WHIRLPOOL f87a8054a9b5a4600e0e96248058725ef909bee494836fe66cce13cc2cf07912edd921a0f59b9e333509ab3f2686a4f824aeeea37c7af8d1d7a3e5843036eff7
 DIST gthumb-2.14.4.tar.xz 5721384 SHA256 1561ca52f9b60fbcd0e8fc976de8b30f0447019c698bfe1051d421935b5a51b5 SHA512 0423b5beb2a317f7e585c1f8bb32d3873accd61e9ff5e7356b3dc968b39d2613d2d97eeb4fdb39220094f67dfccbfb5d30f2fa4d5d5720056de86181453076c9 WHIRLPOOL c2ba8ac2011423305af6ba488fb31688f6f9e32d3f0fc673ce7d0bc9d0d87d79ebd084c1d34a7c82e0930f96a7a4de302bbe2fbe1a3d861df617e0b4451bf3a0
-DIST gthumb-3.0.0.tar.xz 5781108 SHA256 5b6116a69897ee9aeba8db3d1ac800e9a62308738367533268acea40519f58b4 SHA512 2fdd65fc4172c6ff0a51dd33a149ed98c9e451f3e6870d5bcc9c1282aa56ca7e782ca5100c27e0997b009f128a7a8aa1081ee6d196deb5447b36cced572a9a79 WHIRLPOOL c47e1eeb3afd99dde19f4446b019a53c6abafb93879ffd1d0f67f496d58fdb71128fa8034265fcabff8bb2750c854b6e0af181e2eee218e9d8cb71e4c493448e
 DIST gthumb-3.0.2.tar.xz 5803480 SHA256 eeccb23103b00e82941ba78023fa784228aab644bcffffc6ccef77dc47aad557 SHA512 00a9ebfcedb8905ed2c05132eed70644ddfe239da9055d377652fd8f9e4fd84e1ffb1f7e33d3fb46b166e31120c128f09f17edd6c02000f96cc9958623c21c43 WHIRLPOOL 48a1e80cf6c03f8e8aed9f0507983ae1ae22e96c003da7382fe7d065ca5108ce9f1daa279e3f6317a27e31f271335f71e97d9f4bb75ea2c7b3d10ff3230dd573
-EBUILD gthumb-2.14.4.ebuild 2262 SHA256 260b883842f468603244452bb7851777e3cd2f7970b0a5025957e25020e0ca21 SHA512 6be25269a448832d1a159dd6ce0a2f25fd1b60d497b7b94b5ec50afb511c03f659200e10926545782679b07d4e9f99b5f5bf349fe0b7a41f056e5f9b0386d95c WHIRLPOOL dd5e34ef9e251d799df80fd7d34e0c8c6776eea6f4bf1615427b9821c967c779c4ed42f84f15de9520236cd866c8f2c822199b8b7b4429b40c32871fbbab6e03
-EBUILD gthumb-3.0.0.ebuild 2299 SHA256 0c5e0dcc849fe5dda5218a8a169cb7cc1958d82eb68cf72a6b7f9f90199327ba SHA512 634797bdab57c3ef7795b7340fa47145123e445dbeaeb7b1887031d86a66d54d385c98371f17c5c590969f5b9a0b5fa0f19df169d71fcdc18b53fccf78a03e28 WHIRLPOOL 70f120e98f4687290a15123b3e7a50d1aece32613ff4a2d21cdfea6cf19844b65a7e84ed4c07140d3d3c1e650792a88f53a06b673c11e0e5a55f3b535ffa3564
-EBUILD gthumb-3.0.2.ebuild 2212 SHA256 c6c2c68a8e10ae226c0d1a96379f3cac20c2f1579ddae5da884c3c5c3ebfe3c9 SHA512 bd7e419e08723de4756da330710dcc58964fe51324ba5ede91f6af35a9111ee1b2ed49aeb7716689c0f12768b4a0ec1a3c62ba86e7144266d658f8602f53031d WHIRLPOOL b04ca8280e6c19887bae940043c5eaaa2288ad58bf0e8c81e97f0d6f41b4fcd83427f80230f715c85d9c87211786007441b5e111a1fba638a0e51b536f8ae22c
-MISC ChangeLog 23954 SHA256 cea6d8cebbbd734f797e93d902b65a01a77846364af8f270e6ef1f3a219f250f SHA512 42a270f87cd39c64baeccee2efce2d2b396afbecad25b1ba5b30fbbba9c9ae86fe5eefe954e3c97dbc3c6a7c7a1e462ca246608d2854beebfab34c0a9485ceca WHIRLPOOL d3676c1c45f1d2448f5f11bbba5db4e135c2aee218516fe35f50b37da9ca75cb3931c9770671a35ed692aea8e8c3bd2a719271afdb008fa613b296b8b79fafbe
+EBUILD gthumb-2.14.4.ebuild 2206 SHA256 54a8a6d2539d18b4b04c0594426182c82064ebe902f1c8c74c4001125623f3b4 SHA512 9ea843f2ee2e12cd735b233dcb60b63e59a99aa30b778476220a062a3d9132406c3e5c7fdfd29bd47bcf6c36ab7e8f018bdb1215f764ddc2a9ab4ddb109166da WHIRLPOOL 3c63ed66fb5edd6f9616f87d8fca678dfacfc080152c23eeebe08d6c3b0d3a37c4b81b737d4cc749cbdc1aeb7683ed3aa316080d8561b7f31798023cbf613f7e
+EBUILD gthumb-3.0.2.ebuild 2227 SHA256 cfa38c5fc0c035e17cdf4e97d59ae2c210df8ee7755a33a638b957f1b193cf9f SHA512 11a7742d7cccfb99dc7a66376c83fa892e9ec224599ee2000d219c20300aeea118df22f0c3153b524479be0727879c71cd30d05b21519774473d12397388fb9a WHIRLPOOL ffd3806e9ad080eeadfd616cb14cea334e19914f9b1807b34ab884060dc3c3a53925323949d452fb009f1b1edda70178de0e8de534fba14e653e33e65858731c
+MISC ChangeLog 24245 SHA256 51ef0e84d1d080f841b8a9de7aebc02684737d23538978c135b059219e8d2f44 SHA512 309dca8d4ef8ec392bbfd95745269f81bf09787718e51c5b3108edabd755cf13d974e65caf0d174de28297207be5f09ac3d796bc07adb418b217b0b4d170b91a WHIRLPOOL 6d86044f9876e5f164cbbdcf7a8820ca7c4c35b75dcc9b9c7db8b648b0630f1e273eeb15a849d728d0ca76392aad697aaedc65558f15263e276a58828632ca5e
 MISC metadata.xml 323 SHA256 0c127222f7e10a8f967627b17946b817e79a78e11988469a041bb50aaeaa3048 SHA512 8e1072d252d792a3fc3e82f9816759776cb67deac21c479236a69a75db45504e91a54f8cf5c1b07a49dd6f04af4e77b4ea560b77596b8bf8cb15be6bf2a83bf3 WHIRLPOOL f15f0816ab7bc6e9e540440b19f4454d3f4b094744fd5ac4e25bbfe6f959cb377bcd0099ccbdea929be007ab67614d791587f762f5bff4fa0cd4d76dac359c37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJoAIACgkQ1fmVwcYIWAaCsACfZoBdaPS/SQQgMB2HJbszHGeq
-0dQAn1g+ArrQmgs35pSHJ4FT4dcuMdki
-=ozQ1
+iQEcBAEBCAAGBQJQv8hIAAoJEJ0WA1zPCt1hQJYH+wXvFlFVyPQNoCb3tJIbxVnC
+dbn4eNQGMx+djFr0Z3iRjJkvLXnelN6vKBJ3lONn7ulXYoJQCW1Fq2kotMTRBRds
+EYUAD26E4J590/UTFNC3VMIwZ8jaUmNPW03/EDuboimh+euICObVev1SqjIwjydA
+5LcXUaUtzUce65aEIl+0/hlV/FTwwPedQyT+T5t7/jwu3lTYnVLiojFH5u3Z+aB8
+hd5+P38gmNKQAC5+TgYGA3PXzLmWMjJN6biFd/Zexu3VKXxn6hR3ShKipi0GVmwG
+XA5NNhci7tCYRoi2Tor8qtb2zScvWqPh/mJFkmkD/+SJlPHftuwGOXRNlUoqXhw=
+=g3TK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/files/gthumb-no-brasero3.patch b/media-gfx/gthumb/files/gthumb-no-brasero3.patch
deleted file mode 100644
index d11502cb015d..000000000000
--- a/media-gfx/gthumb/files/gthumb-no-brasero3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ed6037f..61ffbf4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -423,14 +423,10 @@ AC_ARG_ENABLE([libbrasero],
- 
- if test x$enable_libbrasero = xyes ; then
- 	PKG_CHECK_MODULES(LIBBRASERO,
--			  [libbrasero-burn3 >= $LIBBRASERO_REQUIRED],
--			  [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
--			   enable_libbrasero=yes],
--			  [PKG_CHECK_MODULES(LIBBRASERO,
--				   	     [libbrasero-burn >= $LIBBRASERO_REQUIRED],
--			  		     [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
--			   		      enable_libbrasero=yes],
--			  		     [enable_libbrasero=no])])
-+			  [libbrasero-burn >= $LIBBRASERO_REQUIRED],
-+			    [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
-+			      enable_libbrasero=yes],
-+			     [enable_libbrasero=no])
- fi
- AC_SUBST(LIBBRASERO_CFLAGS)
- AC_SUBST(LIBBRASERO_LIBS)
diff --git a/media-gfx/gthumb/gthumb-2.14.4.ebuild b/media-gfx/gthumb/gthumb-2.14.4.ebuild
index 33c2728b349c..93127fdfbff2 100644
--- a/media-gfx/gthumb/gthumb-2.14.4.ebuild
+++ b/media-gfx/gthumb/gthumb-2.14.4.ebuild
@@ -1,8 +1,8 @@
 # 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.4.ebuild,v 1.6 2012/10/25 20:24:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.4.ebuild,v 1.7 2012/12/05 22:18:46 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,10 +11,10 @@ inherit gnome2
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="https://live.gnome.org/gthumb"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg raw tiff test"
 
 # We can't link against libbrasero-burn3
 RDEPEND=">=dev-libs/glib-2.28.0:2
@@ -22,13 +22,13 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/libunique-1.1.2:1
 
-	media-libs/libpng:0
+	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 )
+	exif? ( >=media-gfx/exiv2-0.18:= )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
 	gstreamer? (
 		media-libs/gstreamer:0.10
@@ -36,12 +36,9 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 	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 )
+	jpeg? ( virtual/jpeg:0= )
+	tiff? ( media-libs/tiff:= )
+	raw? ( >=media-libs/libopenraw-0.0.8:= )
 	!raw? ( media-gfx/dcraw )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -57,6 +54,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 # Upstream says in configure help that libchamplain support crashes
 # frequently
+# Clutter disabled for bug #435164
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-libchamplain
@@ -69,7 +67,7 @@ pkg_setup() {
 		$(use_enable http libsoup)
 		$(use_enable jpeg)
 		$(use_enable raw libopenraw)
-		$(use_enable slideshow clutter)
+		--disable-clutter
 		$(use_enable test test-suite)
 		$(use_enable tiff)"
 	DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/media-gfx/gthumb/gthumb-3.0.0.ebuild b/media-gfx/gthumb/gthumb-3.0.0.ebuild
deleted file mode 100644
index d23981a63190..000000000000
--- a/media-gfx/gthumb/gthumb-3.0.0.ebuild
+++ /dev/null
@@ -1,84 +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-3.0.0.ebuild,v 1.5 2012/10/25 20:24:33 eva 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 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow svg tiff test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.2.0:3
-
-	media-libs/libpng:0
-	sys-libs/zlib
-	x11-libs/libSM
-
-	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.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-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 )"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.4"
-DEPEND="${COMMON_DEPEND}
-	virtual/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
-		$(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 svg librsvg)
-		$(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-3.0.2.ebuild b/media-gfx/gthumb/gthumb-3.0.2.ebuild
index 91e4f896650f..8cab722734ca 100644
--- a/media-gfx/gthumb/gthumb-3.0.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.0.2.ebuild
@@ -1,8 +1,8 @@
 # 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-3.0.2.ebuild,v 1.1 2012/10/25 20:24:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.0.2.ebuild,v 1.2 2012/12/05 22:18:46 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="https://live.gnome.org/gthumb"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow svg tiff test"
@@ -20,13 +20,13 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.2:3
 
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
 
 	cdr? ( >=app-cdr/brasero-3.2 )
-	exif? ( >=media-gfx/exiv2-0.21 )
+	exif? ( >=media-gfx/exiv2-0.21:= )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-3.2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
@@ -34,13 +34,13 @@ COMMON_DEPEND="
 	http? (
 		>=net-libs/libsoup-2.36:2.4
 		>=net-libs/libsoup-gnome-2.36:2.4 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg:0= )
 	slideshow? (
 		>=media-libs/clutter-1:1.0
 		>=media-libs/clutter-gtk-1:1.0 )
 	svg? ( >=gnome-base/librsvg-2.34 )
-	tiff? ( media-libs/tiff )
-	raw? ( >=media-libs/libopenraw-0.0.8 )
+	tiff? ( media-libs/tiff:= )
+	raw? ( >=media-libs/libopenraw-0.0.8:= )
 	!raw? ( media-gfx/dcraw )"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gsettings-desktop-schemas-0.1.4"