version bump. apply as-needed patch, fixes #132483 and #130284

(Portage version: 2.1_pre10-r3)

9 files changed, 92 insertions, 1 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 79a96da18022..118fb45566bd 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2006/05/07 20:08:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.56 2006/05/07 20:11:52 allanonjl Exp $
+
+*gthumb-2.6.9 (07 May 2006)
+
+  07 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gthumb-2.6.8-as-needed.patch, +gthumb-2.6.9.ebuild:
+  version bump.  apply as-needed patch, fixes #132483 and #130284
 
   07 May 2006; Markus Rothe <corsair@gentoo.org> gthumb-2.6.8-r2.ebuild:
   Stable on ppc64; bug #112129
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.3 b/media-gfx/gthumb/files/digest-gthumb-2.6.3
index c1f203f350f9..15a7d99931b9 100644
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.3
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.3
@@ -1 +1,3 @@
 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.5 b/media-gfx/gthumb/files/digest-gthumb-2.6.5
index 0295bcd78d24..95064ce95b04 100644
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.5
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.5
@@ -1 +1,3 @@
 MD5 726d88dcd16c7d895e7f5de86873f3a6 gthumb-2.6.5.tar.bz2 2339545
+RMD160 489233ca4e6e7e7bfab6483f2a2708c23f03dae9 gthumb-2.6.5.tar.bz2 2339545
+SHA256 86a82035d47e6a74f98ee8e825c348935dd348647aca53ef7044976bc9aa9d23 gthumb-2.6.5.tar.bz2 2339545
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.8 b/media-gfx/gthumb/files/digest-gthumb-2.6.8
index 012b049935ae..fb2273f98d3f 100644
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.8
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.8
@@ -1 +1,3 @@
 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
index 012b049935ae..fb2273f98d3f 100644
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r1
@@ -1 +1,3 @@
 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-r2 b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2
index 012b049935ae..fb2273f98d3f 100644
--- a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2
@@ -1 +1,3 @@
 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.9 b/media-gfx/gthumb/files/digest-gthumb-2.6.9
new file mode 100644
index 000000000000..ec7cb74ff6c3
--- /dev/null
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.9
@@ -0,0 +1,3 @@
+MD5 56b35aa24d4461d7e0ee3c4dea3c6141 gthumb-2.6.9.tar.bz2 1785398
+RMD160 b3832478f6ae795643a11ec2f83e3fbe72c8c633 gthumb-2.6.9.tar.bz2 1785398
+SHA256 da2a7e2c92d7ead726cb742a05230c311daed2fd3e8e11f069154eb746aef2e2 gthumb-2.6.9.tar.bz2 1785398
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
new file mode 100644
index 000000000000..7a1c8826cb8c
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.6.8-as-needed.patch
@@ -0,0 +1,13 @@
+--- 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/gthumb-2.6.9.ebuild b/media-gfx/gthumb/gthumb-2.6.9.ebuild
new file mode 100644
index 000000000000..6bbd92cd14a9
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.6.9.ebuild
@@ -0,0 +1,59 @@
+# 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.9.ebuild,v 1.1 2006/05/07 20:11:52 allanonjl Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="http://gthumb.sourceforge.net/"
+LICENSE="GPL-2"
+
+IUSE="exif jpeg tiff png gphoto2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+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
+	exif? ( >=media-libs/libexif-0.5.12 )
+	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable exif) $(use_enable gphoto2) \
+			$(use_enable jpeg) $(use_enable png) $(use_enable tiff)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix for bug #112129, backported from CVS upstream
+	epatch "${FILESDIR}"/${PN}-2.6.8-Makefile.patch
+
+	# Add configure options (Bug #103365), patch merged upstream
+	epatch "${FILESDIR}"/${PN}-2.6.8-options.patch
+
+	# as-needed #130284
+	epatch "${FILESDIR}"/${PN}-2.6.8-as-needed.patch
+
+	eautoreconf
+}