fix exif dependency which is not optional anymore (bug #205843)

Package-Manager: portage-2.1.4_rc14

4 files changed, 29 insertions, 25 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index e153147adebc..f53072919df8 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.81 2008/01/03 20:35:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.82 2008/01/16 16:15:10 eva Exp $
+
+  16 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> gthumb-2.10.7.ebuild,
+  gthumb-2.10.8.ebuild:
+  fix exif dependency which is not optional anymore (bug #205843)
 
 *gthumb-2.10.8 (03 Jan 2008)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 1ab1cac3c9ef..79ef045d6806 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST gthumb-2.10.7.tar.bz2 2440758 RMD160 dea6665c105dd177dc179f4bbb60d15a875d1bf3 SHA1 21f7c619322018878f409ef1400afeab32de1077 SHA256 e420211d0b17ba533c8c4ceb6f5d939c72d3772d83f0f718518c1b49ef0ef58c
 DIST gthumb-2.10.8.tar.bz2 2446803 RMD160 e0b1ea3109f31f251c6f30658e748bf929cbe63b SHA1 3b1c85212c851b1cf7a168d4a20cfeb9fe47aa6c SHA256 18d54f37e6fd5e21c5bcb4a43686c7bbc401afefac3d96e155a910ca7708f292
-EBUILD gthumb-2.10.7.ebuild 1301 RMD160 abfe427924b25d6eb57900f0d380e846fb8f12e1 SHA1 8e9e0597ed21b07c15ae4046b81af2699cc0e7a4 SHA256 c3fe5ca2ff64c4812cba5a31dc65f1b4914addb37d393a36fb770929a8904010
-MD5 3a57fc1837c5210c4010cd9300022f0d gthumb-2.10.7.ebuild 1301
-RMD160 abfe427924b25d6eb57900f0d380e846fb8f12e1 gthumb-2.10.7.ebuild 1301
-SHA256 c3fe5ca2ff64c4812cba5a31dc65f1b4914addb37d393a36fb770929a8904010 gthumb-2.10.7.ebuild 1301
-EBUILD gthumb-2.10.8.ebuild 1302 RMD160 95d4bb55da0ddadd80dd2bca476a04e07ef0d14d SHA1 9c66f74a902ac68dc5cee3775fd5467ea6c5e37f SHA256 99ae402bf59bf497de7def9efd0d02f50a67e704b6081ecc62a964395aec87fb
-MD5 8ab1f9d267f4d8d65f7ee2d050a4a6d1 gthumb-2.10.8.ebuild 1302
-RMD160 95d4bb55da0ddadd80dd2bca476a04e07ef0d14d gthumb-2.10.8.ebuild 1302
-SHA256 99ae402bf59bf497de7def9efd0d02f50a67e704b6081ecc62a964395aec87fb gthumb-2.10.8.ebuild 1302
-MISC ChangeLog 12355 RMD160 15f27d6753b35847786d72bbd9beb0e3942d2f63 SHA1 9a9f7a8b61d3b395a01b258a1eb214e9c6d47574 SHA256 ec6ba985db2749f4799ce3ed71456c796844168ce6e92a75f40b6fabcc1e2773
-MD5 290ab04e63f05afd6fbbc688b6e910bc ChangeLog 12355
-RMD160 15f27d6753b35847786d72bbd9beb0e3942d2f63 ChangeLog 12355
-SHA256 ec6ba985db2749f4799ce3ed71456c796844168ce6e92a75f40b6fabcc1e2773 ChangeLog 12355
+EBUILD gthumb-2.10.7.ebuild 1263 RMD160 599bdb986f30ffbab24074a8f8bd5bbd5a10b944 SHA1 89b827230465648f1e2e482e96382cd04970b233 SHA256 6315d7ea98f8a3cccbfa79edcb9facfba81a3518c5a90c142bafa84a86ffc888
+MD5 c967b6c5da3285d0406a532c0b7a03cb gthumb-2.10.7.ebuild 1263
+RMD160 599bdb986f30ffbab24074a8f8bd5bbd5a10b944 gthumb-2.10.7.ebuild 1263
+SHA256 6315d7ea98f8a3cccbfa79edcb9facfba81a3518c5a90c142bafa84a86ffc888 gthumb-2.10.7.ebuild 1263
+EBUILD gthumb-2.10.8.ebuild 1278 RMD160 114efe082ad98fb433850b46acf24ea4dc505d17 SHA1 99abaf7c4713b0451d11a9d84ffa765586e45690 SHA256 3cba7804afbb8ac2d6eb52b19682738b1a0946acf6189125ce4dbd31c10e92ad
+MD5 5fc8fb9e20cb9417c119ab7dcb6fb779 gthumb-2.10.8.ebuild 1278
+RMD160 114efe082ad98fb433850b46acf24ea4dc505d17 gthumb-2.10.8.ebuild 1278
+SHA256 3cba7804afbb8ac2d6eb52b19682738b1a0946acf6189125ce4dbd31c10e92ad gthumb-2.10.8.ebuild 1278
+MISC ChangeLog 12522 RMD160 acac42259beccece90009219206e1ea6df58be88 SHA1 4e68462033b20cef6912575eb276e0dc2e64eedf SHA256 37da2c3e10be42d1fcf441747341de52fe79d41b8ab3167a299a5d3ccace80a1
+MD5 84e41f310af0f9cc2a9c847ff098e884 ChangeLog 12522
+RMD160 acac42259beccece90009219206e1ea6df58be88 ChangeLog 12522
+SHA256 37da2c3e10be42d1fcf441747341de52fe79d41b8ab3167a299a5d3ccace80a1 ChangeLog 12522
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 d985be8c7fd5a8535ca888aeddb560a1e8e09980d22a0aafcd2c2cba8aa60bab files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd9Rv4ACgkQ1fmVwcYIWAYUzwCcCaGflwJy2R9EyNL3kSzTyQAw
-LXkAniVX2cS0vpOuAUSaNMycGJhd9ieA
-=hxbN
+iEYEARECAAYFAkeOLaYACgkQ1fmVwcYIWAbG+gCg2rfgE0Ztxyc7pUJH9J++HgJr
+lmUAoJg/BjMWRf1MF6NSK5PPz5OSB7sm
+=UCvH
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/gthumb-2.10.7.ebuild b/media-gfx/gthumb/gthumb-2.10.7.ebuild
index d2708f245a5a..e96ba2084ea8 100644
--- a/media-gfx/gthumb/gthumb-2.10.7.ebuild
+++ b/media-gfx/gthumb/gthumb-2.10.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.7.ebuild,v 1.6 2007/12/17 21:18:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.7.ebuild,v 1.7 2008/01/16 16:15:10 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://gthumb.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc ppc64 x86"
-IUSE="exif gphoto2 iptc raw tiff"
+IUSE="gphoto2 iptc raw tiff"
 
 # Unknown item missing from deps, gtkunique.
 RDEPEND=">=dev-libs/glib-2.6
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/libgnomecanvas-2.6
 	>=gnome-base/gnome-vfs-2.6
 	>=gnome-base/libglade-2.4
-	exif? ( >=media-libs/libexif-0.6.13 )
+	>=media-libs/libexif-0.6.13
 	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )
 	iptc? ( >=media-libs/libiptcdata-0.2.1 )
 	>=gnome-base/libbonobo-2.6
@@ -40,6 +40,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="$(use_enable exif) $(use_enable gphoto2) $(use_enable raw libopenraw)
+	G2CONF="$(use_enable gphoto2) $(use_enable raw libopenraw)
 		$(use_enable iptc iptcdata) $(use_enable tiff)"
 }
diff --git a/media-gfx/gthumb/gthumb-2.10.8.ebuild b/media-gfx/gthumb/gthumb-2.10.8.ebuild
index c7131432c6c8..82044001f3cd 100644
--- a/media-gfx/gthumb/gthumb-2.10.8.ebuild
+++ b/media-gfx/gthumb/gthumb-2.10.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.8.ebuild,v 1.1 2008/01/03 20:35:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.8.ebuild,v 1.2 2008/01/16 16:15:10 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://gthumb.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="exif gphoto2 iptc raw tiff"
+IUSE="gphoto2 iptc raw tiff"
 
 # Unknown item missing from deps, gtkunique.
 RDEPEND=">=dev-libs/glib-2.6
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/libgnomecanvas-2.6
 	>=gnome-base/gnome-vfs-2.6
 	>=gnome-base/libglade-2.4
-	exif? ( >=media-libs/libexif-0.6.13 )
+	>=media-libs/libexif-0.6.13
 	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )
 	iptc? ( >=media-libs/libiptcdata-0.2.1 )
 	>=gnome-base/libbonobo-2.6
@@ -40,6 +40,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="$(use_enable exif) $(use_enable gphoto2) $(use_enable raw libopenraw)
+	G2CONF="${G2CONF} $(use_enable gphoto2) $(use_enable raw libopenraw)
 		$(use_enable iptc iptcdata) $(use_enable tiff)"
 }