Fix install_name for produced shared library on Darwin, keyworded ~x86-macos and ~x64-macos bug #354523

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

3 files changed, 26 insertions, 20 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 8828341376d2..a9bd8e3b4998 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.61 2011/07/03 05:28:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.62 2011/09/24 16:57:47 grobian Exp $
+
+  24 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+  spidermonkey-1.8.2.15.ebuild:
+  Fix install_name for produced shared library on Darwin, keyworded ~x86-macos
+  and ~x64-macos bug #354523
+
+  24 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+  spidermonkey-1.8.2.15.ebuild:
+  Fix install_name for produced shared library on Darwin, keyworded ~x86-macos
+  and ~x64-macos bug #354523
 
 *spidermonkey-1.8.5 (03 Jul 2011)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 6d65abec4a5d..883c03a8d7d0 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -13,24 +13,14 @@ DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005
 EBUILD spidermonkey-1.7.0-r1.ebuild 1517 RMD160 000f9e4cc2f9aef70323cb6ce40128259f41f81c SHA1 bb4b1083c428d5bcdc102be0df0e9e8f14aae689 SHA256 ba5789912e5488171ff51c04863f6260b77e6537154da92ffd799afd9bc4415a
 EBUILD spidermonkey-1.7.0-r2.ebuild 1664 RMD160 2eea40d279729740380fd8eca22d142518805cf3 SHA1 3d0229e52cb2b14899ac5cddf689abdbe064b7a1 SHA256 907e253f2519790d2ac48779637a557b8748bdccbf718cef0991a22dc8c71113
 EBUILD spidermonkey-1.7.0.ebuild 1432 RMD160 9dc3f12649f67fe727f8b327a54bbc91c0522358 SHA1 411aad11f1d1beb4435aa19a43d96447b11e7dac SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e
-EBUILD spidermonkey-1.8.2.15.ebuild 1698 RMD160 fc992acd721ae297da6e42445ed9d45ad64f39f6 SHA1 02c8949883ed9102de97be51fa40cdd48837b11c SHA256 ac8ac663a48aa8396e91ae7f4c6f0fcf6fd072088e5c48b3209b750e979cb974
+EBUILD spidermonkey-1.8.2.15.ebuild 1909 RMD160 f023579d5da8abea011f0310ca6d2bc3130d8bcc SHA1 ee017ef05bfc908bbc65ebaebbbbde556e66457b SHA256 fa7ad212b4606e8b2087de34f2d30bfa10cbbcc90a905a43b32b285df3ccc290
 EBUILD spidermonkey-1.8.5.ebuild 2013 RMD160 b1023578e90a83405d0575b65363938bda01294a SHA1 ba242f1bd760c9e1cc14a71b87f7404a7ae7704c SHA256 fb018dd3b1b3f01aed82badc3cd1ab40fab8694855ed382a89692ecf92fe3828
-MISC ChangeLog 9426 RMD160 e783f1dbe46afbc3fabc8ecc54e00e91e3d62222 SHA1 830755ae7ef227ad0e760949780fbbb667450344 SHA256 81d693cfe008d51932d04e85985f07f3a4419c0e2673c9eacf6ba60fc3614fea
+MISC ChangeLog 9809 RMD160 f0313f02f9f19761b300a1981484898c4785af7a SHA1 b01570cd23939c59577433b7f3375d426457c7f1 SHA256 f1f60ac65e25a91713b9795dbf6e8c2afb1a79bccdc5a99020005adc349e2f08
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQIcBAEBAgAGBQJOD//bAAoJEO/kOhxWD91kJuMQAJCoUyAtESF2HFM2pYNlLbCD
-K62Qqd3TdfBks52gd2S8J45S8qzTDRt2L1s8uTZxC9yj/SUWv9ElreUGat0jU7BX
-2fG12rMHFrGudnMawZJdDc4mNBN5wf5EajVPeNezRVlk7EhTyTnMvJioVfpFksnC
-k5t55+jf4Wf5Al+4Omooz0SZt+LAoWpTvgUKOjxtO+AcUFq6GvALhag/gGW0mJmU
-aKLrT16QEui9fkHR3QlDLCynK15O3OWYYzSDLTJEyw8qJoFQJlYIR4Gl2BZcdl7e
-MwVY6hXsSKnzMQc5DQAhVPCuIj0OEOikkUx2o33O62oKRJezsPPKUWgoLXr9l32n
-blXWRFbxukPBxjUzcnNTJ9NOcyKjAbO2WhiCPKI9lC0XhMrRwCiNQ/PBa2IFGgwV
-wbujzeZ02j5N05QsQIf1c+fWZ/+yUZJdbmPnBoB/1qZkWKOr6E4J2tvkMw1jJDm/
-yld75hCLvFG8bu/9cM+l8gdcApfirHeSEvfwuRLRJr+jMPFUhk88y+McZb+sMUaH
-Nvxq15poDfLsdrkK471FBvAvsdYh5ZRoQpBdYIZXg/nV0eL8Bu6wxBPFOafIgrmi
-WBsf6OPm8ackBvOJVNBct4O4ubX+5g+iVsKD6bVNc4f+5I1rI5ny6ETlUmbSuhYU
-pV8DrT5vgairBh3N3VBP
-=X4FZ
+iEYEARECAAYFAk5+DBAACgkQX3X2B8XHToksgwCeJCpg8fHZIVhfNm3rgmGH/YpH
+hH8AoJCP9h1TY0AwYBE4WniCQ53KoqtO
+=rtPQ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
index cb3414cc058d..56eaee302203 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild,v 1.1 2011/06/22 02:22:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild,v 1.2 2011/09/24 16:57:47 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 inherit eutils toolchain-funcs multilib python
 
 MY_PV="${PV}"
@@ -14,7 +14,7 @@ SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
 
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-macos"
 IUSE="threadsafe"
 
 S="${WORKDIR}/mozilla-1.9.2"
@@ -69,4 +69,10 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc ../jsd/README
 	dohtml README.html
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name
+		install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
+			"${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
+	fi
 }