Options patch round 2; resolves Bug #118613

(Portage version: 2.1_pre3-r1)

4 files changed, 13 insertions, 9 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 4f105b98c935..74e3b838ee84 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.53 2006/01/10 23:05:36 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.54 2006/01/11 23:34:46 compnerd Exp $
+
+  11 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  files/gthumb-2.6.8-options.patch, gthumb-2.6.8-r2.ebuild:
+  Fixing up options patch (Bug #118613).  Adding missing exif flag.
 
 *gthumb-2.6.8-r2 (10 Jan 2006)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 201a43602066..d61b7e5cd1b0 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,4 @@
-MD5 8f942fefeeec98279ae144b03b40fbc6 ChangeLog 7257
+MD5 a647f510082591621faa9e65b551a118 ChangeLog 7442
 MD5 c1d4c50442ad19c29af3bb85dd427716 files/digest-gthumb-2.6.3 66
 MD5 1724520898546aadcf150ec88c8a2e7a files/digest-gthumb-2.6.5 66
 MD5 af2acaad904b53afb8e81cc75c772af0 files/digest-gthumb-2.6.7 66
@@ -6,11 +6,11 @@ MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8 66
 MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8-r1 66
 MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8-r2 66
 MD5 ee3d9e84ae0099f382f5ebf3e922c5b4 files/gthumb-2.6.8-Makefile.patch 1326
-MD5 d7db541c678b9e3856f0c63292c416a1 files/gthumb-2.6.8-options.patch 8379
+MD5 0c9d5458cd12555affb94e578cf10554 files/gthumb-2.6.8-options.patch 8388
 MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238
 MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421
 MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425
 MD5 f41704454939e52af874702071f4ac5e gthumb-2.6.8-r1.ebuild 1376
-MD5 a30ddfff0b8d2a3d7b75ffc2006928f6 gthumb-2.6.8-r2.ebuild 1585
+MD5 60ed0c4b5f7f1f8b3a83bf098d7e51b1 gthumb-2.6.8-r2.ebuild 1590
 MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
diff --git a/media-gfx/gthumb/files/gthumb-2.6.8-options.patch b/media-gfx/gthumb/files/gthumb-2.6.8-options.patch
index 9884989c897a..bc1cf7941e97 100644
--- a/media-gfx/gthumb/files/gthumb-2.6.8-options.patch
+++ b/media-gfx/gthumb/files/gthumb-2.6.8-options.patch
@@ -251,12 +251,12 @@
 +   AC_MSG_CHECKING(GPHOTO2 Support)
 +   AC_MSG_RESULT()
 +
-+   PKG_CHECK_MODULES(GPHOTO, libgphoto2 >= $LIBGPHOTO_REQUIRED)
++   PKG_CHECK_MODULES(LIBGPHOTO, libgphoto2 >= $LIBGPHOTO_REQUIRED)
 +
 +   AC_DEFINE(HAVE_LIBGPHOTO, 1, [Define to 1 to enable libgphoto2 support])
 +
-+   AC_SUBST(GPHOTO_LIBS)
-+   AC_SUBST(GPHOTO_CFLAGS)
++   AC_SUBST(LIBGPHOTO_LIBS)
++   AC_SUBST(LIBGPHOTO_CFLAGS)
 +
 +   HAVE_GPHOTO2=yes
 +else
diff --git a/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild b/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild
index 38a411710dab..61d493d11987 100644
--- a/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild
+++ b/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild,v 1.1 2006/01/10 23:05:36 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild,v 1.2 2006/01/11 23:34:46 compnerd Exp $
 
 inherit gnome2 eutils autotools
 
@@ -8,7 +8,7 @@ DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="http://gthumb.sourceforge.net/"
 LICENSE="GPL-2"
 
-IUSE="jpeg tiff png gphoto2"
+IUSE="exif jpeg tiff png gphoto2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"