Added js shell to spidermonkey-1.8.2.15, as per user request in bug 377291

Package-Manager: portage-2.1.10.41/cvs/Linux i686

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index be318f8b82c355c906ec6f749ab91d430a3320f9..620fee55380a21f8ded8706279d8be4a22d58c78 100644 (file)
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,12 @@
 # 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.67 2011/11/26 04:49:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.68 2011/12/29 17:49:12 axs Exp $
+
+*spidermonkey-1.8.2.15-r1 (29 Dec 2011)
+
+  29 Dec 2011; Ian Stakenvicius <axs@gentoo.org>
+  +spidermonkey-1.8.2.15-r1.ebuild:
+  Added js shell to spidermonkey-1.8.2.15, as per user request in bug 377291
 
   26 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> spidermonkey-1.8.5-r1.ebuild:
   Fix typo (committed as obvious).

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 62bcb406c99ec83ccf7d271d9c15a7dac9048cf8..3eb6983baa72de2a8f17e5f8d062fdc811b4ecae 100644 (file)
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX spidermonkey-1.5-build.patch 3457 RMD160 323b186d6be267bce42f15fe0694b8c17d1e927d SHA1 995708c8cbd03ed690505fab70a54349d4b94d09 SHA256 04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb
 AUX spidermonkey-1.6-header.patch 270 RMD160 ff656884925470695542b2b9412a130c72577f3a SHA1 6039b01f565b2bf2c20490a52b99b52796057b61 SHA256 e81acd7ba025214b2ecfa5918a1652e4590eaca39307c4e8d9f5d949d315373e
@@ -14,14 +14,15 @@ 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-r1.ebuild 1936 RMD160 e547b0fe5f227f02cef53f02c5577dc3bf1edc87 SHA1 c0fd62838640de4a0898a96bb87e93c4c011a9be SHA256 3f85a6879a2087f5480c34026b25dec1105010456c98c9dbda5fc71e744049e6
 EBUILD spidermonkey-1.8.2.15.ebuild 1909 RMD160 f023579d5da8abea011f0310ca6d2bc3130d8bcc SHA1 ee017ef05bfc908bbc65ebaebbbbde556e66457b SHA256 fa7ad212b4606e8b2087de34f2d30bfa10cbbcc90a905a43b32b285df3ccc290
 EBUILD spidermonkey-1.8.5-r1.ebuild 2245 RMD160 3d063c922927a30cf0983944a723ed1d75f34ba6 SHA1 bfc24c4a9c87916cc685075d30dfcd25c26390ba SHA256 4ab499c45ac7ca807998d635ac62940e34a738ae3b06bfa6e8a8091507300f1d
-MISC ChangeLog 10631 RMD160 c36ef7e20aabdbebaedeced40d13da18039cc666 SHA1 8f0cb5b8dbed5e714466e5a9541224d37e77107b SHA256 8ff9abfe5aeef87f0e5796b6e34e2f074c1753770f41e0ae5c2d213367f8dc33
+MISC ChangeLog 10829 RMD160 901b522769faef9cb6dc0553f9eda67a15767be1 SHA1 d0fd1a88a0514c5d36f4bc2409200b0a73bd12fd SHA256 87aa0b9f0ea4c67c1263d0a03e1dcb6c4481e7a0afb688e003be1c5d5cbf512f
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7QcjwACgkQiqiDRvmkBmJ4cgCePbEa6KbPRGLsDNEoSJnnCIIf
-WGsAniX6/N+lWgiFRaBwsy4PoUm4qj6z
-=8Y1d
+iF4EAREIAAYFAk78p/UACgkQAJxUfCtlWe3QCAD/d76azy5mmzNe8LQDNFD2vcPp
+KOea6f4RTCYNedfCPhkBALbdxmeo8uys4sCPcQjoLS3+TqxWZkoQcDUkxVRhZlzF
+=piQF
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild
new file mode 100644 (file)
index 0000000..07b9356
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r1.ebuild
@@ -0,0 +1,79 @@
+# 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-r1.ebuild,v 1.1 2011/12/29 17:49:12 axs Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs multilib python
+
+MY_PV="${PV}"
+MY_PV="${MY_PV/1.8.2/3.6}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+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 ~x64-macos ~x86-macos"
+IUSE="threadsafe"
+
+S="${WORKDIR}/mozilla-1.9.2"
+BUILDDIR="${S}/js/src"
+
+RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
+
+DEPEND="${RDEPEND}
+       app-arch/zip
+       =dev-lang/python-2*[threads]
+       dev-util/pkgconfig"
+
+pkg_setup(){
+       python_set_active_version 2
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
+
+       epatch_user
+
+       cd "${S}"
+       if [[ ${CHOST} == *-freebsd* ]]; then
+               # Don't try to be smart, this does not work in cross-compile anyway
+               ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+       fi
+}
+
+src_configure() {
+       cd ${BUILDDIR}
+
+       local myconf
+
+       if use threadsafe ; then
+               myconf="${myconf} --with-system-nspr \
+                       --enable-threadsafe"
+       fi
+       # Disable no-print-directory
+       MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
+               ${myconf}
+}
+
+src_compile() {
+       cd ${BUILDDIR}
+       emake -j1 || die "emake failed";
+}
+
+src_install() {
+       cd ${BUILDDIR}
+       emake install DESTDIR="${D}" || die
+       dobin shell/js ||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
+}