Adding threadsafe support, thanks to Ben de Groot for the patches, bug #129222

Package-Manager: portage-2.1.2_pre3-r8

8 files changed, 134 insertions, 12 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index cdef751d8cc3..54bfa51fa4a4 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.25 2006/10/08 17:49:22 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.26 2006/10/25 21:09:35 aballier Exp $
+
+*spidermonkey-1.5-r2 (25 Oct 2006)
+
+  25 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/spidermonkey-1.5-header.diff,
+  +files/spidermonkey-1.5-threadsafe.diff, +metadata.xml,
+  +spidermonkey-1.5-r2.ebuild:
+  Adding threadsafe support, thanks to Ben de Groot for the patches, bug #129222
 
   08 Oct 2006; Simon Stelling <blubb@gentoo.org> spidermonkey-1.5-r1.ebuild:
   stable on amd64
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 4ebc0d95826e..54de132aad1f 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -5,30 +5,49 @@ AUX spidermonkey-1.5-build.patch 3457 RMD160 323b186d6be267bce42f15fe0694b8c17d1
 MD5 eb5760a041c83fe1bc5cb5ffb9515e78 files/spidermonkey-1.5-build.patch 3457
 RMD160 323b186d6be267bce42f15fe0694b8c17d1e927d files/spidermonkey-1.5-build.patch 3457
 SHA256 04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb files/spidermonkey-1.5-build.patch 3457
-DIST js-1.5-rc5.tar.gz 1114472
+AUX spidermonkey-1.5-header.diff 243 RMD160 f8269f959df4b851cffa0f89247703fa8f604d89 SHA1 cdd647f6356cc19c36ee1d0a815334f37444bcd5 SHA256 d1d227c990a767ecd1fccf4a0fe7fd331693c97ccbcc2a385fa70b6336dcd369
+MD5 de6ff1ba95346d8d8f2f545ab8e67d1e files/spidermonkey-1.5-header.diff 243
+RMD160 f8269f959df4b851cffa0f89247703fa8f604d89 files/spidermonkey-1.5-header.diff 243
+SHA256 d1d227c990a767ecd1fccf4a0fe7fd331693c97ccbcc2a385fa70b6336dcd369 files/spidermonkey-1.5-header.diff 243
+AUX spidermonkey-1.5-threadsafe.diff 507 RMD160 981e02133f231ea24fb159b975ffb25d7fc603b7 SHA1 5179f71eee324c192fb50c228bade3e1fdaf9a69 SHA256 a677e574250a82e02fd7807b0f55c376b1b5fc55d72f9bf032a920a6a6a99173
+MD5 09d90eeeb50c1e7f8ad06bfa9ab2b93f files/spidermonkey-1.5-threadsafe.diff 507
+RMD160 981e02133f231ea24fb159b975ffb25d7fc603b7 files/spidermonkey-1.5-threadsafe.diff 507
+SHA256 a677e574250a82e02fd7807b0f55c376b1b5fc55d72f9bf032a920a6a6a99173 files/spidermonkey-1.5-threadsafe.diff 507
+DIST js-1.5-rc5.tar.gz 1114472 RMD160 292ba962540517fd6a5de0cce61b64703bbc2ab3 SHA1 2081598642d8002959c7577733028692bdec0bcf SHA256 87cfce45c6440f5dec88241e3b1a3927bc1988cf44429993059d96f345cf1e34
 DIST js-1.5.tar.gz 958135 RMD160 a1f23d53c259a9fa354f29eecdc1c56472f4f626 SHA1 707755be3a94207d5d10ccd1011ca00babe0a689 SHA256 ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
 EBUILD spidermonkey-1.5-r1.ebuild 1067 RMD160 18f5a5a95be1c02a19d333db1565b9e9d644ed36 SHA1 6c253ab488c64937d9e527d75b3069e72d53c5a2 SHA256 ce0b45dc77b3d7ec442e73f4d91dc78c62d9770c83401b5fe90b1a510f3ba37b
 MD5 e264efd73711876a82cd91d7eb378e7d spidermonkey-1.5-r1.ebuild 1067
 RMD160 18f5a5a95be1c02a19d333db1565b9e9d644ed36 spidermonkey-1.5-r1.ebuild 1067
 SHA256 ce0b45dc77b3d7ec442e73f4d91dc78c62d9770c83401b5fe90b1a510f3ba37b spidermonkey-1.5-r1.ebuild 1067
