gimp: fix building with forced --as-needed

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 32 insertions, 8 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index fdc67d7dca47..145def664eb8 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.273 2008/11/22 19:34:17 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.274 2008/11/27 08:52:23 hanno Exp $
+
+  27 Nov 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/gimp-2.6.3-asneeded.diff, gimp-2.6.3.ebuild:
+  Fix compilation with forced --as-needed.
 
 *gimp-2.6.3 (22 Nov 2008)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 72ce5d6cd1c6..14fb50d94d9c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gimp-2.6.3-asneeded.diff 249 RMD160 71043fe5e1278ac578004fe5ab5d7bf8b8d954b5 SHA1 b429eb840e21d136c5e930bec53475914c247d72 SHA256 a9196e29f5dbdf6ff43004c5915e5a838d6d4da1e52b485eaf20b56c7eb39088
 AUX gimp-svg.diff 1080 RMD160 ef80ab1b82622dc28d38a3a606dec40b36685a04 SHA1 636d112dcf71e1b2fc31d3c941e0b49c8bdf422a SHA256 f8dc78958f3e7e0a921bbcb9c0deabed9f0354b3d17257f1740e355b9f456c44
 AUX gimp-web-browser.patch 1579 RMD160 33fd018a83b8ade7ced9bbd4c80b9c29468781fd SHA1 af9742a1aa6d07547d5753dcd34661be6f5e36a4 SHA256 f6329bb38be785a7c8c49cc8de61e41ce3a12a118849a713a54212e91de2a747
 DIST gimp-2.3.19.tar.bz2 16803491 RMD160 3ea293372ef0656543912c0a63ab287fd9ae72ca SHA1 f04efda774e8ed57ded5058d37091f7a8d7b17b2 SHA256 f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
@@ -12,14 +13,14 @@ EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b S
 EBUILD gimp-2.4.6.ebuild 3844 RMD160 1d071e845eaea37a31c346190cc2d68445664cc6 SHA1 f4f828712e7fdeb9c3929c859f927f515346fd61 SHA256 ab657c07a9676324282b18c9e400e4515a944d107520bef7cf660373f2539233
 EBUILD gimp-2.4.7.ebuild 3851 RMD160 1c4e786a176b229acd6f4ec4d1d89201ea04deab SHA1 e583b34bafb4b52cf71ceff4a3303ebad55fb472 SHA256 0d4234105fa5df9f3feba2442f46ec24150ab15b4b82c94d041684339335994c
 EBUILD gimp-2.6.2.ebuild 3015 RMD160 227ee55d15a3e8e67561e56aa4ef8345e3ce7641 SHA1 5e37dedab4da0e75ca7ce4ffb1ad3cbfa11fdfd8 SHA256 fe1a6d20dc169135fee74c5f730883795a050131278454c51759af883cec2a0e
-EBUILD gimp-2.6.3.ebuild 3015 RMD160 25d6796fe09d90435e6c2e1ff97d9e07faa66584 SHA1 f11f24586fbe10ec272d024dffbb7f7ab47df38b SHA256 3367ec1e677578b9349587cf7ce98c62b8469bbc8a1d2c089e588b60d5146cad
+EBUILD gimp-2.6.3.ebuild 3143 RMD160 ffb8e1b7fb8b1ea9f49f193eb77eb73fca05cfba SHA1 da674bff1036e56b3c7c6a3d8a2d80a3bdacdf36 SHA256 7d990ca01cc49fa19d3cab8ff579b22b378c5c0c2f3c7b0d2b26ba7a6f18ffd4
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 36832 RMD160 4d779797a66cb55a41fcec425dca09ffc7b5fc9c SHA1 54cd6984ce0cdaaf7fd2421702aff55f359a9276 SHA256 165e16743e1096737c42cf4e38f6e00c337741a04564a6d8b451aca19d50eb8e
+MISC ChangeLog 36976 RMD160 c90fd47aa0d322125e2ca6a5c55cb3b71afadb92 SHA1 2a8fc7ce4a23670194f2270f19352959a7dce5a8 SHA256 f2bc2c5060a4e6d622216fa47ae3cfd398324faa06d3cb09fa8dc32a9ddc4f0c
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkuXpoACgkQr2QksT29OyCZmQCfcP6BJI92PEghA0yw1voQNIiC
-gqQAn1eOQqFpj/PPN7Wl5xZMpwn2kOBH
-=llAp
+iEYEARECAAYFAkkuX8cACgkQr2QksT29OyBB5QCfT/evZFz2SBXuJmfQJXvJkVZ6
+RnsAoKQqjIm/SUwnGWfcDYLBp8ntkiHm
+=KGLw
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff b/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff
new file mode 100644
index 000000000000..f46aa35f4ab4
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff
@@ -0,0 +1,10 @@
+--- gimp-2.6.3/app/Makefile.am	2008-11-20 23:43:08.000000000 +0100
++++ gimp-2.6.3-1/app/Makefile.am	2008-11-26 17:37:56.000000000 +0100
+@@ -141,6 +141,7 @@
+ 	$(GEGL_LIBS)			\
+ 	$(RT_LIBS)			\
+ 	$(INTLLIBS)			\
++	$(GLIB_LIBS)			\
+ 	$(GIMPICONRC)
+ 
+ 
diff --git a/media-gfx/gimp/gimp-2.6.3.ebuild b/media-gfx/gimp/gimp-2.6.3.ebuild
index 128698146c12..03d69688da50 100644
--- a/media-gfx/gimp/gimp-2.6.3.ebuild
+++ b/media-gfx/gimp/gimp-2.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.3.ebuild,v 1.1 2008/11/22 19:34:17 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.3.ebuild,v 1.2 2008/11/27 08:52:23 hanno Exp $
 
-inherit eutils gnome2 fdo-mime multilib python
+inherit autotools eutils gnome2 fdo-mime multilib python
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
@@ -54,6 +54,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-asneeded.diff" || die
+
+	eautoreconf || die
+}
+
 pkg_setup() {
 	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
 		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."