gentoo resync : 21.12.2017

24 files changed, 49 insertions, 47 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ca277dbb7a74..d32c1dede670 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 937c87a1b459..93abd2fefe6b 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,13 +1,13 @@
 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
+DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4
 DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887
 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
+DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3840 BLAKE2B 72c9943e4bafed115dabfa2fa33a035af9259bc764e8ac6797a9fc7c62aa60110feba43305b25595b6819e7fab261edc2619113deb5ef5629d0b433fc788717a SHA512 1d0d63f67b71a718bf7ed8bb422659a1b83f7c5dddd7d5cf436d5e7c266eb5ffd9096a2653c18b5272c79d659b898ec9fe489ba94d8786cce7823acea11724a9
 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.1.ebuild 3872 BLAKE2B 01d83a8350423026d8b6621cf42b6378ab597a5a927dafd408623bd769d5a299f4d5b455e8eda9c7622a0d85cbbd8422e3042cd425d087e2bd66e929a998ae2c SHA512 a999fddfa85ca29562f69f5183fd01124696a16365dad96b8d53e9b5ec9d988fb627bd0015b733cd8f904254167aedad15801b6a383fc681a4fdd8d2e2bf518e
 EBUILD compiler-rt-sanitizers-5.0.9999.ebuild 3880 BLAKE2B 0a35eefb914655b0c1071b8c41d4aed44f0f2ef650a0368361bd499da2b2d935c8ad505cc9a07fc346d6bb7e66645166b20a41bb063c74928befb8630acd73bf SHA512 0c805ba6b3d3a4fff09fb46e715c2cf7b9963b4c8502fcdcc1946a0128cece01ee84f7efa6dc25d3a181f9c7803d24e3590ff28bb9d79cafade48597cd0bf49e
 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-5.0.1_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
index b21d511f6b07..b57277b9fbe5 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
@@ -15,12 +15,12 @@ LLVM_P=llvm-${PV/_/}.src
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 LLVM_SLOT=${SLOT%%.*}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index f9c4d742af60..b1366ba4e1dc 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
+DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4
 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.1.ebuild 2465 BLAKE2B 673b049f9f286223d377fd1f339e3d6854b9833cf8009b646f63ae36b4c885463d8f072332e19591e937b71f3189388353310599d903a8bd062c53e88a706869 SHA512 a6b6cc988d66efa33917031c30edac1685a2421250182b74e3ae50f86ad30e60b088b43697d256a77cc3e5a0ca44dd111801dd191f20563e35c5620f5d28580a
 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-5.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
index f0801a9eab43..9b135a41b328 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
@@ -12,11 +12,11 @@ inherit cmake-utils flag-o-matic llvm python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+clang test"
 
 LLVM_SLOT=${SLOT%%.*}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9173dd589b29..6f76d4431c13 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,5 +42,5 @@ EBUILD glibc-2.23-r4.ebuild 5011 BLAKE2B 5b002c214f74b9eeb1c5898c32560bd7b8f8651
 EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92ab239a6086164593b63338cf7a841f3cde2891cb108859ea41d2b9993884411d132a8db787d2cc06e9a7087cdf SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2
 EBUILD glibc-2.25-r9.ebuild 5039 BLAKE2B 0706fb07b8ebe4c746e0654274a7a7ee60e197e8765b8f78995af7b0ed11327628ccb5addfe423205e63f00990b19e1d1a6c22104ca437966d947ad2913354fb SHA512 bbcfc6992111c0b8a4638c0d1fe45c1f95f9f03a3db79afbd2a7a61f4736d38810f191bbb0cc4cecdedf4485c2586419f867587084575c5f50e5e7b7cea7228b
 EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
