[gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     882e2ea5135dce6348c7a30705fde08444bc705d
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 19:42:48 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 20:01:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882e2ea5

dev-lang/spidermonkey: bump to 52.9.1 prerelease 1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/spidermonkey/Manifest                         |  2 +-
 ...71003-r1.ebuild => spidermonkey-52.9.1_pre1.ebuild} | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 86c2ecad3b9..ea9d03ce4a8 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -3,7 +3,7 @@ DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e41
 DIST mozjs-24.2.0.tar.bz2 15624530 BLAKE2B 633f3e42011a8395aa4e60842c2de1cb472692a0d9355c1e2c49e1ef943605cafaea0c836f9044adfceb38d7e04a0941b895474d08097f641bfca4494c5c5fe4 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4
 DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4 SHA512 debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
 DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a SHA512 84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d
-DIST mozjs-52.4.0_pre20171003.tar.bz2 30588541 BLAKE2B ca3dace6f22d510d6d9f087f236100cae4b913b8d194fdec77f2a32b82276613417344fc4d899fca0d908ecb981d59f7e5608e7cd62f6f134dbcdf87f89a3276 SHA512 80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa
+DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4
 DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f44446a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192 SHA512 88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3
 DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a

diff --git a/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
similarity index 89%
rename from dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild
rename to dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
index 7e1b059c44a..c8ae70994d2 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,10 +7,11 @@ inherit autotools toolchain-funcs pax-utils mozcoreconf-v5
 
 MY_PN="mozjs"
 MY_P="${MY_PN}-${PV/_rc/.rc}"
+MY_P="${MY_P/_pre/pre}"
 DESCRIPTION="Stand-alone JavaScript C++ library"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 #SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
+SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> ${MY_P}.tar.bz2
 	https://dev.gentoo.org/~axs/distfiles/${PN}-52.0-patches-0.tar.xz"
 
 LICENSE="NPL-1.1"
@@ -21,8 +22,7 @@ IUSE="debug +jit minimal +system-icu test"
 RESTRICT="ia64? ( test )"
 
 S="${WORKDIR}/${MY_P%.rc*}"
-S="${S%_pre*}"
-BUILDDIR="${S}/js/src"
+BUILDDIR="${S}/jsobj"
 
 RDEPEND=">=dev-libs/nspr-4.13.1
 	virtual/libffi
@@ -41,10 +41,11 @@ src_prepare() {
 	rm -f	"${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch \
 		"${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \
 		"${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \
+		"${WORKDIR}"/${PN}/0008-tests-Skip-on-all-64-bit-archs.patch \
 		|| die
 
 	eapply "${WORKDIR}/${PN}"
-	eapply "${FILESDIR}"/${PN}-52-baseconfig.patch
+	#eapply "${FILESDIR}"/${PN}-52-baseconfig.patch
 
 	eapply_user
 
@@ -53,17 +54,20 @@ src_prepare() {
 		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
 	fi
 
-	cd "${BUILDDIR}" || die
+	cd "${S}"/js/src || die
 	eautoconf old-configure.in
 	eautoconf
 
 	# there is a default config.cache that messes everything up
-	rm -f "${BUILDDIR}"/config.cache || die
+	rm -f "${S}"/js/src/config.cache || die
+
+	mkdir -p "${BUILDDIR}" || die
 }
 
 src_configure() {
 	cd "${BUILDDIR}" || die
 
+	ECONF_SOURCE="${S}/js/src" \
 	econf \
 		--enable-jemalloc \
 		--enable-readline \