Added patch to fix compilation when USE=-exif (bug #163533). Pruning old ebuilds.

(Portage version: 2.1.2-r3)

12 files changed, 45 insertions, 260 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index a594a4cf65ea..a76e8b8feefd 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,14 +1,21 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.61 2007/01/23 19:31:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.62 2007/01/25 23:14:22 leonardop Exp $
+
+  25 Jan 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gthumb-2.8.1-noexif_fixes.patch, gthumb-2.8.1.ebuild:
+  Added patch to fix compilation when USE=-exif (bug #163533). Set
+  WANT_AUTO* variables explicitly.
 
   23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/gthumb-2.8.1-respect-zoom-pref.patch, gthumb-2.8.1.ebuild:
   Include zoom pref fix from bug #156342
 
-  23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
-  Bump to 2.8.1
-  	- New stable version after a development cycle, so tons of changes.
+*gthumb-2.8.1 (23 Jan 2007)
+
+  23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org> +gthumb-2.8.1.ebuild:
+  Bump to 2.8.1. New stable version after a development cycle, so tons of
+  changes.
 
   21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   gthumb-2.6.8-r2.ebuild:
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.3 b/media-gfx/gthumb/files/digest-gthumb-2.6.3
deleted file mode 100644
index 15a7d99931b9..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c5553beb22c1025547a9726243b08e3 gthumb-2.6.3.tar.bz2 2186161
-RMD160 6f68caf6517095e38505c67d6c32ee270d8ea7df gthumb-2.6.3.tar.bz2 2186161
-SHA256 86218b1bfc57edbcbf6120552354b1606c9b54a899717e734b1cd4ce828b4097 gthumb-2.6.3.tar.bz2 2186161
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.7 b/media-gfx/gthumb/files/digest-gthumb-2.6.7
deleted file mode 100644
index 0b0b59f1eee3..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4a155affbddc5af3ce82c623c1329225 gthumb-2.6.7.tar.bz2 2342501
-RMD160 7002dac786ed73c37785d9a9c96172cfe3beb2d3 gthumb-2.6.7.tar.bz2 2342501
-SHA256 0ecddfe0b2fb3d8cc3a3c3282beed75f8bc9b4262781556aff3604d75200f35d gthumb-2.6.7.tar.bz2 2342501
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.8 b/media-gfx/gthumb/files/digest-gthumb-2.6.8
deleted file mode 100644
index fb2273f98d3f..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9dcc9600feb5e1cab9d876f1a047a621 gthumb-2.6.8.tar.bz2 2343475
-RMD160 683b4b1a2e43e4c7f2d68fa50696eecdec61844d gthumb-2.6.8.tar.bz2 2343475
-SHA256 296f66f689d1c1b002bb626530fa0cde20fdae418c228db058e048826e59a399 gthumb-2.6.8.tar.bz2 2343475
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1 b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1
deleted file mode 100644
index fb2273f98d3f..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9dcc9600feb5e1cab9d876f1a047a621 gthumb-2.6.8.tar.bz2 2343475
-RMD160 683b4b1a2e43e4c7f2d68fa50696eecdec61844d gthumb-2.6.8.tar.bz2 2343475
-SHA256 296f66f689d1c1b002bb626530fa0cde20fdae418c228db058e048826e59a399 gthumb-2.6.8.tar.bz2 2343475
diff --git a/media-gfx/gthumb/files/gthumb-2.6.8-as-needed.patch b/media-gfx/gthumb/files/gthumb-2.6.8-as-needed.patch
deleted file mode 100644
index 7a1c8826cb8c..000000000000
--- a/media-gfx/gthumb/files/gthumb-2.6.8-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgthumb/Makefile.am.orig	2006-05-06 19:53:15.000000000 +0200
-+++ libgthumb/Makefile.am	2006-05-06 20:10:21.000000000 +0200
-@@ -124,6 +124,10 @@
- 	thumb-loader.c			\
- 	utf8-fnmatch.c
- 
-+libgthumb_la_LIBADD =	\
-+	$(TIFF_LIBS)		\
-+	$(GTHUMB_LIBS)
-+
- 
- gthumb-marshal.h: gthumb-marshal.list $(GLIB_GENMARSHAL)
- 	$(GLIB_GENMARSHAL) gthumb-marshal.list --header --prefix=gthumb_marshal > $@
diff --git a/media-gfx/gthumb/files/gthumb-2.8.1-noexif_fixes.patch b/media-gfx/gthumb/files/gthumb-2.8.1-noexif_fixes.patch
new file mode 100644
index 000000000000..5447124f7ca1
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.8.1-noexif_fixes.patch
@@ -0,0 +1,19 @@
+diff -NurdpB gthumb-2.8.1/src/rotation-utils.c gthumb-2.8.1-patched/src/rotation-utils.c
+--- gthumb-2.8.1/src/rotation-utils.c	2006-11-25 06:10:39.000000000 -0500
++++ gthumb-2.8.1-patched/src/rotation-utils.c	2007-01-25 17:43:57.000000000 -0500
+@@ -111,6 +111,7 @@ update_rotation_from_exif_data (const ch
+ void
+ reset_orientation_field (const char *path)
+ {
++#ifdef HAVE_LIBEXIF
+ 	JPEGData     *jdata;
+ 	ExifData     *edata;
+ 	unsigned int  i;
+@@ -150,6 +151,7 @@ reset_orientation_field (const char *pat
+ 
+ 	exif_data_unref (edata);
+ 	jpeg_data_unref (jdata);
++#endif /* HAVE_LIBEXIF */
+ }
+ 
+ 
diff --git a/media-gfx/gthumb/gthumb-2.6.3.ebuild b/media-gfx/gthumb/gthumb-2.6.3.ebuild
deleted file mode 100644
index 4671e22cafe4..000000000000
--- a/media-gfx/gthumb/gthumb-2.6.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.3.ebuild,v 1.6 2005/06/06 17:32:25 foser Exp $
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE="jpeg tiff png gphoto2"
-
-# FIXME : configure switches, no autodetection
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomecanvas-2.6
-	>=gnome-base/gnome-vfs-2.6
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnomeprint-2.6
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/gconf-2.6
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_install() {
-
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-
-}
-
-USE_DESTDIR="1"
diff --git a/media-gfx/gthumb/gthumb-2.6.7.ebuild b/media-gfx/gthumb/gthumb-2.6.7.ebuild
deleted file mode 100644
index 9598cfc6289f..000000000000
--- a/media-gfx/gthumb/gthumb-2.6.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.7.ebuild,v 1.1 2005/09/17 00:37:21 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
-
-IUSE="jpeg tiff png gphoto2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-
-# FIXME : configure switches, no autodetection
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomecanvas-2.6
-	>=gnome-base/gnome-vfs-2.6
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnomeprint-2.6
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/gconf-2.6
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# testing for bug #78843
-	rm ${S}/components/catalog-view/*.server
-	rm ${S}/components/image-viewer/*.server
-
-}
-
-src_install() {
-
-	# workaround #92920 FIXME
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-
-}
diff --git a/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild b/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild
deleted file mode 100644
index 8ddea1e19467..000000000000
--- a/media-gfx/gthumb/gthumb-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/12/19 10:59:35 corsair Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
-
-IUSE="jpeg tiff png gphoto2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# FIXME : configure switches, no autodetection
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomecanvas-2.6
-	>=gnome-base/gnome-vfs-2.6
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnomeprint-2.6
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/gconf-2.6
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# fix for bug #112129, backported from CVS upstream
-	epatch ${FILESDIR}/gthumb-2.6.8-Makefile.patch
-
-	gnome2_omf_fix doc/*/Makefile.in
-
-	eautoreconf
-}
diff --git a/media-gfx/gthumb/gthumb-2.6.8.ebuild b/media-gfx/gthumb/gthumb-2.6.8.ebuild
deleted file mode 100644
index dde01923561f..000000000000
--- a/media-gfx/gthumb/gthumb-2.6.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.1 2005/09/26 16:23:51 obz Exp $
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
-
-IUSE="jpeg tiff png gphoto2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-
-# FIXME : configure switches, no autodetection
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomecanvas-2.6
-	>=gnome-base/gnome-vfs-2.6
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnomeprint-2.6
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/gconf-2.6
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# testing for bug #78843
-	rm ${S}/components/catalog-view/*.server
-	rm ${S}/components/image-viewer/*.server
-
-}
-
-src_install() {
-
-	# workaround #92920 FIXME
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-
-}
diff --git a/media-gfx/gthumb/gthumb-2.8.1.ebuild b/media-gfx/gthumb/gthumb-2.8.1.ebuild
index 777832894edf..a3ffa0b6506e 100644
--- a/media-gfx/gthumb/gthumb-2.8.1.ebuild
+++ b/media-gfx/gthumb/gthumb-2.8.1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.2 2007/01/23 19:31:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.3 2007/01/25 23:14:22 leonardop Exp $
 
-inherit gnome2 eutils autotools
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.8"
+
+inherit eutils autotools gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="http://gthumb.sourceforge.net/"
 LICENSE="GPL-2"
 
-IUSE="exif jpeg tiff gphoto2"
+IUSE="exif gphoto2 jpeg tiff"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
@@ -38,8 +41,10 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable exif) $(use_enable gphoto2) \
-			$(use_enable jpeg) $(use_enable tiff)"
+	G2CONF="$(use_enable exif) \
+		$(use_enable gphoto2) \
+		$(use_enable jpeg) \
+		$(use_enable tiff)"
 }
 
 src_unpack() {
@@ -47,10 +52,13 @@ src_unpack() {
 
 	# as-needed #130284
 	# New as-needed, including gphoto fixes
-	epatch "${FILESDIR}"/${PN}-2.8.1-as-needed.patch
+	epatch "${FILESDIR}/${PN}-2.8.1-as-needed.patch"
 
 	# Respect zoom preferences.  Bug #156342
-	epatch "${FILESDIR}"/${PN}-2.8.1-respect-zoom-pref.patch
+	epatch "${FILESDIR}/${PN}-2.8.1-respect-zoom-pref.patch"
+
+	# Fix compilation if USE=-exif (bug #163533)
+	epatch "${FILESDIR}/${P}-noexif_fixes.patch"
 
 	eautoreconf
 }