From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 24 Sep 2011 15:43:47 +0000 (+0000)
Subject: Fixup library ids and references, not to use @executable_path on Darwin
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8dd0f39b8c17cbbb84cdb857ba20db030df64684;p=gentoo.git

Fixup library ids and references, not to use @executable_path on Darwin

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

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 6225fc0b6d26..c974e45b3a8b 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,9 @@
 # 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.216 2011/09/24 15:03:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.217 2011/09/24 15:43:47 grobian Exp $
+
+  24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild:
+  Fixup library ids and references, not to use @executable_path on Darwin
 
   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
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index f5dc65275ddc..a254575cefea 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 6963 RMD160 2def1591c22ca9864a87995a68ed989859158950 SHA1 27ec786409aa2ad8d3c96b07bfa8ea6c0d8eefc5 SHA256 d2f260b801458f5e26492df32f2ae0a854aa6dcf89f0284e6e4a3d701ebcae5b
+EBUILD nss-3.12.11.ebuild 7330 RMD160 8c90566945831d6bd98bc1dbc9150ab89a15eb60 SHA1 27cf8c5d8c8731bd944a4533a758d71e4fb1c69d SHA256 ec21f1bb7c23f00153b168687e5ba998f5d5741af74022d61c6ec5d612e62339
 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 27421 RMD160 66843e37195ea99942b81a7e4feca5aea2034aa9 SHA1 3619c5b481bcc973d1c6bfbc70879229986d070f SHA256 01695c6cdfe1887b9f37473338ad6bd8acd0dc1c75dfabd551f864fcac268949
+MISC ChangeLog 27567 RMD160 23e193d9ed2f9903aa7148ecb121f07a92b48c98 SHA1 50a2b8abffd33796f41cceefb6bb7a94343d4bc2 SHA256 34c2a741c5b3ad96206494bdee703d2d5f0f383d877ce82ae94ae0d75be9e768
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk598WQACgkQX3X2B8XHTolGJQCgmjJ8c7t6E2JtHzNOQ+qzxYOh
-b7MAn3ldxntqQPfSC3oOCRjSeOZlED2p
-=fNmC
+iEYEARECAAYFAk59+rgACgkQX3X2B8XHTol+aQCeJyWrRU2oLI29t1J+exuZsmcO
+sfwAn3Ya1uriz29Pch8Pru7xx/KB58m4
+=BUur
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild
index df1bb42503d7..2ea5e9892453 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.3 2011/09/24 15:03:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.4 2011/09/24 15:43:47 grobian Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -158,7 +158,17 @@ src_install () {
 		mv ${file} ${n}
 		ln -s ${n} ${file}
 		if [[ ${CHOST} == *-darwin* ]]; then
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
+			# fix install_name
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" ${n} || die
+			# and the references that were already made against it
+			install_name_tool \
+				-change "@executable_path/libnssutil3.dylib" \
+					"${EPREFIX}/usr/$(get_libdir)/libnssutil3.dylib" \
+				${n} || die
+			install_name_tool \
+				-change "@executable_path/libnss3.dylib" \
+					"${EPREFIX}/usr/$(get_libdir)/libnss3.dylib" \
+				${n} || die
 		fi
 	done