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

Package-Manager: portage-2.1_pre10-r3

10 files changed, 157 insertions, 8 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/Manifest b/media-gfx/gthumb/Manifest
index d24e2d1989e1..477ae59c6704 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,16 +1,74 @@
-MD5 044800a0e2635ea9beee75309b9548f8 ChangeLog 7546
-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
-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
+AUX gthumb-2.6.8-Makefile.patch 1326 RMD160 5dacfd9013dfbd47f88ef539152b51fc882a3ba0 SHA1 ac9a0d7fa2e30fdad10cc6be8e91d8e649763a48 SHA256 fa85a4109772419810b05d3f0663df6c567cd61c4e21dc6708fadb92b653d7ec size 1326
 MD5 ee3d9e84ae0099f382f5ebf3e922c5b4 files/gthumb-2.6.8-Makefile.patch 1326
+RMD160 5dacfd9013dfbd47f88ef539152b51fc882a3ba0 files/gthumb-2.6.8-Makefile.patch 1326
+SHA256 fa85a4109772419810b05d3f0663df6c567cd61c4e21dc6708fadb92b653d7ec files/gthumb-2.6.8-Makefile.patch 1326
+AUX gthumb-2.6.8-as-needed.patch 391 RMD160 8697ccb9b2ce79edaa3ed5ad88198490f534e446 SHA1 f1206a50a4324edf35167d125b173a0cd9443da7 SHA256 7db7b9a7fd801bea8a2dcbf274119faa8ee14a91201ede55e5f6c8132a42fb0d size 391
+MD5 5cc31d6ceea3e045c8d5d8a552780f64 files/gthumb-2.6.8-as-needed.patch 391
+RMD160 8697ccb9b2ce79edaa3ed5ad88198490f534e446 files/gthumb-2.6.8-as-needed.patch 391
+SHA256 7db7b9a7fd801bea8a2dcbf274119faa8ee14a91201ede55e5f6c8132a42fb0d files/gthumb-2.6.8-as-needed.patch 391
+AUX gthumb-2.6.8-options.patch 8388 RMD160 8a88e8fe84741265d4c42aa5232db597dc4cd2d1 SHA1 b7f76972480893d28146b90561bd152bc377ee50 SHA256 780708872f64f4704d2fc93961db8c5db01564a9484488e95c9a0c2727903ad2 size 8388
 MD5 0c9d5458cd12555affb94e578cf10554 files/gthumb-2.6.8-options.patch 8388
+RMD160 8a88e8fe84741265d4c42aa5232db597dc4cd2d1 files/gthumb-2.6.8-options.patch 8388
+SHA256 780708872f64f4704d2fc93961db8c5db01564a9484488e95c9a0c2727903ad2 files/gthumb-2.6.8-options.patch 8388
+DIST gthumb-2.6.3.tar.bz2 2186161 RMD160 6f68caf6517095e38505c67d6c32ee270d8ea7df SHA256 86218b1bfc57edbcbf6120552354b1606c9b54a899717e734b1cd4ce828b4097 size 2186161
+DIST gthumb-2.6.5.tar.bz2 2339545 RMD160 489233ca4e6e7e7bfab6483f2a2708c23f03dae9 SHA256 86a82035d47e6a74f98ee8e825c348935dd348647aca53ef7044976bc9aa9d23 size 2339545
+DIST gthumb-2.6.7.tar.bz2 2342501 size 2342501
+DIST gthumb-2.6.8.tar.bz2 2343475 RMD160 683b4b1a2e43e4c7f2d68fa50696eecdec61844d SHA256 296f66f689d1c1b002bb626530fa0cde20fdae418c228db058e048826e59a399 size 2343475
+DIST gthumb-2.6.9.tar.bz2 1785398 RMD160 b3832478f6ae795643a11ec2f83e3fbe72c8c633 SHA256 da2a7e2c92d7ead726cb742a05230c311daed2fd3e8e11f069154eb746aef2e2 size 1785398
+EBUILD gthumb-2.6.3.ebuild 1238 RMD160 fdee0f0cd2318283b87c48e06f2655929b2d98c0 SHA1 14e13ce96de7dd67367829214b6c34bdf6de45e7 SHA256 4eed4aa22fd55cda57785943f1ea0df8e4a26cfa5fe33ef515ab8e24d3282a0d size 1238
 MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238
