[gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2011-11-14 19:11 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2011-11-14 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d624476e7f55ece7dde7127d1dc03ffb8b07eb30
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 19:10:55 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 19:10:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d624476e

Multiple fixed for spidermonkey-1.8.5

---
 dev-lang/spidermonkey/Manifest                     |    7 +-
 .../spidermonkey-1.8.5-fix-install-symlinks.patch  |   15 +++
 .../files/spidermonkey-1.8.5-fix-ppc64.patch       |   31 +++++++
 .../files/spidermonkey-1.9.2.13-as-needed.patch    |   22 -----
 dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild |   74 ---------------
 dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild |   94 ++++++++++++++++++++
 6 files changed, 144 insertions(+), 99 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 8fbf7dc..61a0e22 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,3 +1,4 @@
-AUX spidermonkey-1.9.2.13-as-needed.patch 623 RMD160 2f77a10c5984d078ed187b1b5f469393f8c7a35d SHA1 367571f1d440e46f87d3edcfafbff0d17cce3cdb SHA256 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f
-DIST firefox-3.6.13.source.tar.bz2 51478675 RMD160 658409db60a8f412ac74ff15a8c1d8c4ed85b71e SHA1 1d1bc70d651bce4006687f5762638563c0494267 SHA256 4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63
-EBUILD spidermonkey-1.8.2.13.ebuild 1603 RMD160 1e1358b96e3a10dd2fd06238726e784d14c7ae44 SHA1 f5564e028be5fa8416fd53a5b1a1ac8861f835f4 SHA256 a90bf84e00990defacf04c00e9cca36da885ce739b2aa3e9a6f44a9fb2adaf7c
+AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
+AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc
+DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
+EBUILD spidermonkey-1.8.5.ebuild 2308 RMD160 326b2e3097f0db237d28a0a24170f39be39657bf SHA1 f25c6d765a2008bef18eab74398881918a142d1b SHA256 447f4def37621da91082d3cf7ffcca9e6af7095dcadf8aeddd497a02c2a3a760

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 0000000..c867e45
--- /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/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
new file mode 100644
index 0000000..d7a2b9e
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
+ 		platform.cc \
+ 		utils.cc \
+ 		$(NONE)
+ 
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/yarr/pcre \
+ 		$(NULL)
+ 
+ CPPSRCS += 	pcre_compile.cpp \
+                 pcre_exec.cpp \
+
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
deleted file mode 100644
index 847bf79..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
---- a/js/src/jsapi-tests/Makefile.in
-+++ b/js/src/jsapi-tests/Makefile.in
-@@ -55,17 +55,17 @@ CPPSRCS = \
-   testSameValue.cpp \
-   testDebugger.cpp \
-   testDefineGetterSetterNonEnumerable.cpp \
-   testExtendedEq.cpp \
-   $(NULL)
- 
- DEFINES         += -DEXPORT_JS_API
- 
--LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
-+LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
- 
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
- 
- ifdef _MSC_VER
- ifdef WINCE
- WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
- endif
- endif

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild
deleted file mode 100644
index b788c5b..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-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 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-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() {
-	unpack ${A}
-
-	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
-	dodoc ../jsd/README
-	dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
new file mode 100644
index 0000000..3b1a293
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@@ -0,0 +1,94 @@
+# 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.2 2011/07/03 05:36:21 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 ~x86-fbsd"
+IUSE="debug 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
+
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.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() {
+	local myopts
+
+	if use debug ; then
+		myopts="--enable-debug \
+			--enable-debugger-info-modules \
+			--enable-debug-symbols"
+	fi
+
+	cd "${BUILDDIR}"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--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
+	dobin shell/js ||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
+}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2012-06-18 18:27 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2012-06-18 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4910d4b47b9d5222db432eb0335a19fcd72a1378
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 18:27:05 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 18:27:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4910d4b4

Allow build to rename libs properly

---
 dev-lang/spidermonkey/Manifest                     |    3 ++-
 .../files/spidermonkey-1.8.7-filter_desc.patch     |   18 ++++++++++++++++++
 dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild    |    2 ++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 9e28820..888d82c 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,8 +1,9 @@
 AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 RMD160 d4c4c41c9cda62f1276e617915a2be744493754e SHA1 790060f9081c5b861d227d2b14b2281c984968d9 SHA256 1e726aa83d26d20454bbfdfe2a5529ac5b07076dd13a9d6faac6341193c85f37
 AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
 AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 RMD160 b3f3037cca9cc56c5f5a3c4e7a7c34a8f5b05efd SHA1 74245c08ef7a289e545a11afaeea60406d3bf717 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470
+AUX spidermonkey-1.8.7-filter_desc.patch 922 RMD160 2278dac6ff00e1c3650ed8ade491f142aa49f3d0 SHA1 462da04f7784530e02880bbc6ee5cabbe7ab0603 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46
 DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
 DIST js187-1.0.0.tar.gz 7106870 RMD160 34d7fccefb85eb74093aad63c96190cb903021ea SHA1 229d05f271933f66536c20da2b1fb8060989cbc4 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4
 DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 RMD160 fc5bf0d85014a7d8d5c4f1f55866a44b8d5cd2bd SHA1 f54f7a761fef1bee23664d3736e3aaf38521a7e8 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353
 EBUILD spidermonkey-1.8.5-r1.ebuild 3123 RMD160 42c22e43d78fee436660c385e4910e70f1b53c89 SHA1 150f46149e44631915fd75057acb0b8f5d0dbd72 SHA256 40243bbaf6a0300f008192d8faaf935c7d857c89ab2455177a2560c15cb47ba5
-EBUILD spidermonkey-1.8.7.ebuild 3080 RMD160 d88d898ca17d62aa3cf2af8dcce4f42e7e0e3ec4 SHA1 192f4cf01d5311560edffdb6a797a61bb9c33a89 SHA256 fc9b0d6ce122ee775859d62acc81f5768732d7918fcf2cebc4e97f001b0658ef
+EBUILD spidermonkey-1.8.7.ebuild 3131 RMD160 26928bef4f05039c81897f55f021b1bb94d6e00f SHA1 aa4e40b1c0213182d808235c78ec3c4f24c7cb13 SHA256 e3e7bf02c53b1944ea1b7fed03ef62ab1deab1a39b47b1dbab36bd21f48f20b1

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
new file mode 100644
index 0000000..65d0a2d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
@@ -0,0 +1,18 @@
+--- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
++++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
+@@ -965,10 +965,10 @@
+ endif
+ endif
+ 
+-install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
+-ifneq (,$(LIBRARY))
+-	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+-	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
++install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
++ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
++	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
++	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ ifeq (,$(HOST_BIN_SUFFIX))
+

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
index 92c1883..8b97a0a 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
@@ -43,6 +43,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/spidermonkey"
 
+	epatch ${FILESDIR}/${PN}-1.8.7-filter_desc.patch
+
 	epatch_user
 
 	if [[ ${CHOST} == *-freebsd* ]]; then



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2012-10-12 19:58 Ian Stakenvicius
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2012-10-12 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e9ef239373e2d3d6b657efaf2454e80de22e835a
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 19:58:41 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 19:58:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e9ef2393

Bump to EAPI5 and fix bugs 437190, 437518

---
 dev-lang/spidermonkey/Manifest                     |   31 +++--
 .../files/spidermonkey-1.5-build.patch             |  138 ++++++++++++++++++++
 .../files/spidermonkey-1.6-header.patch            |   13 ++
 .../files/spidermonkey-1.7.0-ldflags.patch         |   42 ++++++
 .../files/spidermonkey-1.7.0-threadsafe.diff       |   18 +++
 .../files/spidermonkey-1.9.2.13-as-needed.patch    |   22 +++
 dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild |   52 ++++++++
 .../spidermonkey/spidermonkey-1.8.2.15-r2.ebuild   |   80 +++++++++++
 dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild |  119 +++++++++++++++++
 dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild |  134 +++++++++++++++++++
 10 files changed, 639 insertions(+), 10 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0e4b810..71c2d47 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,10 +1,21 @@
-AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 RMD160 d4c4c41c9cda62f1276e617915a2be744493754e SHA1 790060f9081c5b861d227d2b14b2281c984968d9 SHA256 1e726aa83d26d20454bbfdfe2a5529ac5b07076dd13a9d6faac6341193c85f37
-AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
-AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 RMD160 b3f3037cca9cc56c5f5a3c4e7a7c34a8f5b05efd SHA1 74245c08ef7a289e545a11afaeea60406d3bf717 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470
-AUX spidermonkey-1.8.7-filter_desc.patch 922 RMD160 2278dac6ff00e1c3650ed8ade491f142aa49f3d0 SHA1 462da04f7784530e02880bbc6ee5cabbe7ab0603 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46
-AUX spidermonkey-1.8.7-x32.patch 753 RMD160 91337f85781fb37057b3b7194cccde8378fa6a4d SHA1 310cccac981c39d06198dd449ac3126484525e56 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d
-DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-DIST js187-1.0.0.tar.gz 7106870 RMD160 34d7fccefb85eb74093aad63c96190cb903021ea SHA1 229d05f271933f66536c20da2b1fb8060989cbc4 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4
-DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 RMD160 fc5bf0d85014a7d8d5c4f1f55866a44b8d5cd2bd SHA1 f54f7a761fef1bee23664d3736e3aaf38521a7e8 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353
-EBUILD spidermonkey-1.8.5-r1.ebuild 3123 RMD160 42c22e43d78fee436660c385e4910e70f1b53c89 SHA1 150f46149e44631915fd75057acb0b8f5d0dbd72 SHA256 40243bbaf6a0300f008192d8faaf935c7d857c89ab2455177a2560c15cb47ba5
-EBUILD spidermonkey-1.8.7.ebuild 3426 RMD160 eefe7c1eb7ca8576ed63465a9c61e7e00dff97fa SHA1 846b17b3b415c527601c9b2d2953d2ea7f8c6c3e SHA256 0b0f0c9c2274050d572f37abe88e2e61f68ae50295c4057b80d60de845c34dd9
+AUX spidermonkey-1.5-build.patch 3457 SHA256 04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb SHA512 d4ebb63c9ce2a2e84a0a2b32abb8f4316d53bd71a2c6de37f1a48b26514d583b4c573302dcb15f39b4f57878d01dfc4ff9f9d70e9d1abd54f4ce535124c1147e WHIRLPOOL d35da32872cb68f2bf5b86c20691c7212bdff843a9bfcd8fb385e62c7bc55b9248a00edd3654ac2c1e50f57e413c9dd4c4cfcb57b5a59c1cef343f6c202eb6f9
+AUX spidermonkey-1.6-header.patch 270 SHA256 e81acd7ba025214b2ecfa5918a1652e4590eaca39307c4e8d9f5d949d315373e SHA512 f52861ad88b6624fc7e2cd7b9174f53cf0bebf339704932f36ca1d5bd6b133f6e28333fa5d10841c72ccfaccf0f7daa63a1385e2ff6ab8d0192bf70bd437479a WHIRLPOOL d076e64a52adfb9ff55aa7c6191c4a1c29c6917661a15a5cfcc0717960e63403b5557f9e28263cc19c20f3ee4e97c88f87b40b6d786ca3705dd4b2893a0f9c7d
+AUX spidermonkey-1.7.0-ldflags.patch 1076 SHA256 7dcc26496a6413652ff32ce1b1eb04c7ef526658d41a243f1ce0e44598cd809b SHA512 649dccce8206cf99e09715a0e8e7fc0db3bdff4269ab82898476d2e70fda73c420f80f915eadabf17a8bcee529e692bd195dd6df3ac58020e8dd97a91d19a847 WHIRLPOOL 270ea3c19981a597cc8cf9984f5ac358e91fb6ab3fe0ff753cbd933868177e5629b088ae7588b9b630f37ac1cc1381f6e28591e3b47e03bec39627ef332cdcb4
+AUX spidermonkey-1.7.0-threadsafe.diff 513 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9 SHA512 81a6c306f4c2546921a12864ee4320b44ce4313e4972932c1929b3ccac03954f0aa4260911b4d9cffcb135cce5974c91456577a80162ed2052cdff7ebd327b9f WHIRLPOOL f21510a69e5718bef52fd0a4f139ff95cf91ae3626172c473a859c5fc2e7dda1df7e67f92190c4c6c2e74e32ac8a36163ca1164aa2f922ec7a6662b89cfe6e2f
+AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 SHA256 1e726aa83d26d20454bbfdfe2a5529ac5b07076dd13a9d6faac6341193c85f37 SHA512 374278b503bc04aaf9b5db08d28529f5943960b74f4f0b55c46b3bf820f3bd55cc52f46aaf502649745d2455e2a27c867fdc93e46662f4ee1eba91d2b6737a49 WHIRLPOOL f8f2acfae508157ad820f7d8a0f3190cfaadcf3ae76df7d6bbf7aaad02d3f908a2bf60e603f2c591310e25de25e3c9f3543619d68e179d4c937ed81f0acd4c13
+AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
+AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
+AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
+AUX spidermonkey-1.8.7-x32.patch 753 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d SHA512 ae9c0241fd1cc02b5f21865adb1efb750246850dcf93ee1b81c5faf19c5d4d5b0ab6e853527899c438d2139601e8a177f7ee6c9a3700d2816df32f5e09d273e8 WHIRLPOOL 8b43164a8a7cc4d82092e81d4a2d0d21a8614dfe7964f3fbb49d0f70e25178ba0197bd525e9f08cb1c621d991dd4aefc97be15901d3f482fce180e8d90bf8706
+AUX spidermonkey-1.9.2.13-as-needed.patch 623 SHA256 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f SHA512 0acc2dc178396302518a2ac868ff1ab5710615bebe0c9ece31dba59037a92c741c5f02ba24cb76fe239e1b39946ff3362e5414e63f5ff64e48b64012b48a9779 WHIRLPOOL 75bc285dc9bb437a4ae4350eb755bbb2d0418a4f854ce4daeda4ca805ca31e16dabda0e35ac2a05dc0f5fcf6dfe1929547252a63553664921fd24a6ca76a30fa
+DIST firefox-3.6.15.source.tar.bz2 51552828 SHA256 405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f SHA512 82bf0a6c6cb30fc0b18b067ac3d9cb7e48a0fd0126edd851e628d49e429aea33500a5a5eba87bce922e51b1b7410ccccfe4f8b7ce5573bdbd718c76da7acb1da WHIRLPOOL b788d7ba2cfcaec4f317e615878401a7a1fb985aaa43829831c17b699812e59adb7874247114e0143da63198118cab059796fc5d5fd08d72ccc54b4fef279f85
+DIST js-1.7.0.tar.gz 1165607 SHA256 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51 WHIRLPOOL 8044b306b3a1f0abed5ac8a6bf4f9ed70e1ebc6f83f44934a6306d9ed68cd73124f82e40430d764f158377031f5ee986595e58fdb52259ab6a3a8674eaf4eed1
+DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
+DIST js187-1.0.0.tar.gz 7106870 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4 SHA512 7df55daac1eac0a7a7b31df044f7d5cc40a1f5079907b661f7c8489614b0ddff35e4f7cd13214bfc4baf9bdb37d392e4118f63ab589a051978d6ceef63d1e9f2 WHIRLPOOL d0f2ea8add0c7c1ac34ff8a6f887e931768091696dda037e7778ecd7eb02889b455747cfaa9a362844983eb2bdda6bddab46bf542cecf81f91ec5165efc0b9a3
+DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353 SHA512 bd1976b12940390e7d5db6078ca6339006428874788688e4ea4f6bd86afd341c3edd356bac801883637f46085c6d971d4f79e44fa9f6e44b3b715186355be175 WHIRLPOOL 5614bcb99d7101751e6f5be24b20e8a6acd5a682640025830f0c4a4fb74e724e5d71eb56c3e09d0ced4bbfa6c6c93daf42a7bc326c3cf0b07bee777901f25039
+EBUILD spidermonkey-1.7.0-r3.ebuild 1572 SHA256 5fa27ee739b872875263cc820fbd62965602fc382b5b9910bf261806b888b659 SHA512 a416f95f9908f54e1c677121bfb813c4b796e1a08b9b8eed2b67bb4302ab80484ee6128f528c5cc28ded6c64676840d76e8cdaea4909d08ff23bea216ee3594c WHIRLPOOL 7d482652339f3c4d16282fa9b65cd619a90510b46ece74ff3598e2f0fb1dc396f40d10e76922ec9e8d4a8d1da4101c43690fb9086d5c9c4da6fdb376f3529c22
+EBUILD spidermonkey-1.8.2.15-r2.ebuild 1974 SHA256 0c5415bdc7f102f6901c3f72a1456cea267e8042b91b580233a10b95e4a4f873 SHA512 ea45f184d20961623706f69a214d436aced33d104e8ff0f9e728c4a5f64d492cff3fff03a4f934e2cbb799a42dbd38551da6bfa05417543515dfad30383fcb05 WHIRLPOOL 889f37623b078d68ae11f7c0a5043c00a0f887c33dc66c9625834129d520e64939fe582756d7ba4a9d9477d45905da5fde3929cc27dac3837513b00ec628f684
+EBUILD spidermonkey-1.8.5-r1.ebuild 3123 SHA256 40243bbaf6a0300f008192d8faaf935c7d857c89ab2455177a2560c15cb47ba5 SHA512 621e3dd36e8c30c9e1ba7be8f350801f9154154d9bdf535ccb3e74943429b55707e9990f99929ffa97ebdeca800f1241b0357e024c67624b0f5e1ed000aabf99 WHIRLPOOL 8fc4f02b324c65d2f045222cf903a0d27cea272569a752c68651ed21df2d23c14bae97b975ce407be3f3e812841bb4bc8f24849f07aa2b23e609ec4fc38c1686
+EBUILD spidermonkey-1.8.5-r2.ebuild 3369 SHA256 5b9d75e9ffda5ba56b03ecab9db6607fefcceecfcebe59dcaf1b35a0ae7d0bc2 SHA512 00584e4fb20161b62b62559e922df935e3062f507e48032e321c768d2a4abd5f47d26434c5715bbb6a83b944af95f63b1852bd9db7a99ab1e837f800478054b4 WHIRLPOOL e41b2ee96db89c4c8e75762ada184e47680c4f0440dda6ebe2d8ad7686e1bb327d5e7c2ffda81e637d6cfe47781a0cf7e777221cb4bd118397579e620334f8f1
+EBUILD spidermonkey-1.8.7-r1.ebuild 3708 SHA256 34ec51cca1557a5582bed4de9c41301721c351638fe575e498e82e60b75f8eca SHA512 f051c17a8060943b1c403a4067485ceee133156b2fe4da97c9e02009de4d1765827b2b9c0f932113539c53c8f923a1ee68a454bc6c07ff558965a834c326c804 WHIRLPOOL c22e368bc2288f855de9624d27a0e1410e4b9cdc5b19a3798d00ef69656c1b1374a3306eeb595e48c9050b8bd54f271231d457e579e31effa8333e1f0e358868
+EBUILD spidermonkey-1.8.7.ebuild 3426 SHA256 0b0f0c9c2274050d572f37abe88e2e61f68ae50295c4057b80d60de845c34dd9 SHA512 916fc89a9a60d44603ea677f57391dd9fab6ed52b38f1822621f37573a90d802912764e3924de91ef1b3ab3cefd077f07503bd933a48b8c532fb0dfb92e15bcc WHIRLPOOL 2bf79c38bb8bdc98f4e80d81ca1e5b733712b6b36eaaeb766cdd89ced157ee10ae41d524e910d47e03931efb8348faf63dca761db984330c927bd78214d3d37e

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
new file mode 100644
index 0000000..a5c4b47
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
@@ -0,0 +1,138 @@
+--- js/src/Makefile.ref
++++ js/src/Makefile.ref
+@@ -127,7 +127,7 @@ endif 
+ ifdef JS_READLINE
+ # For those platforms with the readline library installed.
+ DEFINES += -DEDITLINE
+-PROG_LIBS += -lreadline -ltermcap
++PROG_LIBS += -lreadline
+ else
+ ifdef JS_EDITLINE
+ # Use the editline library, built locally.
+@@ -370,3 +370,16 @@ TARFILES = files `cat files`
+ SUFFIXES: .i
+ %.i: %.c
+ 	$(CC) -C -E $(CFLAGS) $< > $*.i
++
++DESTDIR :=
++PREFIX := /usr
++BINDIR := $(PREFIX)/bin
++MY_LIBDIR := $(PREFIX)/$(LIBDIR)
++INCLUDEDIR := $(PREFIX)/include/js
++INSTALL := install -g 0 -o root
++install:
++	$(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR) $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
++	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
++	$(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
+--- js/src/config/Linux_All.mk
++++ js/src/config/Linux_All.mk
+@@ -41,37 +41,15 @@
+ # Config for all versions of Linux
+ #
+ 
+-CC = gcc
+-CCC = g++
+ CFLAGS +=  -Wall -Wno-format
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ 
+ RANLIB = echo
+-MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
++MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
+ 
+ #.c.o:
+ #      $(CC) -c -MD $*.d $(CFLAGS) $<
+ 
+-CPU_ARCH = $(shell uname -m)
+-# don't filter in x86-64 architecture
+-ifneq (x86_64,$(CPU_ARCH))
+-ifeq (86,$(findstring 86,$(CPU_ARCH)))
+-CPU_ARCH = x86
+-OS_CFLAGS+= -DX86_LINUX
+-
+-ifeq (gcc, $(CC))
+-# if using gcc on x86, check version for opt bug 
+-# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
+-GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
+-GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
+-
+-ifeq (2.91.66, $(firstword $(GCC_LIST)))
+-CFLAGS+= -DGCC_OPT_BUG
+-endif
+-endif
+-endif
+-endif
+-
+ GFX_ARCH = x
+ 
+ OS_LIBS = -lm -lc
+@@ -88,16 +66,6 @@
+ endif
+ 
+ # Use the editline library to provide line-editing support.
+-JS_EDITLINE = 1
++JS_READLINE = 1
+ 
+-ifeq ($(CPU_ARCH),x86_64)
+-# Use VA_COPY() standard macro on x86-64
+-# FIXME: better use it everywhere
+ OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+-endif
+-
+-ifeq ($(CPU_ARCH),x86_64)
+-# We need PIC code for shared libraries
+-# FIXME: better patch rules.mk & fdlibm/Makefile*
+-OS_CFLAGS += -DPIC -fPIC
+-endif
+--- js/src/rules.mk
++++ js/src/rules.mk
+@@ -82,6 +82,10 @@ $(OBJDIR)/%.o: %.c
+ 	@$(MAKE_OBJDIR)
+ 	$(CC) -o $@ -c $(CFLAGS) $*.c
+ 
++$(OBJDIR)/%.lo: %.c
++	@$(MAKE_OBJDIR)
++	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
++
+ $(OBJDIR)/%.o: %.s
+ 	@$(MAKE_OBJDIR)
+ 	$(AS) -o $@ $(ASFLAGS) $*.s
+@@ -111,11 +115,12 @@ $(SHARED_LIBRARY): $(LIB_OBJS)
+ 	    /implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
+ else
+ $(LIBRARY): $(LIB_OBJS)
+-	$(AR) rv $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+-$(SHARED_LIBRARY): $(LIB_OBJS)
+-	$(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
++SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
++$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
++	$(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
+ endif
+ endif
+ 
+--- js/src/fdlibm/Makefile.ref
++++ js/src/fdlibm/Makefile.ref
+@@ -151,7 +151,7 @@
+ 
+ $(OBJDIR)/%.o: %.c
+ 	@$(MAKE_OBJDIR)
+-	$(CC) -o $@ -c $(CFLAGS) $*.c
++	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
+ 
+ $(OBJDIR)/%.o: %.s
+ 	@$(MAKE_OBJDIR)
+--- js/src/config.mk
++++ js/src/config.mk
+@@ -112,6 +112,8 @@
+ CP = cp
+ endif
+ 
++BUILD_OPT := 1
++
+ ifdef BUILD_OPT
+ OPTIMIZER  = -O
+ DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)

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 0000000..df4cf7d
--- /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/files/spidermonkey-1.7.0-ldflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
new file mode 100644
index 0000000..4ddc346
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
@@ -0,0 +1,42 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=331129
+
+--- js/src/Makefile.ref
++++ js/src/Makefile.ref
+@@ -87,7 +87,7 @@
+ LDFLAGS                = $(XLDFLAGS)
+ 
+ ifndef NO_LIBM
+-LDFLAGS += -lm
++OTHER_LIBS += -lm
+ endif
+ 
+ # Prevent floating point errors caused by VC++ optimizations
+@@ -325,7 +325,7 @@
+ 	$(CC) -o $@ -c $(CFLAGS) $<
+ 
+ $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
++	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^
+ 
+ endif
+ 
+@@ -338,7 +338,7 @@
+ 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
+ else
+ $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
+-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
++	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \
+ 	    $(PROG_LIBS)
+ endif
+ 
+@@ -355,7 +355,7 @@
+ 	$(OBJDIR)/jscpucfg > $@
+ 
+ $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
+-	$(CC) -o $@ $(OBJDIR)/jscpucfg.o
++	$(CC) $(HOST_LDFLAGS) -o $@ $(OBJDIR)/jscpucfg.o
+ 
+ # Add to TARGETS for clobber rule
+ TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
new file mode 100644
index 0000000..8728811
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
@@ -0,0 +1,18 @@
+Index: src/Makefile.ref
+===================================================================
+--- src.orig/Makefile.ref
++++ src/Makefile.ref
+@@ -63,11 +63,11 @@ INCLUDES   += -I$(OBJDIR)
+ 
+ ifdef JS_THREADSAFE
+ DEFINES += -DJS_THREADSAFE
+-INCLUDES += -I$(DIST)/include/nspr
++INCLUDES += -I/usr/include/nspr
+ ifdef USE_MSVC
+ OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
+ else
+-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
++OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr$(NSPR_LIBSUFFIX)
+ endif
+ endif
+ 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
new file mode 100644
index 0000000..847bf79
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
@@ -0,0 +1,22 @@
+diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
+--- a/js/src/jsapi-tests/Makefile.in
++++ b/js/src/jsapi-tests/Makefile.in
+@@ -55,17 +55,17 @@ CPPSRCS = \
+   testSameValue.cpp \
+   testDebugger.cpp \
+   testDefineGetterSetterNonEnumerable.cpp \
+   testExtendedEq.cpp \
+   $(NULL)
+ 
+ DEFINES         += -DEXPORT_JS_API
+ 
+-LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
++LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
+ 
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+ 
+ ifdef _MSC_VER
+ ifdef WINCE
+ WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
+ endif
+ endif

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
new file mode 100644
index 0000000..170963c
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
@@ -0,0 +1,52 @@
+# 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.7.0-r2.ebuild,v 1.2 2011/03/22 15:51:21 jer Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+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/js"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="threadsafe unicode"
+
+S="${WORKDIR}/js/src"
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.6-header.patch"
+	epatch "${FILESDIR}/${P}-threadsafe.diff" \
+		"${FILESDIR}"/${P}-ldflags.patch
+
+	# don't force owner for Prefix
+	sed -i -e '/^INSTALL :=/s/-g 0 -o root//' Makefile.ref || die
+
+	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() {
+	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
+	tc-export CC LD AR RANLIB
+	local threadsafe=""
+	use threadsafe && threadsafe="JS_THREADSAFE=1"
+	emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" ${threadsafe} \
+		XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${ED}" LIBDIR="$(get_libdir)"
+	dodoc ../jsd/README
+	dohtml README.html
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
new file mode 100644
index 0000000..4344ff8
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 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.3 2012/05/03 02:41:39 jdhore Exp $
+
+EAPI="5"
+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/mozjs"
+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]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
+
+	epatch_user
+
+	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}" || die
+
+	local myconf
+
+	use threadsafe && myconf="${myconf} \
+		--with-system-nspr --enable-threadsafe"
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
+		${myconf}
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	emake -j1
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake install DESTDIR="${D}"
+	dobin shell/js
+	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
+}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
new file mode 100644
index 0000000..f9c92c6
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+
+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/mozjs185"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug 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]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.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" || die
+	fi
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	dobin shell/js
+	pax-mark m "${ED}/usr/bin/js"
+	dodoc ../../README
+	dohtml README.html
+
+	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-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
new file mode 100644
index 0000000..2a860b1
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+
+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"
+SPIDERPV="${PV}-patches-0.1"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs187"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug jit static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0
+	virtual/libffi"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/spidermonkey"
+
+	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-x32.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" || die
+	fi
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		--enable-system-ffi \
+		--enable-jemalloc \
+		$(use_enable debug) \
+		$(use_enable jit tracejit) \
+		$(use_enable jit methodjit) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	dobin shell/js
+	if use jit; then
+		pax-mark m "${ED}/usr/bin/js"
+	fi
+	dodoc ../../README
+	dohtml README.html
+	# install header files needed but not part of build system
+	insinto /usr/include/js
+	doins ../public/*.h
+	insinto /usr/include/js/mozilla
+	doins "${S}"/mfbt/*.h
+
+	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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2012-10-21 19:07 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2012-10-21 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     bd3db462805ec2fcf231f3635c41fdabf50f3d94
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 21 19:06:43 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 21 19:06:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=bd3db462

remove stale ebuilds, fix bug #438746

---
 dev-lang/spidermonkey/Manifest                     |   18 +---
 .../files/spidermonkey-1.5-build.patch             |  138 --------------------
 .../files/spidermonkey-1.6-header.patch            |   13 --
 .../files/spidermonkey-1.7.0-ldflags.patch         |   42 ------
 .../files/spidermonkey-1.7.0-threadsafe.diff       |   18 ---
 .../spidermonkey-1.8.5-arm_resprect_cflags-1.patch |   58 --------
 .../files/spidermonkey-1.8.5-fix-ppc64.patch       |   61 ---------
 .../spidermonkey-1.8.7-freebsd-pthreads.patch      |   11 ++
 .../files/spidermonkey-1.9.2.13-as-needed.patch    |   22 ---
 dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild |   52 --------
 .../spidermonkey/spidermonkey-1.8.2.15-r2.ebuild   |   80 -----------
 dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild |  115 ----------------
 dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild |  119 -----------------
 dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild |    1 +
 dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild    |  131 -------------------
 15 files changed, 14 insertions(+), 865 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 9b0aa40..61dfce6 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,21 +1,7 @@
-AUX spidermonkey-1.5-build.patch 3457 SHA256 04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb SHA512 d4ebb63c9ce2a2e84a0a2b32abb8f4316d53bd71a2c6de37f1a48b26514d583b4c573302dcb15f39b4f57878d01dfc4ff9f9d70e9d1abd54f4ce535124c1147e WHIRLPOOL d35da32872cb68f2bf5b86c20691c7212bdff843a9bfcd8fb385e62c7bc55b9248a00edd3654ac2c1e50f57e413c9dd4c4cfcb57b5a59c1cef343f6c202eb6f9
-AUX spidermonkey-1.6-header.patch 270 SHA256 e81acd7ba025214b2ecfa5918a1652e4590eaca39307c4e8d9f5d949d315373e SHA512 f52861ad88b6624fc7e2cd7b9174f53cf0bebf339704932f36ca1d5bd6b133f6e28333fa5d10841c72ccfaccf0f7daa63a1385e2ff6ab8d0192bf70bd437479a WHIRLPOOL d076e64a52adfb9ff55aa7c6191c4a1c29c6917661a15a5cfcc0717960e63403b5557f9e28263cc19c20f3ee4e97c88f87b40b6d786ca3705dd4b2893a0f9c7d
-AUX spidermonkey-1.7.0-ldflags.patch 1076 SHA256 7dcc26496a6413652ff32ce1b1eb04c7ef526658d41a243f1ce0e44598cd809b SHA512 649dccce8206cf99e09715a0e8e7fc0db3bdff4269ab82898476d2e70fda73c420f80f915eadabf17a8bcee529e692bd195dd6df3ac58020e8dd97a91d19a847 WHIRLPOOL 270ea3c19981a597cc8cf9984f5ac358e91fb6ab3fe0ff753cbd933868177e5629b088ae7588b9b630f37ac1cc1381f6e28591e3b47e03bec39627ef332cdcb4
-AUX spidermonkey-1.7.0-threadsafe.diff 513 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9 SHA512 81a6c306f4c2546921a12864ee4320b44ce4313e4972932c1929b3ccac03954f0aa4260911b4d9cffcb135cce5974c91456577a80162ed2052cdff7ebd327b9f WHIRLPOOL f21510a69e5718bef52fd0a4f139ff95cf91ae3626172c473a859c5fc2e7dda1df7e67f92190c4c6c2e74e32ac8a36163ca1164aa2f922ec7a6662b89cfe6e2f
-AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 SHA256 1e726aa83d26d20454bbfdfe2a5529ac5b07076dd13a9d6faac6341193c85f37 SHA512 374278b503bc04aaf9b5db08d28529f5943960b74f4f0b55c46b3bf820f3bd55cc52f46aaf502649745d2455e2a27c867fdc93e46662f4ee1eba91d2b6737a49 WHIRLPOOL f8f2acfae508157ad820f7d8a0f3190cfaadcf3ae76df7d6bbf7aaad02d3f908a2bf60e603f2c591310e25de25e3c9f3543619d68e179d4c937ed81f0acd4c13
 AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
-AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
 AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
+AUX spidermonkey-1.8.7-freebsd-pthreads.patch 175 SHA256 0cc365e8c43c2eeae316382db53f287852b1419851c3ddb412dc60bc22be126f SHA512 43daf55711910fba2927d8e80fa6d786252fcaf3ba31bf2b471b4ebb987ec94a006618b9a423363afb016fa35affdf974c4e4a12dc0070dbfaebab1aa65badc7 WHIRLPOOL bf985a328fd7e5ae0dc8406171b0738b5d55001a9067b5592318c614cf664843432e38228199f7de28043c8199a0e807c117ec7f5aecf3452be7f84098295e08
 AUX spidermonkey-1.8.7-x32.patch 753 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d SHA512 ae9c0241fd1cc02b5f21865adb1efb750246850dcf93ee1b81c5faf19c5d4d5b0ab6e853527899c438d2139601e8a177f7ee6c9a3700d2816df32f5e09d273e8 WHIRLPOOL 8b43164a8a7cc4d82092e81d4a2d0d21a8614dfe7964f3fbb49d0f70e25178ba0197bd525e9f08cb1c621d991dd4aefc97be15901d3f482fce180e8d90bf8706
-AUX spidermonkey-1.9.2.13-as-needed.patch 623 SHA256 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f SHA512 0acc2dc178396302518a2ac868ff1ab5710615bebe0c9ece31dba59037a92c741c5f02ba24cb76fe239e1b39946ff3362e5414e63f5ff64e48b64012b48a9779 WHIRLPOOL 75bc285dc9bb437a4ae4350eb755bbb2d0418a4f854ce4daeda4ca805ca31e16dabda0e35ac2a05dc0f5fcf6dfe1929547252a63553664921fd24a6ca76a30fa
-DIST firefox-3.6.15.source.tar.bz2 51552828 SHA256 405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f SHA512 82bf0a6c6cb30fc0b18b067ac3d9cb7e48a0fd0126edd851e628d49e429aea33500a5a5eba87bce922e51b1b7410ccccfe4f8b7ce5573bdbd718c76da7acb1da WHIRLPOOL b788d7ba2cfcaec4f317e615878401a7a1fb985aaa43829831c17b699812e59adb7874247114e0143da63198118cab059796fc5d5fd08d72ccc54b4fef279f85
-DIST js-1.7.0.tar.gz 1165607 SHA256 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51 WHIRLPOOL 8044b306b3a1f0abed5ac8a6bf4f9ed70e1ebc6f83f44934a6306d9ed68cd73124f82e40430d764f158377031f5ee986595e58fdb52259ab6a3a8674eaf4eed1
-DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
 DIST js187-1.0.0.tar.gz 7106870 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4 SHA512 7df55daac1eac0a7a7b31df044f7d5cc40a1f5079907b661f7c8489614b0ddff35e4f7cd13214bfc4baf9bdb37d392e4118f63ab589a051978d6ceef63d1e9f2 WHIRLPOOL d0f2ea8add0c7c1ac34ff8a6f887e931768091696dda037e7778ecd7eb02889b455747cfaa9a362844983eb2bdda6bddab46bf542cecf81f91ec5165efc0b9a3
 DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353 SHA512 bd1976b12940390e7d5db6078ca6339006428874788688e4ea4f6bd86afd341c3edd356bac801883637f46085c6d971d4f79e44fa9f6e44b3b715186355be175 WHIRLPOOL 5614bcb99d7101751e6f5be24b20e8a6acd5a682640025830f0c4a4fb74e724e5d71eb56c3e09d0ced4bbfa6c6c93daf42a7bc326c3cf0b07bee777901f25039
-EBUILD spidermonkey-1.7.0-r3.ebuild 1572 SHA256 5fa27ee739b872875263cc820fbd62965602fc382b5b9910bf261806b888b659 SHA512 a416f95f9908f54e1c677121bfb813c4b796e1a08b9b8eed2b67bb4302ab80484ee6128f528c5cc28ded6c64676840d76e8cdaea4909d08ff23bea216ee3594c WHIRLPOOL 7d482652339f3c4d16282fa9b65cd619a90510b46ece74ff3598e2f0fb1dc396f40d10e76922ec9e8d4a8d1da4101c43690fb9086d5c9c4da6fdb376f3529c22
-EBUILD spidermonkey-1.8.2.15-r2.ebuild 1974 SHA256 0c5415bdc7f102f6901c3f72a1456cea267e8042b91b580233a10b95e4a4f873 SHA512 ea45f184d20961623706f69a214d436aced33d104e8ff0f9e728c4a5f64d492cff3fff03a4f934e2cbb799a42dbd38551da6bfa05417543515dfad30383fcb05 WHIRLPOOL 889f37623b078d68ae11f7c0a5043c00a0f887c33dc66c9625834129d520e64939fe582756d7ba4a9d9477d45905da5fde3929cc27dac3837513b00ec628f684
-EBUILD spidermonkey-1.8.5-r1.ebuild 3123 SHA256 40243bbaf6a0300f008192d8faaf935c7d857c89ab2455177a2560c15cb47ba5 SHA512 621e3dd36e8c30c9e1ba7be8f350801f9154154d9bdf535ccb3e74943429b55707e9990f99929ffa97ebdeca800f1241b0357e024c67624b0f5e1ed000aabf99 WHIRLPOOL 8fc4f02b324c65d2f045222cf903a0d27cea272569a752c68651ed21df2d23c14bae97b975ce407be3f3e812841bb4bc8f24849f07aa2b23e609ec4fc38c1686
-EBUILD spidermonkey-1.8.5-r2.ebuild 3369 SHA256 5b9d75e9ffda5ba56b03ecab9db6607fefcceecfcebe59dcaf1b35a0ae7d0bc2 SHA512 00584e4fb20161b62b62559e922df935e3062f507e48032e321c768d2a4abd5f47d26434c5715bbb6a83b944af95f63b1852bd9db7a99ab1e837f800478054b4 WHIRLPOOL e41b2ee96db89c4c8e75762ada184e47680c4f0440dda6ebe2d8ad7686e1bb327d5e7c2ffda81e637d6cfe47781a0cf7e777221cb4bd118397579e620334f8f1
-EBUILD spidermonkey-1.8.7-r1.ebuild 3748 SHA256 c9d32ad327d5c17bb5f8b47428e26a7db38537dbcbe6e9c0125ee7eaf0e613a2 SHA512 88b7aa138fae89cd1b465351bbfc261510d07ed048a4e50e42e6d66475ffb0bb098ae24c64ad412207df522a07e61353f07f8c3a666599fe5163ed796dc08571 WHIRLPOOL 03499978e51ce4b4ee4e4963288bf87438742df8b689113476e6ecbeb86014f127c02daefc4ce27ecce0150c8081ca4aa0118f65d767d190047cd1b1950e9da6
-EBUILD spidermonkey-1.8.7.ebuild 3426 SHA256 0b0f0c9c2274050d572f37abe88e2e61f68ae50295c4057b80d60de845c34dd9 SHA512 916fc89a9a60d44603ea677f57391dd9fab6ed52b38f1822621f37573a90d802912764e3924de91ef1b3ab3cefd077f07503bd933a48b8c532fb0dfb92e15bcc WHIRLPOOL 2bf79c38bb8bdc98f4e80d81ca1e5b733712b6b36eaaeb766cdd89ced157ee10ae41d524e910d47e03931efb8348faf63dca761db984330c927bd78214d3d37e
+EBUILD spidermonkey-1.8.7-r1.ebuild 3805 SHA256 33a2f0c0716b811b298cd33c4139c115a32cec0d5516e7bd15a3ea367e803291 SHA512 cec59abecffb2efe6f34fb3cfab9ca7cc46d540b15136981187a8f3be790a7b0e4d679a4f87e1dc0ac346af90dde90dd96b1389f31318716b5fe44fc790802c8 WHIRLPOOL 5ab97e30ca0c23feb72697c576198307a60eedb3b34568e96d4f5a991d9aeddb6006edcd0f766161bd0995fc7ce53f4f8765a3e6d463e0a89a84f82b92246ef1

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch b/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
deleted file mode 100644
index a5c4b47..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.5-build.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- js/src/Makefile.ref
-+++ js/src/Makefile.ref
-@@ -127,7 +127,7 @@ endif 
- ifdef JS_READLINE
- # For those platforms with the readline library installed.
- DEFINES += -DEDITLINE
--PROG_LIBS += -lreadline -ltermcap
-+PROG_LIBS += -lreadline
- else
- ifdef JS_EDITLINE
- # Use the editline library, built locally.
-@@ -370,3 +370,16 @@ TARFILES = files `cat files`
- SUFFIXES: .i
- %.i: %.c
- 	$(CC) -C -E $(CFLAGS) $< > $*.i
-+
-+DESTDIR :=
-+PREFIX := /usr
-+BINDIR := $(PREFIX)/bin
-+MY_LIBDIR := $(PREFIX)/$(LIBDIR)
-+INCLUDEDIR := $(PREFIX)/include/js
-+INSTALL := install -g 0 -o root
-+install:
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR) $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+	$(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
---- js/src/config/Linux_All.mk
-+++ js/src/config/Linux_All.mk
-@@ -41,37 +41,15 @@
- # Config for all versions of Linux
- #
- 
--CC = gcc
--CCC = g++
- CFLAGS +=  -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
- 
- RANLIB = echo
--MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
- 
- #.c.o:
- #      $(CC) -c -MD $*.d $(CFLAGS) $<
- 
--CPU_ARCH = $(shell uname -m)
--# don't filter in x86-64 architecture
--ifneq (x86_64,$(CPU_ARCH))
--ifeq (86,$(findstring 86,$(CPU_ARCH)))
--CPU_ARCH = x86
--OS_CFLAGS+= -DX86_LINUX
--
--ifeq (gcc, $(CC))
--# if using gcc on x86, check version for opt bug 
--# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
--GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
--GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
--
--ifeq (2.91.66, $(firstword $(GCC_LIST)))
--CFLAGS+= -DGCC_OPT_BUG
--endif
--endif
--endif
--endif
--
- GFX_ARCH = x
- 
- OS_LIBS = -lm -lc
-@@ -88,16 +66,6 @@
- endif
- 
- # Use the editline library to provide line-editing support.
--JS_EDITLINE = 1
-+JS_READLINE = 1
- 
--ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
--endif
--
--ifeq ($(CPU_ARCH),x86_64)
--# We need PIC code for shared libraries
--# FIXME: better patch rules.mk & fdlibm/Makefile*
--OS_CFLAGS += -DPIC -fPIC
--endif
---- js/src/rules.mk
-+++ js/src/rules.mk
-@@ -82,6 +82,10 @@ $(OBJDIR)/%.o: %.c
- 	@$(MAKE_OBJDIR)
- 	$(CC) -o $@ -c $(CFLAGS) $*.c
- 
-+$(OBJDIR)/%.lo: %.c
-+	@$(MAKE_OBJDIR)
-+	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
-+
- $(OBJDIR)/%.o: %.s
- 	@$(MAKE_OBJDIR)
- 	$(AS) -o $@ $(ASFLAGS) $*.s
-@@ -111,11 +115,12 @@ $(SHARED_LIBRARY): $(LIB_OBJS)
- 	    /implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
- else
- $(LIBRARY): $(LIB_OBJS)
--	$(AR) rv $@ $?
-+	$(AR) cr $@ $?
- 	$(RANLIB) $@
- 
--$(SHARED_LIBRARY): $(LIB_OBJS)
--	$(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
-+SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
-+$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
-+	$(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
- endif
- endif
- 
---- js/src/fdlibm/Makefile.ref
-+++ js/src/fdlibm/Makefile.ref
-@@ -151,7 +151,7 @@
- 
- $(OBJDIR)/%.o: %.c
- 	@$(MAKE_OBJDIR)
--	$(CC) -o $@ -c $(CFLAGS) $*.c
-+	$(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
- 
- $(OBJDIR)/%.o: %.s
- 	@$(MAKE_OBJDIR)
---- js/src/config.mk
-+++ js/src/config.mk
-@@ -112,6 +112,8 @@
- CP = cp
- endif
- 
-+BUILD_OPT := 1
-+
- ifdef BUILD_OPT
- OPTIMIZER  = -O
- DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch b/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
deleted file mode 100644
index df4cf7d..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.6-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/spidermonkey-1.7.0-ldflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
deleted file mode 100644
index 4ddc346..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect LDFLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=331129
-
---- js/src/Makefile.ref
-+++ js/src/Makefile.ref
-@@ -87,7 +87,7 @@
- LDFLAGS                = $(XLDFLAGS)
- 
- ifndef NO_LIBM
--LDFLAGS += -lm
-+OTHER_LIBS += -lm
- endif
- 
- # Prevent floating point errors caused by VC++ optimizations
-@@ -325,7 +325,7 @@
- 	$(CC) -o $@ -c $(CFLAGS) $<
- 
- $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
-+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^
- 
- endif
- 
-@@ -338,7 +338,7 @@
- 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
- else
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
--	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \
- 	    $(PROG_LIBS)
- endif
- 
-@@ -355,7 +355,7 @@
- 	$(OBJDIR)/jscpucfg > $@
- 
- $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
--	$(CC) -o $@ $(OBJDIR)/jscpucfg.o
-+	$(CC) $(HOST_LDFLAGS) -o $@ $(OBJDIR)/jscpucfg.o
- 
- # Add to TARGETS for clobber rule
- TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
deleted file mode 100644
index 8728811..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-threadsafe.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/Makefile.ref
-===================================================================
---- src.orig/Makefile.ref
-+++ src/Makefile.ref
-@@ -63,11 +63,11 @@ INCLUDES   += -I$(OBJDIR)
- 
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += -I/usr/include/nspr
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr$(NSPR_LIBSUFFIX)
- endif
- endif
- 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
deleted file mode 100644
index 7c9dd84..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -3550,7 +3550,7 @@ AC_MSG_CHECKING(for ARM NEON support in
- _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
-   # gcc needs -mfpu=neon to recognize NEON instructions
--  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+  CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-                [asm("vadd.i8 d0, d0, d0");],
-@@ -4687,9 +4687,9 @@ if test -n "$MOZ_THUMB2"; then
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-       fi
-@@ -4703,9 +4703,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
-     arm*)
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
-       fi
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -354,7 +354,7 @@ ASFILES +=	TrampolineSUNWX86.s
- endif
- endif
- endif
--ifeq (arm, $(TARGET_CPU))
-+ifeq (arm, $(findstring arm,$(TARGET_CPU)))
- #CPPSRCS		+= only_on_arm.cpp
- endif
- #
-@@ -436,7 +436,7 @@ else
- #CPPSRCS		+= only_on_x86.cpp
- endif
- endif
--ifeq (arm, $(TARGET_CPU))
-+ifeq (arm, $(findstring arm,$(TARGET_CPU)))
- #CPPSRCS		+= only_on_arm.cpp
- endif
- #
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
deleted file mode 100644
index 3927c87..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1303461188 -7200
-# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
-# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
-Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
- 		platform.cc \
- 		utils.cc \
- 		$(NONE)
- 
- #
- # END enclude sources for V8 dtoa
- #############################################
- 
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
- 
- VPATH +=	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \
- 		$(srcdir)/yarr/pcre \
- 		$(NULL)
- 
- CPPSRCS += 	pcre_compile.cpp \
-                 pcre_exec.cpp \
-
-# HG changeset patch
-# User Luke Wagner <lw@mozilla.com>
-# Date 1299520258 28800
-# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
-# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
-Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
-
-diff --git a/js/src/jsval.h b/js/src/jsval.h
---- a/js/src/jsval.h
-+++ b/js/src/jsval.h
-@@ -342,16 +342,17 @@ typedef union jsval_layout
-         JSValueTag         tag : 17;
-         uint64             payload47 : 47;
-     } debugView;
-     struct {
-         union {
-             int32          i32;
-             uint32         u32;
-             JSWhyMagic     why;
-+            jsuword        word;
-         } payload;
-     } s;
-     double asDouble;
-     void *asPtr;
- } jsval_layout;
- # endif /* JS_BITS_PER_WORD */
- #endif  /* defined(IS_LITTLE_ENDIAN) */
- 
-
-
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
new file mode 100644
index 0000000..4324df0
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
@@ -0,0 +1,11 @@
+--- a/js/src/config/system-headers
++++ b/js/src/config/system-headers
+@@ -595,6 +595,7 @@ proto/exec.h
+ psap.h
+ Pt.h
+ pthread.h
++pthread_np.h
+ pwd.h
+ Python.h
+ QDOffscreen.h
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
deleted file mode 100644
index 847bf79..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
---- a/js/src/jsapi-tests/Makefile.in
-+++ b/js/src/jsapi-tests/Makefile.in
-@@ -55,17 +55,17 @@ CPPSRCS = \
-   testSameValue.cpp \
-   testDebugger.cpp \
-   testDefineGetterSetterNonEnumerable.cpp \
-   testExtendedEq.cpp \
-   $(NULL)
- 
- DEFINES         += -DEXPORT_JS_API
- 
--LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
-+LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
- 
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
- 
- ifdef _MSC_VER
- ifdef WINCE
- WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
- endif
- endif

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
deleted file mode 100644
index 170963c..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
+++ /dev/null
@@ -1,52 +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-1.7.0-r2.ebuild,v 1.2 2011/03/22 15:51:21 jer Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-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/js"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5-build.patch"
-	epatch "${FILESDIR}/${PN}-1.6-header.patch"
-	epatch "${FILESDIR}/${P}-threadsafe.diff" \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# don't force owner for Prefix
-	sed -i -e '/^INSTALL :=/s/-g 0 -o root//' Makefile.ref || die
-
-	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() {
-	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-	tc-export CC LD AR RANLIB
-	local threadsafe=""
-	use threadsafe && threadsafe="JS_THREADSAFE=1"
-	emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" ${threadsafe} \
-		XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake -f Makefile.ref install DESTDIR="${ED}" LIBDIR="$(get_libdir)"
-	dodoc ../jsd/README
-	dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
deleted file mode 100644
index 4344ff8..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 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.3 2012/05/03 02:41:39 jdhore Exp $
-
-EAPI="5"
-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/mozjs"
-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]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
-
-	epatch_user
-
-	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}" || die
-
-	local myconf
-
-	use threadsafe && myconf="${myconf} \
-		--with-system-nspr --enable-threadsafe"
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
-		${myconf}
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	emake -j1
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake install DESTDIR="${D}"
-	dobin shell/js
-	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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
deleted file mode 100644
index b7dd7ca..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.7 2012/05/07 17:51:46 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-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 ~x86-fbsd"
-IUSE="debug 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]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.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
-
-	cd "${S}"/js/src
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}"
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg
-		mv {,native-}host_jskwgen
-		mv {,native-}host_jsoplengen
-		mv config/{,native-}nsinstall
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk
-		rm config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o
-	fi
-	emake || die
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests"
-	emake check || die
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-	emake DESTDIR="${D}" install || die
-	dobin shell/js ||die
-	pax-mark m "${ED}/usr/bin/js"
-	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-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
deleted file mode 100644
index f9c92c6..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-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/mozjs185"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug 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]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.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" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	dobin shell/js
-	pax-mark m "${ED}/usr/bin/js"
-	dodoc ../../README
-	dohtml README.html
-
-	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-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
index 5e3bc63..dfa34e0 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
 	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
 	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
 
 	epatch_user

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
deleted file mode 100644
index 65e3673..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-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"
-SPIDERPV="${PV}-patches-0.1"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# Apply patches that are required for misc archs
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-x32.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
-
-	cd "${S}"/js/src
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}"
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg
-		mv {,native-}host_jskwgen
-		mv {,native-}host_jsoplengen
-		mv config/{,native-}nsinstall
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk
-		rm config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o
-	fi
-	emake || die
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests"
-	emake check || die
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-	emake DESTDIR="${D}" install || die
-	dobin shell/js ||die
-	if use jit ; then
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README || die
-	dohtml README.html || die
-	# install header files needed but not part of build system
-	insinto /usr/include/js || die
-	doins ../public/*.h || die
-	insinto /usr/include/js/mozilla || die
-	doins ${S}/mfbt/*.h || 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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2012-12-06 21:29 Ian Stakenvicius
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2012-12-06 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d24108930aafba504f8f886f59b5d90bbb530289
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 21:29:12 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 21:29:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d2410893

symbol-versioned spidermonkeys, to roll out to the tree soon

---
 dev-lang/spidermonkey/Manifest                     |    9 ++-
 .../spidermonkey-1.8.5-arm_respect_cflags-3.patch  |   99 ++++++++++++++++++++
 .../files/spidermonkey-1.8.5-fix-ppc64.patch       |   61 ++++++++++++
 .../spidermonkey-1.8.5-perf_event-check.patch      |   21 ++++
 .../files/spidermonkey-1.8.5-symbol-versions.patch |   32 +++++++
 .../files/spidermonkey-1.8.7-jsversion.patch       |   11 --
 .../files/spidermonkey-1.8.7-symbol-versions.patch |   32 +++++++
 ....8.7-r1.ebuild => spidermonkey-1.8.5-r3.ebuild} |   50 ++++------
 ....8.7-r1.ebuild => spidermonkey-1.8.7-r2.ebuild} |    5 +-
 9 files changed, 278 insertions(+), 42 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 61dfce6..b09b05b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,7 +1,14 @@
+AUX spidermonkey-1.8.5-arm_respect_cflags-3.patch 3474 SHA256 2f0a33c7d70e98c231619cf28de151e6961f7fd163a9b02588c75bb3740f6380 SHA512 55726ddffe88c025eac331918b5f12223ccf47a2a2f3f6bb020fd6fc027e558dee811b80d2328dc631daf7d372b10c51004ee4a4ca87e8c1aa2e68f562bf1244 WHIRLPOOL b8a1738080680670cdaa5e4a9d603137c34dd0468448e7c51d6a7ae0d41ce69a74ac2e880d5db7d38171f979d564bd78a8e64fae419d5119558e5eb71a0a5792
 AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
+AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
+AUX spidermonkey-1.8.5-perf_event-check.patch 694 SHA256 c24f4c5b445e4ac20a35e0baf11649b1697d0d0c10e08406d07f9e3d311f8135 SHA512 d974135f6f6897529d482d7ac7ba79031471ed677c646462dd919a36313d05e3720c394afa9b143a7c1f681d5612fc8011faaebc5ba54712790d878d6002fa73 WHIRLPOOL 511e9904f32c4be3c4d73dd760a4c68159e101a4963d895a1b891dd6317a1713c83f95f12cea4de7f80224e8a0f15e0cd490c1eaa3c193e07c7733b5941039cc
+AUX spidermonkey-1.8.5-symbol-versions.patch 1011 SHA256 41bda93bc2309621ece16c2b659a25e94785b8d2a0ca6c983b32f5c50d266ab7 SHA512 8e8f8ea70d87441be070ef5c199ad9589cf4ebedb2ea5bff972aec3c819f3aef517f7dcb1ffac1508dcfcac07cbf2d4bfb8b2b29f1f2c487410de1484e9aa95f WHIRLPOOL e0b0fc506e71a4b4961b2aadd26f86b4499687cba98c56b5e4861ef4acc0e11849af234febc0a2ed2aee603748df87ce8fd0a83484757af1b697d09c65bf8945
 AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
 AUX spidermonkey-1.8.7-freebsd-pthreads.patch 175 SHA256 0cc365e8c43c2eeae316382db53f287852b1419851c3ddb412dc60bc22be126f SHA512 43daf55711910fba2927d8e80fa6d786252fcaf3ba31bf2b471b4ebb987ec94a006618b9a423363afb016fa35affdf974c4e4a12dc0070dbfaebab1aa65badc7 WHIRLPOOL bf985a328fd7e5ae0dc8406171b0738b5d55001a9067b5592318c614cf664843432e38228199f7de28043c8199a0e807c117ec7f5aecf3452be7f84098295e08
+AUX spidermonkey-1.8.7-symbol-versions.patch 1011 SHA256 a0706551d4ff71a984b2b9444901dc98b60a390488c8b99691c7d0d01f7111e7 SHA512 16fa4bab5da4724a8b3c925133a85975bf1bfb47e4b6bfcae1c2f76eed824ea82b321928fc478966686a3582e0cd03630177b041ab75f2c572f7f00d3e3e2242 WHIRLPOOL 8118ea4845394b36c6f5ec8914b66e5b9fadc83bc6f696d0814ff68167e397c3e685a96b4fa3ce0647fe76337b592b778e640b6429095ec0fea2883d0e44777a
 AUX spidermonkey-1.8.7-x32.patch 753 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d SHA512 ae9c0241fd1cc02b5f21865adb1efb750246850dcf93ee1b81c5faf19c5d4d5b0ab6e853527899c438d2139601e8a177f7ee6c9a3700d2816df32f5e09d273e8 WHIRLPOOL 8b43164a8a7cc4d82092e81d4a2d0d21a8614dfe7964f3fbb49d0f70e25178ba0197bd525e9f08cb1c621d991dd4aefc97be15901d3f482fce180e8d90bf8706
+DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
 DIST js187-1.0.0.tar.gz 7106870 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4 SHA512 7df55daac1eac0a7a7b31df044f7d5cc40a1f5079907b661f7c8489614b0ddff35e4f7cd13214bfc4baf9bdb37d392e4118f63ab589a051978d6ceef63d1e9f2 WHIRLPOOL d0f2ea8add0c7c1ac34ff8a6f887e931768091696dda037e7778ecd7eb02889b455747cfaa9a362844983eb2bdda6bddab46bf542cecf81f91ec5165efc0b9a3
 DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353 SHA512 bd1976b12940390e7d5db6078ca6339006428874788688e4ea4f6bd86afd341c3edd356bac801883637f46085c6d971d4f79e44fa9f6e44b3b715186355be175 WHIRLPOOL 5614bcb99d7101751e6f5be24b20e8a6acd5a682640025830f0c4a4fb74e724e5d71eb56c3e09d0ced4bbfa6c6c93daf42a7bc326c3cf0b07bee777901f25039
-EBUILD spidermonkey-1.8.7-r1.ebuild 3805 SHA256 33a2f0c0716b811b298cd33c4139c115a32cec0d5516e7bd15a3ea367e803291 SHA512 cec59abecffb2efe6f34fb3cfab9ca7cc46d540b15136981187a8f3be790a7b0e4d679a4f87e1dc0ac346af90dde90dd96b1389f31318716b5fe44fc790802c8 WHIRLPOOL 5ab97e30ca0c23feb72697c576198307a60eedb3b34568e96d4f5a991d9aeddb6006edcd0f766161bd0995fc7ce53f4f8765a3e6d463e0a89a84f82b92246ef1
+EBUILD spidermonkey-1.8.5-r3.ebuild 3823 SHA256 5e828c14f3026e2f683ec722a7010f482fbbf3bb3725bfddf8f0965e196b420e SHA512 45dcb9dd01d6461ab07c447e7d9b74317b269028ade0e9622256e872a9440abc280c4130b331a44fbf52d9538c357d4e8901045d8c2c064577cb5141f03a4993 WHIRLPOOL fc6b1183c48be41c38e4deeb959349ab1188a485425ab5122218a689b3d72125235a009603a8a4baae310e5750bf453d51a82c3e781282c6ef3c76661ab28734
+EBUILD spidermonkey-1.8.7-r2.ebuild 3953 SHA256 774a6ffe16fdc25278410dacccb797063c5a372697e95fc7c76c3b73a36b96ce SHA512 ec87ac2352305d3263647fe0d8e61afcc75ff40440e2b04d2aca93849c556acc43ae379d12f03b2fa8ea76e4a99848e20ec3e723cd3d241f745ad796db31c4b0 WHIRLPOOL 04919be59e10af466f1a2c572964f946d539f7f02d0b4fcfb26e9ebb7282141dd55262b0bc485d2abb568c536e06c21ed2b5e793ab3e83d88063fe02f37efce1

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
new file mode 100644
index 0000000..ed497ce
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
@@ -0,0 +1,99 @@
+--- a/js-1.8.5/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
++++ b/js-1.8.5/js/src/configure.in	2012-11-02 15:32:38.000000000 -0400
+@@ -3550,7 +3550,7 @@
+ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ AC_TRY_COMPILE([],
+                [asm("vadd.i8 d0, d0, d0");],
+@@ -4654,12 +4654,6 @@
+ dnl ========================================================
+ MOZ_ARG_HEADER(Individual module options)
+ 
+-dnl Setup default CPU arch for arm target
+-case "$target_cpu" in
+-  arm*)
+-    MOZ_ARM_ARCH=armv7
+-  ;;
+-esac
+ dnl ========================================================
+ dnl = Enable building the Thumb2 instruction set
+ dnl ========================================================
+@@ -4668,66 +4662,32 @@
+     MOZ_THUMB2=1,
+     MOZ_THUMB2=)
+ if test -n "$MOZ_THUMB2"; then
+-  MOZ_ARM_ARCH=armv7
++    AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
++else
++    AC_MSG_CHECKING([whether to build for thumb2])
++    AC_TRY_COMPILE([],[return sizeof(__thumb2__);],
++      [MOZ_THUMB2=1
++        AC_MSG_RESULT([yes])],
++      [MOZ_THUMB2=
++        AC_MSG_RESULT([no])])
+ fi
+ 
+ dnl ========================================================
+ dnl = Enable building for ARM specific CPU features
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(cpu-arch,
+-[  --with-cpu-arch=arch      Use specific arm architecture CPU features, default armv7],
+-    MOZ_ARM_ARCH=$withval)
+-
+ if test -n "$MOZ_THUMB2"; then
+   case "$target_cpu" in
+     arm*)
+-      if test "$MOZ_ARM_ARCH" != "armv7"; then
+-        AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
+-      fi
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+-        AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+     ;;
+-    *)
+-      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
+-    ;;
+-  esac
+-elif test "$MOZ_ARM_ARCH" = "armv7"; then
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-      else
+-        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+-      fi
+-    ;;
+-    *)
+-      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+-    ;;
+-  esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+   esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+-AC_SUBST(MOZ_ARM_ARCH)
+ 
+ dnl ========================================================
+ dnl =

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
new file mode 100644
index 0000000..3927c87
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
+ 		platform.cc \
+ 		utils.cc \
+ 		$(NONE)
+ 
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/yarr/pcre \
+ 		$(NULL)
+ 
+ CPPSRCS += 	pcre_compile.cpp \
+                 pcre_exec.cpp \
+
+# HG changeset patch
+# User Luke Wagner <lw@mozilla.com>
+# Date 1299520258 28800
+# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
+# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
+Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
+
+diff --git a/js/src/jsval.h b/js/src/jsval.h
+--- a/js/src/jsval.h
++++ b/js/src/jsval.h
+@@ -342,16 +342,17 @@ typedef union jsval_layout
+         JSValueTag         tag : 17;
+         uint64             payload47 : 47;
+     } debugView;
+     struct {
+         union {
+             int32          i32;
+             uint32         u32;
+             JSWhyMagic     why;
++            jsuword        word;
+         } payload;
+     } s;
+     double asDouble;
+     void *asPtr;
+ } jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif  /* defined(IS_LITTLE_ENDIAN) */
+ 
+
+
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
new file mode 100644
index 0000000..66475b6
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
@@ -0,0 +1,21 @@
+--- a/js/src/configure.in	2012-11-01 19:42:20.130330321 +0100
++++ b/js/src/configure.in	2012-11-01 20:34:03.561351492 +0100
+@@ -3477,7 +3477,16 @@
+ esac
+ 
+ dnl Performance measurement headers.
+-AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1)
++AC_CHECK_HEADER(linux/perf_event.h,
++	[AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
++		[AC_TRY_COMPILE([#include <sys/syscall.h>],[return sizeof(__NR_perf_event_open);],
++		ac_cv_perf_event_open=yes,
++		ac_cv_perf_event_open=no)])])
++if test "$ac_cv_perf_event_open" = "yes"; then
++	HAVE_LINUX_PERF_EVENT_H=1
++else
++	HAVE_LINUX_PERF_EVENT_H=
++fi
+ AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
+ 
+ dnl Checks for libraries.
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
new file mode 100644
index 0000000..460394d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
@@ -0,0 +1,32 @@
+diff -Naur js/src/configure.in js.new/src/configure.in
+--- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
+@@ -0,0 +1,4 @@
++mozjs185 {
++  global: *;
++};
++
+diff -Naur js/src/Makefile.in js.new/src/Makefile.in
+--- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
+@@ -837,7 +837,10 @@
+ 	mozjs185.pc \
+ 	$(NULL)
+ 
+-GARBAGE += $(pkg_config_files)
++symverscript: symverscript.in
++	cat $< > $@
++
++GARBAGE += $(pkg_config_files) symverscript
+ 
+ %.pc: $(srcdir)/%.pc.in Makefile
+ 	cat $< | sed \
+@@ -872,6 +875,8 @@
+ SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
+ SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
+ $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
++$(SHARED_LIBRARY): symverscript
+ endif
+ endif
+ 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
deleted file mode 100644
index 22f4d08..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/dist/include/jsversion.h	2012-04-06 17:24:51.000000000 -0400
-+++ b/js/src/dist/include/jsversion.h	2012-10-12 16:52:50.000000000 -0400
-@@ -41,7 +41,7 @@
-  * JS configuration macros.
-  */
- #ifndef JS_VERSION
--#define JS_VERSION 185
-+#define JS_VERSION 187
- #endif
- 
- /*

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
new file mode 100644
index 0000000..3945172
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
@@ -0,0 +1,32 @@
+diff -Naur js/src/configure.in js.new/src/configure.in
+--- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
+@@ -0,0 +1,4 @@
++mozjs187 {
++  global: *;
++};
++
+diff -Naur js/src/Makefile.in js.new/src/Makefile.in
+--- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
+@@ -837,7 +837,10 @@
+ 	mozjs185.pc \
+ 	$(NULL)
+ 
+-GARBAGE += $(pkg_config_files)
++symverscript: symverscript.in
++	cat $< > $@
++
++GARBAGE += $(pkg_config_files) symverscript
+ 
+ %.pc: $(srcdir)/%.pc.in Makefile
+ 	cat $< | sed \
+@@ -872,6 +875,8 @@
+ SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
+ SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
+ $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
++$(SHARED_LIBRARY): symverscript
+ endif
+ endif
+ 

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
similarity index 73%
copy from dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
copy to dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
index dfa34e0..c3dfe48 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.5 2012/11/25 13:09:41 anarchy Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -10,22 +10,19 @@ 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"
-SPIDERPV="${PV}-patches-0.1"
 DESCRIPTION="Stand-alone JavaScript C library"
 HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 
 LICENSE="NPL-1.1"
-SLOT="0/mozjs187"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit minimal static-libs test"
+SLOT="0/mozjs185"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug minimal static-libs test"
 
 S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
+RDEPEND=">=dev-libs/nspr-4.7.0"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	=dev-lang/python-2*[threads]
@@ -38,14 +35,19 @@ pkg_setup(){
 }
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	# https://bugs.gentoo.org/show_bug.cgi?id=420471
+	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=438746
 	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=441928
+	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439260
+	epatch "${FILESDIR}"/${P}-symbol-versions.patch
 
 	epatch_user
 
@@ -70,11 +72,7 @@ src_configure() {
 		--enable-readline \
 		--enable-threadsafe \
 		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
 		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
 		$(use_enable static-libs static) \
 		$(use_enable test tests)
 }
@@ -115,19 +113,13 @@ src_test() {
 src_install() {
 	cd "${BUILDDIR}" || die
 	emake DESTDIR="${D}" install
-	if ! use minimal; then
+	# bug 437520 , exclude js shell for small systems
+	if ! use minimal ; then
 		dobin shell/js
-		if use jit; then
-			pax-mark m "${ED}/usr/bin/js"
-		fi
+		pax-mark m "${ED}/usr/bin/js"
 	fi
 	dodoc ../../README
 	dohtml README.html
-	# install header files needed but not part of build system
-	insinto /usr/include/js
-	doins ../public/*.h
-	insinto /usr/include/js/mozilla
-	doins "${S}"/mfbt/*.h
 
 	if ! use static-libs; then
 		# We can't actually disable building of static libraries

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
similarity index 94%
rename from dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
rename to dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
index dfa34e0..830deb0 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild,v 1.1 2012/10/23 19:07:07 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -38,6 +38,7 @@ pkg_setup(){
 }
 
 src_prepare() {
+	# Apply patches that are required for misc archs
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/spidermonkey"
@@ -46,6 +47,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
 	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
 	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439260
+	epatch "${FILESDIR}"/${P}-symbol-versions.patch
 
 	epatch_user
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2012-12-06 21:44 Ian Stakenvicius
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2012-12-06 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     d545719afdfbfd2400e0afeb9952d159ea500bed
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 21:44:04 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 21:44:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d545719a

Dropped spidermonkey as I was able to commit modifications directly to the tree today

---
 dev-lang/spidermonkey/Manifest                     |   14 --
 .../spidermonkey-1.8.5-arm_respect_cflags-3.patch  |   99 --------------
 .../spidermonkey-1.8.5-fix-install-symlinks.patch  |   15 --
 .../files/spidermonkey-1.8.5-fix-ppc64.patch       |   61 ---------
 .../spidermonkey-1.8.5-perf_event-check.patch      |   21 ---
 .../files/spidermonkey-1.8.5-symbol-versions.patch |   32 -----
 .../files/spidermonkey-1.8.7-filter_desc.patch     |   18 ---
 .../spidermonkey-1.8.7-freebsd-pthreads.patch      |   11 --
 .../files/spidermonkey-1.8.7-symbol-versions.patch |   32 -----
 .../files/spidermonkey-1.8.7-x32.patch             |   25 ----
 dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild |  129 ------------------
 dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild |  140 --------------------
 12 files changed, 0 insertions(+), 597 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
deleted file mode 100644
index b09b05b..0000000
--- a/dev-lang/spidermonkey/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX spidermonkey-1.8.5-arm_respect_cflags-3.patch 3474 SHA256 2f0a33c7d70e98c231619cf28de151e6961f7fd163a9b02588c75bb3740f6380 SHA512 55726ddffe88c025eac331918b5f12223ccf47a2a2f3f6bb020fd6fc027e558dee811b80d2328dc631daf7d372b10c51004ee4a4ca87e8c1aa2e68f562bf1244 WHIRLPOOL b8a1738080680670cdaa5e4a9d603137c34dd0468448e7c51d6a7ae0d41ce69a74ac2e880d5db7d38171f979d564bd78a8e64fae419d5119558e5eb71a0a5792
-AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
-AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
-AUX spidermonkey-1.8.5-perf_event-check.patch 694 SHA256 c24f4c5b445e4ac20a35e0baf11649b1697d0d0c10e08406d07f9e3d311f8135 SHA512 d974135f6f6897529d482d7ac7ba79031471ed677c646462dd919a36313d05e3720c394afa9b143a7c1f681d5612fc8011faaebc5ba54712790d878d6002fa73 WHIRLPOOL 511e9904f32c4be3c4d73dd760a4c68159e101a4963d895a1b891dd6317a1713c83f95f12cea4de7f80224e8a0f15e0cd490c1eaa3c193e07c7733b5941039cc
-AUX spidermonkey-1.8.5-symbol-versions.patch 1011 SHA256 41bda93bc2309621ece16c2b659a25e94785b8d2a0ca6c983b32f5c50d266ab7 SHA512 8e8f8ea70d87441be070ef5c199ad9589cf4ebedb2ea5bff972aec3c819f3aef517f7dcb1ffac1508dcfcac07cbf2d4bfb8b2b29f1f2c487410de1484e9aa95f WHIRLPOOL e0b0fc506e71a4b4961b2aadd26f86b4499687cba98c56b5e4861ef4acc0e11849af234febc0a2ed2aee603748df87ce8fd0a83484757af1b697d09c65bf8945
-AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
-AUX spidermonkey-1.8.7-freebsd-pthreads.patch 175 SHA256 0cc365e8c43c2eeae316382db53f287852b1419851c3ddb412dc60bc22be126f SHA512 43daf55711910fba2927d8e80fa6d786252fcaf3ba31bf2b471b4ebb987ec94a006618b9a423363afb016fa35affdf974c4e4a12dc0070dbfaebab1aa65badc7 WHIRLPOOL bf985a328fd7e5ae0dc8406171b0738b5d55001a9067b5592318c614cf664843432e38228199f7de28043c8199a0e807c117ec7f5aecf3452be7f84098295e08
-AUX spidermonkey-1.8.7-symbol-versions.patch 1011 SHA256 a0706551d4ff71a984b2b9444901dc98b60a390488c8b99691c7d0d01f7111e7 SHA512 16fa4bab5da4724a8b3c925133a85975bf1bfb47e4b6bfcae1c2f76eed824ea82b321928fc478966686a3582e0cd03630177b041ab75f2c572f7f00d3e3e2242 WHIRLPOOL 8118ea4845394b36c6f5ec8914b66e5b9fadc83bc6f696d0814ff68167e397c3e685a96b4fa3ce0647fe76337b592b778e640b6429095ec0fea2883d0e44777a
-AUX spidermonkey-1.8.7-x32.patch 753 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d SHA512 ae9c0241fd1cc02b5f21865adb1efb750246850dcf93ee1b81c5faf19c5d4d5b0ab6e853527899c438d2139601e8a177f7ee6c9a3700d2816df32f5e09d273e8 WHIRLPOOL 8b43164a8a7cc4d82092e81d4a2d0d21a8614dfe7964f3fbb49d0f70e25178ba0197bd525e9f08cb1c621d991dd4aefc97be15901d3f482fce180e8d90bf8706
-DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
-DIST js187-1.0.0.tar.gz 7106870 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4 SHA512 7df55daac1eac0a7a7b31df044f7d5cc40a1f5079907b661f7c8489614b0ddff35e4f7cd13214bfc4baf9bdb37d392e4118f63ab589a051978d6ceef63d1e9f2 WHIRLPOOL d0f2ea8add0c7c1ac34ff8a6f887e931768091696dda037e7778ecd7eb02889b455747cfaa9a362844983eb2bdda6bddab46bf542cecf81f91ec5165efc0b9a3
-DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353 SHA512 bd1976b12940390e7d5db6078ca6339006428874788688e4ea4f6bd86afd341c3edd356bac801883637f46085c6d971d4f79e44fa9f6e44b3b715186355be175 WHIRLPOOL 5614bcb99d7101751e6f5be24b20e8a6acd5a682640025830f0c4a4fb74e724e5d71eb56c3e09d0ced4bbfa6c6c93daf42a7bc326c3cf0b07bee777901f25039
-EBUILD spidermonkey-1.8.5-r3.ebuild 3823 SHA256 5e828c14f3026e2f683ec722a7010f482fbbf3bb3725bfddf8f0965e196b420e SHA512 45dcb9dd01d6461ab07c447e7d9b74317b269028ade0e9622256e872a9440abc280c4130b331a44fbf52d9538c357d4e8901045d8c2c064577cb5141f03a4993 WHIRLPOOL fc6b1183c48be41c38e4deeb959349ab1188a485425ab5122218a689b3d72125235a009603a8a4baae310e5750bf453d51a82c3e781282c6ef3c76661ab28734
-EBUILD spidermonkey-1.8.7-r2.ebuild 3953 SHA256 774a6ffe16fdc25278410dacccb797063c5a372697e95fc7c76c3b73a36b96ce SHA512 ec87ac2352305d3263647fe0d8e61afcc75ff40440e2b04d2aca93849c556acc43ae379d12f03b2fa8ea76e4a99848e20ec3e723cd3d241f745ad796db31c4b0 WHIRLPOOL 04919be59e10af466f1a2c572964f946d539f7f02d0b4fcfb26e9ebb7282141dd55262b0bc485d2abb568c536e06c21ed2b5e793ab3e83d88063fe02f37efce1

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
deleted file mode 100644
index ed497ce..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/js-1.8.5/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
-+++ b/js-1.8.5/js/src/configure.in	2012-11-02 15:32:38.000000000 -0400
-@@ -3550,7 +3550,7 @@
- _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
-   # gcc needs -mfpu=neon to recognize NEON instructions
--  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+  CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-                [asm("vadd.i8 d0, d0, d0");],
-@@ -4654,12 +4654,6 @@
- dnl ========================================================
- MOZ_ARG_HEADER(Individual module options)
- 
--dnl Setup default CPU arch for arm target
--case "$target_cpu" in
--  arm*)
--    MOZ_ARM_ARCH=armv7
--  ;;
--esac
- dnl ========================================================
- dnl = Enable building the Thumb2 instruction set
- dnl ========================================================
-@@ -4668,66 +4662,32 @@
-     MOZ_THUMB2=1,
-     MOZ_THUMB2=)
- if test -n "$MOZ_THUMB2"; then
--  MOZ_ARM_ARCH=armv7
-+    AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
-+else
-+    AC_MSG_CHECKING([whether to build for thumb2])
-+    AC_TRY_COMPILE([],[return sizeof(__thumb2__);],
-+      [MOZ_THUMB2=1
-+        AC_MSG_RESULT([yes])],
-+      [MOZ_THUMB2=
-+        AC_MSG_RESULT([no])])
- fi
- 
- dnl ========================================================
- dnl = Enable building for ARM specific CPU features
- dnl ========================================================
--MOZ_ARG_WITH_STRING(cpu-arch,
--[  --with-cpu-arch=arch      Use specific arm architecture CPU features, default armv7],
--    MOZ_ARM_ARCH=$withval)
--
- if test -n "$MOZ_THUMB2"; then
-   case "$target_cpu" in
-     arm*)
--      if test "$MOZ_ARM_ARCH" != "armv7"; then
--        AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
--      fi
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-       fi
-     ;;
--    *)
--      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
--    ;;
--  esac
--elif test "$MOZ_ARM_ARCH" = "armv7"; then
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--      else
--        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
--      fi
--    ;;
--    *)
--      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
--    ;;
--  esac
--else
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--      fi
--      ;;
-   esac
- fi
- 
- AC_SUBST(MOZ_THUMB2)
--AC_SUBST(MOZ_ARM_ARCH)
- 
- dnl ========================================================
- dnl =

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
deleted file mode 100644
index c867e45..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
deleted file mode 100644
index 3927c87..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1303461188 -7200
-# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
-# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
-Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
- 		platform.cc \
- 		utils.cc \
- 		$(NONE)
- 
- #
- # END enclude sources for V8 dtoa
- #############################################
- 
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
- 
- VPATH +=	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \
- 		$(srcdir)/yarr/pcre \
- 		$(NULL)
- 
- CPPSRCS += 	pcre_compile.cpp \
-                 pcre_exec.cpp \
-
-# HG changeset patch
-# User Luke Wagner <lw@mozilla.com>
-# Date 1299520258 28800
-# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
-# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
-Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
-
-diff --git a/js/src/jsval.h b/js/src/jsval.h
---- a/js/src/jsval.h
-+++ b/js/src/jsval.h
-@@ -342,16 +342,17 @@ typedef union jsval_layout
-         JSValueTag         tag : 17;
-         uint64             payload47 : 47;
-     } debugView;
-     struct {
-         union {
-             int32          i32;
-             uint32         u32;
-             JSWhyMagic     why;
-+            jsuword        word;
-         } payload;
-     } s;
-     double asDouble;
-     void *asPtr;
- } jsval_layout;
- # endif /* JS_BITS_PER_WORD */
- #endif  /* defined(IS_LITTLE_ENDIAN) */
- 
-
-
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
deleted file mode 100644
index 66475b6..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/js/src/configure.in	2012-11-01 19:42:20.130330321 +0100
-+++ b/js/src/configure.in	2012-11-01 20:34:03.561351492 +0100
-@@ -3477,7 +3477,16 @@
- esac
- 
- dnl Performance measurement headers.
--AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1)
-+AC_CHECK_HEADER(linux/perf_event.h,
-+	[AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
-+		[AC_TRY_COMPILE([#include <sys/syscall.h>],[return sizeof(__NR_perf_event_open);],
-+		ac_cv_perf_event_open=yes,
-+		ac_cv_perf_event_open=no)])])
-+if test "$ac_cv_perf_event_open" = "yes"; then
-+	HAVE_LINUX_PERF_EVENT_H=1
-+else
-+	HAVE_LINUX_PERF_EVENT_H=
-+fi
- AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
- 
- dnl Checks for libraries.
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
deleted file mode 100644
index 460394d..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur js/src/configure.in js.new/src/configure.in
---- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+mozjs185 {
-+  global: *;
-+};
-+
-diff -Naur js/src/Makefile.in js.new/src/Makefile.in
---- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
-@@ -837,7 +837,10 @@
- 	mozjs185.pc \
- 	$(NULL)
- 
--GARBAGE += $(pkg_config_files)
-+symverscript: symverscript.in
-+	cat $< > $@
-+
-+GARBAGE += $(pkg_config_files) symverscript
- 
- %.pc: $(srcdir)/%.pc.in Makefile
- 	cat $< | sed \
-@@ -872,6 +875,8 @@
- SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
- SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
- $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
-+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-+$(SHARED_LIBRARY): symverscript
- endif
- endif
- 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
deleted file mode 100644
index 65d0a2d..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
-+++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
-@@ -965,10 +965,10 @@
- endif
- endif
- 
--install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
--	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
--	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
-+install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-+ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
-+	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
- endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
deleted file mode 100644
index 4324df0..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/config/system-headers
-+++ b/js/src/config/system-headers
-@@ -595,6 +595,7 @@ proto/exec.h
- psap.h
- Pt.h
- pthread.h
-+pthread_np.h
- pwd.h
- Python.h
- QDOffscreen.h
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
deleted file mode 100644
index 3945172..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur js/src/configure.in js.new/src/configure.in
---- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+mozjs187 {
-+  global: *;
-+};
-+
-diff -Naur js/src/Makefile.in js.new/src/Makefile.in
---- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
-@@ -837,7 +837,10 @@
- 	mozjs185.pc \
- 	$(NULL)
- 
--GARBAGE += $(pkg_config_files)
-+symverscript: symverscript.in
-+	cat $< > $@
-+
-+GARBAGE += $(pkg_config_files) symverscript
- 
- %.pc: $(srcdir)/%.pc.in Makefile
- 	cat $< | sed \
-@@ -872,6 +875,8 @@
- SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
- SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
- $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
-+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-+$(SHARED_LIBRARY): symverscript
- endif
- endif
- 

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
deleted file mode 100644
index f14a269..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/js/src/jslock.cpp	2012-04-06 16:24:51.000000000 -0500
-+++ b/js/src/jslock.cpp	2012-06-21 20:57:00.877937542 -0500
-@@ -150,17 +150,22 @@
- 
- static JS_ALWAYS_INLINE int
- NativeCompareAndSwap(volatile jsword *w, jsword ov, jsword nv)
- {
-     unsigned int res;
- 
-     __asm__ __volatile__ (
-                           "lock\n"
-+/* GCC's x32 abi support */
-+#if defined(__LP64__)
-                           "cmpxchgq %2, (%1)\n"
-+#else
-+                          "cmpxchg %2, (%1)\n"
-+#endif
-                           "sete %%al\n"
-                           "movzbl %%al, %%eax\n"
-                           : "=a" (res)
-                           : "r" (w), "r" (nv), "a" (ov)
-                           : "cc", "memory");
-     return (int)res;
- }
-

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
deleted file mode 100644
index c3dfe48..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.5 2012/11/25 13:09:41 anarchy Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-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/mozjs185"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug minimal 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]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${FILESDIR}"/${P}-symbol-versions.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" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README
-	dohtml README.html
-
-	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-1.8.7-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
deleted file mode 100644
index 830deb0..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild,v 1.1 2012/10/23 19:07:07 axs Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-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"
-SPIDERPV="${PV}-patches-0.1"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs187"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# Apply patches that are required for misc archs
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${FILESDIR}"/${P}-symbol-versions.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" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	if ! use minimal; then
-		dobin shell/js
-		if use jit; then
-			pax-mark m "${ED}/usr/bin/js"
-		fi
-	fi
-	dodoc ../../README
-	dohtml README.html
-	# install header files needed but not part of build system
-	insinto /usr/include/js
-	doins ../public/*.h
-	insinto /usr/include/js/mozilla
-	doins "${S}"/mfbt/*.h
-
-	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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2013-01-30  2:02 Ian Stakenvicius
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2013-01-30  2:02 UTC (permalink / raw
  To: gentoo-commits

commit:     cc0f12ed36ce0c12cff80fee21db928bc0853b1f
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 01:59:05 2013 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 01:59:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=cc0f12ed

working ebuild -- not tested at runtime yet as API changed again

---
 dev-lang/spidermonkey/Manifest                     |    4 +
 .../files/spidermonkey-1.8.8-filter_desc.patch     |   18 +++
 .../files/spidermonkey-1.8.8-symbol-versions.patch |   32 +++++
 dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild    |  137 ++++++++++++++++++++
 4 files changed, 191 insertions(+), 0 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
new file mode 100644
index 0000000..71a5f39
--- /dev/null
+++ b/dev-lang/spidermonkey/Manifest
@@ -0,0 +1,4 @@
+AUX spidermonkey-1.8.8-filter_desc.patch 922 SHA256 e754f29fe76bd14a200725f5a61364c5c00963b1fbaba55fb27b9282bea9d684 SHA512 cc536a582dba7245485f57f02b696248fe6e39ea22ee437a725a7aca8426d8fe70a42c3c3974cf7bf6be2f2a0e44c23f38603c1d116db13533f7ed7c50e84283 WHIRLPOOL 0f98c9df83208be78886e9295b30e44143824e4dda1d457934b76ad4927c6c7aa4be9fa6a69fb1d05dffb598a4539d15a9457f9bf1355500579f7983e9f61fe4
+AUX spidermonkey-1.8.8-symbol-versions.patch 1011 SHA256 87eb0cc07eaec5b6e0ad63cd8dd24230c105c6e15a63fd679e837be5a5c11208 SHA512 07895a3086744a5d18f81fa12b8196bd6aa1e30fbd3242ece14f6a994a49cbdf5b61bba384bef6bd8c227df7c3c2217b121b9279bf93e0a4af2d7b1098488b94 WHIRLPOOL e21c5c005dbce047f2b38b303a404c8faa155a84b6ee9c28204844a15801d9fdbf6768bfbd48aecebd0ddb23c3871e4e658dc100812a56e324e2c68fc8852da0
+DIST js188-1.0.0.tar.xz 4192856 SHA256 219d37f225180e8b2936d9def85a57243bd10d19e69a684a1eeed79ab1394b10 SHA512 1881ca3c216a70b1b6eeef639e3420e046da7ffe98d82d31145d8e9cba0c1fa773cd275c22e61b12c24e8051ac15e9544c613da9864bf3ca48d66a72a00f711c WHIRLPOOL 673ad3865f2afe29c0173726f2631b111bd71952bdc0d9223991e61e6e64844e7aec54680a35fa1b207d4f2479db8361be05afe65c756e18f0b0eb76535b5d4e
+EBUILD spidermonkey-1.8.8.ebuild 3781 SHA256 10a7f7a8a38e98dc1c78b0006713bbebadf5817fbb28d8b02a78c5c55223ed1b SHA512 7be1f05881b35a9bc446e71b81e7bcd585e1e5ab865231a9025ed39a5e3052d169e74ddd45cdf3e5bae6b62d190a17a3ff9820846fc95e57329322deeebcb8d8 WHIRLPOOL f968243de449144dccc54e0a868070c213d04f09be1be4df681d16958912d71b089fd5192202a56cf948987058ff22d9e1bf7975c06aa98a8cd6c4b0f04d1ec0

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
new file mode 100644
index 0000000..d02c175
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
@@ -0,0 +1,18 @@
+--- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
++++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
+@@ -965,10 +965,10 @@
+ endif
+ endif
+ 
+-install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
+-ifneq (,$(LIBRARY))
+-	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+-	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
++install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
++ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
++	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
++	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ ifeq (,$(HOST_BIN_SUFFIX))
+

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
new file mode 100644
index 0000000..7a0d644
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
@@ -0,0 +1,32 @@
+diff -Naur js/src/configure.in js.new/src/configure.in
+--- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
+@@ -0,0 +1,4 @@
++mozjs188 {
++  global: *;
++};
++
+diff -Naur js/src/Makefile.in js.new/src/Makefile.in
+--- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
+@@ -837,7 +837,10 @@
+ 	mozjs185.pc \
+ 	$(NULL)
+ 
+-GARBAGE += $(pkg_config_files)
++symverscript: symverscript.in
++	cat $< > $@
++
++GARBAGE += $(pkg_config_files) symverscript
+ 
+ %.pc: $(srcdir)/%.pc.in Makefile
+ 	cat $< | sed \
+@@ -872,6 +875,8 @@
+ SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
+ SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
+ $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
++$(SHARED_LIBRARY): symverscript
+ endif
+ endif
+ 

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
new file mode 100644
index 0000000..07388bb
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.3 2013/01/06 18:17:18 armin76 Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+
+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"
+SPIDERPV="${PV}-patches-0.1"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="http://dev.gentoo.org/~anarchy/dist/${TARBALL_P}.tar.xz"
+#	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs188"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug jit minimal static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0
+	virtual/libffi"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python_set_active_version 2
+		python_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+src_prepare() {
+	# Apply patches that are required for misc archs
+#	EPATCH_SUFFIX="patch" \
+#	EPATCH_FORCE="yes" \
+#	epatch "${WORKDIR}/spidermonkey"
+
+	epatch "${FILESDIR}"/${P}-filter_desc.patch
+	epatch "${FILESDIR}"/${P}-symbol-versions.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" || die
+	fi
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		--enable-system-ffi \
+		--enable-jemalloc \
+		$(use_enable debug) \
+		$(use_enable jit tracejit) \
+		$(use_enable jit methodjit) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	if ! use minimal; then
+		dobin shell/js
+		if use jit; then
+			pax-mark m "${ED}/usr/bin/js"
+		fi
+	fi
+	dohtml README.html
+	# install header files needed but not part of build system
+	insinto /usr/include/js
+	doins ../public/*.h
+	insinto /usr/include/js/mozilla
+	doins "${S}"/mfbt/*.h
+
+	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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2013-04-01 18:30 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2013-04-01 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     2d0d382e9bc56e3664c162a4b2fa27ec5dbd0a2c
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 18:30:14 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 18:30:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2d0d382e

spidermonkey: 17.0.0 release multiple memory leak issues have been fixed

---
 dev-lang/spidermonkey/Manifest                     |    6 +--
 .../files/spidermonkey-1.8.8-filter_desc.patch     |   18 ---------
 .../files/spidermonkey-1.8.8-symbol-versions.patch |   32 ----------------
 ...key-1.8.8.ebuild => spidermonkey-17.0.0.ebuild} |   39 +++++---------------
 4 files changed, 12 insertions(+), 83 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 71a5f39..43da2b7 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,4 +1,2 @@
-AUX spidermonkey-1.8.8-filter_desc.patch 922 SHA256 e754f29fe76bd14a200725f5a61364c5c00963b1fbaba55fb27b9282bea9d684 SHA512 cc536a582dba7245485f57f02b696248fe6e39ea22ee437a725a7aca8426d8fe70a42c3c3974cf7bf6be2f2a0e44c23f38603c1d116db13533f7ed7c50e84283 WHIRLPOOL 0f98c9df83208be78886e9295b30e44143824e4dda1d457934b76ad4927c6c7aa4be9fa6a69fb1d05dffb598a4539d15a9457f9bf1355500579f7983e9f61fe4
-AUX spidermonkey-1.8.8-symbol-versions.patch 1011 SHA256 87eb0cc07eaec5b6e0ad63cd8dd24230c105c6e15a63fd679e837be5a5c11208 SHA512 07895a3086744a5d18f81fa12b8196bd6aa1e30fbd3242ece14f6a994a49cbdf5b61bba384bef6bd8c227df7c3c2217b121b9279bf93e0a4af2d7b1098488b94 WHIRLPOOL e21c5c005dbce047f2b38b303a404c8faa155a84b6ee9c28204844a15801d9fdbf6768bfbd48aecebd0ddb23c3871e4e658dc100812a56e324e2c68fc8852da0
-DIST js188-1.0.0.tar.xz 4192856 SHA256 219d37f225180e8b2936d9def85a57243bd10d19e69a684a1eeed79ab1394b10 SHA512 1881ca3c216a70b1b6eeef639e3420e046da7ffe98d82d31145d8e9cba0c1fa773cd275c22e61b12c24e8051ac15e9544c613da9864bf3ca48d66a72a00f711c WHIRLPOOL 673ad3865f2afe29c0173726f2631b111bd71952bdc0d9223991e61e6e64844e7aec54680a35fa1b207d4f2479db8361be05afe65c756e18f0b0eb76535b5d4e
-EBUILD spidermonkey-1.8.8.ebuild 3781 SHA256 10a7f7a8a38e98dc1c78b0006713bbebadf5817fbb28d8b02a78c5c55223ed1b SHA512 7be1f05881b35a9bc446e71b81e7bcd585e1e5ab865231a9025ed39a5e3052d169e74ddd45cdf3e5bae6b62d190a17a3ff9820846fc95e57329322deeebcb8d8 WHIRLPOOL f968243de449144dccc54e0a868070c213d04f09be1be4df681d16958912d71b089fd5192202a56cf948987058ff22d9e1bf7975c06aa98a8cd6c4b0f04d1ec0
+DIST mozjs17.0.0.tar.gz 6778934 SHA256 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4 WHIRLPOOL 4df7b51577787194065162b09d2c3dda849c13fa901305f9925d4ca5d38bb7f8e2daa943099e003fb9d11f9264ae2d77ccf04e5eea11e3ddcb624b504b99d52f
+EBUILD spidermonkey-17.0.0.ebuild 3014 SHA256 b42ce82c55fffb91c0414871585e05a7fe8458d52cc3e2b7345553c98cebc07a SHA512 ceef826441a5e8c6be4f9a2d0432dd8abb09eace29e5e57413c252611f1d3abd15be0e61e7e5e65246a4bc07b1824369ad495ee4968ec5b1a73675d707c51663 WHIRLPOOL 126f7fae0736080d98f83050c2cad4d29553f0f5ac4d53fec52e8b6a7a46f58ecb6788ecf503c6c92fa13e44ed198d83bc0f09bda94e9ce6357bd49120261af8

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
deleted file mode 100644
index d02c175..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
-+++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
-@@ -965,10 +965,10 @@
- endif
- endif
- 
--install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
--	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
--	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
-+install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-+ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
-+	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
- endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
deleted file mode 100644
index 7a0d644..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur js/src/configure.in js.new/src/configure.in
---- a/js/src/symverscript.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/symverscript.in	2012-11-07 09:37:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+mozjs188 {
-+  global: *;
-+};
-+
-diff -Naur js/src/Makefile.in js.new/src/Makefile.in
---- a/js/src/Makefile.in	2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/Makefile.in	2012-11-07 09:37:09.000000000 -0500
-@@ -837,7 +837,10 @@
- 	mozjs185.pc \
- 	$(NULL)
- 
--GARBAGE += $(pkg_config_files)
-+symverscript: symverscript.in
-+	cat $< > $@
-+
-+GARBAGE += $(pkg_config_files) symverscript
- 
- %.pc: $(srcdir)/%.pc.in Makefile
- 	cat $< | sed \
-@@ -872,6 +875,8 @@
- SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
- SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
- $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
-+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-+$(SHARED_LIBRARY): symverscript
- endif
- endif
- 

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
similarity index 73%
rename from dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
rename to dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
index 07388bb..571c44f 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.3 2013/01/06 18:17:18 armin76 Exp $
+# $Header: $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
 inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
 
-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"
-SPIDERPV="${PV}-patches-0.1"
+MY_PN="mozjs"
+MY_P="${MY_PN}${PV}"
 DESCRIPTION="Stand-alone JavaScript C library"
 HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://dev.gentoo.org/~anarchy/dist/${TARBALL_P}.tar.xz"
-#	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
 
 LICENSE="NPL-1.1"
-SLOT="0/mozjs188"
+SLOT="0/mozjs17.0.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug jit minimal static-libs test"
 
 S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
-RDEPEND=">=dev-libs/nspr-4.7.0
+RDEPEND=">=dev-libs/nspr-4.9.4
 	virtual/libffi"
 DEPEND="${RDEPEND}
 	app-arch/zip
@@ -40,23 +36,12 @@ pkg_setup(){
 }
 
 src_prepare() {
-	# Apply patches that are required for misc archs
-#	EPATCH_SUFFIX="patch" \
-#	EPATCH_FORCE="yes" \
-#	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${P}-filter_desc.patch
-	epatch "${FILESDIR}"/${P}-symbol-versions.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" || die
 	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
 }
 
 src_configure() {
@@ -116,18 +101,14 @@ src_test() {
 src_install() {
 	cd "${BUILDDIR}" || die
 	emake DESTDIR="${D}" install
+
 	if ! use minimal; then
-		dobin shell/js
 		if use jit; then
-			pax-mark m "${ED}/usr/bin/js"
+			pax-mark m "${ED}/usr/bin/js1*"
 		fi
+	else
+		rm -f "${ED}/usr/bin/js1*"
 	fi
-	dohtml README.html
-	# install header files needed but not part of build system
-	insinto /usr/include/js
-	doins ../public/*.h
-	insinto /usr/include/js/mozilla
-	doins "${S}"/mfbt/*.h
 
 	if ! use static-libs; then
 		# We can't actually disable building of static libraries


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
@ 2014-05-09 21:22 Ian Stakenvicius
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2014-05-09 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     7de0f97e44335f6bb92087290ecf5420150b56a6
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri May  9 21:22:00 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri May  9 21:22:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=7de0f97e

alpha of spidermonkey-31 for testing, no keywords right now

---
 dev-lang/spidermonkey/Manifest                     |   1 +
 .../files/spidermonkey-31-jit-tests.patch          |  32 +++++
 .../spidermonkey/spidermonkey-31.0_alpha2.ebuild   | 138 +++++++++++++++++++++
 3 files changed, 171 insertions(+)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 60732e5..5fb45d0 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1 +1,2 @@
 DIST mozjs-24.2.0.tar.bz2 15624530 SHA256 e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4 WHIRLPOOL ea74d19c79b1a0fe407e2803900c49c23e8b76444fb4e20995072c3c59427e8df1895df04f2f4de779a1c58cd1166dd97aeaf7564350832011efe89dbcf9583e
+DIST mozjs-31.0a2.tar.bz2 21261131 SHA256 fe57dca9bf5be446d6bea385245824c1b4487d06040d90a0a9fa1adf21836303 SHA512 d4dbc0cf5d5bc3b1d52d346d0d54bb10182962551eba3ef2186efc7a433f8b856db9c8df2488e6a4385fbd18dcd22468c76f025bb52187af33990066089709fd WHIRLPOOL 4305a6c4b141efbb559ff879189270e291f396d825f87627d9e8c62cab5de7b56eb4c6b0fd91e2d5ed568eb17e896822755c54e47b2bddd7d2275d3c2a088836

diff --git a/dev-lang/spidermonkey/files/spidermonkey-31-jit-tests.patch b/dev-lang/spidermonkey/files/spidermonkey-31-jit-tests.patch
new file mode 100644
index 0000000..9e281f8
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-31-jit-tests.patch
@@ -0,0 +1,32 @@
+--- a/js/src/jit-test/tests/basic/cross-context-stack-1.js
++++ b/js/src/jit-test/tests/basic/cross-context-stack-1.js
+@@ -1,21 +1,21 @@
+ // Error().stack (ScriptFrameIter) is no longer context-bound.
+ function beta() {
+     evaluate("function gamma() {\nstack = Error().stack;\n };\n gamma();", {newContext: true});
+ }
+ function alpha() {
+     beta();
+ }
+ alpha();
+-assertEq(/alpha/.test(stack), true);
+-assertEq(/beta/.test(stack), true);
+-assertEq(/gamma/.test(stack), true);
+-assertEq(/delta/.test(stack), false);
++assertEq(/alpha@/.test(stack), true);
++assertEq(/beta@/.test(stack), true);
++assertEq(/gamma@/.test(stack), true);
++assertEq(/delta@/.test(stack), false);
+ 
+ function delta() {
+     evaluate("stack = Error().stack", {newContext: true});
+ }
+ delta();
+-assertEq(/alpha/.test(stack), false);
+-assertEq(/beta/.test(stack), false);
+-assertEq(/gamma/.test(stack), false);
+-assertEq(/delta/.test(stack), true);
++assertEq(/alpha@/.test(stack), false);
++assertEq(/beta@/.test(stack), false);
++assertEq(/gamma@/.test(stack), false);
++assertEq(/delta@/.test(stack), true);

diff --git a/dev-lang/spidermonkey/spidermonkey-31.0_alpha2.ebuild b/dev-lang/spidermonkey/spidermonkey-31.0_alpha2.ebuild
new file mode 100644
index 0000000..d78e741
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-31.0_alpha2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild,v 1.1 2014/03/08 14:38:51 anarchy Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
+
+MY_PN="mozjs"
+MY_PV="${PV/_alpha/a}"
+MY_P="${MY_PN}-${MY_PV/_/.}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+#SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2"
+
+LICENSE="NPL-1.1"
+SLOT="31"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS=""
+IUSE="debug jit icu minimal static-libs +system-icu test"
+
+RESTRICT="ia64? ( test )"
+
+S="${WORKDIR}/${MY_P%.rc*}"
+BUILDDIR="${WORKDIR}/jsbuild"
+
+RDEPEND=">=dev-libs/nspr-4.9.4
+	virtual/libffi
+	>=sys-libs/zlib-1.1.4
+	system-icu? ( >=dev-libs/icu-1.51:= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	virtual/pkgconfig"
+
+pkg_setup(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python-any-r1_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${SLOT}-jit-tests.patch
+#	epatch_user
+#
+#	cd "${BUILDDIR}" || die
+#	eautoconf
+}
+
+src_configure() {
+	mkdir "${BUILDDIR}" && cd "${BUILDDIR}" || die
+
+        local myopts=""
+        if use icu; then # make sure system-icu flag only affects icu-enabled build
+                myopts+="$(use_with system-icu)"
+        else
+                myopts+="--without-system-icu"
+        fi
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" \
+	ECONF_SOURCE="${S}/js/src" \
+	econf \
+		${myopts}
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		--enable-system-ffi \
+		--enable-jemalloc \
+		$(use_with icu intl-api) \
+		$(use_enable debug) \
+		$(use_enable jit tracejit) \
+		$(use_enable jit methodjit) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/js/src/jsapi-tests" || die
+	emake check
+	cd "${BUILDDIR}" || die
+	emake check-jit-test
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	mv "${ED}"/usr/bin/js "${ED}"/usr/bin/js${SLOT}
+	mv "${ED}"/usr/bin/js-config "${ED}"/usr/bin/js${SLOT}-config
+
+	if ! use minimal; then
+		if use jit; then
+			pax-mark m "${ED}/usr/bin/js${SLOT}"
+		fi
+	else
+		rm -f "${ED}/usr/bin/js${SLOT}"
+	fi
+
+	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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-05-09 21:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-09 21:22 [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ Ian Stakenvicius
  -- strict thread matches above, loose matches on Subject: below --
2013-04-01 18:30 Jory Pratt
2013-01-30  2:02 Ian Stakenvicius
2012-12-06 21:44 Ian Stakenvicius
2012-12-06 21:29 Ian Stakenvicius
2012-10-21 19:07 Jory Pratt
2012-10-12 19:58 Ian Stakenvicius
2012-06-18 18:27 Jory Pratt
2011-11-14 19:11 Jory Pratt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox