Fix pkg-config and nss-config for Darwin where the linker doesn't understand (and need) -R arguments

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

4 files changed, 24 insertions, 14 deletions

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 12961bee220e..8984fe8d8141 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -20,13 +20,13 @@ DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 S
 EBUILD nspr-4.8.6.ebuild 3483 RMD160 a3736195b5aa341e925c9fa6f09df9d0e1c75b60 SHA1 a4c153ed5f97ca7d31a55b087f2423be690a48c0 SHA256 cf1ab1d37b4af5230a773400cadf3c46b0a66bceecca1c8b746328391bfff92b
 EBUILD nspr-4.8.7.ebuild 3553 RMD160 62a91e0b411696afbe298416ceac40b4d125b984 SHA1 604e72352eed0d42357821a006ca46de0bee2b30 SHA256 edf7031ec2f6d8f861c695195e13c5c7c581e0b6898681e87a347301280ceada
 EBUILD nspr-4.8.8.ebuild 3553 RMD160 eb3b82725a1035c5b0b1bac07fa67fbba3934a2a SHA1 a4a7d25b3d637b77c69dd03f4886922dbe0d8e4b SHA256 c178bf852a1fa2150716ff08ade3c6fb2755986bed4fbf44227f068d5e38b86c
-EBUILD nspr-4.8.9.ebuild 3559 RMD160 3ad2c1edb6cc2cb375e3d53f42b65d625f0dc69b SHA1 cee5f9f93c6d4f024f160e78a4239b651f4710d8 SHA256 e66eaea8f78dc76a721587871b0056005b4115e7732b7cc8df105089aa4a4392
-MISC ChangeLog 21885 RMD160 08264e78199e6a06eb98658f645e8cb39800d132 SHA1 a2700105faf57cc551d73edcdf5b959b90bb092a SHA256 79542b189c3087a86e955d8e359fe45557e4d5d4a7018cc6dfd04ccd58bbe2de
+EBUILD nspr-4.8.9.ebuild 3790 RMD160 364ada8400885b70184a68b862ed1d72e514e55f SHA1 0ff406d9596f12ede8de80c3c1ef01dcfccf31e2 SHA256 d64485084ffb9c014ebd20ed42b7ebe161d05d9bb56412045cea02f4e8dcf971
+MISC ChangeLog 22076 RMD160 4c60482787e851628d0caae19f76de1f5ec6ad75 SHA1 4e01a5c862e5812cf71eaac5f9e3dc445932f610 SHA256 d6c96fc2e7fe5f8e0c989a4be851aa4feeb7441d3c55e42ea30e76923121798a
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5jT38ACgkQkKaRLQcq0GK8/ACdEQ3uao7Y9+c6sfenxqZkEcVU
-k74AnjVd9zTVIwtpQDMKQzFTcPBxpnEO
-=uZDh
+iEYEARECAAYFAk598msACgkQX3X2B8XHTom6kgCfRvlnjBQ3h3vvFKpFSVKKcHRI
+4nwAn2Ikz1mQFlGRKvaToYvrhFwli6ic
+=a1/2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 9cc31fa26c01..6225fc0b6d26 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.215 2011/09/24 14:17:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.216 2011/09/24 15:03:58 grobian Exp $
+
+  24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild:
+  Fix pkg-config and nss-config for Darwin where the linker doesn't understand
+  (and need) -R arguments
 
   24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild:
   Marked ~x64-macos, libnaming fixes, and disable resigning of libs on Darwin,
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2d9abb6e3e02..f5dc65275ddc 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,16 +10,16 @@ DIST nss-3.12.8.tar.gz 5951955 RMD160 08f8118e194fcfd5225c4dc64873f0883b8278b6 S
 DIST nss-3.12.9.tar.gz 5984608 RMD160 d4da08fb2f363ea5ea90599bd90e54aaad0a3e56 SHA1 5b49da5e6f61610a718fcd0838dac365a5e17de2 SHA256 0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978
 DIST nss-3.12.9.with.ckbi.1.82.tar.gz 6012144 RMD160 a5392169f240fe804aa4d55229a246c7f4997c65 SHA1 32d8c607c2301bdf053ab5d4fea7ec5af9d5d35a SHA256 b55ea655f3029737b4236f27301c1eb48b417714ff45ac8b8b67963ea80787a3
 EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b
