gentoo resync : 08.01.2018

37 files changed, 141 insertions, 107 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 070c659242bc..cfcf9f4dd60e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index fc9475230bbc..02e0fab8cb5c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,16 +35,16 @@ DIST glibc-2.26-patches-4.tar.bz2 315447 BLAKE2B 038926c8c187cfea5c00a7017a48635
 DIST glibc-2.26-patches-5.tar.bz2 357699 BLAKE2B 98a0cb231bf35a132747f1fa6e654a9ad2eff8b445f002a0239c9a45f5a896ad490570aedee2b43e6cfa94794ae5c8b5e312e369838c3770823f28b61b51b592 SHA512 0040469e4a85f5c2aac972e42aeb06b0adfc3a132b32b19306be9f1877339fe6651a2fbd4d90d502b07ae4460f74efbd1cd103d38a2038df9402b0a380f03c2a
 DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebfe3c958107032beaa879710252be3bc4122bb62166408725d43785f233544df6159d29cce0fc5b2c08f45adbe SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0
 DIST glibc-9999-patches-3.tar.bz2 19892 BLAKE2B e0a51f376e7142f56ae2a0862a7723343ee378275c1a0c6c3a69607b5bb7f9bd655f0a68f8f9cfc32008e06852d0eb0a9e16c85ea9a395dc36b428f1ea6100d8 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596
