gentoo resync : 24.02.2018

18 files changed, 244 insertions, 43 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b46fb6288cb9..2a906d51ccd7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
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
 }
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index f9c8b33836c6..133e3db37911 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -5,5 +5,5 @@ DIST libseccomp-2.3.3.tar.gz 564546 BLAKE2B b5249379baf07ab2fef8a8659a30c9e87cbf
 EBUILD libseccomp-2.3.0.ebuild 955 BLAKE2B 4f8809c66da37cb71217ed72bf36e8bbc8813065f1b812eeef1b309fca18b0a8a4a39b613a6a79d41914655778a2ed031f5948f496027e98fda62a84b190dde4 SHA512 cef9191e4a27650afb955eeef4ae61ac7bf5ed8e08fd39e4645d0fb7658c4fa6f3896b5f6105054da97eaf63158ef778f58f2cb735e46ea774537533c9726dd8
 EBUILD libseccomp-2.3.1.ebuild 962 BLAKE2B 0f260d292b8dfd9541f94ad860425805f615a08d0f6de9e7e39faee0ab46b48bb1d7bc820bb99dfe1fe6ffffe3c8b083f2fdadbdede05d3611ed7d9f9e177194 SHA512 58e7fd61a982923ced093c7a861b15838f38fb0fcf64fa87e3a6669985ba28e4b30896e76c0373b9be42a9bcbc6e71393dd31a50ed090441fde2cc707481a208
 EBUILD libseccomp-2.3.2.ebuild 955 BLAKE2B 76fff8e11b0113a29570b803c7cdc41fc63b5da7b393d8f6471df7b0098a6f6cb0d7a6901407597d261466fd0e9fa77eef25d4ad318085566d202eb7a1c2254d SHA512 e9c95226208a53e73e57dce5bea09c74b0e66fd373d8ea5b3fabfb21af078add0c3e6577525c9b17d25699243ba157593f069e2067001be21e22a2347f5c9b35
-EBUILD libseccomp-2.3.3.ebuild 962 BLAKE2B b034890aa1e4dcbacb0e04c7a7a33acca727582de2751d2c0f70a5e8317934e344a50ab94505050246bf13a42c4630b9a168ee52186bcb3ec35e33217989bec2 SHA512 632feece839172dc327d47cb0367002f558f3c4d44de2ebcc69fe7068ee1d60c7de2424bcdd45887984aa9c812031de15d43d948d4786a2d871bff1a9f72678a
+EBUILD libseccomp-2.3.3.ebuild 975 BLAKE2B d724fd625685ee55831ced527b3cb1916e2dbec9bcfe4496d21a9780576b70f7279299d2ca81a612f0e45e871339e77c19d296d05421ff365742df2f06c6b848 SHA512 9109131aa983bc1b7a25971c9d061a4fd4cc660710d18e32106c57ab48dd9b5248e0bd624b59f868b7a218ca5a93c710299b4484fb961d6d1fc920aba464a9f0
 MISC metadata.xml 305 BLAKE2B d660c00d553100c2dc8deb364d56acdef4771051f3d876a63e7264a501653ba539840ccab398e834428990f3c22accca16a34a9d64f433f5258656c5085a3dae SHA512 5b35970c91056a844e76bfd8e3040f58d38784390fd7fcbd881bfd3eb11e7c4c01c16cf4e320f19aaca494c715037b142e3ceddf6a28b1f272b7b01b95cf3ff0
diff --git a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
index e70326756c71..02012e60dd28 100644
--- a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index afacd6b5f2cd..0c77f3175c36 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -13,6 +13,6 @@ EBUILD llvm-libunwind-3.9.1.ebuild 1187 BLAKE2B adc3bdff94f0b5a855c4d6eac0ee123d
 EBUILD llvm-libunwind-4.0.1.ebuild 1094 BLAKE2B dec5d0847983833e461635ac5711b5d253963650aed87678277bec86d1334ae9348d26605e20acf2a8d2405e891dd10c9303abf7d243ed86e36c8f3e3f12b83b SHA512 3fb7283eea0b4282c549d7cf2cee1aea0f9d28b7689f5b83a32893c32ebfabc703eb0328593109db96a86351b639bc3e60572c7de93fbed18dd359a14b352386
 EBUILD llvm-libunwind-5.0.1.ebuild 1094 BLAKE2B 3378498096da36b9cbd6e70c9f2646cf6215f6d964e0a991e389c33af1a1614bc0c0dd404b58141d64513a22709e1755c79f4466b3cf7b43515f623927f766f0 SHA512 cd9740fad0a59488d543fa2af2a2908457180840999d463071bb557d45214e0cf04069f922e90e0a3b3f8144b8966d2f3564c098561a2ae0511264d1eb2b104a
 EBUILD llvm-libunwind-6.0.0_rc2.ebuild 2175 BLAKE2B 0dc3dff5bb94741e09cb646145d697edd692835a54c80b97eb917ee32eb191f42e121ab397eaf5c50347a149d0ca63a4bfca4b0bcd24cd3838423df77cf11b8b SHA512 72d4c209f41a30d54cdb735afa1767460bdc3451eddf5fced9d3919915e2dfcf0d5806e996805bebd88f88a6501784182743c3184d26217bcc80ee38905c9011