+EBUILD spidermonkey-1.5-r2.ebuild 1439 RMD160 b75a2e9c0446362e38696a724770d80eb7fe3467 SHA1 7382309b1482994c2e5cb8622c81f10f3348ad3a SHA256 516117c92819a50382668f37c668969a594d853caaa94516aa2a841e471c55ff
+MD5 0c95e97053659a0c3475628896b370a0 spidermonkey-1.5-r2.ebuild 1439
+RMD160 b75a2e9c0446362e38696a724770d80eb7fe3467 spidermonkey-1.5-r2.ebuild 1439
+SHA256 516117c92819a50382668f37c668969a594d853caaa94516aa2a841e471c55ff spidermonkey-1.5-r2.ebuild 1439
 EBUILD spidermonkey-1.5_rc5.ebuild 802 RMD160 963ca7e60c914fb7c68df84043a6a1d1d039a7dc SHA1 3baf2ab33e10f2b1f1b759ce85d6308d8d72c066 SHA256 62e06454f69ccb6e46f6fd80995d3ff95a94fa75b70dab50eca882f1308326b2
 MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802
 RMD160 963ca7e60c914fb7c68df84043a6a1d1d039a7dc spidermonkey-1.5_rc5.ebuild 802
 SHA256 62e06454f69ccb6e46f6fd80995d3ff95a94fa75b70dab50eca882f1308326b2 spidermonkey-1.5_rc5.ebuild 802
-MISC ChangeLog 3707 RMD160 2258f9ca9e45c46fc7f6329da8a711cb6593ad01 SHA1 254e56f6dc3b110c1a0538bcfb7e59f8eb0cf919 SHA256 3a248432832af213ee681fc57b5d9c02153bbce6bec98335d53cb50fb21fdef9
-MD5 0de6bcf3d03d625d880bc1db0e411fa9 ChangeLog 3707
-RMD160 2258f9ca9e45c46fc7f6329da8a711cb6593ad01 ChangeLog 3707
-SHA256 3a248432832af213ee681fc57b5d9c02153bbce6bec98335d53cb50fb21fdef9 ChangeLog 3707
+MISC ChangeLog 4008 RMD160 534512aff5a40f12cf984ff9e0745151891fbdee SHA1 9d5877c7ba99c05bd0011e4d8dd897227af047ee SHA256 af90b2f8cf646744014d8b6dafda04f9817c37d8d38216a1be6497045568cd1b
+MD5 0fd535a72112e2ba4b824681513efd07 ChangeLog 4008
+RMD160 534512aff5a40f12cf984ff9e0745151891fbdee ChangeLog 4008
+SHA256 af90b2f8cf646744014d8b6dafda04f9817c37d8d38216a1be6497045568cd1b ChangeLog 4008
+MISC metadata.xml 342 RMD160 4ae91f7b0cb5e0683c01358c504f7c8cb93f0c03 SHA1 78ec4a8c9be9fa279818c20fdc02487f2235cc09 SHA256 6a159fa4e04a2fc731021388301d67f55a4c4cba9ddf280b58f30c2926991be3
+MD5 dd408e7b2bf959034c11bb7a99d786ee metadata.xml 342
+RMD160 4ae91f7b0cb5e0683c01358c504f7c8cb93f0c03 metadata.xml 342
+SHA256 6a159fa4e04a2fc731021388301d67f55a4c4cba9ddf280b58f30c2926991be3 metadata.xml 342
 MD5 677d1aee7aeb40d5281803cab44cdc52 files/digest-spidermonkey-1.5-r1 220
 RMD160 5986a2ba0cf7d9d375e7f14cc4cf8127dd345852 files/digest-spidermonkey-1.5-r1 220
 SHA256 ccc1683b427d27b181a3216dec1a64f59759d1263c7a69eca326b39c925e0255 files/digest-spidermonkey-1.5-r1 220