-EBUILD glibc-2.18-r1.ebuild 5550 BLAKE2B c80fbd78f3b30381955c44fb7a5a665edec188c46f732651a843974905b306c4a895da398302eaad1cb37fa9de092523bd18cd4a1bba9eef1bc6ea1de82ada66 SHA512 c6987e27573579da33711c68a1ce1e0c4535874666f50a149b9e484c87838e3dd1c7376c2cb15a6d85e1998a4f000660b5b4e659d37b4526e1752ea973046fb2
-EBUILD glibc-2.19-r1.ebuild 5507 BLAKE2B bd16b5c32abd24fce12e0a979d5ee76bc06c2a40f79b5e70af617293ec8e1a05d99ea5179aad1542f33f2462e27d83e8c80e777b0f51f0a093ac20504c05e40f SHA512 122c3628afa6e08a5f9eaa08cbde7cfa21ed47decc935634184541a5e5192a778524c99aac20c534a4cbd494dfa474cd152dca74012131419eaef52d6409ac1d
-EBUILD glibc-2.20-r2.ebuild 4983 BLAKE2B 6176a2a403ef60a382ec0e163520b0c6508b32a1c3050effa684633db36dce3d8c0a8533f5919acda470a1ac61470f932a9b817578821f92e137a335cb029a9f SHA512 29fd2fc8e0bdd875aa439bec4ab58e76edd40bc8ec7f5545d85be5b45e7e572356f71c5c06b5e48f0e6cd0efe61766f8f789a39aa222840143f2389f95b6c484
-EBUILD glibc-2.21-r2.ebuild 4958 BLAKE2B 3f381766fa48659813891bb738ac48df39737c43416d04323ab07e02a05c2df73b5e1a6e6faa073eb671240a213a84adc0dad53fbbbd1acab28aef7d8b3bc808 SHA512 4e95449753ac9043ae7b5db1442f05106bee6237d24529e8cc0bc4ba1270937a067d25a9c90ccc357f8d38d8bc6be9c5c9bf52472c8adac9b5cc9c8c415cc8f5
-EBUILD glibc-2.22-r4.ebuild 5009 BLAKE2B c627e49eef4e48b62d1f2f464da61f9d77de1f3c7fd895bdc4013bf716883ba3b52a360e8a72d295aac8e48f481fa2519b77fb64b89cefd49f7468117b189c97 SHA512 740e963131bbebb20614a9cd27b09a3a1707f91bb83e1aede168156e15cc546950b5c2e6226d44c879b2a4fc8ab96ce9d648d9ed3b67cb2c06d6868a0a3bd3e0
-EBUILD glibc-2.23-r4.ebuild 5011 BLAKE2B 5b002c214f74b9eeb1c5898c32560bd7b8f865138fd7c4851887f3f81be98635285344eca8cb88264b3b527b8a3dd1f03008beb642461a8fcb98ea309c08ee3e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221
-EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92ab239a6086164593b63338cf7a841f3cde2891cb108859ea41d2b9993884411d132a8db787d2cc06e9a7087cdf SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2
-EBUILD glibc-2.25-r10.ebuild 5048 BLAKE2B a76422a369612b4815dbd6c06ef1f0b936dafd036858de524883406ba2b3aec53968a194b73c66139ada14cdc8ad6db296fbd4b4e44d8aa0e4931d8440d6f6ef SHA512 584c55bd533547d3d81486d0f959d382b41b424ae063d7c2bdb963f1a403bb0ee2022c692b3b8f907691bcd9c2b31828483f4eb3501580f72b0e5c7c1bb24a21
-EBUILD glibc-2.25-r9.ebuild 5038 BLAKE2B 6bf0e5ad7ff8403fdf35e001418446cb5bc09c4407f28ee04be3e5bf0ab3bb5da57128cea4e4943c81a615b7704ef4e1805d61540b39702702da3723eeee8ada SHA512 e28ab996019d8f3b80523ca4ae2c42857e469ce61eb01d1c248699a37d141223bac5c345b14bd50d18fedd173818d6bc94ab0bcd37aa565cd695bdbbc7dd7b6b
-EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
-EBUILD glibc-2.26-r5.ebuild 25579 BLAKE2B 8e1717b52232878c58a752bab7f0216130ba67e8372b4d4bfa3dbdb8f4f30bf82d09afa08bc0e09742a5f4a9c408558921087634740719cc46a214b2635f149f SHA512 db50eb559993b128ed09c22c258b051849720f3cc0d72867ddfb76c8b99c90602d279a79f7dad958e58c237e28903424477fd1f980ddc87080719f96d9123970
-EBUILD glibc-9999.ebuild 25821 BLAKE2B c52ab7226bd30f3d3cc674575e8022a84c040e04ae5221ef7e479c71dcb5d74c7d721a8d02aecee42341dbf1c2f111ea3d472d9cd33f83b1f4b0d837af8b7cea SHA512 ead08f31af0d81a53203146e7a6001d3c9b8e182a7ab524efb7fe70188fdf4aa0250c65f02b06e996c2cd2ee705ac7f6394ab7f98ed539125c44d048703ca139
+EBUILD glibc-2.18-r1.ebuild 5514 BLAKE2B 2b007c0f935df77d35d74adceab874eeab55306c1fc69eee3c0f45a5d9cd02e6b4dcf7ab25d2bb450fd07fe7f20a827a774a6e15322f7b8a447726acdf31a3f7 SHA512 b306c31227f15cbf0dbf518195736856f30949544dac12fb4b5b0aabd3e421f040663aacea159181b61f92777a19519241f5c05f6e65576b26f6406df85ef83b
+EBUILD glibc-2.19-r1.ebuild 5471 BLAKE2B 8531139c723de6358daa971e96f98db628eec14c696b004a4e8a4a7efc8a0c610d713625655c55293c94898d13ac9aea5ae1a58134aedb30b1b695859748a964 SHA512 aae5bcdaa10cf6a3026e28b406046bd7297fdacfa8d0ace60f76177aa2efed6b0f82b639f5e6db6bd42d99440d12644d62e9b14cf49ced7284f011cb3c406775
+EBUILD glibc-2.20-r2.ebuild 4947 BLAKE2B 24062f002678df912ced724a3d919bc2f07476c98000092cb3fa3f2be1836db57348c88b6fc1da7a9364103136eecbe687fe365d131f10c82de3cb0edd3eb8c5 SHA512 ff76e9173ab6bfccb1c659f79cefb93f6fa6266adab40a3816f56acddb7866cee67ba6bfa8d1b9988eff755e9d1a879e62973fc332566c185f019af5e17a9f1d
+EBUILD glibc-2.21-r2.ebuild 4922 BLAKE2B 99bd1be39a3643f845c0daff4f7b19a0abb37de95a8494b4dc9d29aaee74281d4a252792010ff4935e5d661a7240cf4d5944907267e9059ce208b59891528085 SHA512 ff896f5bb20502db03f00d1438a06a026e0940106e368b4bb27abb72bb927fb235371a5a6b01130e35906f17c478e79e44bec6dda02bd5fedb30552bf4a6cc86
+EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa0980aa9b6fe0d11cf45850a7bec482b77c8a0aa00b66a2103d4ff03ca16b0b7d38cd089b8f010039faaaf26d76b SHA512 1a056e465dc38dc4956b4707ff9fc9da8df4046d95edeb3dd6ae36fc229545acefdd317c50961a153ec83f21cba3d645d1e45b526157f8209a932242c2b08c33
+EBUILD glibc-2.23-r4.ebuild 4975 BLAKE2B 9a0d3a3689896fab9f71fa20a83be5f2563f023040563f85385f8d28d32d6eee7f144acbdf4a35d6c1a65d56289ae72813b1d7f561f514e391e95dd4e43a4902 SHA512 9662308abee890c1eeaa45a49c4238448c62400d8b8661fc7588cd78aa58cbe044a0c15f46a6e8d161a203f3645600385fc2200d4d6434c24e496781aa06b04a
+EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9
+EBUILD glibc-2.25-r10.ebuild 5012 BLAKE2B 86753e126c049ba2407529668b82094650a718b0abc954a28ee578d331c2ffa5e425ddfff67b7ab4decb91c3b966220eef6cf0247544015c0b3160ccff330576 SHA512 3a06e7d0a949bc7347c37e7b2fe48ad6ed328af9b0c3ca808f5fb50643aec6bd050ff868c926bc6f9aa62f572a2da26527de666a12b9e5ff9cb7cf680547e951
+EBUILD glibc-2.25-r9.ebuild 5002 BLAKE2B a779dd86f2940aa5e65d7c035c0e11f2ccf0fb115d03b47913a9615e1b468fb90e1914440cb18ce1200224f84c750f4eea6bbe25a5b4badc4948d6ddee458519 SHA512 cc6cf2bce9ed49ac097b0ab85aab58d3b1674ac963d83b8be9f3d6543006db7def027c707aa95f9d48134576e8eb16edd4e0bbb82c0ad6e848638d254fffe2a5
+EBUILD glibc-2.26-r3.ebuild 25337 BLAKE2B 7d35bc98ff62279aaf8221a5366d6624c9c51344d3550a827739d700f32de23ac2a8f9b08f7a8d6437d61a200aeedfa041f68425675881c676642cc5499ac822 SHA512 71a2d63ec8772548d8b88576f6088f394dc364a864aab4e803c6d02600c296c629408fab94ca1b5402d1cfa5503c5a8409f2aed7e5d6afc5e16b98a0eb715765
+EBUILD glibc-2.26-r5.ebuild 25543 BLAKE2B d6f427a7c876a264fc7b14516c7e36adf97a594d291ff34b90f69397fa097968a38db2fbfd19854fedf55d59e7d1b8ff757b525cf6f33182cd3633f0044ef254 SHA512 364a561a54f81d4e40298310acec3c7bd976276abae24549d891de58146739964bb73e91b53c193fae8e6328dccbda0b57fbfca2b7e27912d1654c18ab62e13c
+EBUILD glibc-9999.ebuild 25767 BLAKE2B 0c5ddf6b25ca3bb5303fc3bfc977f70273a98e533380d770df3dfbd683a06a37ebb335d138bc49831b92eee416e63227b609e8c621ac9f81e26e52cd71091b51 SHA512 94dd656d151ebbe0a8eeecd4a2470a7f758279751aa6de9a55631112152829136674ad40e77d57ba5dac24204f4d4c2f0ddb9b5dfa334e68460fb5db61c2eb82
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild
index a9c0bfc2c2b7..a056ef575af5 100644
--- a/sys-libs/glibc/glibc-2.18-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit toolchain-glibc
@@ -27,7 +27,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="4"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -72,7 +72,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.20
 		>=${CATEGORY}/gcc-4.3
 	)"
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index 8860850c0224..a2b10e2a5c15 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit toolchain-glibc
@@ -27,7 +27,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="3"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -72,7 +72,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.20
 		>=${CATEGORY}/gcc-4.3
 	)"
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 04363835f616..2c35723c25b2 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="5"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.4
 	)"
diff --git a/sys-libs/glibc/glibc-2.21-r2.ebuild b/sys-libs/glibc/glibc-2.21-r2.ebuild
index 9216657a9703..6db7c6a78833 100644
--- a/sys-libs/glibc/glibc-2.21-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="7"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.6
 	)"
diff --git a/sys-libs/glibc/glibc-2.22-r4.ebuild b/sys-libs/glibc/glibc-2.22-r4.ebuild
index 5949f88d64ac..416fec87178b 100644
--- a/sys-libs/glibc/glibc-2.22-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="13"                                 # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.6
 	)"
diff --git a/sys-libs/glibc/glibc-2.23-r4.ebuild b/sys-libs/glibc/glibc-2.23-r4.ebuild
index 01efec5a7b42..18fe392f108e 100644
--- a/sys-libs/glibc/glibc-2.23-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.23-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="8"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -82,7 +82,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.7
 	)"
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
index 29a17f827aec..eb338ca1447b 100644
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="10"                                 # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -82,7 +82,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.7
 	)"
diff --git a/sys-libs/glibc/glibc-2.25-r10.ebuild b/sys-libs/glibc/glibc-2.25-r10.ebuild
index 71709c387e75..89b89e762404 100644
--- a/sys-libs/glibc/glibc-2.25-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r10.ebuild
@@ -32,7 +32,7 @@ PATCH_VER="13"                                  # Gentoo patchset
 
 GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch"
 
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -85,7 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.7
 	)"
diff --git a/sys-libs/glibc/glibc-2.25-r9.ebuild b/sys-libs/glibc/glibc-2.25-r9.ebuild
index 62c5c1ac0cfd..e31acb3be955 100644
--- a/sys-libs/glibc/glibc-2.25-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -32,7 +32,7 @@ PATCH_VER="12"                                  # Gentoo patchset
 
 GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch"
 
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -85,7 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.7
 	)"
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index b936a612e1fb..84dc10f40557 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ PATCH_VER=4
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Min kernel version glibc requires
 : ${NPTL_KERN_VER:="3.2.0"}
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.9
 	)"
diff --git a/sys-libs/glibc/glibc-2.26-r5.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild
index c5a076afbdb0..4eb6b34679f5 100644
--- a/sys-libs/glibc/glibc-2.26-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r5.ebuild
@@ -32,7 +32,7 @@ PATCH_VER=5
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Min kernel version glibc requires
 : ${NPTL_KERN_VER:="3.2.0"}
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.9
 	)"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 2aed938db026..5d7f3a9fbe9d 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ PATCH_VER="3"
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
 # Min kernel version glibc requires
 : ${NPTL_KERN_VER:="3.2.0"}
@@ -65,7 +65,7 @@ is_crosscompile() {
 }
 
 just_headers() {
-	is_crosscompile && use crosscompile_opts_headers-only
+	is_crosscompile && use headers-only
 }
 
 SLOT="2.2"
@@ -94,7 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-4.9
 	)"
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index c66731137ac9..3d5b0cc9da6f 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,3 +1,5 @@
 DIST kpmcore-3.2.1.tar.xz 408356 BLAKE2B 9cc48cc1383345c05484f19f344eaef9e0c30b942574b19f8d11591d8a581ccd489e832f14b787394f6ae9342180704816e6855775919c544d0f2c8206b93ba9 SHA512 f7a198a1632f96f092b937275ffc779ac1997c9ea6973906a2e08d6f7852aaaffc5abc480bec88d41a793ed8f5b364f7150f40aab1187fbbf33915a01cdc61e5
+DIST kpmcore-3.3.0.tar.xz 412648 BLAKE2B c8e5bf8d20108b8c3164466bf4b08ec9e58808a20134e27b188f0b85809bf1dffabe293f7b1f53d96a6291d4a5d9c1945a496763aa5f72eaccde83f4fcc62c8b SHA512 62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e
 EBUILD kpmcore-3.2.1.ebuild 742 BLAKE2B 32ffb253fffc4cd2998fea11f05db580851cd4492dc7013199a7c96dc7db9063fc479bde27605427ba7bc8d4c34d978a2931f56a126872b5d5f6fb82cb3bb993 SHA512 aaf210e0721d63ce00870ade6a84f573bbf23317694dd4b2c1969a39ed6716acdb89d9952baca2f32de5883ffc99e5e0392b651ec00ecbf65e548b86b85f94ec
+EBUILD kpmcore-3.3.0.ebuild 712 BLAKE2B 6b2612013340a5ab06e3cd39ed9ac153740536d894c892573c78b38e59ffe10b5b6078526dc682d40bd17d02d003243ff23ebf2e28deb7722787afe8b21d7922 SHA512 c9270797ea5131d5c2af779555ea373511f4bb7e84fe790ac179cf049fd238ed39ff4a02bc3cb5eecd0e9a2266880216ee426cc28ea71c8e29779e9e3c24f7f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-3.3.0.ebuild b/sys-libs/kpmcore/kpmcore-3.3.0.ebuild
new file mode 100644
index 000000000000..d61de3d54ffc
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-3.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Library for managing partitions"
+HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
+LICENSE="GPL-3"
+SLOT="5/7"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libatasmart
+	>=sys-apps/util-linux-2.30
+	>=sys-block/parted-3
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 285478f008b7..7e9d91437fb9 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,6 +3,6 @@ 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
-EBUILD musl-1.1.18.ebuild 3082 BLAKE2B ffc41a796597676ecddae84376909dca5cb96555a71edaa2d4e44ba20427f31cc1819ee8eb7b7cdcfc6721552019cb944bf93e25e07f54c021b8f58c9e44af7b SHA512 4e1d2fe1a2484b8af7d94388212aea5343591df09633e9382b5d389fc7695e2e38215f14b29fe98c027bb244a8ca8c8c798aa020701eab6d1a0a21e425efaddf
-EBUILD musl-9999.ebuild 3086 BLAKE2B fc772d8b5b84f2baa5fd727b85856e2c912f2b9076241c55b314b9c1dd382f827b38535c1911f317a96c563cf9e968eb48b9833667bb7a06c45d57d5c5e2dc64 SHA512 ca447c747b0e4e3a124323f2dfc2a91cbafa2613784f2e7814ea856a97232c0140352403189663d2dfaf3cbf32a72f3b6760b96e09ef572c73d1d31c333d9874
+EBUILD musl-1.1.18.ebuild 3046 BLAKE2B dd3ec79934c99b2bbe10d34d6efabe818fc1e94320fd44779a1ad6394e16bac0ac077742cab1c7ceaf554ab74d9825386d63cae95814ec564e5f92636fb52fcf SHA512 6bc48fad1aea48f7cc153cb82ee0cb1b08bc396f66ef6731fcf5e668e58a4154d2f404ed197b6be6c26449f71bd3479c0f52ccb51984ff9af45d04cbf4c47f1c
+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.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
index a36df0d0e875..e36e21994580 100644
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ b/sys-libs/musl/musl-1.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a
 HOMEPAGE="http://www.musl-libc.org/"
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 
 QA_SONAME="/usr/lib/libc.so"
 QA_DT_NEEDED="/usr/lib/libc.so"
@@ -42,7 +42,7 @@ is_crosscompile() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 pkg_setup() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9e0e184d6562..991afd750a8f 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a
 HOMEPAGE="http://www.musl-libc.org/"
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 
 QA_SONAME="/usr/lib/libc.so"
 QA_DT_NEEDED="/usr/lib/libc.so"
