Add patch to link correctly while using --as-needed. Thanks to Mike Auty (ikelos) in bug #128480.

Package-Manager: portage-2.1_pre9-r3

5 files changed, 76 insertions, 19 deletions

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index a66a154466f1..7de4ed11e079 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp-print
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.70 2006/04/23 09:23:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.71 2006/04/23 10:23:25 flameeyes Exp $
+
+  23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gimp-print-4.2.7-asneeded.patch, gimp-print-4.2.7.ebuild:
+  Add patch to link correctly while using --as-needed. Thanks to Mike Auty
+  (ikelos) in bug #128480.
 
   23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   gimp-print-5.0.0_rc2.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index cf450b5df85e..f0955650ee91 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -1,33 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gimp-print-4.2.7-asneeded.patch 1632 RMD160 b67ce5afee6b944229a4b33e4630a66451df4eab SHA1 b0a0f7396906d2563c53cff5638aa8cd2dadfb47 SHA256 ce30ce227e6a5b605a0b25f695e69c6fb680d30fae3f4f2d9be40ab6b5dfb134 size 1632
+MD5 a05ec877703c18041a47316cc21318c0 files/gimp-print-4.2.7-asneeded.patch 1632
+RMD160 b67ce5afee6b944229a4b33e4630a66451df4eab files/gimp-print-4.2.7-asneeded.patch 1632
+SHA256 ce30ce227e6a5b605a0b25f695e69c6fb680d30fae3f4f2d9be40ab6b5dfb134 files/gimp-print-4.2.7-asneeded.patch 1632
 AUX gutenprint-5.0.0-rc2-asneeded.patch 1923 RMD160 d047cb3e6839cb57c28a603bd1c6227dda4a7da9 SHA1 5219311d1aa3da83d257d2923cf8123fb0b807c0 SHA256 39afdbcd0abba35db991331d6c208d23f6c130a0f4c7dc32b4b76b8de8cc68ca size 1923
 MD5 a4008ff715378b9dc53d13898ef7c236 files/gutenprint-5.0.0-rc2-asneeded.patch 1923
 RMD160 d047cb3e6839cb57c28a603bd1c6227dda4a7da9 files/gutenprint-5.0.0-rc2-asneeded.patch 1923
 SHA256 39afdbcd0abba35db991331d6c208d23f6c130a0f4c7dc32b4b76b8de8cc68ca files/gutenprint-5.0.0-rc2-asneeded.patch 1923
-DIST gimp-print-4.2.7.tar.gz 5178122 size 5178122
+DIST gimp-print-4.2.7.tar.gz 5178122 RMD160 b517b1d3cff22347053c634ed96202588d93b63e SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489 size 5178122
 DIST gutenprint-5.0.0-rc2-m4-2.patch.bz2 4496 RMD160 d93e15d05acd11654581535758bae990d7b6355e SHA256 304735441ccb41f926fced1ca06596004a346a0938458aec5f639d94158f003a size 4496
 DIST gutenprint-5.0.0-rc2.tar.bz2 4075898 RMD160 7045f7fd16822692992ddfd50c08bc3e4ccd4815 SHA256 6affc101116a20574e6dc148b72959a5601e96ae603ed287342677a7115fdf7b size 4075898
-EBUILD gimp-print-4.2.7.ebuild 2298 RMD160 7c17cde78f37ad782767834d3a171e44ad12d1d5 SHA1 d823c72db21f9311053bbbe9ef00b6febd09539e SHA256 5f901c18be2068a377fece27813eb90f9b5783e763c83281f4a2ed9dd110382d size 2298
-MD5 5742009b196e73622e3496d99180485b gimp-print-4.2.7.ebuild 2298
-RMD160 7c17cde78f37ad782767834d3a171e44ad12d1d5 gimp-print-4.2.7.ebuild 2298
-SHA256 5f901c18be2068a377fece27813eb90f9b5783e763c83281f4a2ed9dd110382d gimp-print-4.2.7.ebuild 2298
+EBUILD gimp-print-4.2.7.ebuild 2393 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 SHA1 7cfa03c83371240ff566360de8ae9d7f9ca14473 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7 size 2393
+MD5 e2687cb0f337cb6ce6f53f2dd2dc47b8 gimp-print-4.2.7.ebuild 2393
+RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 gimp-print-4.2.7.ebuild 2393
+SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7 gimp-print-4.2.7.ebuild 2393
 EBUILD gimp-print-5.0.0_rc2.ebuild 2642 RMD160 e09bccfbcfeffc7d55e672c144ada68fe83861e2 SHA1 aed09b8b9ac3f13390df5f40d7d8408c383be824 SHA256 10139a4af11fd6362c89c56e31f6b9e43af81c5c5b2106bb176919fc6d62c782 size 2642
 MD5 8c9135e0e76f962f4b216e99b046f59c gimp-print-5.0.0_rc2.ebuild 2642
 RMD160 e09bccfbcfeffc7d55e672c144ada68fe83861e2 gimp-print-5.0.0_rc2.ebuild 2642
 SHA256 10139a4af11fd6362c89c56e31f6b9e43af81c5c5b2106bb176919fc6d62c782 gimp-print-5.0.0_rc2.ebuild 2642
