gentoo resync : 24.02.2018

4 files changed, 21 insertions, 24 deletions

diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 64c625a7d815..34b40620d736 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -7,7 +7,7 @@ DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412
 DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3840 BLAKE2B 72c9943e4bafed115dabfa2fa33a035af9259bc764e8ac6797a9fc7c62aa60110feba43305b25595b6819e7fab261edc2619113deb5ef5629d0b433fc788717a SHA512 1d0d63f67b71a718bf7ed8bb422659a1b83f7c5dddd7d5cf436d5e7c266eb5ffd9096a2653c18b5272c79d659b898ec9fe489ba94d8786cce7823acea11724a9
 EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4079 BLAKE2B 87863e4d0c754f6dacaa9a633c6fa97da803aabcad8be1ffa98c27e06e71d03c132fff3c34bbfda2b963f35ad8c9e9315dc08a8a63c489c0bb3a16b3b3646f7f SHA512 01f6dc8700713833961b223a82e9b0035701ef4a291b8ffb483e2b784ec345b5d58ccf84cd168dace95888260dd882a75b09e66b9c0f3001b826a91058a4508b
-EBUILD compiler-rt-sanitizers-6.0.0_rc2.ebuild 4411 BLAKE2B 5620b59311e4eec6d759ca2ac90c3cf477c940cf064181002614ac9029de9829c9174f64ce9c313d2420a9b37e19cfee95cea6f0ce1b2e18c0aa0a0cc039d7e5 SHA512 7814093fe15329293d9de350383a40d553d5c18e85332e371bde82d96646c199aafc8932b43a1a3bab6180ba783fa2c57fae97d62761e244eed759ba9622474b
-EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4433 BLAKE2B e3cb6572ba349e08c5027196af769454dec3b8a9192c4db724fde9aa70dddd104e21b4b0ea39acc161156af0b64f3e3d354ee409240bfc100ae96e0278ad22e3 SHA512 965d0c2bb4bf5f15e71f4d4517c98a7542ed0e07a50d8070b2b97dc23f5910bf0c20b7495b2638c4a8a8ff9388bbff2e13bf62ac88548f507035a7e441286145
-EBUILD compiler-rt-sanitizers-9999.ebuild 4408 BLAKE2B 1fc8eee2b6abfcb8eb044b76514dffce7faed2b9ffe259b532ec7bcf9cd82e6507d2c48677c7483a04c140e9e3739dd01c76df633f949e6b6b450469eb4e9e1f SHA512 cb229dfe2be81f81fccba786ca02a93b59760195b773b8101ad2e9ba9a066b6c98f2c177343fac9fe20ab517ffa2af6b3d50fa59af6ecba475735af82f8496bd
+EBUILD compiler-rt-sanitizers-6.0.0_rc2.ebuild 4422 BLAKE2B 20f17d908c4a3b9aca0c3fa1a01724ea60e485cfd387bce169e848a2305bf231ecebae09cfa6c372038f93ef6e0014d5b88761e61325869e2efbe00fb18dad65 SHA512 03f1b2b2f1fe706773444ee186eba1a7c10d722ba8f321a81154d74e248652ca0aa095194d0843e317f6834fd0b9941234b70d51300a16db6c15aa52fd5bb372
+EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4444 BLAKE2B d06667426ca648d616ff3e856c55e470c134507e50b067c3b10e0e8da33ad223af1507c8f69c01185fdb22e061d2e23baffc8ae6661afc78b8ccd79c16c4ced1 SHA512 cd4eb04eed5e9e8bb01284760df56320df90f8a4bf806b88c7c8e6689a8b9d171bf32f3a92bda2f23483d50fde56159c283c2ffd6f11bb63fb433a350bdf945e
+EBUILD compiler-rt-sanitizers-9999.ebuild 4419 BLAKE2B a57ae45b316c41c3ebf85eec81d270999d6049b27cc389a29979989993ef037176547b1422fcf763a074e738bac1f10b6f566fcecad55920b25a0611c71065d1 SHA512 9aad13ba98c021b47446831396ea2f6addf7b3d92d879f7cfbb645ca86fd9390ea343435ca9c62e49b03e224d7d09aa07dcb05da8deffa2296f927638863f742
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild
index 19492d445c29..8a7c7cce6834 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	>=sys-devel/llvm-6
 	clang? ( sys-devel/clang )
 	test? (
-		app-portage/unsandbox
+		!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
 		sys-libs/compiler-rt:${SLOT} )
@@ -95,14 +95,9 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_XRAY=ON
 	)
 	if use test; then
-		cat > "${T}"/unsandbox-lit.py <<-EOF || die
-			import os, sys
-			os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:])
-		EOF
-
 		mycmakeargs+=(
 			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 			-DLLVM_LIT_ARGS="-vv"
 
 			# they are created during src_test()
@@ -151,6 +146,10 @@ src_configure() {
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
 
 	cmake-utils_src_make check-all
 }
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
index b3850e773bed..b263b10f2f76 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	>=sys-devel/llvm-6
 	clang? ( sys-devel/clang )
 	test? (
-		app-portage/unsandbox
+		!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
 		sys-libs/compiler-rt:${SLOT} )
@@ -96,14 +96,9 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_XRAY=ON
 	)
 	if use test; then
-		cat > "${T}"/unsandbox-lit.py <<-EOF || die
-			import os, sys
-			os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:])
-		EOF
-
 		mycmakeargs+=(
 			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 			-DLLVM_LIT_ARGS="-vv"
 
 			# they are created during src_test()
@@ -152,6 +147,10 @@ src_configure() {
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
 
 	cmake-utils_src_make check-all
 }
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 2b85804e799d..f83cb210e4e7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	>=sys-devel/llvm-6
 	clang? ( sys-devel/clang )
 	test? (
-		app-portage/unsandbox
+		!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
 		sys-libs/compiler-rt:${SLOT} )
@@ -95,14 +95,9 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_XRAY=ON
 	)
 	if use test; then
-		cat > "${T}"/unsandbox-lit.py <<-EOF || die
-			import os, sys
-			os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:])
-		EOF
-
 		mycmakeargs+=(
 			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 			-DLLVM_LIT_ARGS="-vv"
 
 			# they are created during src_test()
@@ -151,6 +146,10 @@ src_configure() {
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
 
 	cmake-utils_src_make check-all
 }