@@ -42,7 +42,7 @@ is_crosscompile() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 pkg_setup() {
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index 43877140b647..c3dbc4b724aa 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -6,12 +6,12 @@ DIST newlib-2.2.0.tar.gz 16521910 BLAKE2B 530290c8f219774885e3c408889b7f58bbeefe
 DIST newlib-2.3.0.20160104.tar.gz 17674117 BLAKE2B abdfd902e502da32862d8151bf11bd778548cc930bcd2e0e546f5b23c075d6448f3f85e7b4388d64fbf255a5f3b893ace6e13405115a7dc0e3ac5c8846722429 SHA512 d83ce298b1b72eabf92e4ec14af3afdf3122e34aff5e320295a398df077235a78aa87148895b441a4f7de3047815e7ce13ea06a06135dd86b69a200236514293
 DIST newlib-2.4.0.tar.gz 17574364 BLAKE2B d97be2fe2fe93629230a2b0b1dbf23b2062fab54921e658bae9438fb42a1af975d763f2643352b5dbc3027faffa76ff97170aed9f5d6fb33ae4c6d947f1b608b SHA512 c60665e793dce2368a5baf23560beb50f641e1831854d702d1d7629fb6e9200cf814527f29796792a3d2dff81afee4255723df99ceb0732f99dd9580a17d2ac0
 DIST newlib-2.5.0.tar.gz 17912392 BLAKE2B bc89491758d59f3529c72308e963c5b3e39044d6d586ef3814cc19cf55aee33948656c544df7dfcbe3915105e7373f53d7b2baf96b9b8147e3af780c1d08e670 SHA512 4c99e8dfcb4a7ad0769b9e173ff06628d82e4993ef87d3adf9d6b5578626b14de81b4b3c5f0673ddbb49dc9f3d3628f9f8d4432dcded91f5cd3d27b7d44343cd
-EBUILD newlib-2.0.0.ebuild 1616 BLAKE2B 18429c2a948a5b9b3bd12e3c0029d55c32fff4df9673a8d6e7550148d7449a902a35b5015f1f51526c96a6651327ea0ca9f0c09d3f938690ec2b5464d878cdc8 SHA512 3732d242b676ba1f320ab759145a4f71a21e821414ebc73149ae88b77a522a474b7f58ecfb9907cd2f78b1a4da51c66137e8938ff1bab5ceaceadc4500ae80cf
-EBUILD newlib-2.1.0.ebuild 1711 BLAKE2B 5044099c80a5f9780e3ed0719cca31704d49415c0d7b910aa34ae595e9f3bb14c643c49b43758674ee42b0c51e926bee65df8ef71b5228b1c87fd7dd45cf9ddb SHA512 8d72568ac842863ac1c7147fbe586e6256319faa81a7801e79cb8523206408981c2cb774c96997e0575f5bd9ae90969e7fbe5f70b1f1f6819acb6ca6648ab838
-EBUILD newlib-2.2.0.20150423.ebuild 1828 BLAKE2B da4e3e4de139eb0fc9c8d32c115940f8de6fa01dc033d6497e384268055ff663eef0056e6781cda0711d5630a60db92e88129cc35bf7493cf77f57e533dda773 SHA512 66ee2754b45093ba8c9f5c8ff7b3b6304cc43d28fb83233c25d80e91ebbe62423e8a3b2c44922616cd670ad232160fba5c972600252e775ef9d4b97027b51450
-EBUILD newlib-2.2.0.ebuild 1846 BLAKE2B 5b8893a63389991b42a6290f88d91e1b471e3830f29e0e8c46eeb94477e979175af4cac4488fee889ea9b75b0abdcfb0cf0aa4d601fa49b1d814b21e59778bd0 SHA512 134e8e06977de1e047b51994477d42013c8859f582729d352572c0e77a23e186e885a9318d26a07910bbdb2f2f8a11cc16c23f14c92c77c2214355bad997966b
-EBUILD newlib-2.3.0.20160104.ebuild 1830 BLAKE2B 3d59d95bbe973a920f6ffc25b3eaf6d7b6bb7773b8c1e0f9bd1035db8b7585b7d71c373b5d3e5200a6ec219ad01f2586ffaeeef93194571cbfce167571d06b6a SHA512 96fd03cacb32c679f11014f62a6a70a62d1c81c830391eabd73b654766f80358c40b42f0297835bc0079f282b38f60129559495c2e820afed97029ae21cc10a6
-EBUILD newlib-2.4.0.ebuild 2023 BLAKE2B 7136b0feba3a895d52d628fc6e50b17e2071f6b407e5ef33be69b72fa1364a8c25e3265a0ad0dc3bb25a8a3ab06cc01b6d2148789cd70b01e1ab3e238f1a0958 SHA512 f3c1b79607e6cf986123b731f5e1bde625d2f54b876103378a5c1b22dcb39f292e571002b7c1466e82c5f0b573df742c7b75878b80633075eadf32fef49bd072
-EBUILD newlib-2.5.0.ebuild 1982 BLAKE2B 7c3470e88765b4a02725d832c76fa69b8c0712841a52bb0942fd834ccebf8eda185025ea108b68c2c076ed636b306aefef1bb6f5ac6dbc5cfbc0f7102f87f91d SHA512 15a86d859e9a82922b07316184caa42303862d10ab1d9137a1be34e6691980bc1e61e58155022cde59ca5eb5e667b96fda7db038ee2229bc376830535878f95f
-EBUILD newlib-9999.ebuild 1982 BLAKE2B 7c3470e88765b4a02725d832c76fa69b8c0712841a52bb0942fd834ccebf8eda185025ea108b68c2c076ed636b306aefef1bb6f5ac6dbc5cfbc0f7102f87f91d SHA512 15a86d859e9a82922b07316184caa42303862d10ab1d9137a1be34e6691980bc1e61e58155022cde59ca5eb5e667b96fda7db038ee2229bc376830535878f95f
+EBUILD newlib-2.0.0.ebuild 1598 BLAKE2B c6a79f7150464d3998c31c0413c1a265266c170d49974ef3d03bbc7e672f456fff261f18597bcdbe0eaeef6a66660c1484ebbc4c97f8ab2b5c3871905ab1b0b0 SHA512 cb691c209bc9089ae55e0a2418b24a509524e1547814c28092da85e918a7820c88a57034f6f32453f5d9671390b375feb1e418384e8f92cc4e6812600c31fc45
+EBUILD newlib-2.1.0.ebuild 1693 BLAKE2B 02e62abf711192dad669a15cd560f077818c4acf2a736647ef80c8206b848c6a40862a89f10c52e65d0cd4f0f85cc7d056a0fba4406d4fd7cc563bab06c45ccb SHA512 77e0e9d6c31bc1fb0dc9507006b82720a862c85fc8b0bd77598c3cafb31edb9c6d60f8ad8379ac02275e097b57dd576ee3dff41531cfff8cacbe1c1eef5b6437
+EBUILD newlib-2.2.0.20150423.ebuild 1810 BLAKE2B 6fa6c3eef0952bbf86fe6d0e14701e4b96bc673e317f5b1a00f7b6dae154f4e95f85b11e849f60680dde7d78b514abf72bcffc1445f75240fae53662297c381b SHA512 291a186ffc821c70241c71051f5fa84305ed7721ef3c54e8e5ab8ee5fee055094d5095953be252bf2b672a65c656f4ae63539f363df2cb096b6fe527809f646b
+EBUILD newlib-2.2.0.ebuild 1828 BLAKE2B 0421266bc2227bffe4a7a0a7ea16a05ad60adafc5c3096e2a417533f304049d6e9e7de5ba4c128ae22718710faaed1ab7c82a6f2a6183af93582be7ea962acbd SHA512 b243506f0b0cd7cebe1fee7270f9f7acc11557c4a211274f9578bd224e4a2b2a8f8dc26dd06ef4be60ce75b7b6dd315130b3944d2d786439b31a5801fe9cfc38
+EBUILD newlib-2.3.0.20160104.ebuild 1812 BLAKE2B a26ce8367ca5d6a37175918a045e221af0458e8f2f03ebc5d9ac7534b07b9c7404138c8fe793abd0f9cca999c53aa39176cc9911d425f1c8c37dea9e37bc407b SHA512 703cf1eeb333bbf1b701d8d68a9fc9146fb61a213defaa38592f88c343f6ef145af34d8e2b7cd08bdbc1afc9e1641d43c9ad57cfb20b3e5df38fd9638e5652e9
+EBUILD newlib-2.4.0.ebuild 2005 BLAKE2B 74bb441de26a3ad3ac654acc6a144888820d3b38e0f02cdbbc9ba43f5491d5e8dc7e4c2d980b37610cdc03bc2a437256e74b2c6dacd2e316a73ee422018f485b SHA512 23013ed713a7353c25f19c8dee4a2e7f9b905c8e692cc3b5ab17e0420675997edf1c05ebbfceb2ffbc4bccbe431a14b96738c819fca8b3351bde20dfac32c6f4
+EBUILD newlib-2.5.0.ebuild 1964 BLAKE2B 2f6790df10eb1a249158c26331f33f8d3119eeaab6cb039a49830c0582fa3288fa1ba2f395ee05892b594e2a2454bf4176bd9c85994d90a8db20b3a221ccb35c SHA512 71799c1ba85a245a5af899f51602314daed22b9834b4f82f28a92c59681b314fff35b22185b47811a9dc7e9e307a8d96bbbb4b5b7f151b6f9298e0ac21b2df80
+EBUILD newlib-9999.ebuild 1964 BLAKE2B 2f6790df10eb1a249158c26331f33f8d3119eeaab6cb039a49830c0582fa3288fa1ba2f395ee05892b594e2a2454bf4176bd9c85994d90a8db20b3a221ccb35c SHA512 71799c1ba85a245a5af899f51602314daed22b9834b4f82f28a92c59681b314fff35b22185b47811a9dc7e9e307a8d96bbbb4b5b7f151b6f9298e0ac21b2df80
 MISC metadata.xml 330 BLAKE2B 38ab8de6e1df9d737b0d0b4f2eaea0866b283366c38f4f54df9e7b07efe67d157357402d56e0e5915bf0242090d0249ceb30d0af18d4e21bbe9462770110363c SHA512 cf10bd2100eec996bcd2668a2e8fda67321f6969c59b3969ca1a62bc814113a48d475dbdcae3f4d6ac2186e770ec61d5c8c90690de921ea05696dc8924ec50b5
diff --git a/sys-libs/newlib/newlib-2.0.0.ebuild b/sys-libs/newlib/newlib-2.0.0.ebuild
index 1e1ee8fed867..053d58f02482 100644
--- a/sys-libs/newlib/newlib-2.0.0.ebuild
+++ b/sys-libs/newlib/newlib-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -20,7 +20,7 @@ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
 KEYWORDS="-* arm hppa m68k ~mips ppc ppc64 sh sparc x86"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-2.1.0.ebuild b/sys-libs/newlib/newlib-2.1.0.ebuild
index 3ee1e7eb83e0..fdf7d10a2f68 100644
--- a/sys-libs/newlib/newlib-2.1.0.ebuild
+++ b/sys-libs/newlib/newlib-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -20,7 +20,7 @@ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
 KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild b/sys-libs/newlib/newlib-2.2.0.20150423.ebuild
index df987d568b6a..c851572aa12a 100644
--- a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild
+++ b/sys-libs/newlib/newlib-2.2.0.20150423.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-2.2.0.ebuild b/sys-libs/newlib/newlib-2.2.0.ebuild
index 2754fda04d90..a583773e9351 100644
--- a/sys-libs/newlib/newlib-2.2.0.ebuild
+++ b/sys-libs/newlib/newlib-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -26,7 +26,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 # Handle the SLOT changes. #497344
diff --git a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
index 43c6ac3aa91b..70750a911182 100644
--- a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
+++ b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-2.4.0.ebuild b/sys-libs/newlib/newlib-2.4.0.ebuild
index e70a03bdcad2..724e01a55fa8 100644
--- a/sys-libs/newlib/newlib-2.4.0.ebuild
+++ b/sys-libs/newlib/newlib-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-2.5.0.ebuild b/sys-libs/newlib/newlib-2.5.0.ebuild
index 6a325c787586..51c3318e2020 100644
--- a/sys-libs/newlib/newlib-2.5.0.ebuild
+++ b/sys-libs/newlib/newlib-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
index 6a325c787586..51c3318e2020 100644
--- a/sys-libs/newlib/newlib-9999.ebuild
+++ b/sys-libs/newlib/newlib-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 SLOT="0"
-IUSE="nls threads unicode crosscompile_opts_headers-only"
+IUSE="nls threads unicode headers-only"
 RESTRICT="strip"
 
 NEWLIBBUILD="${WORKDIR}/build"
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index f02d2542d19f..310db0123a2c 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.25.tar.bz2 2234505 BLAKE2B c1f352ca0145a473e357f2627b08905ce66d0a1630dd7d62996abc52cf6ec6f51d789fecf59158dd8b425304fab992d4f2fe7290a21966b240cab7fc75fdccd9 SHA512 3bc5e3f0626a529a688e56649b34c48d0ddf733c09279c84fad0954880aa7c0ec3440664811196d11bbc3f05cbea99f3ba47efaad7f315a55ba3d8d587d3b313
 DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b
 DIST uClibc-ng-1.0.27.tar.bz2 2306274 BLAKE2B 64ad0634ca548960ad3ff003d98981853b0658cad75fcf3b7391b5b965656dc15daa06ae312ca34672caa47a2a3e33fbe6291c94df10547eef5dc395c2cbd0cc SHA512 bf8f56f75465f7b793e0356df495a00a41ed2478ea90e8d686e8591dcb1bb75be27fadedd8adf2494f5053ceefa4b0ba2223758efa2a920ea0f55bf104e433a2
-EBUILD uclibc-ng-1.0.25.ebuild 10564 BLAKE2B 975ecd8e3e5365fa9868448ebfe3d0914f4f9fdf7e2b6e19b70fbfd2b612c282242116782f465e44790e276c5c90dc08a6bfc869d2d8d5a0a03beaf423217f98 SHA512 ec54d3cf80a5a8ed9349ce7a180e64bd78fe52d76fa86d77652080f784fab8507904a2f7a05e8d5139aa003f2f5dfadca9400e2f79ec1957fadc67acf1446016
-EBUILD uclibc-ng-1.0.26.ebuild 10564 BLAKE2B 975ecd8e3e5365fa9868448ebfe3d0914f4f9fdf7e2b6e19b70fbfd2b612c282242116782f465e44790e276c5c90dc08a6bfc869d2d8d5a0a03beaf423217f98 SHA512 ec54d3cf80a5a8ed9349ce7a180e64bd78fe52d76fa86d77652080f784fab8507904a2f7a05e8d5139aa003f2f5dfadca9400e2f79ec1957fadc67acf1446016
-EBUILD uclibc-ng-1.0.27.ebuild 10568 BLAKE2B 1b3cf3038036a04aaaadd9826aaf1656f41e3a654a2c9148001e8a86dbf024a2e61df16536489857380fae20f0db25cbf36c3b97d023908bec5df1327b3cb1b5 SHA512 0dd24ced837a0190a10c92fe512398ad4166d79db995e5e46e827d3f40e89798817aad6dbae0f03b2f392b636140c0701012ca6ab5fd16f58adef44cad79f34f
-EBUILD uclibc-ng-9999.ebuild 10568 BLAKE2B 3a0756acc5dd8431d1f0eef6ccd70331979aeeb1bff787121811c0d4a2888a521439d5fe11d6134202ab2f889fce1b13439663a6c463b9b00f5243f404f4d72c SHA512 a37488a645cd5f69f4dff6cf98533775bedf81cac1630eb4c0818ff2065a2286182a55e2473defff0c6b65d23038ede8914bd2ce62431644bda6c60d955b8eab
+EBUILD uclibc-ng-1.0.25.ebuild 10528 BLAKE2B 008167fee3fe21e07becaebb302f9c1a389f8b38df5ae4fb3bb1b0da3ca01847380c267d32e0badca0c16f034c46f7eb894e26952b825d243490b80d2dcc0823 SHA512 5e17953c9b892a65c3c4728862841c0a5da077db212e9f2dfbaef644044150401c5e7a0aaadba83cbaf63680db1453a8555d93bbc46d9c856812d538cac17239
+EBUILD uclibc-ng-1.0.26.ebuild 10528 BLAKE2B 008167fee3fe21e07becaebb302f9c1a389f8b38df5ae4fb3bb1b0da3ca01847380c267d32e0badca0c16f034c46f7eb894e26952b825d243490b80d2dcc0823 SHA512 5e17953c9b892a65c3c4728862841c0a5da077db212e9f2dfbaef644044150401c5e7a0aaadba83cbaf63680db1453a8555d93bbc46d9c856812d538cac17239
+EBUILD uclibc-ng-1.0.27.ebuild 10532 BLAKE2B 1f79a8e30fe1bf18e5648b48d9702e12a7b53de04295a5af37fbf7ee1343a67d25c6ef8dc1bcb63e37b4610c4407463b40772b15ee105270749665a83e1df9a1 SHA512 a50c006c732f296283c1c16f5ddb87b28912c29201d03bca419f73e06d34c01a470ab2851293a238d55876ab5c8c2e8a75fb66058146f8f2bf25af8cca64fb2a
+EBUILD uclibc-ng-9999.ebuild 10532 BLAKE2B 1f79a8e30fe1bf18e5648b48d9702e12a7b53de04295a5af37fbf7ee1343a67d25c6ef8dc1bcb63e37b4610c4407463b40772b15ee105270749665a83e1df9a1 SHA512 a50c006c732f296283c1c16f5ddb87b28912c29201d03bca419f73e06d34c01a470ab2851293a238d55876ab5c8c2e8a75fb66058146f8f2bf25af8cca64fb2a
 MISC metadata.xml 877 BLAKE2B 191277020e32edd39fc3a1594aaf3fad65ca7b48a2f0df3f0e381d3c7cc5451c09f9ad87a6da9e75b146c2ebe209918d699519582fc64fb8c3b7ae2e51eaf507 SHA512 3988e346916b283836e5c3d094eec4f25c66763e4e10a6413fe97f98629e1f14b67d6013f13f9ca2e2712dd638567973c02e6ebcce3554c55caf5483c3c9dfd4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild
index 89d2e3727161..5245bd5b23c8 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -59,7 +59,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
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 89d2e3727161..5245bd5b23c8 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -59,7 +59,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild
index 3cd7177086ee..9c2e972dc4c0 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -59,7 +59,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index f6ad51297978..9c2e972dc4c0 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -59,7 +59,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 41755d4c9030..8c1290f51547 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,6 +1,6 @@
 DIST uClibc-0.9.33.2-patches-17.tar.bz2 32437 BLAKE2B c051e8acf4f7d8da219918a5cd7b465865da7e64307b2a1c64b6b86f8381340edf03745301f0b3b358403d56712964c3d57f330b88a3e8ff2da22d898a35c909 SHA512 6a6ad8aef862f742e60965c447e5abee2349886f01bf5e44111b2a6c21e59e4644195cf36e85b8ce0dabbf7b92dc2c36ae27f0b7a02b0f9f4278e46ec5fb5a76
 DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765757829c2a88d4937d02314bc7c07bd36a21d815213f1478b24075bb029112738161bb1be383df08cec5e786aae260 SHA512 1cf18fe5418e12ae12ce995d7455d465bc4737f225afc49512ec69858771e099bead7b18408b01c7e6f845dcc80c3b4f875332eeffdcc04ae4b48474fb29a8dd
-EBUILD uclibc-0.9.33.2-r15.ebuild 9422 BLAKE2B 0ce97063aa3e7db61f59fd773af1027f066cc6f6427e3e6eb8dc30a8e8e722bbb366a5d74dcaf984cd5e74c646a39c3530849971177ea41f0d8c8a32556c0ba9 SHA512 a5bab81d76c55cd4b5a1dfbc5d2d89b19ffa5d4e800947952a64adfba9045bd1f9979e178549f54f1acc2cacf52f8e15571bb633ca8476c6798fb990e78285bb
-EBUILD uclibc-0.9.33.9999.ebuild 9384 BLAKE2B dae6480963790f37c5e5168a2e4f10e29827ab0a4441a51840c35783c49d56e3b23cfd733ffb0d3e73d8055d4dcd7d516d353b4d8856cd2fa5c1055b20e6ada3 SHA512 88fda23fad51de81f9e7b392a0879711c0df0a1df632e68805e3a4669da8284b3c4374886371c1d445533ab7487636d974a33c1d2bbceb7c442727ca6cb2114c
-EBUILD uclibc-9999.ebuild 9365 BLAKE2B e3681498c3bd0d3e6e56d32be3b81ef0ec6de986879331fdcd3d20e4e6219525aeb69215b71ac3a377548b02fbdc48664fd029d70a78994e7171ff7db824bf31 SHA512 be886e84791f55231b9a97c5c04f5bd7fd7a025895a8e9ab8ee8127e9b866b0f3c1a9e3ae58bad56805aa835c0f790ef843e1138a8af493c2e9d63fde1e65a14
+EBUILD uclibc-0.9.33.2-r15.ebuild 9386 BLAKE2B ac8aa826c8b51d9bc6d3a54b35105af17fa3d735cbeeca5283ef1a6312aad80e405100af6078658b51037bbeba3a873846d6244753dcd8c08027eab2f56af19a SHA512 7bdf5a54c1fe8a781c655ec44a8b4f50f7f758b4b7547de0d2a44a2c321291282c427e6d140de581ebb471a377009eec77d8c27f432617b91863bb780ad37d1d
+EBUILD uclibc-0.9.33.9999.ebuild 9348 BLAKE2B 0889fa7e2bc7c86f5a461ad43bfde8b7968e3ab7624ee881da04b11000164f6586683095fcd0773eb6e47d195b48b041450999da67f226939c1ecef6a724fbf5 SHA512 f9f97e41563be062974547c6945c45716edf16433c308bee9593ee051e6fb0d5ce786348d76acc8318db7d48ed27e451eba16a121538ed658218503492938e34
+EBUILD uclibc-9999.ebuild 9329 BLAKE2B c833b8f34dd30ef29c0d843731ded7b8778b9a60c675b5e8c009ed82bd827a9ed3355b7fd613e99b7fa2655f49cefe04147b5b3075e4691a2c74231fb75b7ac7 SHA512 ea49b5e167e624328efa4a145183e500ac916a979216d38e7d642ee3aaad704da70cb0b957bb0161242ce3709d123d701664a43717e38cb172c5b09ff5ef41d8
 MISC metadata.xml 1388 BLAKE2B 2c031c5d87aefe90b83a2d0de01ee836b978bf1e89a8b16cbbf71acbc5366a57c3d15423a4beb6a6c51ad6adecc45731b949591fdf6faa5de7a6516ea04d5ce9 SHA512 59111cac2b1c0e2df5ed96d01e6913307915281c8d24019f5a12213dabd0621adfb52e87d344e1de484e1b6dd19014ce695f00b96f27ce26d7632e825863beeb
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 2702793af658..32bb54180854 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -27,7 +27,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -49,7 +49,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index 82d3a46528c1..fbc8a60a1fc9 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -28,7 +28,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -50,7 +50,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index fb29176b32f1..f5cec3749e75 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -27,7 +27,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -49,7 +49,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {