gentoo resync : 10.03.2018

12 files changed, 64 insertions, 13 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5d4286586de2..9ca8661aa224 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 38faa1205cfa..4c28428eb0c9 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -11,7 +11,7 @@ EBUILD libcxx-3.7.1.ebuild 5335 BLAKE2B 6f4dbbb8dbc7f6e8b97f05ff3e638bb037bad416
 EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
 EBUILD libcxx-4.0.1.ebuild 6301 BLAKE2B d4a17d742479e7532c986046fe12b4aed0d1e59faaebead864f7e3f91c4be82aa5d708a7efe2038a146151d10530b0f31a34006e8af6c4dc24f18537dc8c0feb SHA512 8e4a82071fd5945f7876adc9cd20ed2d35ee952711574e8ac2b735d60299b480e269b07ad829c015377c8042a54b6604ffcfe41f98869b25844c00b62bec3b46
 EBUILD libcxx-5.0.1.ebuild 6301 BLAKE2B 3a8fc402a70214032823a1590a8ca088e16bb84ad0d75acda69c9dc306747e8b9c9fe48179e3c9481765ab656217a7f76ecee9c4a1d6a61d9923fad7c624d8c7 SHA512 ffe69b27e9358cea5a31b64f6a1f335565b2229ba6ecfad5636b813df174daffa6a2ca6f47f30da1d7e833aea803ce2be1e3f95589a379af4c138c212bc0df64
-EBUILD libcxx-6.0.0.ebuild 6260 BLAKE2B 1fe2c19c9647785a1d74df09134a1e0a7613459489f78481ca3feea6fcc63801db5c804b48877acf73a220d357e2fe0b56d414990a3b340c98ab9a6e7b827655 SHA512 c5e9584950341719275184a5d52a94743bd312c04e630658e428ee18fb591536441fab793a8bea1677dec6d4f6657cc117771b83998e1eecb220c11a4be55af1
-EBUILD libcxx-6.0.9999.ebuild 6578 BLAKE2B 0f6f36280e4b525551a8105556f9b7e3a4fb54fc044461d9fd41f2380cdeef2022d0143692b2652d42160ec955963c6b69e3192c5ac9d39aaf11573a4c9b0142 SHA512 7fe8bf31c0ef5e62e904b19b045dbd746ce9c109a4e723c77e8a556f787abea60b3999cd1095bbee0ba3d03252069a804843f2fb2b76dfb5de63f926b2edd110
-EBUILD libcxx-9999.ebuild 6550 BLAKE2B 8c85f392d8bdd4d9c69f7b58be8f01352c5715de24f4461ddb63a2da49c5773b2796b0a6cdb8b77f511c2cb8c14b1a2e13f5758eddf0c01aa3bc892aaeca2ebd SHA512 72f98b822d320848d45a5f7676dd462dd433d07b8eff3b3c61b16c4e684f244ba83c6b0d4d008be858950a655ae4f28fa58667a238c84e38af88a4c5a768278d
+EBUILD libcxx-6.0.0.ebuild 6702 BLAKE2B 07ecb57d7bb8e443dcd67f1264aaea3506c2d0542bf319b51258c09c687f7703776f466e37c066d15e7e0af855c9c8dd49125db1f1eb08096d1b3e89f7663ebc SHA512 6f0f5db33afa4e1b837f37ebd66a8d5115217d3c622f076a208f8ce83aa18465ab49be81c0c25bbe51aa3afe5de9ccf578bdb18ff526ce76103c1e877c83f92a
+EBUILD libcxx-6.0.9999.ebuild 7020 BLAKE2B 550b6aba9d3bbdb22a57d989795461d5dd723061623673637f81b0a0847647ce77f5540831d17c86ba26f8aa4571d42c77c0648de85e8aac7107d3bf35981895 SHA512 9e408776b6c6a7806d04ec96d205887493a531691711cfe4c676214c33f99c1494aaeb25307c09c8606c073c10c6ae6e6a894fb958488d2dd41977cfdc0fbdd8
+EBUILD libcxx-9999.ebuild 6992 BLAKE2B ca6c1858b79b56d987ec0ea9aea817ffba40aa9b6a2eeac7bfe3b1303ae849cd434fd0044688fd2220b3940dc52a35d3ee5f1939e030cf3181d5528351ad9604 SHA512 f8690d503888b03b511eae8575b996764ee5c2d4cc7d9afefea9576d635736d653655306d7af1c4028497aeded6e2f423b8ba6dcd08f62a79f0ea846e9532cbf
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-6.0.0.ebuild b/sys-libs/libcxx/libcxx-6.0.0.ebuild
index 9c9b75e3d7f1..0948ab0c6825 100644
--- a/sys-libs/libcxx/libcxx-6.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.0.ebuild
@@ -73,6 +73,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -109,6 +114,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/sys-libs/libcxx/libcxx-6.0.9999.ebuild b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
index cf76bba5fdfd..4e687c722c60 100644
--- a/sys-libs/libcxx/libcxx-6.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
@@ -85,6 +85,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -121,6 +126,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 214c61d31f67..f304a076c171 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -84,6 +84,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -120,6 +125,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 4e3ab1939aed..56e00aa40454 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -12,7 +12,7 @@ EBUILD llvm-libunwind-3.9.0-r1.ebuild 1182 BLAKE2B 8a01875c7c57c4c4052d0bc680794
 EBUILD llvm-libunwind-3.9.1.ebuild 1187 BLAKE2B adc3bdff94f0b5a855c4d6eac0ee123dbdc845da541d06fb6f3d533a0375d969427488cbbb4bcef4d545c8e6993ab4c78a8c5f3bca9f06f2b36a84199e471b0c SHA512 bdd65eb012df3af046c71406af02927255f3502aaf92e53fa9dbf2adfa0150b68e4325cfef2f07d1893738ba6ba3f009a89e37861ffe7999752ea77fc3963a0b
 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.ebuild 2260 BLAKE2B d57d8c27a2ac3edade766299d871c4ef4f291154243f9193f54674a6988734553a0fc5a569e4b494eec03666f30fc08d2f63a9d8de7ad8163f0c1edb50541c31 SHA512 3dede49f3d05ef64618d2625a3ba3c1bc22b6c30c91fb5f4f6e0366a4b282a202e0fca46fe1452ee454bba01766cf5f89a9f52dc3d95ea266875e1680411cadb
