Fix --as-needed support, bug #250175

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 57 insertions, 4 deletions

diff --git a/gnustep-libs/popplerkit/ChangeLog b/gnustep-libs/popplerkit/ChangeLog
index 4017d7e1be7f..7a24a64c7ad1 100644
--- a/gnustep-libs/popplerkit/ChangeLog
+++ b/gnustep-libs/popplerkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-libs/popplerkit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.15 2008/11/17 14:06:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.16 2008/12/08 14:31:40 voyageur Exp $
+
+*popplerkit-0.4.0-r1 (08 Dec 2008)
+
+  08 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/popplerkit-0.4.0-config-as-needed.patch, -popplerkit-0.4.0.ebuild,
+  +popplerkit-0.4.0-r1.ebuild:
+  Fix --as-needed support, bug #250175
 
   17 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org>
   popplerkit-0.4.0.ebuild:
diff --git a/gnustep-libs/popplerkit/Manifest b/gnustep-libs/popplerkit/Manifest
index 696a4678c5b1..9484fb231f6c 100644
--- a/gnustep-libs/popplerkit/Manifest
+++ b/gnustep-libs/popplerkit/Manifest
@@ -1,7 +1,8 @@
 AUX popplerkit-0.2-poppler6_support.patch 6044 RMD160 0130b7dd0f6eb486ee097df1704784b5ccc36c90 SHA1 658578ed2245c5b347da5d9302ebedcc6edfc757 SHA256 b41398eb79b16fe32fedc9d5ab3265b31f4cc156a33268b03b77241c0e9cf10e
+AUX popplerkit-0.4.0-config-as-needed.patch 1636 RMD160 a9b2c2a0222e549f7aa154624657d26efa4fdd68 SHA1 e34fd8c090acea85309691ef56a91b8bd7179005 SHA256 143dfd50d019e8b648db18492bab440bb089b8730cab7bb4d4093488a4ccf160
 DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
 DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
 EBUILD popplerkit-0.2.ebuild 739 RMD160 6394374fdb6046fb16a7bd9b5a7e3ce8671dc81c SHA1 b13e082345d59d81869e385097622e7aa9aa09b3 SHA256 ee5c331d7a57c2abb3595a02c239d8cd180e0006c7b3c9b244965bef966f65ec
-EBUILD popplerkit-0.4.0.ebuild 796 RMD160 1ab0ab2340171b8703a860d07fb997a6848bf2b5 SHA1 58abd80d20c0853a05a496c2a3403d1db09015f3 SHA256 51bfd0fb5aa7f53c95d47482b85f86158916e4172f7322429e43332286a42d85
-MISC ChangeLog 2040 RMD160 e7ad00848d4f090e86af2e01257a802e3ff2e85d SHA1 3e09bb76e3f8fc0d01a2e3dc227b34ea724c7a28 SHA256 b45adb325f02b9d4632b5eac684396de3ade8ad9585288d12787558fbb7efcae
+EBUILD popplerkit-0.4.0-r1.ebuild 892 RMD160 7573af1f379eccdf86a1ca9ff3a4549e13656dd0 SHA1 71b62c7424f23edb6e0a706334d99577bde8b35b SHA256 1ca3f86d05bc8d7b9f9f278d78f82b757e5b31efd564f66aace738149f77d8c0
+MISC ChangeLog 2278 RMD160 1b2f547c68e22db73ef217137ee06223fb54c184 SHA1 6a293a213846dfa600909dc62e882ad3766cb85d SHA256 4018d4364125f11d2a3cbfd0bccb927ec7a0ed4cce84308b65a8a3ffa95c1132
 MISC metadata.xml 249 RMD160 ba5b4e225358e1ecbc6edcd8b8a5c314d7897b18 SHA1 4c78f83a26931b22608dbddf72ed75de1e2b5589 SHA256 78beb5173d3c75a10c26540981e01218b86d92441d0a09c84b0af106d2e8b24a
diff --git a/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch b/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch
new file mode 100644
index 000000000000..179d81309d86
--- /dev/null
+++ b/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch
@@ -0,0 +1,38 @@
+--- Frameworks/PopplerKit/config.sh.orig	2008-12-08 14:43:36.000000000 +0100
++++ Frameworks/PopplerKit/config.sh	2008-12-08 14:43:51.000000000 +0100
+@@ -22,7 +22,7 @@
+     exit 1
+ fi
+ POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags fontconfig`"
+-POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs fontconfig`"
++POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs fontconfig`"
+ 
+ # poppler splash device
+ ${PKG_CONFIG} --exists poppler-splash
+@@ -31,7 +31,7 @@
+     exit 1
+ fi
+ POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags poppler-splash`"
+-POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs poppler-splash`"
++POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs poppler-splash`"
+ 
+ # poppler cairo device
+ ${PKG_CONFIG} --exists poppler-cairo
+@@ -42,7 +42,7 @@
+ #   Disable Cairo support for now to avoid most of problem
+ #   HAVE_CAIRO="YES"
+ #   POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags poppler-cairo`"
+-#   POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs poppler-cairo`"
++#   POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs poppler-cairo`"
+    HAVE_CAIRO="NO"
+ fi
+ 
+@@ -85,7 +85,7 @@
+ echo "FT_CFLAGS=${FT_CFLAGS}" >> config.make
+ echo "FT_LIBS=${FT_LIBS}" >> config.make
+ echo "ADDITIONAL_CFLAGS+=\$(POPPLER_CFLAGS) \$(FT_CFLAGS)" >> config.make
+-echo "ADDITIONAL_LDFLAGS+=\$(POPPLER_LIBS) \$(POPPLER_LIBS)" >> config.make
++echo "LIBRARIES_DEPEND_UPON+=\$(POPPLER_LIBS) \$(FT_LIBS)" >> config.make
+ # we add -I/usr/X11R6/include for older FreeBSD version.
+ echo "ADDITIONAL_INCLUDE_DIRS += -I/usr/X11R6/include" >> config.make
+ echo "HAVE_CAIRO=${HAVE_CAIRO}" >>config.make
diff --git a/gnustep-libs/popplerkit/popplerkit-0.4.0.ebuild b/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild
index c3a2e216bdd7..31ce3cff0c8c 100644
--- a/gnustep-libs/popplerkit/popplerkit-0.4.0.ebuild
+++ b/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.0.ebuild,v 1.2 2008/11/17 14:06:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.0-r1.ebuild,v 1.1 2008/12/08 14:31:40 voyageur Exp $
 
 inherit gnustep-2
 
@@ -19,6 +19,13 @@ RDEPEND=">=app-text/poppler-0.6
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-config-as-needed.patch
+}
+
 src_compile() {
 	# Compile MissingKit separately
 	cd "${S}"/MissingKit