-EBUILD glibc-9999.ebuild 25185 BLAKE2B e68de57a706879b932db7089c9981107bb9cac9056f1607800fa1f5e452cb4369f14d30596ea77adf92f562d3ef646600bdaa15515ade14fd85e11ff4063d8b4 SHA512 2f10ca2c5535a4c542ee4a8141841a501c738d07715da1e0e2f70da4cccb54ff28bee9f90917fa26ad32779f48f446c96d73e1601b037bad70a40665f1eaeafe
+EBUILD glibc-9999.ebuild 25615 BLAKE2B fa6507373cf8c934beca7228b8768cfc573077f416e938e5b36cc5f39894ac9a646b05746548b7b7625f4ee34ffbd165319aaa45768a963c10b8d8654e304826 SHA512 ed0a29a626c9a55432d45a5cc3814b34ee3fae775eb529969810be918f33b0fca4c0bed54d66f07961a0600e1cf8aec67ca611a486f48853376bdd510008a82e
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 68d17a224695..a5bf3b51ebc1 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -342,6 +342,17 @@ glibc_do_configure() {
 	esac
 	myconf+=( --enable-stackguard-randomization )
 
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
 	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
 	myconf+=( --enable-kernel=${NPTL_KERN_VER} )
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 9994020aa3c0..48fcea5b6a00 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-r1.ebuild 1477 BLAKE2B 683242711e05bea3fd429d2bbdbca4f3355331629d50843623be467105184e8c4588df743c7f11f955b0f48bfcb1a603773ee8bd90d78e8a25247a99ba39e5b1 SHA512 b863b56bed6b797ddded0706d06a22f3d6406f898787117b4a55b1db526877544dd5e42071c8ca8b28c04a97ee05106155d5eb6833aaa4f4c9be1b22d88c342d
-EBUILD libblockdev-2.15-r1.ebuild 1479 BLAKE2B 97b45c9326153dd6be11594b808f6c5304b273d92fc61c7f66d6d2a36ae920907e8c079e0008311dfdd2bd817412e98a50f88efc6931ba79d7fa41e12fc08bfb SHA512 a25739dd9021976e765e9d311a41b6303917bc8bb404f414187a139721790a1e9ad38a25c364a0c0aa68d103ed6c432d5094833f6fd9e85d0ac081a64f4c5db1
+EBUILD libblockdev-2.14-r1.ebuild 1484 BLAKE2B b68fac839e029d54c45f8fc3af039eb06ba45404eef2d0ed356aff07740da83ac32b020c94a5551e873cbab9f5b2cc9a307c70a43d5a7a36868d9455e6b0dda0 SHA512 8a3ed88adc55976fd14dd3e3ab6e1bac4c49a701063084ce695c981ec9c96dd4180a81dba2202f2240f9984b42ed6494d0ef4a6d081d5b9c0f4ce24b48c4e339
+EBUILD libblockdev-2.15-r1.ebuild 1486 BLAKE2B 86fcd5aae0f0af81039770937792fb07ceaab2922616eb2bca03ef99cd8e1bbdb0d9e6eed70d6bf0997bc815ef323b1860c228a30bed1528aa56aa0dc6b4ece3 SHA512 95caa41a0137386e06c71d9e4cfb61029d846d661e0b5e04dbc2c611be6aac486db5c306511d80cc8bf07dbd6806d3a3e5ea02eefeb176f3f5598a7ab4c41963
 MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
diff --git a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
index f6c6ea77308f..30b34917f3d5 100644
--- a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
diff --git a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
index ac5b3b314a1e..dbbdbc4beff9 100644
--- a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 56a32803a309..ec81b292a85b 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,14 +9,14 @@ DIST libcxx-3.9.0.src.tar.xz 1198308 BLAKE2B 689fed969562466bd230445a0edb886880d
 DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
 DIST libcxx-4.0.1.src.tar.xz 1446380 BLAKE2B cd871eff4c4ca25a1fe4d27f778e913fe536a0b5863ea7dd3c8895f6b743b6f039e4df71f9ba5124c98761a8099666f68e1dfd073b5ec7b9fe0007ef09a9117d SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a
 DIST libcxx-5.0.0.src.tar.xz 1518940 BLAKE2B 5ffb6dd99bef7cdf800dd458b4f9ef6ade9270221a60165cbbe8480f550235f12d877818c8272a04b5077e1f1c56f8e4dfde42dccfe6c1d8875ceed6fb339d5d SHA512 210749f6585d8fd39fc63a32dd85d68de4aa480c91915cbf419b9e8a3b300fa4624f03200ed963cecc8ab233777c36e8c522fa0762a2aa068bc65e6f48118328
-DIST libcxx-5.0.1rc2.src.tar.xz 1533332 BLAKE2B 7ac60315ca68054cafdfa3814daea3fe288c140e397b78474b657d7816dfb00c0b84715fac41a7257e85c61f27d7eaefaed7096356c39f02ff2c305440e00bd3 SHA512 aaf9aeded70f948440cb55f3c8a7633be6edb8abde496d5f1571d62fb5d34d8f3ec27935a774224e620b26845ab1081189511a5eb223b5611ec4adfbbc3a2641
+DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 9454fbca8228ee456feb79b65a63ce5daa27bf2e47e457d79592f4974dceeace19fe6cdeee51cc51f94e9072d7ce3c03e5acb617507670153647b9c435feadbd SHA512 994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c
 EBUILD libcxx-3.7.1.ebuild 5341 BLAKE2B 10bb770ac1f8567c88dfe30f58f51530f5d767c7d7aad9a4840ad684052eb549d82883cd7e372000699260e53973e19b297850dabfba72d889d61dce0fcd6251 SHA512 12d94732f3446447a0ed025dd7df4ec7711c3d3278c98c2922c85c6b78afe369bcbebee65e259825b4008417decfa4f6438ed803a8e271418b061864ee5de9c0
 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 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.1.ebuild 6303 BLAKE2B c56d390a2d9ec464af90befc35e3e8c37003e90a5a9a131110edf49a4b31749c586463556555c9ceeb234201d560c3adf5355422b73a38919ce45760b99a6636 SHA512 72a1d367d03be76b8cc43ea3653563be2c86376c796b759fc99feff4e7489a86875548fffe89ab87b26885a94028a1131a5f295c5e5ec5270dea80f2a6e189aa
 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-5.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild
index ab78b95992b4..43a14f9abb6b 100644
--- a/sys-libs/libcxx/libcxx-5.0.1_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.1.ebuild
@@ -14,11 +14,11 @@ inherit cmake-multilib llvm python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+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/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index ee29d20049c9..ce31818f22d2 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,17 +4,17 @@ DIST libcxx-3.9.0.src.tar.xz 1198308 BLAKE2B 689fed969562466bd230445a0edb886880d
 DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
 DIST libcxx-4.0.1.src.tar.xz 1446380 BLAKE2B cd871eff4c4ca25a1fe4d27f778e913fe536a0b5863ea7dd3c8895f6b743b6f039e4df71f9ba5124c98761a8099666f68e1dfd073b5ec7b9fe0007ef09a9117d SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a
 DIST libcxx-5.0.0.src.tar.xz 1518940 BLAKE2B 5ffb6dd99bef7cdf800dd458b4f9ef6ade9270221a60165cbbe8480f550235f12d877818c8272a04b5077e1f1c56f8e4dfde42dccfe6c1d8875ceed6fb339d5d SHA512 210749f6585d8fd39fc63a32dd85d68de4aa480c91915cbf419b9e8a3b300fa4624f03200ed963cecc8ab233777c36e8c522fa0762a2aa068bc65e6f48118328
-DIST libcxx-5.0.1rc2.src.tar.xz 1533332 BLAKE2B 7ac60315ca68054cafdfa3814daea3fe288c140e397b78474b657d7816dfb00c0b84715fac41a7257e85c61f27d7eaefaed7096356c39f02ff2c305440e00bd3 SHA512 aaf9aeded70f948440cb55f3c8a7633be6edb8abde496d5f1571d62fb5d34d8f3ec27935a774224e620b26845ab1081189511a5eb223b5611ec4adfbbc3a2641
+DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 9454fbca8228ee456feb79b65a63ce5daa27bf2e47e457d79592f4974dceeace19fe6cdeee51cc51f94e9072d7ce3c03e5acb617507670153647b9c435feadbd SHA512 994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c
 DIST libcxxabi-3.9.0.src.tar.xz 511324 BLAKE2B 75c35b2b30cb04db35db93378d1cc541f194071564c5c8d4c577f076153fc34c7aae793527566cc912437e0f255fbc0520533037b5376105e8e9e4f80a71ba6b SHA512 500207bfd59664bd42d920741d6b467c4b88569453742db6470af081c77be04894e097a14b8419e333b51abce484566366e35cbc3ed2607cd86dfc0ec0ddd0c5
 DIST libcxxabi-3.9.1.src.tar.xz 510964 BLAKE2B a6abda1b92473781ea3029169c43547f15c1aa6e0ec6f9692ae633d109e050a6ff82ce8bceb0455375991b85c99784a4f06a568b8c77a4cf2865b9b2861e9595 SHA512 4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e
 DIST libcxxabi-4.0.1.src.tar.xz 515820 BLAKE2B 7d9e0dee4f6cb3eaa22647d959f8bf3d86779f8c51c0738143ba3daca83881daacc0663a1d2463507c8c4b8a1b9e1d5c111b829e5af2cb5b6f86bae8f06a0d47 SHA512 e94315ba8a507d8481d70c33e7ab2d724d51726edb8412c70a1b5f59e3f15d5825f1502dc2db138b20e5293fb90a184050be94d5ac270fd7ce78b502efb9f86a
 DIST libcxxabi-5.0.0.src.tar.xz 521524 BLAKE2B 8f21b423c3407515c582eb30832c7db45df2b0028b5cadf3ff32280781b72b94ecbc921334e5c1f35581bada2dfe77590fa997555b355fae3abca48a2b15a696 SHA512 88f48a3232c220a7d22ee31121e5c2bd09b506177079a1ff567eeae213e24a9bb8bd13e59f0c6ca5ec995c60bf516e3c2507d342a149a2c4cef8aad7b4b330f8
-DIST libcxxabi-5.0.1rc2.src.tar.xz 522200 BLAKE2B 765a73431a01adfa81b06205e8e8646d5faae86bc7c9e84680b48f8aa65854a3cad64ba560aef39376176e73a71d0e318aeea931c24e3f1f935324726bfbd7ae SHA512 88e6f5d8622c6a675c79db8787ed19d71539ec14bb33f990928ea65aa96bad8accf761d4eb90c5462379e6526b18f8067b89c9ecb4eab5b756c79ff7522b1bf2
+DIST libcxxabi-5.0.1.src.tar.xz 521504 BLAKE2B e8263f458545ffb8ec27234e554427696644dcde3b46bea4fa0ee14b2b174d0c6c8dcc7905477140afaf567347e91815827aa6700c92ccfbfbea5364f591fc2a SHA512 a8d448653772690a19f68c1270f9cf18f27d7225847825f29c6ea21846c1074aa61c31b81bc2ae4007067985d389071c32e69b2560282ddb85864a99e9bdd884
 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 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.1.ebuild 2572 BLAKE2B f26f8acd9b6fc6015918b2edce1fad7c154dad9dac9dbc5fd96b1a7629bb10cf8747044d40fa5170e0bc2d911a8ad9baa8608320f090cd3608535f919f924f87 SHA512 1123673cb0fbaeabe73b8cf23f03b0d606b99ac11e82fc9d8a428c3db531e35b683b8957dbe9ac5f07b3c8d149e790e22c135d236ff7d22eed16170845538d9d
 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-5.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
index 70f374bfdaeb..97d5b4c62394 100644
--- a/sys-libs/libcxxabi/libcxxabi-5.0.1_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
@@ -15,12 +15,12 @@ LIBCXX_P=libcxx-${PV/_/}.src
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	http://prereleases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+libunwind +static-libs test"
 
 RDEPEND="
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
index d88c1e034e9d..de5ffc019f07 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -3,4 +3,4 @@ AUX libnih-1.0.3-pkg-config.patch 2491 BLAKE2B 6308443ce8ee8c77564a0c9a64b6f0a31
 AUX libnih-1.0.3-signal-race.patch 2081 BLAKE2B c11b900289e5fbb53b3d7e7f6a90d302bbb06a7d041b1b9b502ff585e440697f77b2ae5e2eb7ae40ff3817a052bd34da02766efd1ea021ce3ad78c4542307edd SHA512 5367cb0c6382004cc2a829b9b71f0c02a09e4983940afac90c4c5c0bfbda53fb36a6cc7e38ede7a895ce28f99a4f69e89392ebaadefdc536eb7efa90c2426ff8
 DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
 EBUILD libnih-1.0.3-r3.ebuild 1483 BLAKE2B 7cbff91bf9f0d3b04b5b02d9eeacf62c00c6b6f830ae38223fd2e08f4ade97d2b7696993a42e322ca74c661847a0d60991e22d9e97a366fef35c10cfaed2702b SHA512 e4986f22dd8460c14604cc3d7caba029ba8cb17d38593c5bc4f044613ccd1590b1cafab8c7593c8e3efb96b17597bcb3437b3993d7abb5296c131bdddbb20fba
-MISC metadata.xml 357 BLAKE2B d50d43b299a74cd85988cfa55cf007a8caa643b89d52ee177fd7c8598c3d63a104a092d6a66fa01cfd21a73d5a6719623b5c47d51d118d40a014c17431dbaa9c SHA512 c9748a867960a45077282ebfbb48051e3995bee6648f14547ac5385b8baddcd36f927bfd94dfcd1656342de935ee97a2f376e687470720ea761e035c7c5feddd
+MISC metadata.xml 241 BLAKE2B 02f7c7b912751df8725055416a093647e79dfdbf7f06c9f56246c67f6a1176997454dd3aaaa493ecf7d00d8ae295066e2861ac10bee860a94eef6085437561af SHA512 31e21c0bed310c4a025385f24c5b76f2e588999912fa548ca343947d95ad448b3a1232211cd4427607550c0f5de2e562e2b4e492415b6d207c954a516b811a84
diff --git a/sys-libs/libnih/metadata.xml b/sys-libs/libnih/metadata.xml
index a889a8646dfc..c029a63d0b84 100644
--- a/sys-libs/libnih/metadata.xml
+++ b/sys-libs/libnih/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>feel free to update however you like</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">libnih</remote-id>
 	</upstream>
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index ab632e2c616a..b8860ff74d48 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -9,14 +9,14 @@ DIST openmp-3.9.0.src.tar.xz 2257596 BLAKE2B fae0e3e36afcd1a223030f09209865ce706
 DIST openmp-3.9.1.src.tar.xz 2031588 BLAKE2B feafb94a832ec48a67d6e00720724dcecb533a4a09e0d69462af33e13454b20393aa21fabb062c362824cdfbee712db1030732271e4cd49085fa69cff9800835 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b
 DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf
 DIST openmp-5.0.0.src.tar.xz 2074004 BLAKE2B db4a94ab4a40eef794494b9ca00568d8841ccab57d9832227b07014f13494b2dd1fd90c4c4a34aa7516388efb827026f5353ffe67bc55d1a9b80617859fd6822 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513
-DIST openmp-5.0.1rc2.src.tar.xz 2076308 BLAKE2B 8728f9da3f8627ff10dadf36eeabeeb6b7228a2c36fec13f679c7f4cbed680fb7b177f7d188dd001292062577468b71b0d14643df86974c9849c0e9876726821 SHA512 9d4464f4f22164057bd8d0225d1c5d90df54331a6b63a905032c7b0e3e380b2d689dd08b3175c53e6aae95315060f107a2fb15bc23738a20cbd6e1751c5d789b
+DIST openmp-5.0.1.src.tar.xz 2075472 BLAKE2B a4da4726a17dc0fd083e11fe1bebf446978137aa4453000e8fea950021fff091a818246f0817dd60ce67353d3f7d75ab8fec2b9e955389d9c94e195945efda50 SHA512 4493b918fd83ef26e2b3f3429d1b00d722328e4c9697ac7625a390834f6e88ada8e5b02ce0ecb4771129207b1b81a9d171f4599ab9388762a3c6db0afc499ff4
 EBUILD libomp-3.7.1.ebuild 1368 BLAKE2B 31a4e2b6cea595eedf00655e46a11e235c52a03c278bef9f61586e35fc59d288c63d1416880ad0e70cf6c935bd3466437ff7508d208c6153e19e6b5db12f46ca SHA512 ae3b3688f05694e867d98f1a02ef70a36d95b457f0fb369c0f60c86ee4b1a37fab860d1866bf437c6a4344b96904618e717b3a3a5ec7e6756065e4d5e35c9a3a
 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 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.1.ebuild 1807 BLAKE2B b33ad89c820b4583321ba6bed22a6445cd71ad2287915cb3676e57a107b10e7357c5c9dd16fea04ce7fad6f40d714f747f8e73f042e0f46e7b968a2ad2ad968b SHA512 f559d0a90ed50d88ceca3fff2cb0ded4dd15fdd2845d8259453429c4ccfa7232c32d39d295d39cfa5d417c0f87eb72bc260f31ab41c635be460fa7b0661e05d8
 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-5.0.1_rc2.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild
index 174b86c806f4..7b723ea293a9 100644
--- a/sys-libs/libomp/libomp-5.0.1_rc2.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -12,7 +12,7 @@ inherit cmake-multilib python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 # Additional licenses:
 # - MIT-licensed Intel code,
@@ -20,7 +20,7 @@ SRC_URI="http://prereleases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 1bb02c73f43f..19033da9fba5 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -4,4 +4,4 @@ DIST libseccomp-2.3.2.tar.gz 559238 BLAKE2B 0040ad977431ae9731dadcae11b0099d3ec7
 EBUILD libseccomp-2.3.0.ebuild 955 BLAKE2B 4f8809c66da37cb71217ed72bf36e8bbc8813065f1b812eeef1b309fca18b0a8a4a39b613a6a79d41914655778a2ed031f5948f496027e98fda62a84b190dde4 SHA512 cef9191e4a27650afb955eeef4ae61ac7bf5ed8e08fd39e4645d0fb7658c4fa6f3896b5f6105054da97eaf63158ef778f58f2cb735e46ea774537533c9726dd8
 EBUILD libseccomp-2.3.1.ebuild 962 BLAKE2B 0f260d292b8dfd9541f94ad860425805f615a08d0f6de9e7e39faee0ab46b48bb1d7bc820bb99dfe1fe6ffffe3c8b083f2fdadbdede05d3611ed7d9f9e177194 SHA512 58e7fd61a982923ced093c7a861b15838f38fb0fcf64fa87e3a6669985ba28e4b30896e76c0373b9be42a9bcbc6e71393dd31a50ed090441fde2cc707481a208
 EBUILD libseccomp-2.3.2.ebuild 957 BLAKE2B 8d74d354f73ba0b8699922f445b4610b31d5c57f24ea7e8d1e033d6578ee9b8da45ce54851b907d96b481cf0933b9ac77b4b4951c373523caec656154fefb602 SHA512 0c2367d7e52e642d689ca37246fbb694f22ee7de0858f96605ff2f89c775b7fe888889ad78beb0d3277db884e5c621ccccdb30ceeb73ef232bf3781667397975
-MISC metadata.xml 355 BLAKE2B a83878debeceb4e62fbd182b2ba286bb961997f2d079aa32e69ed448e211f09497b813eb78a1cb1aa747f266b7abd261d0148da33d94dc07b4df7a854be2cce4 SHA512 dbf3c5decd7e918af6092ae690a2566c98f9b5386eee17c363dde79c03ca7d3a4103926a9327711aa059cf82916a4cb36360ce3c762093301aa44bc8cfd70f42
+MISC metadata.xml 305 BLAKE2B d660c00d553100c2dc8deb364d56acdef4771051f3d876a63e7264a501653ba539840ccab398e834428990f3c22accca16a34a9d64f433f5258656c5085a3dae SHA512 5b35970c91056a844e76bfd8e3040f58d38784390fd7fcbd881bfd3eb11e7c4c01c16cf4e320f19aaca494c715037b142e3ceddf6a28b1f272b7b01b95cf3ff0
diff --git a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml
index 3a6400d9d03e..56f0df8af09f 100644
--- a/sys-libs/libseccomp/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seccomp/libseccomp</remote-id>
 		<remote-id type="sourceforge">libseccomp</remote-id>
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 52aa9ed28a8e..c63ec9afb2c9 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,13 +5,13 @@ DIST libunwind-3.9.0.src.tar.xz 61764 BLAKE2B 215aa7cabf9e5d8d3e3dfc3bad50f0aad1
 DIST libunwind-3.9.1.src.tar.xz 61788 BLAKE2B bab410d714e2dc012273997bb3fb3c366f64608b712eae15f8c08a2b049b6bdba0660a1f4942906e2e9cd7b11563c8a5b3007b92b1485c32036ac84f55fe7053 SHA512 a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7
 DIST libunwind-4.0.1.src.tar.xz 63388 BLAKE2B f49772beabaa8519a5f8dbbaef9c2d6554468a66b89a5f012946d59f772fe864809a5c95b726bcb4c059ca551a4eb023a88f4fa618756b34fef2058e272467e6 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59
 DIST libunwind-5.0.0.src.tar.xz 72236 BLAKE2B 814fc20402e62c783c61a11b36f00b430a38d673ba810178ca35a70880c5d2455956aa6e84c3cb796e7f4fc3d6b9352fd75dac575a47d38cffd248c2b143f699 SHA512 20d54d5342d67425f5e36e9c690f1bb67bc2a3b7184b3ad546b689e510728d7c596f178d4f5186daf7480409ed4e455848b4ad1d9d896370fac1db69885fc793
-DIST libunwind-5.0.1rc2.src.tar.xz 72024 BLAKE2B af3644806722f1ffd844b4ba4c6d14e249b421fdd5b3acc1cfbfc3a421e76993305121fef044163384274cfd31f4b83e88c456d05ad0c9cff0036d4e6e4be95a SHA512 ab95a87ed35f8ae07702bbd58afee4adb7ecae039c41da86d389d0a8584fee830dfb3ac34f1783b878b86b1d0ec43845141dd9cc727940da68079711e8dfa2c1
+DIST libunwind-5.0.1.src.tar.xz 72180 BLAKE2B da1fbb92e9953d018a3c30290ceda9a2a18c21b5c908d9ff65979158bd06b8866eb74f078d12832e2aed7d0332c996262e3b2a1341844eb933ba3de5fb41ff98 SHA512 6c0f7a286c1ffa46769685ee36604cd90ed40470e1c3d3ef03c46bcc9e5f9e36e68a0a1f67b9b300823170b48c9b8d2db4625afd885f1d024905db1dffd9fc49
 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 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.1.ebuild 1096 BLAKE2B 50a0cc37e419efa13bdb883d11922dc51b094d09b8fb758e9f8e5b5b0bc17bc17cf2ecb3384691e11ee54b8e813cb5a95afcd4e34c364dc6221ac8a5a8ef3ca8 SHA512 8ff88efcf19f55a6880f4fba24126645b6429eb667ea8cdd90aaa800ec856f1f83c2ce2ebfc4a8074ee25af2f68ddc67216e1a1423cbc2f744accf0a075bbcb6
 EBUILD llvm-libunwind-5.0.9999.ebuild 1109 BLAKE2B b86a453abeeacb3baf56bef5a5daa3a2c8df3a251e589f15537bc56c500edc069be3a56fd04c3f71581fc05b2c7831eeae34b3766ed7dfc31bc735a979cfcba6 SHA512 926839a7f702a1827cebdb45289560409056f63c77d1a4a57a2b00b8b9b813353b06b8742628d6a23d7dd4c94864af6fb059b9b6d045fa31819af4a7513046c5
 EBUILD llvm-libunwind-9999.ebuild 1084 BLAKE2B 549f50753c3ed20954b1fd1260ce1cd216a4e9bf56c23b59e8ac34b9e8163419a76c3634995143fbea2c8f681069944607c823f130235b97985936e1030a4413 SHA512 9393e7fafe3a5b0416c0206a1d25ba9f0601dfc329293c9d4b02d61859aaf7f5b1c1be1fc7e82429f278385f70890f1ab49b8db0785c33ac0d2e193877741cd7
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1.ebuild
index c7915c92206c..a85458427d14 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1.ebuild
@@ -10,11 +10,11 @@ inherit cmake-multilib llvm
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/libunwind-${PV/_/}.src.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/libunwind-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +static-libs"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index b75c1bbbbe92..41755d4c9030 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -3,4 +3,4 @@ DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765
 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
-MISC metadata.xml 1514 BLAKE2B 7f684f3967611e67efeabdcd39c5ffd62ba34f389f4ad4f58281bb34badd5bf6629ed3ee08b0050f3c1e8e4e0b16d7c761e4221fe13774eeb3e5c2233eb80728 SHA512 caa48eab239c985eccb63387ffe2605cec1d94809fdaae7c8042a4ef49e3a9d7aa5706cf8f3a3dca4104f54772157fcf84572e7a725bd92b4154118b16bca949
+MISC metadata.xml 1388 BLAKE2B 2c031c5d87aefe90b83a2d0de01ee836b978bf1e89a8b16cbbf71acbc5366a57c3d15423a4beb6a6c51ad6adecc45731b949591fdf6faa5de7a6516ea04d5ce9 SHA512 59111cac2b1c0e2df5ed96d01e6913307915281c8d24019f5a12213dabd0621adfb52e87d344e1de484e1b6dd19014ce695f00b96f27ce26d7632e825863beeb
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index 9de4d50e5d41..d5ebc1b71d8d 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>