Respect LDFLAGS, bug #181792

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686

4 files changed, 24 insertions, 22 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index f73d5ce49b59..b453e96e176c 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.125 2008/08/06 10:37:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.126 2008/08/13 19:26:47 armin76 Exp $
+
+  13 Aug 2008; Raúl Porcel <armin76@gentoo.org> nss-3.11.9.ebuild,
+  nss-3.12.ebuild:
+  Respect LDFLAGS, bug #181792
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 76c8fec4e4f4..a9ed8f1af9aa 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.12-nss-config.in 2400 RMD160 927a5573d72ad8c9d06a56fd094b7523d8cc0784 SHA1 0227f94c745519b67b1b530e6cc116e8069a6b43 SHA256 6d03d7c1ade80922831b90a4242bf57519d649c4ab47eaac0958ceee90c169b2
 AUX 3.12-nss.pc.in 280 RMD160 e6966434f42fdcdb71977ba80638c74ef4b2ae63 SHA1 2024da0f72759c87375459a4e521caaf97a7922c SHA256 c61ebe55abca04bf6b05024e6c160735f74fe83a1ba48b0314a4110b6828bbc9
 AUX nss-3.11-config-1.patch 1440 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 SHA1 7a9153ec9bd099d2b1d42ab3de240201ae5d6004 SHA256 9a67bbbd9996535ac0aff115294c6537be5ba2efc99ae48c3bc92eb995e670bc
@@ -14,14 +11,7 @@ DIST nss-3.11.7.tar.gz 3731160 RMD160 5edec8f5d33e15ddba45b3d4fcfa3ca62628540c S
 DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 SHA1 96dc531d4ed518d4b4bf43932896cab276d6f3ed SHA256 fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
 DIST nss-3.12.tar.gz 5163155 RMD160 a84f9fa11e9fdb1c13f6d9b804b6f37dac4ee0af SHA1 6b8e83c0931cfad161aae993d344687b67f317aa SHA256 d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
 EBUILD nss-3.11.7.ebuild 4195 RMD160 4277636203125b85942af289c92c7e2c8a4d13e7 SHA1 92cece9c10fea4da6a780f3d9e16e2741dd40347 SHA256 9b7bc3036787b39c47bc15eb9d261bd8a46b459021887b7323f9974cbff5bef3
-EBUILD nss-3.11.9.ebuild 4196 RMD160 78d9a474370b87775caca47af4d14604faf25a51 SHA1 38ab26c01081a19514ec2512ee3b588a708875c9 SHA256 5d299c0502de8cd407b99195791ce81bb801459aae538eda4ca2a08254cc2fab
-EBUILD nss-3.12.ebuild 4354 RMD160 84ce2447cab213345af7625456640e67e1aed94c SHA1 627859f94609d2420f8857350b341610d6a1c24d SHA256 d50e74657b7e227df7ba4b003f3ae72e1c9426a35227455db2d6bd2b4e8038af
-MISC ChangeLog 15524 RMD160 571deaef58e9f165e05a09ea51a65849bc3cc7b3 SHA1 28125c5113ebf055e07988b1fee8cec44f11331c SHA256 a1dc5a778045bead92ec283217d7b51a344c74d6a1ae1529f247536f991bb735
+EBUILD nss-3.11.9.ebuild 4229 RMD160 e2cc4995a8c78777d972abca315de28f4c9ce6c1 SHA1 382e81ad744944f9b2cfb21a8b7d29f3b40bcdbb SHA256 9c39c5a35186ae3fe7fa4407f9b4a884a845fc9a31ac0f2db8bee9c33f82084e
+EBUILD nss-3.12.ebuild 4380 RMD160 a2b3987128da1d2b7a17ccd9400ef0d704bb186b SHA1 640c8468a16e8f6fbbb563d458373c433f386958 SHA256 51a24eace3fda7a075587c4513587403ead565eab10030ece99ce310784ff225
+MISC ChangeLog 15647 RMD160 e9a347645b7c0ecaa083b85a81fe1c3082bc6bf3 SHA1 03e0bff82bf7353e9a64ad8ed4ede1d1a0b869e7 SHA256 abcab6a88166ca4fc2e1845bdbc0cf5b74ec6d8d1d3001afbc082c9dff03945c
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZfvcACgkQOeoy/oIi7uzbVwCghYh7Hqyr9AYuONZlHGfAePtX
-Kt8An34RjkWUpOUFaTFMtBICqYGHI4IS
-=Pimd
------END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.11.9.ebuild b/dev-libs/nss/nss-3.11.9.ebuild
index be92b3e062ee..405632f77359 100644
--- a/dev-libs/nss/nss-3.11.9.ebuild
+++ b/dev-libs/nss/nss-3.11.9.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/dev-libs/nss/nss-3.11.9.ebuild,v 1.8 2008/04/11 17:15:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.9.ebuild,v 1.9 2008/08/13 19:26:47 armin76 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -20,17 +20,21 @@ DEPEND=">=dev-libs/nspr-${NSPR_VER}"
 src_unpack() {
 	unpack ${A}
 
+	cd "${S}"/mozilla/security/coreconf
 	# hack nspr paths
 	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include"
+		>> headers.mk || die "failed to append include"
 
 	# cope with nspr being in /usr/$(get_libdir)/nspr
 	sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \
-		-i "${S}"/mozilla/security/coreconf/location.mk
+		-i location.mk
 
 	# modify install path
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i "${S}"/mozilla/security/coreconf/source.mk
+		-i source.mk
+
+        # Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.11-config.patch
diff --git a/dev-libs/nss/nss-3.12.ebuild b/dev-libs/nss/nss-3.12.ebuild
index 1ffb439af391..0a51dc6ff430 100644
--- a/dev-libs/nss/nss-3.12.ebuild
+++ b/dev-libs/nss/nss-3.12.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/dev-libs/nss/nss-3.12.ebuild,v 1.1 2008/06/18 14:57:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.2 2008/08/13 19:26:47 armin76 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -21,17 +21,21 @@ DEPEND=">=dev-libs/nspr-${NSPR_VER}
 src_unpack() {
 	unpack ${A}
 
+	cd "${S}"/mozilla/security/coreconf
 	# hack nspr paths
 	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
-		>> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include"
+		>> headers.mk || die "failed to append include"
 
 	# cope with nspr being in /usr/$(get_libdir)/nspr
 	sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \
-		-i "${S}"/mozilla/security/coreconf/location.mk
+		-i location.mk
 
 	# modify install path
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i "${S}"/mozilla/security/coreconf/source.mk
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.11-config.patch