+RMD160 fdee0f0cd2318283b87c48e06f2655929b2d98c0 gthumb-2.6.3.ebuild 1238
+SHA256 4eed4aa22fd55cda57785943f1ea0df8e4a26cfa5fe33ef515ab8e24d3282a0d gthumb-2.6.3.ebuild 1238
+EBUILD gthumb-2.6.5.ebuild 1421 RMD160 5fde3411f732a218268f624a27f4500e881affa3 SHA1 4e96ab1285ea5c8574ded28220757922076c74d9 SHA256 e6d68be8ef31ea352e8397ad7edb70ea19fc5e2adc1345993af66fc71e6749d0 size 1421
 MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421
+RMD160 5fde3411f732a218268f624a27f4500e881affa3 gthumb-2.6.5.ebuild 1421
+SHA256 e6d68be8ef31ea352e8397ad7edb70ea19fc5e2adc1345993af66fc71e6749d0 gthumb-2.6.5.ebuild 1421
+EBUILD gthumb-2.6.7.ebuild 1425 RMD160 28b580b4ac09873c460a0ff64d7b6d2ce7ab81f9 SHA1 a9b9e615c333594b8d75787a0c7aef88a0586c91 SHA256 fa2e6ddb7e6946233cc85d0ab55397dae67ae0b8b9b02e028d1d7178f7481fd3 size 1425
 MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425
+RMD160 28b580b4ac09873c460a0ff64d7b6d2ce7ab81f9 gthumb-2.6.7.ebuild 1425
+SHA256 fa2e6ddb7e6946233cc85d0ab55397dae67ae0b8b9b02e028d1d7178f7481fd3 gthumb-2.6.7.ebuild 1425
+EBUILD gthumb-2.6.8-r1.ebuild 1376 RMD160 d48f33f253b7183968d86d02346df9c822ff2c63 SHA1 409560da437c871defb99e9f5b74a9304822efe4 SHA256 c8c5967bdc0ec2edceb33016636e39d3f96fbde64e737259e620ce708f93634a size 1376
 MD5 f41704454939e52af874702071f4ac5e gthumb-2.6.8-r1.ebuild 1376
+RMD160 d48f33f253b7183968d86d02346df9c822ff2c63 gthumb-2.6.8-r1.ebuild 1376
+SHA256 c8c5967bdc0ec2edceb33016636e39d3f96fbde64e737259e620ce708f93634a gthumb-2.6.8-r1.ebuild 1376
+EBUILD gthumb-2.6.8-r2.ebuild 1588 RMD160 5f94bc20045a11954e51ae729f859a3aa0e206cb SHA1 3ad22e46569d50f0733dc91c4ebb90e7c77e293a SHA256 a3a634e513dbdc81a8a7689ccd99612e35bed0886ff18b56a5c6e8b701d08a9a size 1588
 MD5 b5071035add8de1bca2444d1cc3f1888 gthumb-2.6.8-r2.ebuild 1588
+RMD160 5f94bc20045a11954e51ae729f859a3aa0e206cb gthumb-2.6.8-r2.ebuild 1588
+SHA256 a3a634e513dbdc81a8a7689ccd99612e35bed0886ff18b56a5c6e8b701d08a9a gthumb-2.6.8-r2.ebuild 1588
+EBUILD gthumb-2.6.8.ebuild 1420 RMD160 f6b935a3be0a9e75d337823dce39fcf824b4aca9 SHA1 d7994ca2365e511f2bb2ec9d04e9bf5dda733099 SHA256 9b057b0d79d261f3939b275105a6abfbed6e4907eda41e73e8073051056603d9 size 1420
 MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420