-MD5 e7bfb72073e1ade3470d60ba93042804 files/digest-spidermonkey-1.5_rc5 63
-RMD160 57d592fdb69d165a4ed78546e4c09e86d1fb6c4c files/digest-spidermonkey-1.5_rc5 63
-SHA256 6577cd567c5bccf00de98430ddca7bff41370c39a60fd87f989a8a0d92bdd81e files/digest-spidermonkey-1.5_rc5 63
+MD5 677d1aee7aeb40d5281803cab44cdc52 files/digest-spidermonkey-1.5-r2 220
+RMD160 5986a2ba0cf7d9d375e7f14cc4cf8127dd345852 files/digest-spidermonkey-1.5-r2 220
+SHA256 ccc1683b427d27b181a3216dec1a64f59759d1263c7a69eca326b39c925e0255 files/digest-spidermonkey-1.5-r2 220
+MD5 af8945e84d6ca9fc79ae81c9d1a855e3 files/digest-spidermonkey-1.5_rc5 235
+RMD160 3a9b0c4a2f41ac06fde50959a9ac309a41d4cda7 files/digest-spidermonkey-1.5_rc5 235
+SHA256 68d834ccdcfdf34a0b67331be81288dca9ed915d001fc37763f259e1efc55625 files/digest-spidermonkey-1.5_rc5 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPr4namhnQswr0vIRAs+/AKCnvOyOx95tWfa3+uQF0eFV5u5f2ACfT1/T
-ovnRBXJ1a8bnLzXJ5kcc7ug=
-=JCxD
+iD8DBQFFP9I+vFcC4BYPU0oRAkATAKCHqZDu+KXRCTwifCboNNt33PuSDQCfdMKe
+LK+YpQSju3S/Dj6YDMEca+8=
+=hIlQ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5-r2 b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5-r2
new file mode 100644
index 000000000000..e540f24e336b
--- /dev/null
+++ b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5-r2
@@ -0,0 +1,3 @@
+MD5 863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz 958135
+RMD160 a1f23d53c259a9fa354f29eecdc1c56472f4f626 js-1.5.tar.gz 958135
+SHA256 ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585 js-1.5.tar.gz 958135
diff --git a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc5 b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc5
index aada4c0c8298..1812ea921f18 100644
--- a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc5
+++ b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc5
@@ -1 +1,3 @@
 MD5 3c720a8af00ff5590e623c00a683c53b js-1.5-rc5.tar.gz 1114472
+RMD160 292ba962540517fd6a5de0cce61b64703bbc2ab3 js-1.5-rc5.tar.gz 1114472
+SHA256 87cfce45c6440f5dec88241e3b1a3927bc1988cf44429993059d96f345cf1e34 js-1.5-rc5.tar.gz 1114472
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-header.diff b/dev-lang/spidermonkey/files/spidermonkey-1.5-header.diff
new file mode 100644
index 000000000000..33fcee22549f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.5-header.diff
@@ -0,0 +1,11 @@
+--- js/src/Makefile.ref.orig	2006-03-06 00:42:57.000000000 +0100
++++ js/src/Makefile.ref	2006-03-06 00:43:24.000000000 +0100
+@@ -179,6 +179,8 @@
+ 	jsscript.h	\
+ 	jsstr.h		\
+ 	jsxdrapi.h	\
++	jsutil.h	\
++	jsprf.h		\
+ 	$(NULL)
+ 
+ API_HFILES =		\
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-threadsafe.diff b/dev-lang/spidermonkey/files/spidermonkey-1.5-threadsafe.diff
new file mode 100644
index 000000000000..eab0330bd57d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.5-threadsafe.diff
@@ -0,0 +1,16 @@
+--- js/src/Makefile.ref.orig	2006-03-06 03:31:04.000000000 +0000
++++ js/src/Makefile.ref	2006-03-06 03:33:03.000000000 +0000
+@@ -61,11 +61,11 @@
+ 
+ ifdef JS_THREADSAFE
+ DEFINES += -DJS_THREADSAFE
+-INCLUDES += -I../../dist/$(OBJDIR)/include
++INCLUDES += -I/usr/include/nspr
+ ifdef USE_MSVC
+ OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
+ else
+-OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr${NSPR_LIBSUFFIX}
++OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX}
+ endif
+ endif
+ 
diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml
new file mode 100644
index 000000000000..216ea5a080e9
--- /dev/null
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<longdescription lang="en">
+		Stand-alone JavaScript C library
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5-r2.ebuild
new file mode 100644
index 000000000000..ce9758a90c85
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5-r2.ebuild,v 1.1 2006/10/25 21:09:35 aballier Exp $
+
+inherit eutils toolchain-funcs multilib
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="threadsafe"
+
+S=${WORKDIR}/js/src
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.5-threadsafe.diff"
+	epatch "${FILESDIR}/${PN}-1.5-header.diff"
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_compile() {
+	tc-export CC LD AR
+	if use threadsafe; then
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
+		|| die "emake with threadsafe enabled failed";
+	else
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)"\
+		|| die "emake without threadsafe enabled failed";
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
+	dodoc ../jsd/README
+	dohtml README.html
+}