Version bump

(Portage version: 2.1.2.7)

4 files changed, 73 insertions, 1 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index be08538b488a..0c6ca58275ef 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.30 2007/04/24 19:05:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.31 2007/05/13 18:32:19 aballier Exp $
+
+*spidermonkey-1.6 (13 May 2007)
+
+  13 May 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/spidermonkey-1.6-header.patch, +spidermonkey-1.6.ebuild:
+  Version bump
 
   24 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   spidermonkey-1.5-r2.ebuild:
diff --git a/dev-lang/spidermonkey/files/digest-spidermonkey-1.6 b/dev-lang/spidermonkey/files/digest-spidermonkey-1.6
new file mode 100644
index 000000000000..4583fe5a642f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/digest-spidermonkey-1.6
@@ -0,0 +1,3 @@
+MD5 bd8f021e43a8fbbec55ac2cd3d483243 js-1.60.tar.gz 1081150
+RMD160 630e0f5606d9cc398daa41e71ca3f98c04e3aed2 js-1.60.tar.gz 1081150
+SHA256 cffbcf6721b897ca1259661f418f3d81c1193702f59a29f0f3232c9b8f24faa3 js-1.60.tar.gz 1081150
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
new file mode 100644
index 000000000000..df4cf7d50744
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
@@ -0,0 +1,13 @@
+Index: src/Makefile.ref
+===================================================================
+--- src.orig/Makefile.ref
++++ src/Makefile.ref
+@@ -185,6 +185,8 @@ JS_HFILES =		\
+ 	jsstr.h		\
+ 	jsxdrapi.h	\
+ 	jsxml.h		\
++	jsutil.h	\
++	jsprf.h		\
+ 	$(NULL)
+ 
+ API_HFILES =		\
diff --git a/dev-lang/spidermonkey/spidermonkey-1.6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.6.ebuild
new file mode 100644
index 000000000000..7f0422081940
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.6.ebuild,v 1.1 2007/05/13 18:32:19 aballier Exp $
+
+inherit eutils toolchain-funcs multilib
+
+MY_P="js-${PV}0"
+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 ~sparc ~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}/${P}-header.patch"
+	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
+}