-EBUILD llvm-libunwind-6.0.9999.ebuild 2215 BLAKE2B 4a0d306187646c947e9cf5a61e4d4a60ad07e9d740045802cfffbe4e7e746ff77bea88050afa181ba6e5fd26a26fa90aeeffdb066431d457be436ac0119ea711 SHA512 deacaf07724777d15d9781ce3d352e3ff4bea79f1ccbf148e2062dc9955c67a72af661ccd271f5cfdad208d52737d1a7116b73b3e90af71c1c7d752a05079bdf
-EBUILD llvm-libunwind-9999.ebuild 2190 BLAKE2B f244aeaf432b4a8442cd8c3683dafca81da78900e622e27b41624af62990ed11077351f7df8db4aa69f5750a4af1f92adaa58242e0854fa539ad360f7b519f66 SHA512 7b7b37bb7c0e3a7f3546947e8b51edb8a81553a63112d39efcfa772a52e2dabbf4b13e22c4b6695b52f163798f33f8d29f28b135eee5a2bef39d96a180299885
+EBUILD llvm-libunwind-6.0.0.ebuild 2400 BLAKE2B 625b6c19ca4d92a67beeb162d8dbb464e4600075f7a637c31e146bf39a0629bd8be754c8aaab08d0e88819a4b72153564fd21f45cd52fff31cbc4d86cc6b074b SHA512 521ffe875502c5f97990a89cf2f4c1089757d37cd48e9eca5a19db39286cfe44f257420dfece844fc1a06aca0bfc9678a1285b64e5bdd8f8f15a5a2fe4466a56
+EBUILD llvm-libunwind-6.0.9999.ebuild 2355 BLAKE2B 9d4339c8b1f716a1062948c179198d2499d4831aa9ce2805c301831dc27a5839f15bcdb0965c4c6865d7c528d04f0e923f3cf18aff8948b885cf800a9ac6ed82 SHA512 3f5bde87934cc8a21eb8b4eefba1b5ecc60bedbd6aef3e98ddbd313acab5b2d30d3f0aca75dad890053824b2220ac5ff714ef9e4c1be2e1b65e4b6bdceb8b3ad
+EBUILD llvm-libunwind-9999.ebuild 2330 BLAKE2B 477d3a8aac1fa2434121e516df401c8c174b088d67e111e7e853e6770df93c14bb0ce48f9a31b80b45f980e31ffcb197e0b804b010dc191e1d41467218c332ed SHA512 a911d774c6d313a1002fefc743f3057d5ff23ef89f611a492f975a44f58a3c3b84c332759c869e50f4a2d2641b21c9c0bd3d7a8101593d4a0114a33a164a9ddb
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
index 45ca2b2e5f9f..db6bc3cacf89 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
@@ -25,10 +25,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
 	>=sys-devel/llvm-6
 	test? (
-		sys-libs/libcxx[${MULTILIB_USEDEP}]
+		sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+		sys-libs/libcxxabi
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 S=${WORKDIR}/${MY_P}
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 789d9a6d71c7..6eb95d733fc2 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
@@ -24,10 +24,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
 	>=sys-devel/llvm-6
 	test? (
-		sys-libs/libcxx[${MULTILIB_USEDEP}]
+		sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+		sys-libs/libcxxabi
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 # least intrusive of all
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index c16358fe4c62..387b8c31086c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -23,10 +23,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
 	>=sys-devel/llvm-6
 	test? (
-		sys-libs/libcxx[${MULTILIB_USEDEP}]
+		sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+		sys-libs/libcxxabi
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 # least intrusive of all
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 59fc75cea703..f6e08060a56b 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -2,8 +2,8 @@ AUX uclibc-compat-r1.patch 814 BLAKE2B 75fe9c5321171f3e378200e1c4d11792b3ea047fb
 DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b
 DIST uClibc-ng-1.0.28.tar.bz2 2299119 BLAKE2B 1f31b9a98fd669bad42ceeb1b8c33fd65994b0252707b532ad8a71c12f8bd0c4d99bc89ad919a1fbc2526efcf25d2e9f823f889c7c009da98e861269399c97a3 SHA512 9e77fece126b6ba6f9903a2fc5689a9f7efb335e38914a3806a7e0831033f5373a4b07e942d28876ed81a6a80b2d64b0fa122dccc4874db263d2d5fb7fef99ba
 DIST uClibc-ng-1.0.29.tar.bz2 2290382 BLAKE2B f6968397daaa66d75dff5508bdff4a3d05453a0657474b9ff167d14a0b0d715f22c61708060243efd1064922b4dd1e84987fe9cf1b13aa7bdb85e27b8c65a3b1 SHA512 7ab00f2a1c7a87f8d35b7bc51b7a8ad0f9120d8c117be8c03720c09b17d7f9f8b8a633ef7efa3e69f8d292b0357580f055f1542ad2257cff337056c9d3b5e207
-EBUILD uclibc-ng-1.0.26.ebuild 10508 BLAKE2B 92461db708d970ecf2984e3bd735ae7f19296d9aa5cc5389c94e41782d88b254685f1b75357bb0f4a24077399e3b934060477792bcba4b8749d9b3d63b778f88 SHA512 8816ce2bd8cc7fd91e353c832fc6437f8e00623ac129b4d1fc20258ddb143dd7558e612102289c6143909168a558697fa275a49545ac2ca23969f5aba7ec66f9
-EBUILD uclibc-ng-1.0.28.ebuild 10280 BLAKE2B 03370b6f8a7c84f8a11954ac54ceba548ef17dda02edc6e34a3c27d97823bd7fdb2bfbb5a5e1c6835cc529112d35a4d27c8dfad173b83de13404fbfcaf5a3a6b SHA512 e69a80bd2898493c66f2c4a1ed46a2d6ce34ba1da5e0811c61736c0e77c00cd4057cdd3c79b48d617a66ef2845e88d7adade6522f786fb15a57f735a4fe1adf8
+EBUILD uclibc-ng-1.0.26.ebuild 10529 BLAKE2B f8d3649613cadf6f30ec12d28cdf14e7b248982bc900da406bdefa291cc2fa90255dffd60f6e5f9dc41b811a21e6fc58b0b818755ae953c7a8849eaad4d143e1 SHA512 fdf65a81b649543661df14e6a50416d30694acb96a59bf6299cf3b0a83c40af0bd38aea9a212d396eac4ec0881bbceb84dcad374117db214a33ebfb74369300a
+EBUILD uclibc-ng-1.0.28.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7
 EBUILD uclibc-ng-1.0.29.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7
 EBUILD uclibc-ng-9999.ebuild 10283 BLAKE2B a1c1c9ccdba9161981794837d8fabe8496e3f6259044284c6459523b61f30edc3e7d6980372d69eb8830bf54e6ffe74ea6fa112e872a46d29d800c7295a0d5d2 SHA512 6e2b12bab2783c9f7e746e389a548a50a4238c3e8f29e80b0b8f178954470fad2f5294a0e18419a10a8f5f2464ed37be283e0408ffb47fdb500b401e6ba3b3c7
 MISC metadata.xml 877 BLAKE2B 191277020e32edd39fc3a1594aaf3fad65ca7b48a2f0df3f0e381d3c7cc5451c09f9ad87a6da9e75b146c2ebe209918d699519582fc64fb8c3b7ae2e51eaf507 SHA512 3988e346916b283836e5c3d094eec4f25c66763e4e10a6413fe97f98629e1f14b67d6013f13f9ca2e2712dd638567973c02e6ebcce3554c55caf5483c3c9dfd4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild
index 6ce66393dd49..f9471f6e42a4 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ppc"
+	KEYWORDS="-* amd64 arm ~mips ~ppc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
index 6f75777134ce..507f8c13ae96 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* amd64 arm ~mips ~ppc x86"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
 LICENSE="LGPL-2"