gentoo resync : 13.01.2018

3 files changed, 19 insertions, 2 deletions

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0abcf4db0fcc..25e1a033c208 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,3 +1,4 @@
+AUX moz38-dont-hardcode-libc-soname.patch 637 BLAKE2B d78f53814955c3e0842040f47330d8216b3f496574fadc045294b534f2ec7d049b14564cb495c37ae2d084db2f5671e447d1d98aa19a367f8b96ec97201b4f30 SHA512 f3d447996da3bf445f082a0b5c3018eb618b6b08a49bc43f275dc6cc77d7d906928e99264378472e96213df8f8b5d279a0af72d9d6a0a3417b266d7752c7f1fd
 AUX spidermonkey-52-baseconfig.patch 963 BLAKE2B 4652a28774677933a2974b50336ca772908892097b533a6c13f943a9179d8112e004e4aeba336e9e5565f165d6dee5d424a68d80896f66b8a69632f570f2199d SHA512 22870d6ee8a0a0b4359d78173aef0ade49063bfad495fd40815852684a1cdf17f9f50585e0d693eb712c2a2225ea43c4387cf454f3b9bd39e01899f3936775f1
 AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
@@ -19,7 +20,7 @@ EBUILD spidermonkey-17.0.0-r4.ebuild 3546 BLAKE2B 0cf5236b5ee991dc161633db218d42
 EBUILD spidermonkey-17.0.0-r5.ebuild 3564 BLAKE2B 94cb60c2e53143a50fb98e2f6e572fa354d22b87469a8ba4487891d3864672b0e315fbb4cbbc03fb1fdf203e9adc7fecbcafe5ca63535adb03890788673a5156 SHA512 1032e8cb002b43ca41b585a9f20865dfeea6750056df6a468bec9f3f7c78b4c707654787f4a2bc9368b3ce4a81b3be72ab6d1fe7bdccb37048b73fadb8343f6c
 EBUILD spidermonkey-24.2.0-r3.ebuild 4015 BLAKE2B 6608e66e03d2b606dc0117a46b462778468ac3697e64c44aa8a102c830f32c17e12c8458b2f43b05cf90306e7331407686959141078001534d1e33607d89e1ae SHA512 d715cf8f6ceb2139c14502ebe4c01a5a949fa59937737529dd9a5074444e1c25a2379018d740af2bb2cf99bbb3e35280bc88e68a44fa95d49d24e73f1843f003
 EBUILD spidermonkey-24.2.0-r4.ebuild 3991 BLAKE2B b7d253dbcedbddd3ae9738465101a4c6982381f037af2f0a78a9ca8f7b744f62777b4018b0d7728025153b8e0b6b2f6d5f78efb437835e12539802dff34e72ca SHA512 679ca189b9d1fbb9c6a6a56fe1b0ad7ad754df37f69c5194c522bde089cc1a5863d21e35c9ef2651812fbaa1233944296a3fb59852274625d79dd94ccf27c653
-EBUILD spidermonkey-38.2.1_rc0.ebuild 3813 BLAKE2B bd71913f2fe51f8a2ff3394430517b4d9923adbc7873fa073fa13746d02adb97d7fc3df7ace509859ffb2ed65c5b9f1dd02645cbc60d569b143960a4b4eb10ce SHA512 aa7b7cb2258a46338fb25b5ccb7f9c82b5cb97be192ef38e81adc6d0eaf676e73e65b80f48ed0c4f1bd0da020a529ad99a94a8c0458d48c06f7ab0b29a454a79
+EBUILD spidermonkey-38.2.1_rc0.ebuild 3869 BLAKE2B 745ac2159448b848b242bddc66df7184aeca7a5016e78006f8c45305d26bc599b37bfb29ca87502564567674e0e6f5aa03a998c7f370aa20beb059f8b5b9903d SHA512 bb728b4e9237df7fc2d093842635bdc5f7d2426479206e9d83907fbd4d2f1aa40a25c5c321d0e9b5dd0ac4f03601a8a9c0f6cbfdbe94792da78eccf55b78bacd
 EBUILD spidermonkey-45.0.2.ebuild 3905 BLAKE2B 9bd9a00eb41ac4f61da71b3feed187d1a70a2b4487f305580732ad734e91bf512dba6f8a7a5889814982e70ce25c9c9b0be8b87f05dacef7edfa2e08b53ada3c SHA512 a9a39994674ecdf1a974fbcc20f8c94e1f1f168db4095ba8c21a9d2fd01a6dbd0a59c932419c6b5f6c42b9bd7cc8b2aeaeb81973663a44b23372ea331b65d5db
 EBUILD spidermonkey-52.4.0_pre20171003-r1.ebuild 3868 BLAKE2B 3c4315cd6c23dffad04093eae078ea3e9878b0a4284aec1baca43617816fdbb3ee711e3c49998041b67f097837d8ce14317ee8eb2aff8bc5ad8376c87f955eae SHA512 5dcddaf5debdee01c4dab41b5088cf4f5375ba7c2f35f35c91f65dce0c3d1db74ce17955effc5002c8147e37fbb873b6a7d2242c0794ee98052e40e9c68b4f11
 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0
diff --git a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
new file mode 100644
index 000000000000..708c7496975f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
@@ -0,0 +1,15 @@
+--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py	2018-01-12 12:21:16.764318254 -0500
++++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py	2018-01-12 12:22:23.392069398 -0500
+@@ -93,10 +93,11 @@
+ 
+ if info['os'] == 'linux':
+     import ctypes
++    import ctypes.util
+     import errno
+     PR_SET_SECCOMP = 22
+     SECCOMP_MODE_FILTER = 2
+-    ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
++    ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
+     info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
+ else:
+     info['has_sandbox'] = True
diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
index 476c5c40b785..6b3861a9c18f 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
@@ -42,7 +42,8 @@ src_prepare() {
 		"${WORKDIR}"/sm38/mozjs38-fix-tracelogger.patch \
 		"${WORKDIR}"/sm38/mozjs38-copy-headers.patch \
 		"${WORKDIR}"/sm38/mozjs38-pkg-config-version.patch \
-		"${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch
+		"${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch \
+		"${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
 
 	eapply_user