-EBUILD nss-3.12.11.ebuild 6718 RMD160 85a2d2273f3568a1de5b9b0bb540d4bbf4e6a891 SHA1 6ec22d5b1f7509fba937ccc6a085f53b0fd5cb22 SHA256 163c7555994eb95fd23c9393afba499f96142406f2cb143db0514f5c5430eb39
+EBUILD nss-3.12.11.ebuild 6963 RMD160 2def1591c22ca9864a87995a68ed989859158950 SHA1 27ec786409aa2ad8d3c96b07bfa8ea6c0d8eefc5 SHA256 d2f260b801458f5e26492df32f2ae0a854aa6dcf89f0284e6e4a3d701ebcae5b
 EBUILD nss-3.12.8.ebuild 6615 RMD160 f29d4249af89a8ac8d2f681ff4d954b27998c8f1 SHA1 42b3310d57b05fc3780e35562be4005573bd894b SHA256 05d6eb4d6f0ed6d9d117a3714647a445237ddfb3feb6268ca2c23604ddf24a3f
 EBUILD nss-3.12.9-r1.ebuild 6651 RMD160 e703a80c96a376b8096e6d2025c544c8c28cf298 SHA1 4efbc98b9629df2147966f75cd0a76c3ad9ea076 SHA256 0a7b2685fca3b84b9c6b9b1df77ca98949b0454a5576fc664d35472ef4ef9743
 EBUILD nss-3.12.9.ebuild 6624 RMD160 512c34751a753da29043b158c290a222bd0159ed SHA1 729be6566c55e02600ed0552775497a7a98953eb SHA256 385dd1ab26aa17bd61e15f4a9ae3c0683a35d2cb5e71458140e2aee76bdb7bff
-MISC ChangeLog 27244 RMD160 232655f02d32edb2603a998bab4bed547a18b77e SHA1 2555a4f23cb89d33129d488663d9bba3805a090b SHA256 e0f9ed55ad51908c492129da017cecd8d3291fe8e6cec4a6161ac14dad63d2a3
+MISC ChangeLog 27421 RMD160 66843e37195ea99942b81a7e4feca5aea2034aa9 SHA1 3619c5b481bcc973d1c6bfbc70879229986d070f SHA256 01695c6cdfe1887b9f37473338ad6bd8acd0dc1c75dfabd551f864fcac268949
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk595nkACgkQX3X2B8XHTolQnACghgcOVz90RrS2+LYduRGEx5tc
-7JcAnRa/hsJRDWqche33W2V1+22cFOph
-=bU5e
+iEYEARECAAYFAk598WQACgkQX3X2B8XHTolGJQCgmjJ8c7t6E2JtHzNOQ+qzxYOh
+b7MAn3ldxntqQPfSC3oOCRjSeOZlED2p
+=fNmC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild
index 907e6685b15a..df1bb42503d7 100644
--- a/dev-libs/nss/nss-3.12.11.ebuild
+++ b/dev-libs/nss/nss-3.12.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.2 2011/09/24 14:17:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.3 2011/09/24 15:03:58 grobian Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -42,7 +42,13 @@ src_prepare() {
 
 	# Fix pkgconfig file for Prefix
 	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		"${S}"/mozilla/security/nss/config/Makefile
+		"${S}"/mozilla/security/nss/config/Makefile || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Fix pkgconfig for Darwin (no RPATH stuff)
+		sed -i -e 's/-Wl,-R${\?libdir}\?//' \
+			"${S}"/mozilla/security/nss/config/nss-config.in \
+			"${S}"/mozilla/security/nss/config/nss.pc.in || die
+	fi
 
 	epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch  # breaks non-gnu tools
 	# dirty hack