+RMD160 f6b935a3be0a9e75d337823dce39fcf824b4aca9 gthumb-2.6.8.ebuild 1420
+SHA256 9b057b0d79d261f3939b275105a6abfbed6e4907eda41e73e8073051056603d9 gthumb-2.6.8.ebuild 1420
+EBUILD gthumb-2.6.9.ebuild 1608 RMD160 c06bb930764e5c5c7e019c6df9ece21c9271d7a4 SHA1 0f709531a8415c236c879db4f40f10974657cc0e SHA256 85cafece935c91873f554701fd40718e8b039f2307c52c177dc60f07c28a3330 size 1608
+MD5 990496220ff962b630e8eadb79c74424 gthumb-2.6.9.ebuild 1608
+RMD160 c06bb930764e5c5c7e019c6df9ece21c9271d7a4 gthumb-2.6.9.ebuild 1608
+SHA256 85cafece935c91873f554701fd40718e8b039f2307c52c177dc60f07c28a3330 gthumb-2.6.9.ebuild 1608
+MISC ChangeLog 7761 RMD160 e818b7f142891c8479077a076f25d935b1d0935c SHA1 31d6e9c45a2fc1a5b4e5b73359742d8e867d6f68 SHA256 021cfac0d00579e5e6570de7f8172c22708142091ddf096928f6f336068ac73b size 7761
+MD5 fb69815ba7a076ea540b4cc45d2d319f ChangeLog 7761
+RMD160 e818b7f142891c8479077a076f25d935b1d0935c ChangeLog 7761
+SHA256 021cfac0d00579e5e6570de7f8172c22708142091ddf096928f6f336068ac73b ChangeLog 7761
+MISC metadata.xml 222 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 SHA1 e78ebe8223fab03acef8562079599d6d962e494e SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f size 222
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 metadata.xml 222
+SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f metadata.xml 222
+MD5 8f464fe5b1811238908cbd419b2eb42a files/digest-gthumb-2.6.3 244
+RMD160 8a20eae1512f370daabf2982b4645d4db6329846 files/digest-gthumb-2.6.3 244
+SHA256 44328369703efdadc1461699d74790a4ef93d349957a25802a1bb654f058a9ca files/digest-gthumb-2.6.3 244
+MD5 95ea600101614b212932b534508bd10c files/digest-gthumb-2.6.5 244
+RMD160 40ad8276356a140799a0a0c984d8d853758f0546 files/digest-gthumb-2.6.5 244
+SHA256 d42adc5e1bdd0c0ca87e76f2aad1794566b94491049d1fa0a94029e03d98e23b files/digest-gthumb-2.6.5 244
+MD5 af2acaad904b53afb8e81cc75c772af0 files/digest-gthumb-2.6.7 66
+RMD160 2aed06913442f164a07515fe5cc736cce2f8f6e9 files/digest-gthumb-2.6.7 66
+SHA256 86d69d9c6cd8edeb8683c5c7cc1bb508069d3e1cd20620a18a128ae528195fa1 files/digest-gthumb-2.6.7 66
+MD5 6442689278863c90c65493f65d9aa4f3 files/digest-gthumb-2.6.8 244
+RMD160 6b2d35b638620ebb8fa50e90e858f0ffba9fac98 files/digest-gthumb-2.6.8 244
+SHA256 1928506d79a9e1d3a50ad9432ec1770deb7750937a59b1a93e9e36124064f20a files/digest-gthumb-2.6.8 244
+MD5 6442689278863c90c65493f65d9aa4f3 files/digest-gthumb-2.6.8-r1 244
+RMD160 6b2d35b638620ebb8fa50e90e858f0ffba9fac98 files/digest-gthumb-2.6.8-r1 244
+SHA256 1928506d79a9e1d3a50ad9432ec1770deb7750937a59b1a93e9e36124064f20a files/digest-gthumb-2.6.8-r1 244
+MD5 6442689278863c90c65493f65d9aa4f3 files/digest-gthumb-2.6.8-r2 244
+RMD160 6b2d35b638620ebb8fa50e90e858f0ffba9fac98 files/digest-gthumb-2.6.8-r2 244
+SHA256 1928506d79a9e1d3a50ad9432ec1770deb7750937a59b1a93e9e36124064f20a files/digest-gthumb-2.6.8-r2 244
+MD5 aa08f99c0097ea67bf32a1d4ccfa4cce files/digest-gthumb-2.6.9 244
+RMD160 e80e5af01f85ccb189be847f158b2f4016966875 files/digest-gthumb-2.6.9 244
+SHA256 9938d41a76ec9038f163b8f0919cfaa4fe586549e539de77c3e9049d423c317f files/digest-gthumb-2.6.9 244
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
+}