-EBUILD llvm-libunwind-6.0.9999.ebuild 2113 BLAKE2B d590daa466f0c7197e8e88b11ecdf8e801859df58d7a65493da9fc94d5283101a4f7529f646cf22bcdcfa2850c998ae3589ef7d9062eb0c12f95391387b60e9d SHA512 0e8c7c9978aa44ec585d3d061f8656d173647318ac5be08ed50956cd598607c5b21084a28c9afcbbb27d014bb56412aacb6a252be847d955532288717af4c498
-EBUILD llvm-libunwind-9999.ebuild 2088 BLAKE2B d33a29894d277e5a1af4f1dd10e30614fe570344581c8ad19e78c8e8cf60bb96c28bec6b7a74d6dd66a426c818f95839f1bef5423b5a52be64ac14462cb9fece SHA512 6b6417e4966964379d6a813811fbe1bfe3f7a8218f96272cb362295aeb57d5a4386f3a0463faa10eb17762bc08788934af75a5dc03b5204b8032d342498a17e6
+EBUILD llvm-libunwind-6.0.9999.ebuild 2137 BLAKE2B 3581b0abe1bcc69f9fc58fe22512ca5f4df324442c83d0eeda14e0f83eeb5816935bf740a8304faf40b4bf751279cc1526d7777a2baca0f44133406c01b5ef98 SHA512 7221f66dc3daf371e5a88a63c35c0e6314430bc9a469520e0b55d0d69baa7a2687264c4812bae1748540c31b48de2e537231741bf6370fae5a0e40fad23e11a9
+EBUILD llvm-libunwind-9999.ebuild 2112 BLAKE2B ff52df299796ba3f94c7ee105430c2c037f4151e5e72bb3e1c795f6ff20cc59c3bbd3c3a83e823a23fbd4e311b2b9b64cfacd19ee6210f4b514f9d6c8926103e SHA512 768f695e7a862a3fc7755b522e7be5c03ff472bdad79881913a78890544c8ffe141ec18ed94175cee995a6c60dd9c6397fa5d9f29d56afe4bf23f6269f453304
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
index 7523ff7bd6f6..87f9ee1eb39b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
@@ -43,15 +43,17 @@ pkg_setup() {
 
 src_unpack() {
 	# we need headers & test utilities
-	git-r3_fetch "https://git.llvm.org/git/libcxx.git
-		https://github.com/llvm-mirror/libcxx.git"
+	if use test; then
+		git-r3_fetch "https://git.llvm.org/git/libcxx.git
+			https://github.com/llvm-mirror/libcxx.git"
+	fi
 	git-r3_fetch
 
 	if use test; then
 		git-r3_checkout https://llvm.org/git/libcxx.git \
 			"${WORKDIR}"/libcxx '' include utils/libcxx
-		git-r3_checkout
 	fi
+	git-r3_checkout
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index 60a321c7d609..02cd558be9ab 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -42,15 +42,17 @@ pkg_setup() {
 
 src_unpack() {
 	# we need headers & test utilities
-	git-r3_fetch "https://git.llvm.org/git/libcxx.git
-		https://github.com/llvm-mirror/libcxx.git"
+	if use test; then
+		git-r3_fetch "https://git.llvm.org/git/libcxx.git
+			https://github.com/llvm-mirror/libcxx.git"
+	fi
 	git-r3_fetch
 
 	if use test; then
 		git-r3_checkout https://llvm.org/git/libcxx.git \
 			"${WORKDIR}"/libcxx '' include utils/libcxx
-		git-r3_checkout
 	fi
+	git-r3_checkout
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 7e9d91437fb9..51377a9b4a33 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,6 +3,8 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
+DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
 EBUILD musl-1.1.18.ebuild 3046 BLAKE2B dd3ec79934c99b2bbe10d34d6efabe818fc1e94320fd44779a1ad6394e16bac0ac077742cab1c7ceaf554ab74d9825386d63cae95814ec564e5f92636fb52fcf SHA512 6bc48fad1aea48f7cc153cb82ee0cb1b08bc396f66ef6731fcf5e668e58a4154d2f404ed197b6be6c26449f71bd3479c0f52ccb51984ff9af45d04cbf4c47f1c
+EBUILD musl-1.1.19.ebuild 3050 BLAKE2B 335b607d9582f68fbe58fbad77f4e23a17dfbf69af214560f7195bb7480946fc9f77cd1f608f465942793488347eafc69a890da90c96720494fbb87bf92103da SHA512 573aa0de46f552ee99cca7621fdcedb000e2ddaab25f84fd5222aff399070914765ab69f29c03b9adde37050464ed1beb518016b4a2f32037a4d126c53f59050
 EBUILD musl-9999.ebuild 3050 BLAKE2B 335b607d9582f68fbe58fbad77f4e23a17dfbf69af214560f7195bb7480946fc9f77cd1f608f465942793488347eafc69a890da90c96720494fbb87bf92103da SHA512 573aa0de46f552ee99cca7621fdcedb000e2ddaab25f84fd5222aff399070914765ab69f29c03b9adde37050464ed1beb518016b4a2f32037a4d126c53f59050
 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
new file mode 100644
index 000000000000..991afd750a8f
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 2d6d7cdeb57c..3cd8bf33822c 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -16,5 +16,5 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
 EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8
 EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2
-EBUILD ncurses-6.1.ebuild 8772 BLAKE2B 28cc7403d9634ecaee2f5914884afafb397abad470c32c6e1454bb9840da014fcce4b2497eb2ed5b8d3156866c6f9cb53867e8f3bef2bb31053e3d51cd4cc710 SHA512 3c4fc9aed4015d0825570e8ddeafd9d1aad53820f00915e58fbfd9a8bf1624a1cec3f333ff780c4bbfc52d647ccc24104bf5c62271284bd20474876c1989dc80
+EBUILD ncurses-6.1-r1.ebuild 8505 BLAKE2B 5330f9fb2d1d70db510ecae0f6b3665d9e103561954493ffb2d27ac349a8526edef086243780bb321222ce00e312797597d4dd8ad1594a250c1e1c160cecd953 SHA512 30039fb4482cc65dd08b4fe848f1fe524cce73876fc8e1aaaf0e7a2faba626e4b49c3b3ee328231e80038d70443949eb98f472c95192389fdf4dcbe01862b227
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.1.ebuild b/sys-libs/ncurses/ncurses-6.1-r1.ebuild
index 1e12299cee0e..fffbdd92da9b 100644
--- a/sys-libs/ncurses/ncurses-6.1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
 	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
 	!<x11-terms/rxvt-unicode-9.06-r3
 	!<x11-terms/st-0.6-r1
 	!app-emulation/emul-linux-x86-baselibs"
@@ -113,13 +114,8 @@ do_configure() {
 		# Disabled until #245417 is sorted out.
 		#$(use_with berkdb hashed-db)
 
-		# ncurses is dumb and doesn't install .pc files unless pkg-config
-		# is also installed.  Force the tests to go our way.  Note that it
-		# doesn't actually use pkg-config ... it just looks for set vars.
-		# This is fixed in newer versions:
-		# https://lists.gnu.org/archive/html/bug-ncurses/2015-08/msg00026.html
+		# Enable installation of .pc files.
 		--enable-pc-files
-		--with-pkg-config="$(tc-getPKG_CONFIG)"
 		# This path is used to control where the .pc files are installed.
 		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 
@@ -152,6 +148,7 @@ do_configure() {
 		$(use_with test tests)
 		$(use_with trace)
 		$(use_with tinfo termlib)
+		--disable-stripping
 	)
 
 	if [[ ${target} == ncurses*w ]] ; then
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 7bd86fa23ae7..691ec2163401 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,6 +3,8 @@ AUX slang-2.2.4-memset.patch 1054 BLAKE2B a4d013b70719de8ab92fbd04afbde87b6be519
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.0.tar.bz2 1532986 BLAKE2B 92fe1338c2f07e78fbffd0435252a75d8158ae0ce6da9cf95cc553bcd8bdd393b7f1c975d516ab732805a006a03db963651736027e052c156910393443053934 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050
 DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da089b9e9a24d23ddd4958cbc43c729e42326b9e487f6356989434ad3029c1c7ae27b49b60b8e9598053cb24f043c8 SHA512 e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7
+DIST slang-pre2.3.2-23.tar.gz 1990343 BLAKE2B 3b5ddb9dd5238f4db69afbebae1d72facf8691521a55edb59d1b1e41c0c177c8275f1fff7854a94fde50eca15b5d5efc87e4d1e5b114d93c9d8c65693152b5c7 SHA512 8f8c7fa0c8a89d15648b4bbc93c39fe9915a118676f0a4d69a92a85dd5335b3c413e6068f43bc827844f83d8f26a1d6885c8250d050f337f36dfa3bb4623b277
 EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661
 EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd
+EBUILD slang-2.3.2_pre23.ebuild 2302 BLAKE2B 94f3bf407f5b5b33b2836accc9b2dd4c52b1be894fec16895afc7f00c22865ec8582fe3b35656f6bbf382ad20a815bab9f96c6c8e566e0b269868f3d02143c59 SHA512 c3c5a4b4b0453c1d60da857e4676ed4ce964f94e0f613d9dc62395d70d643c594923348c477a984fe744bc045116836f07a0c42439a418ba682c96d5c34bb75f
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2_pre23.ebuild b/sys-libs/slang/slang-2.3.2_pre23.ebuild
new file mode 100644
index 000000000000..eee22b8362b8
--- /dev/null
+++ b/sys-libs/slang/slang-2.3.2_pre23.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib-minimal
+
+DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
+HOMEPAGE="http://www.jedsoft.org/slang/"
+if [[ "${PV}" = *_pre* ]] ; then
+	MY_P="${PN}-pre${PV/_pre/-}"
+	SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+else
+	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
+		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="cjk pcre png readline static-libs zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="
+	sys-libs/ncurses:0=
+	cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
+	pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-slsh-libs.patch
+)
+
+src_prepare() {
+	default
+
+	# avoid linking to -ltermcap race with some systems
+	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+	# we use the GNU linker also on Solaris
+	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
+		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+	# slang does not support configuration from another dir
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-readline=$(usex readline gnu slang)
+		$(use_with pcre)
+		$(use_with cjk onig)
+		$(use_with png)
+		$(use_with zlib z)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake elf $(use static-libs && echo static)
+
+	pushd slsh >/dev/null || die
+	emake slsh
+	popd || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install $(use static-libs && echo install-static)
+}
+
+multilib_src_install_all() {
+	rm -r "${ED%/}"/usr/share/doc/{slang,slsh} || die
+	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
+	docinto html
+	dodoc doc/slangdoc.html slsh/doc/html/*.html
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 73973965a085..c761569fc594 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -4,5 +4,5 @@ DIST tzcode2018c.tar.gz 223876 BLAKE2B d0eaf4094c786a71d0ea4bbcf974044790f2631af
 DIST tzdata2017c.tar.gz 335571 BLAKE2B 466eefacd5600d15685d973b16d98053b3610efd9a1a9c7c7f1f384dcde8950d037c25ef065a85876433f9e9483fa72c46bb28f9c4225c7fe38a6376ada91132 SHA512 feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
 DIST tzdata2018c.tar.gz 341074 BLAKE2B b2aff97cd4e9e094e4de93245e80b04c8aa4764199320beaf02633d16e230fa75908e5f088e67d837d91c7cc6b7a2757f90815fb7a439f35a73d9f59954a7016 SHA512 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
 EBUILD timezone-data-2017c.ebuild 4643 BLAKE2B 839382769d486bb6af71e13f9d80e98a4bc32c832b2671ff9b4f7693420cf3d95675abde53794d39bab20e378ca3df75794860ef29237dea88f01d154e1b5f04 SHA512 3a21c9c3ab764080539ee184a349a189a9259d1878c3af016f984eaa46e16ad5f0227d8cdcad26cb2b8466328298c597ca0ed4e4b0cbe33b9097b237d8a35642
-EBUILD timezone-data-2018c.ebuild 4983 BLAKE2B ac27b2aa19ba8b2c32409fb1e51c8bce73315697fb98c0dd074af10c63675872d9a42a72e5371f1427652d1de224de1b3d37d768596b7fc7bf0b7a385ea7c091 SHA512 6eebd82881dba5450a1ea846bbbd47f2f55f8dbebde6bbc57c099d4e8b312fc22dc9eef5c41170c26677d449fa06de135ab4a06e4c8f3e093f5e25886acb9e3a
+EBUILD timezone-data-2018c.ebuild 4987 BLAKE2B 7a096ff1b487da2683ffa6dc899dcce1d2e9d68083be53c20b374ebd43e7c8b9804d0128fd0ae22185c0adabca20970c8ddab510103b0343f2d524546bf0a71d SHA512 d6f514b2c6bf58a3f39a5661fa569c6f0bc7fcf8a3cd3d695422239b0da39cbdbd458d9904003be672361deaaa35fd253d68401f00e98b6eead79699cd7a402b
 MISC metadata.xml 658 BLAKE2B 75ee5deafa4e9c1336119b2b2b87de6f8520a29f8fa7901c4995bddbb0cb185de9a019ff7703d0a8aa7b2f685a9ec2ca518641ea0c0a1b6123aa05faa04274a1 SHA512 94b68a5195b17cd1a7283a90a42ba9e1dfb0e7dde7c16f48202233cc2fc20ea718a1588b57b2af372e3c35ed403276cdd59456165a225f149a813abff2144c73
diff --git a/sys-libs/timezone-data/timezone-data-2018c.ebuild b/sys-libs/timezone-data/timezone-data-2018c.ebuild
index 7f59f932db46..3ce4d9cbb229 100644
--- a/sys-libs/timezone-data/timezone-data-2018c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2018c.ebuild
@@ -80,7 +80,7 @@ src_compile() {
 
 src_test() {
 	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
+	emake -j1 check VALIDATE_ENV=true
 }
 
 src_install() {