Add 1.8.5, which is a new js tarball created from the firefox-4.0 source called 'mozjs185'. This release changes the library name, and the pkg-config file name. See https://bugzilla.mozilla.org/show_bug.cgi?id=628723 for more details. Also, remove obsolete spidermonkey-2.0 ebuild.

(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)

4 files changed, 107 insertions, 76 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 7479781cdd69..8828341376d2 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,17 @@
 # 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.60 2011/06/22 02:22:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.61 2011/07/03 05:28:44 nirbheek Exp $
+
+*spidermonkey-1.8.5 (03 Jul 2011)
+
+  03 Jul 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +spidermonkey-1.8.5.ebuild,
+  +files/spidermonkey-1.8.5-fix-install-symlinks.patch,
+  -spidermonkey-2.0.1.ebuild:
+  Add 1.8.5, which is a new js tarball created from the firefox-4.0 source
+  called 'mozjs185'. This release changes the library name, and the pkg-config
+  file name. See https://bugzilla.mozilla.org/show_bug.cgi?id=628723 for more
+  details. Also, remove obsolete spidermonkey-2.0 ebuild.
 
 *spidermonkey-1.8.2.15 (22 Jun 2011)
 
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
new file mode 100644
index 000000000000..c867e45ee4f3
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
@@ -0,0 +1,15 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+
+--- js/src/Makefile.in
++++ js/src/Makefile.in
+@@ -888,8 +888,8 @@
+ ifeq (,$(HOST_BIN_SUFFIX))
+ 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
+ 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
+-	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
++	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
++	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
+ endif
+ endif
+ ifneq (,$(IMPORT_LIBRARY))
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild
new file mode 100644
index 000000000000..560aa21e3427
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild
@@ -0,0 +1,80 @@
+# 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.5.ebuild,v 1.1 2011/07/03 05:28:44 nirbheek Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs multilib python versionator
+
+MY_PN="js"
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
+MY_P="${MY_PN}-${PV}"
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	dev-util/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+
+	epatch_user
+
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_configure() {
+	cd "${BUILDDIR}"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}"
+	emake || die
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests"
+	emake check || die
+}
+
+src_install() {
+	cd "${BUILDDIR}"
+	emake DESTDIR="${D}" install || die
+	dodoc ../../README || die
+	dohtml README.html || die
+
+	if ! use static-libs; then
+		# We can't actually disable building of static libraries
+		# They're used by the tests and in a few other places
+		find "${D}" -iname '*.a' -delete || die
+	fi
+}
diff --git a/dev-lang/spidermonkey/spidermonkey-2.0.1.ebuild b/dev-lang/spidermonkey/spidermonkey-2.0.1.ebuild
deleted file mode 100644
index b7712f7b75fd..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-2.0.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-2.0.1.ebuild,v 1.1 2011/05/16 12:05:54 djc Exp $
-
-EAPI="2"
-inherit eutils toolchain-funcs multilib python
-
-MY_PV="${PV}"
-MY_PV="${MY_PV/2.0/4.0}"
-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"
-IUSE="test threadsafe"
-
-S="${WORKDIR}/mozilla-2.0"
-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_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_test() {
-	# failure in check-date-format-tofte.js is https://bugzil.la/600522
-	cd ${BUILDDIR}
-	emake check
-}
-
-src_install() {
-	cd ${BUILDDIR}
-	emake install DESTDIR="${D}" || die
-	dodoc ../jsd/README
-	dohtml README.html
-}