gentoo resync : 15.12.2017

32 files changed, 45 insertions, 77 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index f47b4902960a..db722a51b386 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 ce31bc5d9138..f01451232370 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,9 +4,9 @@ DIST compiler-rt-5.0.1rc2.src.tar.xz 1509784 BLAKE2B 898e32e189589b6b72073cb791d
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
 DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
-EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3699 BLAKE2B 71f7a008b859711d7932755946b9c536b4eac246dc28d00be21522c1b7a64e50e6d7b18d0f24dcbc6e8472a0bf37d1b55041079eb50f46ff1e06bd4125b53b9f SHA512 1ad3d9900981f9e07023b0dc10cf324adb1e8a0680491ef7ca7f600a73be48acf096ba0e8f595bbd69af6cddb7999be685668139613124cefc812558b182aa28
+EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3698 BLAKE2B 6c9de6cb35220bb75078cca984f69ada001f461a23ddf22d90f79363ea73021ada54a6de142f2d6f2be07a349044cf903aaf172829006c9ee38fc77b083ae517 SHA512 fc8d225f02a62ea92aab4472e3d75865f94fe22a25caae5e47be156dc9d65242bc3d6cc1643c23dad8616e96f3865b3a9e102eefc4dbaaecb7c433505dff4aeb
 EBUILD compiler-rt-sanitizers-5.0.0.ebuild 3645 BLAKE2B 2ebf4a7189fce215a4c3bc91c59bd2af1e5ff20da607bbc80a5881b479a2c7a5e108c7efce269dffa5705141d0792842fb5227143bcb0afa84f0c03a88b7cffb SHA512 c54db543aafa607484f49bba0171c5e46c30ac461431711baa7ec1f65e81aae633c48bb5c83dc1f0b77a3aacaab539040e3fdadb842c27ae1b1fb4904ff1c95e
 EBUILD compiler-rt-sanitizers-5.0.1_rc2.ebuild 3858 BLAKE2B 47cab615a0e744cb17cf82a197486dddf2624f92b28e9429a3a854866d5a4423ddf1ababad4830a07fb9eaa2487eccec64a9bcfbb1a5c180619e3f64132b86a6 SHA512 76476996e5fa8966e0bf58ed3a319e60819ad86749872e8f172d21f293e886b5324d05dfef76bfe9cb49ef1af3f5f6488e2e6eeef74bdbe1aca27d3a5d600516
 EBUILD compiler-rt-sanitizers-5.0.9999.ebuild 3880 BLAKE2B 0a35eefb914655b0c1071b8c41d4aed44f0f2ef650a0368361bd499da2b2d935c8ad505cc9a07fc346d6bb7e66645166b20a41bb063c74928befb8630acd73bf SHA512 0c805ba6b3d3a4fff09fb46e715c2cf7b9963b4c8502fcdcc1946a0128cece01ee84f7efa6dc25d3a181f9c7803d24e3590ff28bb9d79cafade48597cd0bf49e
-EBUILD compiler-rt-sanitizers-9999.ebuild 4056 BLAKE2B d3343cad6483114b9dd5c3bbff163f337b4bf2fa411e80590fd205f7db61f43b799e6ec08c6a21e9f151d466d5d07ccfd1d5a17ce1e92c241b9fa6bab2c606fe SHA512 fb50c1f65fd68fa7700237581e3477dea9a176534e490ae49d6c9e72151dd07d3d7fc0bdc4e3bcb71af95a5aa62e45d90a5a7624ecca2ac92636bc32ac48dbc7
+EBUILD compiler-rt-sanitizers-9999.ebuild 4083 BLAKE2B 156028942ef5fbb3c609dd7131a3969611bd21db04a74cd07f28d42aa74b80a1d18ede1a637d7eb4ad3d77c00f4b94c4d14b6ab23d76d3eb72bcae6b9c73715e SHA512 d0fadf5b7f75288db152d1f8f91ced98db83cbc7d781c128c2727cd5aeb59c5bf2bab2b1e127f59c9e3230c3e692b9f77a6d5b60f4b4ab54c91f5cc40f0a795f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
index 025607074c65..892c742dd09d 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 LLVM_SLOT=${SLOT%%.*}
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 e178f9fc63c5..d13c7b67d32f 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -21,6 +21,7 @@ LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="6.0.0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 LLVM_SLOT=${SLOT%%.*}
 # llvm-4 needed for --cmakedir
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 5007121e647a..f9c4d742af60 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,9 +1,9 @@
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
 DIST compiler-rt-5.0.0.src.tar.xz 1507996 BLAKE2B 7294b7c4fee6401baaf2a9c9bd22d3f94d57334575ae0d5c599b613990d6f139b72acee8c2c66f6c7bc17378d5258290e749f691cc6c6c5bf9f204e3a76b37a0 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb
 DIST compiler-rt-5.0.1rc2.src.tar.xz 1509784 BLAKE2B 898e32e189589b6b72073cb791dc9498201d7267e13ad60704b9a66f3e4e839497a84c7cfc5817e72263b5287d00cf25debd2e739ea4174213c56ddb2aed6e38 SHA512 ec2a91e81bc7ac069849f07c31335c88734fd34b512ca3bedaed9c33116549853ac6ac7188552c181900ed8d7ff14ec08c004c87d7fbcbc234e73710c2047d2b
-EBUILD compiler-rt-4.0.1.ebuild 4139 BLAKE2B 2ab6ab1d1c4529c571a5692410ebb9d889d4b23341b5d32280365677c75b4d464a1b87aad6507014fc7c7e0099fd2823755576a9ab2783eff49f426f6b7418f6 SHA512 5e87c35c6a4a57220f90ad5d40473e247f782c3de011e1d94f677f081c42f3958479abe6cd62f33762a28a7fb406276fe26dbd965775717f7950079673072d0b
+EBUILD compiler-rt-4.0.1.ebuild 4138 BLAKE2B e13bd10d0709bd482064b110742f7714306116e27c8123a3f61a446dc3a10e5de688c4b0ff0b5e43f392032c05e5abf8b1d429e9351090691e56c204c2341bed SHA512 76e4ca5084fa6c4e909cad6327d8e59a9a5ff8e88f6d7800c65ea0b19e464408598eb3c7e950ddc72b882dcb332f0ac094b15a3081739dfd0873a998e27d9bfb
 EBUILD compiler-rt-5.0.0.ebuild 2465 BLAKE2B 673b049f9f286223d377fd1f339e3d6854b9833cf8009b646f63ae36b4c885463d8f072332e19591e937b71f3189388353310599d903a8bd062c53e88a706869 SHA512 a6b6cc988d66efa33917031c30edac1685a2421250182b74e3ae50f86ad30e60b088b43697d256a77cc3e5a0ca44dd111801dd191f20563e35c5620f5d28580a
 EBUILD compiler-rt-5.0.1_rc2.ebuild 2449 BLAKE2B e878c26bc11b3561f27e5512d04213b14efa981c4a4cb3b148bd1e09303264db701155161bf299cf47ed4cc392030fac3311bba49bbb305bc7d503591177ce26 SHA512 cef01a2a92ddf0cd909db29c02673845335966c2aa54158c01303882603dc476d87192ca7b8be3ea8166eab3eb5ce73f94624c5919c5983e88ce05021f6a91f4
-EBUILD compiler-rt-5.0.9999.ebuild 2565 BLAKE2B 2039e204c3fa29094b534f132d5e6db720774eb1d7bb4f7b5f1eb8433415a0ea2660d1c4b19d1b796a9a117f6e44c655b81f26edc9b9b7e3c29bca0d5ed832c3 SHA512 f7a1a7db0cec09ffefa9c8d96f603b86d388f8eb94f3e8fcb26dc85046d58c9a42e7ade0c869a54e6e427980f82bc67f4ad0b6f8c8d1349e3ccfc7b0ffee84c4
-EBUILD compiler-rt-9999.ebuild 2641 BLAKE2B 2253eb1cc2c7174f833ac425777d5c4d0a4980237c4fe89c804704b658eee63cf49cca634562045b858519e0364e2d4f25da147ca0820a7defa4481c17bccdab SHA512 a3abf71a684f1d208b18c9fc805296a445c5cdafb945384b19eba05bc53d61942c18d4f21bb8c86d0a2f1edd3daa4ffaa4d89696e4b146e94f7bcb991b85697d
+EBUILD compiler-rt-5.0.9999.ebuild 2609 BLAKE2B 0f414fb2d871d44d02b378a773bcc9bd399efa301b98a8c8dc5214bf3ae2ecadd7f8b9f29d23811925140f64e864158954a11123a03e695184bc43bf0fc89955 SHA512 c55bce769c44522f56469c31a5bdde1a5c8bb1aa34b595fd1224efafd04fd51503f17107ff702e930e0f89b5f21e2e424b954e143b0eb5095413356d0a13a45a
+EBUILD compiler-rt-9999.ebuild 2685 BLAKE2B 0e2f94ebd9ed6a4d09cbb8ed3f28c08770c56f9b59a702392aab863058823f7fd87730dd5147337824dd9695bfddcdcf1e0d7a24aa9554a7b6ccd4cf44ad3bf5 SHA512 20be6e5b6c42cd2f0e106a095976b25781469cd114d7922e1e7bcd116a77197dead82406db324dfd77aa0fe3dbf0458811963d84e2d27ea5086af3ab63e664e7
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
index 60da7b150a0a..8808e083b283 100644
--- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+clang test"
 
 LLVM_SLOT=${SLOT%%.*}
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild
index d53f8561e00a..460f6dae2004 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild
@@ -22,6 +22,7 @@ LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="5.0.1"
 KEYWORDS=""
 IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
 
 LLVM_SLOT=${SLOT%%.*}
 # llvm-4 needed for --cmakedir
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 3f8cb77ef772..4dd44182ae9b 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -21,6 +21,7 @@ LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="6.0.0"
 KEYWORDS=""
 IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
 
 LLVM_SLOT=${SLOT%%.*}
 # llvm-4 needed for --cmakedir
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 2c2e16c51184..b616bce03f5a 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,5 +1,5 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
-EBUILD libblockdev-2.14.ebuild 1448 BLAKE2B 5bf5e85a1274695102935e34bc6daca29ec0d50643fa7e19db6925099910a7710739eea684b740e863a19b8655c74d1b3e75bfffe2563d6ee5fb2d8ecdcd02e4 SHA512 135199110854701a7708f0db0fe09a7c1d992b45aea19c4eee5b11ffabb646e4ffb77c4957ae544aeac3f3a1f91292f7a8ed8f2392438ba34cbdf3de90f1aa75
-EBUILD libblockdev-2.15.ebuild 1450 BLAKE2B 2b05b617a0e3b4948e08203f22c2b62b74b9acdeb4f6e63b519db919278eddc9d2f6e0c8b56c647cdb6246926d882531dd0f99958a50cdf1208d7816ba5a0796 SHA512 42e0cbe8a870c7ef122322f3129b369154ca23c3676fd79fa45243696bb5907c67837c0d07b9dfc1447313cfdf859d3cee30c6a6618b7684a9a16acec3e30982
-MISC metadata.xml 699 BLAKE2B 484cf31979e0ce0b88dab61b07d98db701bfab43fdfa1b10650770c71ada544558d4e4a80de48e2ea57dae6fca5789c2491c604a7da477776e45ec8d3eb145d2 SHA512 64d93b75e3100a80d83112de338979f1ea9dd42ff39ef96f232343e977058de0b1d8785f93760ee24616df564ab4f8af490909242cbbad037f044b283a21634d
+EBUILD libblockdev-2.14-r1.ebuild 1463 BLAKE2B 52be223fc58ef3941c633e088e52a4cf19385c4d87ddc4fb3c5557e84a2d98ca635719aa81e1b28b143dd5807a2433facdc499c8941fe0ea3bd042bfcc29daaf SHA512 c3538ca04a1c5f19eeece1b34b2dce5dd6f51d6512a1e0064c599650c2a0eccdae6a0c707ced729350d568cd2985fdbec236543a867947a49d2ed36fdc5fcb67
+EBUILD libblockdev-2.15-r1.ebuild 1465 BLAKE2B 1d92fb06dd31fed407d7fb81bc84e321a00a7b3fcff65357d8863cbcc8dc50cab22c2a24f5b2c7ef835d5ef33c3232a81f59372fa92ecf5b9767a6ed48f5cc72 SHA512 6c949c0ee8cdaa31089bbb3c2a534f41fd6b486e3d6ab27843744976fb8b450ee8852389fbae072fa70c95b1ef6fbb64c17f795a57e51aedb2299f160460beca
+MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
diff --git a/sys-libs/libblockdev/libblockdev-2.14.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
index 2e025fb3e1e7..97d5e9685f53 100644
--- a/sys-libs/libblockdev/libblockdev-2.14.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
@@ -15,14 +15,14 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bcache +crypt dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
-	crypt? (
+	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
 		>=sys-fs/cryptsetup-1.6.7
@@ -71,7 +71,7 @@ src_configure() {
 		--without-mpath
 		$(use_enable test tests)
 		$(use_with bcache)
-		$(use_with crypt crypto)
+		$(use_with cryptsetup crypto)
 		$(use_with dmraid dm)
 		$(use_with doc gtk-doc)
 		$(use_with lvm lvm)
diff --git a/sys-libs/libblockdev/libblockdev-2.15.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
index 53c3efbcb20a..e4528c494496 100644
--- a/sys-libs/libblockdev/libblockdev-2.15.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
@@ -15,14 +15,14 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bcache +crypt dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
-	crypt? (
+	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
 		>=sys-fs/cryptsetup-1.6.7
@@ -71,7 +71,7 @@ src_configure() {
 		--without-mpath
 		$(use_enable test tests)
 		$(use_with bcache)
-		$(use_with crypt crypto)
+		$(use_with cryptsetup crypto)
 		$(use_with dmraid dm)
 		$(use_with doc gtk-doc)
 		$(use_with lvm lvm)
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 6f4957ace55d..7fd674aa5a14 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="bcache">Enable block device cache support.</flag>
+    <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
     <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
     <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
     <flag name="kbd">Enable kernel block device support.</flag>
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 39f673c0178d..56a32803a309 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -14,9 +14,9 @@ EBUILD libcxx-3.7.1.ebuild 5341 BLAKE2B 10bb770ac1f8567c88dfe30f58f51530f5d767c7
 EBUILD libcxx-3.8.1.ebuild 5720 BLAKE2B 4904374d9992591026be582dd932d48969fdd8383d96a010643e75803df5baf056b647c544324173c637ccf884a34608cd87435de0fe66722261454f9e35b276 SHA512 f674c2647756a1157bdaaa0dfb2ceb923830369d473f4d20bc896f94a3b4aaa5c6e8500b3449ec5e8b7c9b54a74a0002706848f60355a688c5c25425d0a3d1c4
 EBUILD libcxx-3.9.0.ebuild 6794 BLAKE2B 13927aed8c4338f138eb4eff989e013b99371aca40976ed27197c59460dede6350114ec0364327b0698bd01cb2d17a00f4468635a3ee502d103efc0de1733f47 SHA512 326cbb999424e5fca216a57b90b850c0d98d43bd93835525aed06fc6fc9354d35cfd51fb1d08683fa06da595dbb4719bf3d90dc67dd5b881b6242f964aba0438
 EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
-EBUILD libcxx-4.0.1.ebuild 6302 BLAKE2B a23e26a409bd1ac5cb2af2ee0afcea40c81d78aeb3bb60c7820c09331a903265f84dbf89851aae6d8c6113099877a1021a2ea432794dc330848a1cb93a3f9a49 SHA512 5ec4235312e071ff5b48ff803af94426a5235cdea8b14362a7552b36fe2ceae3fbbccf86348f046cdc7e69fed8fa6118cd1274762dd2bae0d72ba6bc5fed6a48
+EBUILD libcxx-4.0.1.ebuild 6301 BLAKE2B d4a17d742479e7532c986046fe12b4aed0d1e59faaebead864f7e3f91c4be82aa5d708a7efe2038a146151d10530b0f31a34006e8af6c4dc24f18537dc8c0feb SHA512 8e4a82071fd5945f7876adc9cd20ed2d35ee952711574e8ac2b735d60299b480e269b07ad829c015377c8042a54b6604ffcfe41f98869b25844c00b62bec3b46
 EBUILD libcxx-5.0.0.ebuild 6303 BLAKE2B c56d390a2d9ec464af90befc35e3e8c37003e90a5a9a131110edf49a4b31749c586463556555c9ceeb234201d560c3adf5355422b73a38919ce45760b99a6636 SHA512 72a1d367d03be76b8cc43ea3653563be2c86376c796b759fc99feff4e7489a86875548fffe89ab87b26885a94028a1131a5f295c5e5ec5270dea80f2a6e189aa
 EBUILD libcxx-5.0.1_rc2.ebuild 6287 BLAKE2B a361f04fb00f24d81df73c2e7b80969b5c1df4bafeaa60c23a865a9324a05ffd5e10c9d770ee433b80870022197e859907a8e5db44209474b4bf80c022e3bc59 SHA512 f366f12fbe623b384ba92fcbe6befd4e8603c50d37cc93973d088d3f9dd350a159a965173a787a7083819ab150d2d8f3b6fa94a298ccb82bffb9cc5c40a99242
-EBUILD libcxx-5.0.9999.ebuild 6614 BLAKE2B f9d459cbeb42546be39ec9d024a1784f0d40ee4fb6ddc9ea7b109b5adc3769edcad5f7c48bea70b3f087205f1e08c9f88ec38101db1662e48f13f88c517f94d5 SHA512 b15a6eb21ea58907beed4603cab1088ee9b53adece3a8fded74c50763afe5b565d2cd7ac80b4b5326829a9e32fdf728ddb99c17f5bd3a9a691689a56c8203522
-EBUILD libcxx-9999.ebuild 6458 BLAKE2B 9c11d52454631b6b2ad2fc792a644efdbad95d874d85e0a358ee78579a202faecd6db98c4f78407bd9eb31105b92ca04d4311038cbefe2b73a83329fc8518010 SHA512 7f73a4a5c868c67e2c479740e6c98f53fea359956fd3758d8f4270a0107158354a4c703810976c65e5d943c46394870f965ffa3d0f930e694d037f400859f36f
+EBUILD libcxx-5.0.9999.ebuild 6641 BLAKE2B cb8d68f8044165c202ce44c28dfd4546f32e2350d27f41c40928f0c22353f043aa68d72e9d16c2663606f117db7712eb0ef3bdc44586625c9f4b65ce21a8f073 SHA512 b25bd5d47e401f6ae8a29806a0f0259a6a1cdb7726d0ad093f87308a7510ff5aaeb2a59a619dfa8fe69f1c16b004fca720af769f7e3370914336ef4dbc4d4a16
+EBUILD libcxx-9999.ebuild 6485 BLAKE2B 09a9fc6dcf7240816f5a6eeec43446e983749eb5ae97a15f5df752c32c827bc5fef9c3b7cb3ff6b6dc290d8d2f7b00c239a93eec15809e12a0ff04cba2f1130b SHA512 18d69115e73f777ac6b98778bb64ef80da638394271ab71b07838fb7aa80661844829cf724664da4d6e56c1e22f8da6caa351e13d04119ed2c8f96df4c07048a
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 7cf64b9d1b2a..8b6e05f5ff3d 100644
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxx/libcxx-5.0.9999.ebuild b/sys-libs/libcxx/libcxx-5.0.9999.ebuild
index fde85c232023..bd31b1623010 100644
--- a/sys-libs/libcxx/libcxx-5.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.9999.ebuild
@@ -36,6 +36,7 @@ fi
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 17104067dfdc..cbc6f0f2df65 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -35,6 +35,7 @@ fi
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 906b6d51263d..ee29d20049c9 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -12,9 +12,9 @@ DIST libcxxabi-5.0.0.src.tar.xz 521524 BLAKE2B 8f21b423c3407515c582eb30832c7db45
 DIST libcxxabi-5.0.1rc2.src.tar.xz 522200 BLAKE2B 765a73431a01adfa81b06205e8e8646d5faae86bc7c9e84680b48f8aa65854a3cad64ba560aef39376176e73a71d0e318aeea931c24e3f1f935324726bfbd7ae SHA512 88e6f5d8622c6a675c79db8787ed19d71539ec14bb33f990928ea65aa96bad8accf761d4eb90c5462379e6526b18f8067b89c9ecb4eab5b756c79ff7522b1bf2
 EBUILD libcxxabi-3.9.0.ebuild 2627 BLAKE2B c2400a6de314ba79e6baebbb5da817ab75334c531728c7b5eb2f5abb8488439d48e23a7f3fc2d824c1ef52b602806795aa45a6c69012e6dc94d2312df4ec65c8 SHA512 2cf85fde3b6ddb253b3be983ca10e0dfdc9abb4db3d0750953442a90f734ef4c7053c4a6bbd8aab7391e19e73deba3769c2aaaead54162535d545f25f21f6826
 EBUILD libcxxabi-3.9.1.ebuild 2646 BLAKE2B a1f66067e57f09aca9d2f44735f3c7b01af38b381ecab526f9bae8ffbc5c96856c5a6d8c829b2d95f0a0afffefd319670c8484c826ce81b94a63c51bb53ed114 SHA512 4849fbfe11876cb403d78852abd6df27a0dbeada69c15fd1af6e7a20d742fcca064b227592e3ac69e32546cef94c790f28d63d40c8522213a9910f0b625ea379
-EBUILD libcxxabi-4.0.1.ebuild 2492 BLAKE2B 40b6bb3d9d2dc9268f49fc9e43129f43e7417d907604bece61156269948b2df4230297b0ce4035f5eb965fdf500d11447ed608bf0009c46b7247ae788c564f11 SHA512 b682381f81563248b3264ced6e0c313badccd8ea3fc0a915cb3bf4ad9bf813b952cc28e50c7391dd185b52dd2de488d63cd35aa859e3862cf83a9774ae29090d
+EBUILD libcxxabi-4.0.1.ebuild 2491 BLAKE2B 9f0bf316a6c451379291ab2825411f1a11c5924a4b9aa2dc7f742961c15072572240f945583373a3016be4cfde7993c123cb72cc6a93d31a56a7037d126f7df3 SHA512 fea9cfc1ee9389aad2e11a63802de0dd7c2f2e82ccefb5afa25349b64bba296022f293ffc66c5ba7c8e704513b17a77d911b2de7ef800db5f9a484596a9e147e
 EBUILD libcxxabi-5.0.0.ebuild 2323 BLAKE2B 54536346e2df1bac00277483ae44ed0c6f7fc2a1c880209d2a350fba020125fb08ec093bb65b949f09c6b904d93f55c3d12e3545971e331b148fc2c89f24a77e SHA512 540a980d884a5c1e7aaf627a855a6a9f64e8fe8ef89513ed10fbc56aeff77d160a91467c79348a3538273da1f3786695ade4c18a644aa46d97333ec411f26584
 EBUILD libcxxabi-5.0.1_rc2.ebuild 2558 BLAKE2B f3702a98518397cd545dac1edbc8da8a7f673f0cb28ea0f3c814f19edfe1eda9894af639802503a19caed57a77cd5d81dcafe67ad8a64a224d3ff0d0945a04ed SHA512 0d572c80ae84d92a53643b5de38d330142f1e54ee4757b127f1c119a506b6dcd93e2e96fc1fc4afa26727a5c661b43b4c063422451ce023a0abf686d3fe6d23a
-EBUILD libcxxabi-5.0.9999.ebuild 2505 BLAKE2B 46060a43a82da8c5cdcc0743856e29987e516a573753a67b415a14246c8803370e87b9adf4d9258d2b9aede24e43c9d6534bf95a6ea323b6771eb145296cb0c6 SHA512 3672050a5185ea9dd057e7aa732a96e5a385bd373e197a3709c1cd6c36fbc027b2a447ed0e96b20e55a8a6a98e9d952df9841fbebe5f81ee83f327a1fdb82fee
-EBUILD libcxxabi-9999.ebuild 2511 BLAKE2B 5cc402eabd98c9e34a38d0ecf4a96c67d00fecb638336dc7f95940abf4fc01b5ef743781709c4a262dfbc35d177f0eea9a4d57a625ba66e2405542810f97554c SHA512 f700b543d3f97a4b7b284db61ed1c5786b3a8abfb7f9bef09598ac6cf1f6556f90f3d0f6a5374e06e39fa40af3e2861a1a63af61d99b4c990d32fd613f1a955e
+EBUILD libcxxabi-5.0.9999.ebuild 2532 BLAKE2B a0cf8646c5f1de51a3cf5146cdef6a106869d65aef9e585acc01b4e26feab20b0407265ff727e1d0a4398685e9d64b26f86c78d2d054ea859e136abeb8d531c4 SHA512 11e684bee140b4b851727b2ede77726b355d676b92a607e0dd67a55bc0c42d5cbc19be68ba6041e71cbe10c7ec0bbd6e7231768e7998effbd162bbbcf06636cb
+EBUILD libcxxabi-9999.ebuild 2538 BLAKE2B df56a395a119b42e7e9bf2e5253187081f9b07cf53a8b94b911e50f25f09895b1e293f57f38c30847132a74b3df5094e06724e418f241b6d38bc94e478e2c31a SHA512 20299a0929507ddde82500c8ae8f972c28c900c62cdbe09e1e329ed2cd1ce0b1c76bf2f9e271a3981616409b26cd96ab2c11123dc397c0b83e9261d3bbf4b187
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
index 4d423309c10f..0610e3424371 100644
--- a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+libunwind +static-libs test"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild
index c6950c7dd0f1..e0e65a32002c 100644
--- a/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild
@@ -21,6 +21,7 @@ LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
 IUSE="+libunwind +static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index 0aabd1e62b80..1b77a1cfce7c 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -20,6 +20,7 @@ LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
 IUSE="+libunwind +static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libunwind? (
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index fd72ce5f6d62..d301b87f0d53 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -8,6 +8,6 @@ DIST libcxxrt-0.0_p20170515.tar.xz 60488 BLAKE2B ae605dbd85a619886a3dca4ded06529
 EBUILD libcxxrt-0.0_p20140322.ebuild 1948 BLAKE2B a442aeb9054cb6cced1f7ec165454541ac35d46dcc23c3a2cb81877166483502f5c3fb110858c14dd613713e73e73a53f2983a178c0f3336f14a972e1477811f SHA512 cd45ca0995e24113b1a14b3a068297f7dd1ae8217e873633429636902c93d4dbe98fa6949df81997c90bc15681442abc34859f179a8320ebbd193269330e63a9
 EBUILD libcxxrt-0.0_p20150423-r1.ebuild 2014 BLAKE2B 8d9e607e57b218c4e7e6508832a6826962224c18e5605f9d5598ecb3019dbaa69183c231b288f2b12c341bab6eadf8a72f8d9494e6de065c181a82f6616961c8 SHA512 8f8a7c32b57a66089d1ea88ed09566459a1038437f9df570dda9ec03cdd4fe9412136b8a2bda2a581dfae26624a5697d207a5adb7aaaeb3e740750a9a3785e13
 EBUILD libcxxrt-0.0_p20160922.ebuild 2035 BLAKE2B d3aedc1c4e5955824f1e72e545060339df660cf05c0917166a1c4eff9b44774680318f4e0657af6b59a7c5685ff705c9efde834aee4e06f6394c85cf28563e83 SHA512 ce681af3a08dc2d2fdd35009f33e22e5848a14ea072deaa784c8ff303573332f94df7e8dc3ff8c50c130fa5806ac71a7873ffb714b726876be60abe9a8edbac1
-EBUILD libcxxrt-0.0_p20170515.ebuild 2326 BLAKE2B 77fe47b754ccbadcbf95c6a9272651118910b5d02b356b1229d0f6aa738a272310755d6fb809a6cee14f34ff59e7955eba9b541247efc241276333ebceab9fff SHA512 cf66be5eddd69a4ce677acc242c7d53d3417f27f05b257b589bc9601fde5dd34301261553df8c0268f967ac94a4f3332012954006660b517b1ab15af98ca0d46
+EBUILD libcxxrt-0.0_p20170515.ebuild 2331 BLAKE2B 86747e835231f3c4fe3beffcf023ea6687b30d3064225b70d8a5fa40d831cb347bc353513460b70a7b6ed6606eab07ea47107f6cd8903cdb3d6b1dff6e2f0b47 SHA512 718ba346db7b7c59eec93868f68e6bfdc8ade3929ab054cb4b3c7bf6a1ad2e1a0ff653cad1177f76a57428ea9525218227ddefc945606338a792fc3337fd9135
 EBUILD libcxxrt-9999.ebuild 2319 BLAKE2B 60308d479b27db441a23e94a55acda96e91410bcf5189c64cd073775e9b201b34a6d83fc7f795f695529de6c093e07c1f72d1ee3bc0dd2d3a1fab2dac4269cd3 SHA512 756e662c154d5b0936e6ba2686b15045cffa358e02b938efa28b90cef6031f944d9cd9c7638988d3a1fd97747b34d84c4549c12695a3b23070d2f5076d092187
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
index b64983f176ee..a68f18e86397 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
@@ -21,9 +21,9 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~mips x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~mips x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 fi
 IUSE="+libunwind +static-libs test"
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index f9dad424b0ab..ab632e2c616a 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -14,9 +14,9 @@ EBUILD libomp-3.7.1.ebuild 1368 BLAKE2B 31a4e2b6cea595eedf00655e46a11e235c52a03c
 EBUILD libomp-3.8.1.ebuild 1368 BLAKE2B b686505a85cd3a343808fa1343d0fa6c31c8e66c43c81f92152553c4e996ba88000def2355ac079e2b7b0755efe064596ed7b51409443a1143287c6a1a26e6e1 SHA512 7ba7b4fccdbc2e9a69f73f5fafd985f862b4b28eb3f775d2650e78a2596826b1d8d947aa6e19f708572409139ea094da0d1c24ee35fb3d8812f8363bd948b3c7
 EBUILD libomp-3.9.0.ebuild 1264 BLAKE2B d47970eb3edd24601f97770c326f9274849425ae33aa745cb3544f91a0475944bd1d637b7a50fe3ef0f4643f7fb7adaa91756ca79acf556216362e8c8e1c53b1 SHA512 e0772254fd1ccf735a4325a41bcd30eaaeec30063a541b9f77a5295e1674e0b4a38af86738bfc9a71f4196b81945cd7c08655fc468105aa11d24c38d303aac0a
 EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1ce0abb127d68bbe09f4e735d6d8ed4404f19bb6d8cb4808a782a5b72c9425e4acd2fe2cc97ebc3372de1c72c SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794
-EBUILD libomp-4.0.1.ebuild 1972 BLAKE2B 14fd15282bd6cc46f4c3632d9700671f9c6f8a457d383c86348d8b80d406e99a25970c0f9719bf8de48aa385e0c9f7da6eb2f834d93dbb1d095cf21c23246444 SHA512 25176de83d8627320cbe14ff163a6c1408bc002ccf90db38709bb42c61d34bf6669f10508ca973c5be73c91347be5b65d4a574fb7d8fa1a2906ccc87f97af6b1
+EBUILD libomp-4.0.1.ebuild 1971 BLAKE2B d19562b2b0778606a4d4b71bf435387c6b5e0f0fa361172a5603e07d43a87be015a65cc138b775a5187d0acb050b07a7fb2401b1a6db8fc4492c4086a3f73399 SHA512 682abb24a1023a0edd550ed0dd10a8f4882d2b2b1c16ac2c83f88d43055474a8175c5a5bd25fb0f2ccec11e21e71b6ee17bd2a36088c92eea99bd8b656c4ae52
 EBUILD libomp-5.0.0.ebuild 1807 BLAKE2B b33ad89c820b4583321ba6bed22a6445cd71ad2287915cb3676e57a107b10e7357c5c9dd16fea04ce7fad6f40d714f747f8e73f042e0f46e7b968a2ad2ad968b SHA512 f559d0a90ed50d88ceca3fff2cb0ded4dd15fdd2845d8259453429c4ccfa7232c32d39d295d39cfa5d417c0f87eb72bc260f31ab41c635be460fa7b0661e05d8
 EBUILD libomp-5.0.1_rc2.ebuild 1791 BLAKE2B 811c45bcc2f944ed37bdcdadb9871cf22257879cec4263ee4be46f0f41eedb0cb01faa42eec8f744a5a33e66f473f4bacada524d85208422879309b0e85cc347 SHA512 7adaf81a85daf8d963cde88bfda0b319ada94addff6958d454f2fc8deb091bead3456355b4cf969ef7109dbf996c77388b06161b895541bbb04927549b5db6bf
-EBUILD libomp-5.0.9999.ebuild 1820 BLAKE2B 4be7d2ef6df5f77f6a6487d4a38e077917d1c725ef15c80896f2b8d410e961c54b47712f00c8c8c435e21399d1e46b345c1082377d4d713e368e0741f88c179c SHA512 44029d28b3c3855bd449791973a7c4b386b035269deacc78bda7edf5fd94094247fe64604e98ab2a970684782259df88573589441b6e410a1b7e88f96f260433
-EBUILD libomp-9999.ebuild 1945 BLAKE2B 933b91f158d315c83b222e948bb2465dd7ceeebdd26cb070e71a0acc258ee45c743f8532f915873f8384fdc1371211ef393e7be0e74e72e8e117aeb157db227c SHA512 c80e50ea516c26da5fe12dedb1359bc87958bed2dff5c8528280254a481e47b4193876929dd3622f29c55dc2623f92a36171e582296adf650bddb0918539ac2c
+EBUILD libomp-5.0.9999.ebuild 1847 BLAKE2B cb17caf6b069c5b2dc8389dea3a1d27762f1ef09fb9678f21b4da38c9eed801e2e30bfb70c9e5c1a377384c9d6e6d86d1ac1d36793f8010510ff62db9e1789d3 SHA512 cb455d949d818e7e05d2ab58c3e3ac43714273e4fc8fe9551e774e7fd72587be1353b8acfa00487fbe982716f366fc1f64023952b8d525df1febec5cd837f3a1
+EBUILD libomp-9999.ebuild 1972 BLAKE2B 857ebaa53c46c3d359660f78b747e8dfa0e056634bde1a7bd7950ac36c1c05d6404cdf9b12f94c1440085d506cab5e35dea03fbf98132ce20a746bfce5c7a089 SHA512 9198129a5bc13f36c882b9790ce03d452481f702e10ab9bfba7362c11d250889c30e5ffab90143e57d953fe27fd0d050413cfe72ccdb34d33752b8650e68d058
 MISC metadata.xml 670 BLAKE2B e059d444954246af28f1e5fde5a5bcda4662965a09fbe77d852e27ee7017e1723937b693c4e057963b71e32b5492660965a15af60087c540dc1161dc1a349a38 SHA512 d4269bb7192e00feed26327bb2ac36db3b1c4f5d55417c22efb9a64fa5a006c17dd39459ecc305e8a9a3a954271ad10013fe5c9159a30ea609513aabddebf485
diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild
index fede770fd3ff..0ca953656f66 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="hwloc ompt test"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/libomp/libomp-5.0.9999.ebuild b/sys-libs/libomp/libomp-5.0.9999.ebuild
index dbbe22181596..fc51f5600aa2 100644
--- a/sys-libs/libomp/libomp-5.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-5.0.9999.ebuild
@@ -25,6 +25,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS=""
 IUSE="hwloc ompt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index d62e8ac7000c..3a3f7466c591 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -24,6 +24,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS=""
 IUSE="hwloc ompt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 5fd83476bc80..52aa9ed28a8e 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -9,7 +9,7 @@ DIST libunwind-5.0.1rc2.src.tar.xz 72024 BLAKE2B af3644806722f1ffd844b4ba4c6d14e
 EBUILD llvm-libunwind-3.8.1.ebuild 887 BLAKE2B 3907895101351e22b913f3362d6c9c68790f1ee95c22d90980aa7e90a0373173830afdbac9298426a21e41dc8af17b8449e4f00b9c532173dc9d4a993b9f0fb4 SHA512 bbb072b142bf07850f2ff7ae59d4f46693bd7b43b326860c76c232d206fc129541eb658e6f31d5103115b572ecc5af408617be4ab3af04ed520000360df38bad
 EBUILD llvm-libunwind-3.9.0-r1.ebuild 1182 BLAKE2B 8a01875c7c57c4c4052d0bc6807945e0a086106135a73e08b5f18b52230d36e5eff2b57b1d8e26cdaab4e8b57da045fe59788966a97014d2d32cbe0f70c525f2 SHA512 409250525e1697964c71d8abf80d64da6da8361324db073fb4ab6facc5dd4a93d65a98aec0a52ff895ed865d7d102c8ba2c9c4fa51cc6cffd9bd73f1477d6992
 EBUILD llvm-libunwind-3.9.1.ebuild 1187 BLAKE2B adc3bdff94f0b5a855c4d6eac0ee123dbdc845da541d06fb6f3d533a0375d969427488cbbb4bcef4d545c8e6993ab4c78a8c5f3bca9f06f2b36a84199e471b0c SHA512 bdd65eb012df3af046c71406af02927255f3502aaf92e53fa9dbf2adfa0150b68e4325cfef2f07d1893738ba6ba3f009a89e37861ffe7999752ea77fc3963a0b
-EBUILD llvm-libunwind-4.0.1.ebuild 1095 BLAKE2B 326bddee05e2b13256a5a07c300ae431ff197e87dc3b02f2b3ceac657775f9865178a61df1d6cfb67e1225bb7307fdcd2c4164f2cda8a55d632336aee7f5726b SHA512 f1c2f3c276d66eee844c62b6e59f80a11618e2d674d043523c72f291ee72eb2979c75f494443b986770c46a9b65d7883451b6236f0020e52336fa8e0bf6b9d71
+EBUILD llvm-libunwind-4.0.1.ebuild 1094 BLAKE2B dec5d0847983833e461635ac5711b5d253963650aed87678277bec86d1334ae9348d26605e20acf2a8d2405e891dd10c9303abf7d243ed86e36c8f3e3f12b83b SHA512 3fb7283eea0b4282c549d7cf2cee1aea0f9d28b7689f5b83a32893c32ebfabc703eb0328593109db96a86351b639bc3e60572c7de93fbed18dd359a14b352386
 EBUILD llvm-libunwind-5.0.0.ebuild 1096 BLAKE2B 50a0cc37e419efa13bdb883d11922dc51b094d09b8fb758e9f8e5b5b0bc17bc17cf2ecb3384691e11ee54b8e813cb5a95afcd4e34c364dc6221ac8a5a8ef3ca8 SHA512 8ff88efcf19f55a6880f4fba24126645b6429eb667ea8cdd90aaa800ec856f1f83c2ce2ebfc4a8074ee25af2f68ddc67216e1a1423cbc2f744accf0a075bbcb6
 EBUILD llvm-libunwind-5.0.1_rc2.ebuild 1080 BLAKE2B a077659210b3e67b359392603846d48ac50d68d509ee6d6e42239701b6d681d766d0fd6a83ef832b6d689e08e5324433ca392daa6662561314a117aec3481b57 SHA512 c244e325ae926be547381ab959393a10124296db6cf456d34b3a72e93190d9d5cbcb2c733b25e677fedcba3a3967454f1f8f8b4f7a8c0df6a6f50b8a9f7e4317
 EBUILD llvm-libunwind-5.0.9999.ebuild 1109 BLAKE2B b86a453abeeacb3baf56bef5a5daa3a2c8df3a251e589f15537bc56c500edc069be3a56fd04c3f71581fc05b2c7831eeae34b3766ed7dfc31bc735a979cfcba6 SHA512 926839a7f702a1827cebdb45289560409056f63c77d1a4a57a2b00b8b9b813353b06b8742628d6a23d7dd4c94864af6fb059b9b6d045fa31819af4a7513046c5
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-4.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-4.0.1.ebuild
index 416847799c24..92fe84f04882 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-4.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/libunwind-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +static-libs"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index eb7d9c96d19e..feb3d773b916 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -8,5 +8,5 @@ DIST tzdata2017b.tar.gz 324317 BLAKE2B aec4ac18b1ff7435754923c62e424813c975d0e06
 DIST tzdata2017c.tar.gz 335571 BLAKE2B 466eefacd5600d15685d973b16d98053b3610efd9a1a9c7c7f1f384dcde8950d037c25ef065a85876433f9e9483fa72c46bb28f9c4225c7fe38a6376ada91132 SHA512 feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
 EBUILD timezone-data-2017a.ebuild 4599 BLAKE2B 921bd7e12a9f5e5a0a636f26998c4e7438838d79270a862c64a149d79576ab1b47241d41ffd7dabeb672f14bb288fb0d1ac4d285a3f2e20aa9516c1ab0c0c21e SHA512 0fc13e2b412819126186dc725210069c89864efb01cafbe521a8345788be8ee3d3b1d59a4e0a624fe6919f6b0418947a64ca038cc26a50bd6f12624489ecdd65
 EBUILD timezone-data-2017b.ebuild 4676 BLAKE2B 8a32faba541657e795f39e92f67899b5c0b076dc14f5efe21124375bc830c362672a6b1181fdfcb2704ef4e01827a2c75f7de101279925c87246eec499176dea SHA512 f68387320004598e1b55612b6228e21f708581878485f08547ce58d3fbbff456b2d6af3fd3810398308784724430fd64202781d0df88d4a5acc676e56e82c2a9
-EBUILD timezone-data-2017c.ebuild 4665 BLAKE2B a82a9a9aab6360e775e6b8a311f359f05680f364be3502f0a519d53bbe2ec1f9580434ba1d0a616566eeec0de3fa7873c3030c663b0d0d54ac520e9f0fa59ed9 SHA512 0c2866a6d65cfc93c50f1c4d892c906fa2f07a10f178a78118dc28cdce54ac3a5d9906e76377509ca091319e3fed934845b58dd55846c090cf52509a73774f40
+EBUILD timezone-data-2017c.ebuild 4664 BLAKE2B 4a223b4c38625ecf29f6aa15eafceee6b9b3919043c837c0697d0b100c9e52f8b8083603fa87e6eaf7ce951bfeecf44c408c98e590508754e19fa4fe9f940428 SHA512 53e9175f1a0f10a218f946e4fbcf4daf195de0f78bd7b51d7951d0ec4aad7fde8872d44215414b05f518e016151518dd0a0774bd6725079944edf3fb89201389
 MISC metadata.xml 658 BLAKE2B 75ee5deafa4e9c1336119b2b2b87de6f8520a29f8fa7901c4995bddbb0cb185de9a019ff7703d0a8aa7b2f685a9ec2ca518641ea0c0a1b6123aa05faa04274a1 SHA512 94b68a5195b17cd1a7283a90a42ba9e1dfb0e7dde7c16f48202233cc2fc20ea718a1588b57b2af372e3c35ed403276cdd59456165a225f149a813abff2144c73
diff --git a/sys-libs/timezone-data/timezone-data-2017c.ebuild b/sys-libs/timezone-data/timezone-data-2017c.ebuild
index 221ca19c89f1..b5a35bed920a 100644
--- a/sys-libs/timezone-data/timezone-data-2017c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2017c.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.ta
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="nls leaps_timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index acbe52167410..f02d2542d19f 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1,5 +1,4 @@
 AUX uclibc-compat-r1.patch 814 BLAKE2B 75fe9c5321171f3e378200e1c4d11792b3ea047fb4e62460cfd03db1fc761a7e711565ba97afd507a5996d3adbe83e08152a28464310098599867bcc642c1c53 SHA512 35eedbf33282285ae362a6e1b71f91a19ded8b18792f706b3d7e9c68221a61db238d84772a793cf086001272eda1b227043b90e8ef31c27796ffe837ccad11d0
-AUX uclibc-ng-update-reboot_h.patch 1254 BLAKE2B 48b75fb4312a093fcb1c2eca4a12cea043dcb2874296d2238530268546571495f6954e8aca1f4217381f1d91146bb8e2fc0aaa253136b1b92c0803784464728f SHA512 605cabbbe19c3b2c442d7629c5adc340dd8899ca484b3d495d719a2fab68ef881973043c663211a61fba167ff0bdaa12f8534545da8e3049ab27ab1439477964
 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
diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch b/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch
deleted file mode 100644
index 70d7d709b624..000000000000
--- a/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5a305695ad09696bc27c1928deedabbc9e93da55 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Mon, 22 May 2017 09:57:27 -0400
-Subject: [PATCH] include/sys/reboot.h: add constants RB_SW_SUSPEND and
- RB_KEXEC
-
-This syncs up <sys/reboot.h> with the GNU C library, see their
-commit 1a09dc56.  These constants are needed by init systems like
-openrc.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- include/sys/reboot.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/include/sys/reboot.h b/include/sys/reboot.h
-index bc685aebb..fafd2fb0c 100644
---- a/include/sys/reboot.h
-+++ b/include/sys/reboot.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -38,6 +38,12 @@
- /* Stop system and switch power off if possible.  */
- #define RB_POWER_OFF	0x4321fedc
- 
-+/* Suspend system using software suspend.  */
-+#define RB_SW_SUSPEND	0xd000fce2
-+
-+/* Reboot system into new kernel.  */
-+#define RB_KEXEC	0x45584543
-+
- __BEGIN_DECLS
- 
- /* Reboot or halt the system.  */
--- 
-2.13.0
-