-MISC ChangeLog 10401 RMD160 1adda333c18bc27fda08e49d37166db289bbe6df SHA1 a1472c1fb691c875eda554437cbffc82f301189f SHA256 b60f614bba20ac0cb31954a93d69f2862ba8f221bc59fd0ab2f75253ce658354 size 10401
-MD5 8e0b7c20e541b852408fc8c7b6db9d4b ChangeLog 10401
-RMD160 1adda333c18bc27fda08e49d37166db289bbe6df ChangeLog 10401
-SHA256 b60f614bba20ac0cb31954a93d69f2862ba8f221bc59fd0ab2f75253ce658354 ChangeLog 10401
+MISC ChangeLog 10624 RMD160 38a463f608a246e29d5dd70d6d844df85f41db1d SHA1 fabc7c6d46510dd1702dad9952f0e0082e8fa48f SHA256 25dca56e5124801d5205730a6ced75dcb0118f4cae4dd52680ee522f7ef36756 size 10624
+MD5 8a914c5938fe925784ccffc93431567c ChangeLog 10624
+RMD160 38a463f608a246e29d5dd70d6d844df85f41db1d ChangeLog 10624
+SHA256 25dca56e5124801d5205730a6ced75dcb0118f4cae4dd52680ee522f7ef36756 ChangeLog 10624
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 0dbf86fe4303814e2dfa36f8c4b8e67c files/digest-gimp-print-4.2.7 69
-RMD160 adf4b327550673748bde3c7e8aeef653cd643a6d files/digest-gimp-print-4.2.7 69
-SHA256 d6a46732da2bf1d156f512b976d26cfeeed6f5eb21bbd4c7f5c54c297d158e36 files/digest-gimp-print-4.2.7 69
-size 69 files/digest-gimp-print-4.2.7 69
+MD5 3004782c3a7d48655bfd4670cb64fac9 files/digest-gimp-print-4.2.7 253
+RMD160 7ab910f602732c55eb077ebf488a54e2ab161884 files/digest-gimp-print-4.2.7 253
+SHA256 baad29165ce99523343d5fcdc93a76fb1f715ce911eef710016f415f1fab5958 files/digest-gimp-print-4.2.7 253
+size 253 files/digest-gimp-print-4.2.7 253
 MD5 c61fe9d77b7ec031b2accb2b0bdc915a files/digest-gimp-print-5.0.0_rc2 548
 RMD160 b0695946b50f333f465b415e2e455b58aff4088c files/digest-gimp-print-5.0.0_rc2 548
 SHA256 3cac8d8b884bca0d04a951b4ca82efe242fe5e4fbd5c9ade21a56fd771b820a7 files/digest-gimp-print-5.0.0_rc2 548
@@ -35,7 +39,7 @@ size 548 files/digest-gimp-print-5.0.0_rc2 548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFES0bsAiZjviIA2XgRAlfCAJ4uK6YSzR/+Rgjf1UhgD2a2FVRjmACdGE9x
-02QJFQyxXYmdH969pTvasbo=
-=8V9Q
+iD8DBQFES1TmAiZjviIA2XgRAsseAKDOHTf8m/ApGLe70B45wTy2299DqgCgpBuD
+v48mIMPNeeQ8sFBdFzRHTSY=
+=DJuv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.2.7 b/media-gfx/gimp-print/files/digest-gimp-print-4.2.7
index 9dd17fbd8225..f739c2f601e9 100644
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.2.7
+++ b/media-gfx/gimp-print/files/digest-gimp-print-4.2.7
@@ -1 +1,3 @@
 MD5 766be49f44a6a682d857e5aefec414d4 gimp-print-4.2.7.tar.gz 5178122
