gentoo resync : 18.11.2018

3 files changed, 42 insertions, 4 deletions

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 8b9442fc70ad..b8d6132b8d33 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,5 +1,6 @@
 AUX moz38-dont-hardcode-libc-soname.patch 637 BLAKE2B d78f53814955c3e0842040f47330d8216b3f496574fadc045294b534f2ec7d049b14564cb495c37ae2d084db2f5671e447d1d98aa19a367f8b96ec97201b4f30 SHA512 f3d447996da3bf445f082a0b5c3018eb618b6b08a49bc43f275dc6cc77d7d906928e99264378472e96213df8f8b5d279a0af72d9d6a0a3417b266d7752c7f1fd
 AUX spidermonkey-52-baseconfig.patch 963 BLAKE2B 4652a28774677933a2974b50336ca772908892097b533a6c13f943a9179d8112e004e4aeba336e9e5565f165d6dee5d424a68d80896f66b8a69632f570f2199d SHA512 22870d6ee8a0a0b4359d78173aef0ade49063bfad495fd40815852684a1cdf17f9f50585e0d693eb712c2a2225ea43c4387cf454f3b9bd39e01899f3936775f1
+AUX spidermonkey-52.0-fix-alpha-bitness.patch 836 BLAKE2B bf89aadfdceab9d1460c31b496618dc19d2461d27e0713887d8c59b7a565a70d38cbaa2ca099b50555417beba54c2b207f80cf13ba633da35be7fab6b3c41faf SHA512 67ccafd8e2b84d59d13ff93bd12930b4804f8cf64cc896a4edf99c962481f583866ea6c4f84b3fd9d1093ad8ca7d23712615470dfadb57d293258754dd612484
 AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
@@ -22,5 +23,5 @@ EBUILD spidermonkey-24.2.0-r3.ebuild 4016 BLAKE2B 4f52b07f5f156f701ba6e1dc7837a1
 EBUILD spidermonkey-24.2.0-r4.ebuild 3989 BLAKE2B a859c05afcfe262398de5f0b4d0c148eaf2d94f57e9f029814982efcc740acbfc8349e756f75b3ce83a746571e27a31d88c78126b1b1e0cc9154e4b86f53dc8e SHA512 ca080e9993b2c10aed9abd0d54bd0722e8f4a53ed755f60389e9bf6b0d3347115ca7cc347b708592619ef69f6f1f38e5c9778c949f7224e579e7da09cd269067
 EBUILD spidermonkey-38.3.0.ebuild 3874 BLAKE2B 7b5584b2dc11f445605a5a718914b689b8fee1b259ca92011b6efe6e4f71160c3c8cc19359d4f253ea7325691d0d06a47c46ab61dc691812727456b1accaf7c4 SHA512 51e6a9eb249e7c7467ff7cd0db48d9587ff9e5c3a63ca730382867cef9d8c6600ae9c87f2b4b41dfc92fbd21fb92addcff597370ab6570d6a15c0d5372cdc909
 EBUILD spidermonkey-45.0.2.ebuild 3980 BLAKE2B 8f5b8aaba2c9ffc9adf16ff14216375434ddb3511add9817022e2913b41b415fdb3a2899ab341dc3e389460dbdf6d00cfb86270e8fd7a8de78eda6bbfc73b6ee SHA512 f99a6f6385e9cd39b8f6acb63b4c5f6e05250eb475e7906c6b06251c2a3de593d2617cbed3ef9f5c13b6009bcac6cb9b989ec362e0bfc6e351adcbec033d2806
-EBUILD spidermonkey-52.9.1_pre1.ebuild 4065 BLAKE2B 3506ec3f1879ba3d0b5030553e36137f024851d2e96aa508c469af8d1fbafbba12f1607e2f11e33ccfafc690f7e738b258392dd78aa139e24f91b866c88938b8 SHA512 16ce1efc58e8d8cef79cb53cde77dd1ede34e35543b4c09eef353491dd7b47912d8554263a798c626cef72bc69b53f55440f1465602961110024e6e85433a479
+EBUILD spidermonkey-52.9.1_pre1.ebuild 4229 BLAKE2B eb2d9f09aa55fa3882d48e56e1c7584dbed1fdde7e5df5ddb76cbd649af5aa95fe941eead19b97bc7e08a74ee358a51c428598317a36b8f6910f01e92c538a99 SHA512 a4510d988db6f78770c0e1520e48aa54e4c8ceb60c92396eeb9427222f64bf193c3a282ac14b9966d246e9a5c66bb9d77d78f8625ebb92428b1304b4b1d7a364
 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0
diff --git a/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch b/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch
new file mode 100644
index 000000000000..b0f872964388
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+# Date 1482966103 -3600
+# Node ID 1f4d99d8dff27bcc25eff21dc6a16dae63f48595
+# Parent  ce9e9f0dc752896ac7ba00bb0610b3f731e948b0
+Bug 1326496 - mozbuild: Fix bitness from 32 to 64 bits on alpha. r=glandium
+
+
+diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
+--- a/python/mozbuild/mozbuild/configure/constants.py
++++ b/python/mozbuild/mozbuild/configure/constants.py
+@@ -35,17 +35,17 @@ Kernel = EnumString.subclass(
+     'Linux',
+     'NetBSD',
+     'OpenBSD',
+     'WINNT',
+ )
+ 
+ CPU_bitness = {
+     'aarch64': 64,
+-    'Alpha': 32,
++    'Alpha': 64,
+     'arm': 32,
+     'hppa': 32,
+     'ia64': 64,
+     'mips32': 32,
+     'mips64': 64,
+     'ppc': 32,
+     'ppc64': 64,
+     's390': 32,
+
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
index a0bc863ec2ec..7faa00344684 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.
 
 LICENSE="NPL-1.1"
 SLOT="52"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug minimal +system-icu test"
 
 RESTRICT="ia64? ( test )"
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}"
 pkg_setup(){
 	[[ ${MERGE_TYPE} == "binary" ]] || \
 		moz_pkgsetup
+
+	export SHELL="${EPREFIX}/bin/bash"
 }
 
 src_prepare() {
@@ -46,7 +48,7 @@ src_prepare() {
 
 	eapply "${WORKDIR}/${PN}"
 	eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
-	#eapply "${FILESDIR}"/${PN}-52-baseconfig.patch
+	eapply "${FILESDIR}"/${PN}-52.0-fix-alpha-bitness.patch
 
 	eapply_user
 
@@ -91,6 +93,7 @@ cross_make() {
 		CC="${BUILD_CC}" \
 		CXX="${BUILD_CXX}" \
 		RANLIB="${BUILD_RANLIB}" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 		"$@"
 }
 src_compile() {
@@ -120,6 +123,7 @@ src_compile() {
 	fi
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake \
 		MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
 		HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
@@ -133,6 +137,7 @@ src_test() {
 
 src_install() {
 	cd "${BUILDDIR}" || die
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 
 	if ! use minimal; then