+RMD160 b517b1d3cff22347053c634ed96202588d93b63e gimp-print-4.2.7.tar.gz 5178122
+SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489 gimp-print-4.2.7.tar.gz 5178122
diff --git a/media-gfx/gimp-print/files/gimp-print-4.2.7-asneeded.patch b/media-gfx/gimp-print/files/gimp-print-4.2.7-asneeded.patch
new file mode 100644
index 000000000000..9f381c47c9c5
--- /dev/null
+++ b/media-gfx/gimp-print/files/gimp-print-4.2.7-asneeded.patch
@@ -0,0 +1,38 @@
+Index: gimp-print-4.2.7/src/cups/Makefile.am
+===================================================================
+--- gimp-print-4.2.7.orig/src/cups/Makefile.am
++++ gimp-print-4.2.7/src/cups/Makefile.am
+@@ -77,12 +77,12 @@ epson_SOURCES = epson.c
+ epson_LDADD = $(LIBPRINTUT) $(CUPS_LIBS)
+ 
+ genppd_SOURCES = genppd.c
+-genppd_LDADD = $(LIBPRINTUT) $(CUPS_LIBS) $(LIBGIMPPRINT_LIBS)
++genppd_LDADD = $(LIBGIMPPRINT_LIBS) $(LIBPRINTUT) $(CUPS_LIBS)
+ genppd_LDFLAGS= $(STATIC_LDOPTS)
+ genppd_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
+ 
+ rastertoprinter_SOURCES = rastertoprinter.c
+-rastertoprinter_LDADD = $(LIBPRINTUT) $(CUPS_LIBS) $(LIBGIMPPRINT_LIBS)
++rastertoprinter_LDADD = $(LIBGIMPPRINT_LIBS) $(LIBPRINTUT) $(CUPS_LIBS)
+ rastertoprinter_LDFLAGS= $(STATIC_LDOPTS)
+ rastertoprinter_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
+ 
+Index: gimp-print-4.2.7/src/cups/Makefile.in
+===================================================================
+--- gimp-print-4.2.7.orig/src/cups/Makefile.in
++++ gimp-print-4.2.7/src/cups/Makefile.in
+@@ -225,12 +225,12 @@ epson_SOURCES = epson.c
+ epson_LDADD = $(LIBPRINTUT) $(CUPS_LIBS)
+ 
+ genppd_SOURCES = genppd.c
+-genppd_LDADD = $(LIBPRINTUT) $(CUPS_LIBS) $(LIBGIMPPRINT_LIBS)
++genppd_LDADD = $(LIBGIMPPRINT_LIBS) $(LIBPRINTUT) $(CUPS_LIBS)
+ genppd_LDFLAGS = $(STATIC_LDOPTS)
+ genppd_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
+ 
+ rastertoprinter_SOURCES = rastertoprinter.c
+-rastertoprinter_LDADD = $(LIBPRINTUT) $(CUPS_LIBS) $(LIBGIMPPRINT_LIBS)
++rastertoprinter_LDADD = $(LIBGIMPPRINT_LIBS) $(LIBPRINTUT) $(CUPS_LIBS)
+ rastertoprinter_LDFLAGS = $(STATIC_LDOPTS)
+ rastertoprinter_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
+ 
diff --git a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild b/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
index 34e2c38268a5..3aeadb9706cb 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.7.ebuild,v 1.12 2006/01/24 19:16:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.7.ebuild,v 1.13 2006/04/23 10:23:25 flameeyes Exp $
 
-inherit libtool
+inherit libtool eutils
 
 IUSE="nls gtk readline cups foomaticdb ppds"
 
@@ -22,6 +22,14 @@ DEPEND="cups? ( >=net-print/cups-1.1.14 )
 LICENSE="GPL-2"
 SLOT="0"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+}
+
 src_compile() {
 	elibtoolize --reverse-deps