gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /sys-libs
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
208 files changed, 704 insertions, 1779 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fdb4943a1091..7056219df8af 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 2569295ca23f..38c20b33be6c 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -10,10 +10,10 @@ DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
-EBUILD binutils-libs-2.27.ebuild 2847 BLAKE2B 3d02dfccc46d3398646d338e01f096de36a74fdf6d224a8ae221120fe8105cc674ed09840b01d84994ff11c4f73c88b39737b3ff484d32dbfb1183f20eb3a1a4 SHA512 629aeca9ec392f957fbbe7f2a3d5564016d096b7cbe63ef9337351e599722bced4c3eb190d8dd0f091eb3ff816e839b03f7a7662f22f9e22b36ef3e8e5bb93ae
-EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a1775ca47030bd26cf2cf4ce4f6b7f3c5325d1629b3713aa40a1f85b9b0151555cf0a978c0390bef48846b3b1eb0c89b05d SHA512 b00d0080957824bf447035172b4941fecfd358f2cbbdeb82a578e11e0a8b4c712091344b904d8f74840164032d210834b30ed8a90ac3dddb47dc9632d66f8a9b
-EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
-EBUILD binutils-libs-2.30-r4.ebuild 3594 BLAKE2B 60b602ed843164cceee4c490fba486e38b4fe8272ec94dafc652aa891a2a148f4e8f69d88c9fb6ca6fa154cd1365bf1473ea73ce2f9bab4d1a36d08259eb7f89 SHA512 fed6718f162b379e381900b1b4c7fcfa3bfe0710f8d489e3ba19ff1d3accb51dfde7d44df5c608d8c9cf6f5d5cc92e7e518b7719ccb832b89d285507507022ee
-EBUILD binutils-libs-2.31.1-r6.ebuild 3573 BLAKE2B ab5423831f517f01dfea0f4c9ecda3c4b44a6bbd780831ac93258d8f8a2074669ea334aba2c3d8dac787e922605f00c21543ffa9186997fdab73d51cbb05f593 SHA512 66bedc93c56f13390db3676061297e958eee5b480dbf5414c6c58d150684e799b4b522f39340296ebad4e746da140cb20d026e6bc252143a04f04aa96453c26b
-EBUILD binutils-libs-2.32-r1.ebuild 3581 BLAKE2B 1dea490837436fb97b9a39e25a230175981daa0c17dbc88c7041180dc36d1f6377772623e76f29273b2c339bdcf85ae65878975418b65c30227acb65147fdfb4 SHA512 2b4e7a27e2d78abadba650ba232bbe86a2fff1bb8814d4b172c820e3c911b1115ea9e89e5ea3332d5cd23bce9ac59770c77447e293e8383ff9070bc2746eb71e
+EBUILD binutils-libs-2.27.ebuild 2825 BLAKE2B e5954627842425182792b369dd7c14a22a4abc19f812487196d65870273b2866c6716237dfe2f5746300882f1f0ec2f73ca891c865ac8afd2996b4d4460bc5e4 SHA512 3315ccbfb1e83ecee0174007141168e2345183ff3b95db266513bbe435c207d348f60ed7e8c701b4eadcf2aeefcc8f41c8f3198b260b258100dbb4f8e6ba0d55
+EBUILD binutils-libs-2.28.1.ebuild 2850 BLAKE2B 57b3e0b62ca8539dee42212155d8b1a1de8d59f1ad8664f267e33d02a9bc835c6dac0f4992bf8dc83c166f23364b241f52fd19dcf2bcb6dbc8c374048af82fe9 SHA512 1daa6865a61a619c856186402fa64cff4bd0be3cb76e45300dc4f58fe2df2cfd523a883e74904e650a4e52dc407175602ec3b65c8964a314a35f679d86491426
+EBUILD binutils-libs-2.29.1-r1.ebuild 2899 BLAKE2B 4f2469ace95d68e9f9a8bf8c820758543eac6ac8b266ae8bc0460f5f66eabb0cd93519023487e4cc40aab918e10dd891c365daadeec538c5f9cf98a5ff3cd3e8 SHA512 a4453c637003017dbf893e35502005d370e5bfeef2cae062df8d0c1c1590b9bb3417beea2eb31525d08711ff600df9580d8c807c7d72108a1208a241f9fba5b4
+EBUILD binutils-libs-2.30-r4.ebuild 3572 BLAKE2B ff5ff847f4de66dc13fab3f905aaad930a2565d0ded1aa0ab4bbf7f3c9fa9d7b883d4bff782ecb1004a2bf542278609ca107e3168dffc2c655cd671a9fd92a06 SHA512 21e81cb7ec342000c26c8cd96560ecd6d437e9bd58687235bf32fd256c9664cdf3bf3c9455649b5205cf14b4056f299f2fde636e59843b2255d552a2ec2fbb71
+EBUILD binutils-libs-2.31.1-r6.ebuild 3551 BLAKE2B b411715ff0600b9bb16b7b201fd50359d3c58dcf068c72f0133781e7c105daefbc4fa5b4bfd40069c8677b5ec5364bb35c424b01a27d7b9e34f35044e0f22bdc SHA512 84af124ed436ba20cd89365d90e6f1415f08a92600b0bf680513b928157240c8c8243f298fb09c0df614c3287c772e4bc4498b314ac0ea75d5e2384707e35ccc
+EBUILD binutils-libs-2.32-r1.ebuild 3559 BLAKE2B caf8b0469daa9fdddc0465c5596c41533fec733029ca9f5fb7c87505bd83d7ff28507547990d724a4a0653d35d9967b374806a223fd899af89653d63b9e103f3 SHA512 97d8b2448d1f61568da3520c44b3e6727dfd6150d757dca8d18a744dba297e0046ba58d9aea783a034f5ea9a158182959aac82e41571953ae18514dfce8cb829
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
index fcf683ee8b95..d0af54dd79a4 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
index 0e16ddc1a119..27973ddc6bca 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
index c984fa829dc6..397ff492d0b7 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
index e7a413d64f42..c76cf9795729 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
@@ -21,7 +21,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
index 6ec25132089e..43a4acb6a985 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
index a1095c8e3c92..1d047890a615 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 0b27356e87ef..6b13e6b16267 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -2,20 +2,17 @@ AUX 7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B b
 AUX 7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch 4161 BLAKE2B 3db2dcebf70ca3e7c399dfb22d8ae50d51863f7a8a15a10b0232f73d4fc2ee0b51ff67e8842b0e4d29dd41e60a326c90670f62a431ca593617f566e03bc7f90a SHA512 2f03f4d0232b600861de0c527d6bef26b0e3273865a7d7344e083a6a7de4033de6d30df3a6b22f4d23be74dfa8864ccaebd42c1f0d4474abc83a66f8997e19fb
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
-DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
 DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
 EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 5091 BLAKE2B 49de7e76998a3a58caae207454c1e795b20439d2691626e91319e96598b5e7d01fb9cc362bf0d43ed4b9bdc8da38bc8ce518369c63e96f6a192fb06c4ad79074 SHA512 b9e8b1f384378298d01689c831e771199891e39620e54ee843428f416cb63e888f12cbd13595e21a987c9ccacad29817c510bd774801110319cc7b2b1d4b34c7
-EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05072397003d6e46793a763f91eb79f60c183d89e7265a53f6f96401dc87546bba5b8d21dd38dd0b8bceecdb652702685288465916 SHA512 c9b1dee74f1cbe7d6822589372389c2e3e6f3398211e26d83072dab290541797fa08c52c4c6ac581a59dac52fe5893a27812e5e46e175b9146f2c8348f170458
-EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5400 BLAKE2B 5d3e5eafc23e91d956a1362907fff35285d15b7f2b3331ca81ad227e8558debed939f155a98b51385d86b4fab3a55b699a259dd0748c1615b163449b44e4bb5a SHA512 bc7d4f154ca02a544596772869e6ac49a9b13e3f4b967391f949c94682c18861020a168c5e20dd8f5ef3032df07e255974f6a4b08e5edb7c6d03a37b6959281a
-EBUILD compiler-rt-sanitizers-8.0.0.ebuild 5137 BLAKE2B f155a3b8d1ea7c1ec3bd598784a0600c7c0050a7e25a17895d919a5d7d0b05b28548e42fce9ee66a7fbb9b328b5cc7f1a998cb110f1e20a1d0b55c564f33d91e SHA512 4ebfa01e7d110bee738b63c7b9129cfaff13aaa90e38f8e08bec256b7fa098eb79f8b92dacd21c0af3b717005207b0eb4c8c4ebec92da805b53c0052759f03e2
-EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5198 BLAKE2B 0747b059b35d63ce40ef5680889e55c1fd2416ad701cf78a703a1dd660793e988e74e2a55694a2b61f315da386589769f87889d97c97ac274fb9d024d7a1ee49 SHA512 2ab68d421f5fd76b0f165b913474c1951b3863337d5e5cdbac5e86cec2521b1754c938d74faa4ce0f8cf66c1cc7b01a75df873988ef1999f0ca1aa999752b74c
-EBUILD compiler-rt-sanitizers-9.0.0.9999.ebuild 5116 BLAKE2B c574e6f2864ba854d45b1aa09daf7d732b66c9f368a5224f48d448ad4e750f95c2c7c5b29d38333a482a281af9ca2da441aa5231f43cb628335dc846bce0104f SHA512 4eb6b23b9c538d0da4e6ced124b32a3ef5a6f6706dcb48c991b7335de9bdee0f0abf0b77439e547ece607a47f07bd568cd492580440ceebd55d443f1adde3219
-EBUILD compiler-rt-sanitizers-9.0.0.ebuild 5224 BLAKE2B 166adaf64558109d4dfe70b4c736f18a54301fa681f3a588130ea0d7cf1b38b31e781a5c7ef418aacf55651be3870dba52a55dcbeedcd5e2ba0836325cf47d32 SHA512 f75e42c667498bc32d93281532ef207e53d3eb18b23c669c8641392e67a4553d4eb0f100da0f3812fffff99fd07c453b60c8a36153f0efe520cdf6bbcae11a4e
+EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5441 BLAKE2B aee706d982849e61b7fc87a63812131c41eead7135740385719610bee8ba1e3e10823e36ea9ffc2041f15c70a51a56c902e887507aabc2dc02c04a23672bd721 SHA512 aae5f86ab86a09e64a5a07e3432c78478eaf6c9faf3c57101806af49746672d95dd78481f31356286f4c0ceed09ba305d7a0dcf1922d849ebedec87ef6769426
+EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5388 BLAKE2B 63d9681596e72e8df4c04046d5ad5277402957ebea29f2ceca0e3252a69ef8498998b710bc5be8a66efde59087223e5bd23fb5c2ffa1ef644a07577032e1330f SHA512 f94e76d0bdc8d99c09d4e9d1bfc3f566f45b0c7e42242cd76ba1d61d46f8d244ff971a154693980753a0323ece57138285a5f7e42af1f41f662f32f6ac09b23b
+EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5186 BLAKE2B fb334e5216a59f76afb035414e1d145c3780fa672439a728b37e34c63f73516b0c5a55efc75dc6abe59b7f47240dc5969016eeb597cc00a873ff77a16dba72d9 SHA512 305c3018df76a6c55f1d0121f02b87d821d1645145bda6ab631ddfbc23714ee3879e9c5f2e6fbee12872c0a05a8730216120b1a141b722fd36cafdaffb5773eb
+EBUILD compiler-rt-sanitizers-9.0.0.ebuild 5212 BLAKE2B 05e518ad210dba3aae0ff0c66f4b091766e6f0988d4d50d16a62739fd691554ccf1d8efd23b7149d14b1d152ee22ea0f9f7a2f6a7b2663cbf9293a6ccd45c149 SHA512 6c9b05b80c80a16f40cda94b6692733ceee1a017e671142a438489cda52398c55ec839f29e6c1debd9f566f5d6d3251f47915c57abbbb6c4037485151d3dde22
+EBUILD compiler-rt-sanitizers-9.0.1.9999.ebuild 5116 BLAKE2B c574e6f2864ba854d45b1aa09daf7d732b66c9f368a5224f48d448ad4e750f95c2c7c5b29d38333a482a281af9ca2da441aa5231f43cb628335dc846bce0104f SHA512 4eb6b23b9c538d0da4e6ced124b32a3ef5a6f6706dcb48c991b7335de9bdee0f0abf0b77439e547ece607a47f07bd568cd492580440ceebd55d443f1adde3219
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
index 6fc9d6443c53..10bf0f5035a3 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild
index 7830fccfa5f2..0087a7d348fc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild
deleted file mode 100644
index dcee1739e811..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils flag-o-matic llvm \
-	multiprocessing python-any-r1
-
-MY_P=compiler-rt-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-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="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
-# FIXME: libfuzzer does not enable all its necessary dependencies
-REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/unittest || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use test; then
-		# remove tests that are (still) broken by new glibc
-		# https://bugs.llvm.org/show_bug.cgi?id=36065
-		if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
-			rm test/lsan/TestCases/Linux/fork_and_leak.cc || die
-		fi
-	fi
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# built-ins installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	cmake-utils_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake-utils_src_make check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
index 584c1f62144e..927d0fc6fa92 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.ebuild
index ebe55c6b1d56..47659864723e 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild
index f147105624d8..f147105624d8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index e0cfebe21caf..d6b20e0bb439 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,13 +1,11 @@
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
-DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
 EBUILD compiler-rt-10.0.0.9999.ebuild 2921 BLAKE2B 3f96154943747cc7a8945c8af75880650e919266dda3232fb1c6984c8fb2af92dde32e0557f2c3b9805cefac69166fa34aa42b42f6bb1ec328b389757f7f2fa1 SHA512 fc713062020b5ed70e12ceaaf2043d4e907a8d840e152b43a8177f892985d116475818048262162fd856392ba2080a6c7b830a52bc590b5d12c379d375e7c1be
-EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980aff78331a65b5658a50e0f808c9cb694d2e5d85bd753d291e1b5f96ab9e6cbc6a6d9f0cddcd9f7f8521ed5280f8291 SHA512 ecce0303d9db8ec0c74b3d0b248547402c32b7bceef52a5bb999f076c8fa82e209d5d113e6c14a1511e99dbf04bfd4d79077da1c010d9069a1bd284a168b26e0
-EBUILD compiler-rt-7.1.0.ebuild 2912 BLAKE2B 62a9f92312dcbc67366f8cafd7fde15d721480b92ea068cb56456a70139b3278e738e15265fbc4c0dcfa6c4eb27a17e6889063326f77a2b9801b50121dce247a SHA512 96d7c9a5e5bf2e66dd61b585480314bee2aa1b208ed231d52e2e7387a6289b349f03ec5a858403b491e0d1f8d6fe663eecfa90a7d9918e90e74253c585129588
-EBUILD compiler-rt-8.0.0.ebuild 2916 BLAKE2B cb63ba2b0e7a3f913fe58f2e53fb5deaa827c0fa7b10a89891a7da7fcf658fb6d9ab0fd50e501d35a788c9f53b3c267c85a03dbbb9722f4a3294aec4a1c0e4b8 SHA512 d11deefc294f5d99e4b92384a154dfebcb9ab5a7549aaefefbe791bf5cc319c1ea547eb076bb416702d8812d967e4721f7d51f18ec9d741a0347cd79b8172ad1
-EBUILD compiler-rt-8.0.1.ebuild 2950 BLAKE2B 56fc9e86b8236aed100ea4a8260bdff741055074ccd24d18e5bb6143b3024cfd7b82ad47cf8702386249c8a3871feda31ae75d360ba1f0d196ef0875c37ef385 SHA512 905eb05686637d5b7017c21d69f8bbc1f129563199f5ab8e59d3ce4f8b04867f2304347c6ab0a9547169fa3a5eddf06c8bf3825ae25272abd78638b89262094a
-EBUILD compiler-rt-9.0.0.9999.ebuild 2946 BLAKE2B 94fd398f887d1d5726a8397621864353d72b081b57e981bb2cc77199cb42419f590c0f45cb7c2e3ea8ad431efccef0091557d7169b009c5796a92d384c0c84f1 SHA512 8ea75505267484b1aa9f9f873fba4bdb745903f4618d38a151cfb1f66b9e251c5f6647731fb99d108447a4bac1d9878e06b958cf4d922cb8a4a5601d879219b0
-EBUILD compiler-rt-9.0.0.ebuild 2978 BLAKE2B 732502046085034443755b34112d1027581124149177e2c2f4d08c7b6c632b072f0b75df11a6718cf55a6732f00d67c9f94de17013932713c3577fe5df68bb61 SHA512 2e99a75b4a0e8898c9454bc5b3afd7427d40d89dcc27fc73bdfcfb9c72c25904bbf0312cbd8838b8cea5789f5dfb929b6a4007499aaea488103d1c8fe16e80fb
+EBUILD compiler-rt-6.0.1.ebuild 2899 BLAKE2B 9db37364c5e328b38c64dc2c6ed076b944e2d3528e17bb34ec2ade4e498226f8c3f26196ac416ff51bd0b64335856b7161a6ca2b264a8db331fa4626d9b3eac6 SHA512 ea9086fc9943fc9910522d1672fb0448b47c51ad81aa3c0d59282c6109f63a87190392c46c3cb234427ef190fa116e8b4232f089c428e1b28ea80744285e8e50
+EBUILD compiler-rt-7.1.0.ebuild 2900 BLAKE2B 60bec479b6e5caa39b98e5bf54621e9cf395c7e20ce0269d336153811f39de065b53744c11bded995899a6be33cf207c0c4a091b4be8a9ce8b8b479d26b057e8 SHA512 6cf5d533db3bbc75125f40439f8a6132f6c0c4fa04bd1d6007e9014ae4638fb1e99d475da780e07d12509873c26d129696cbd657c6c0b79521aa0561a927b23e
+EBUILD compiler-rt-8.0.1.ebuild 2938 BLAKE2B 6ce7229e928bbd6b269b3d37ad233f188e831fc2dd3153346eecad4a031a6a6f7a82fa8c25020fc8169eeeeede6e138aee2d7b3f520be02c1f5450bb802fac9a SHA512 567c3cd3d932f02a5d0f627cac45fbbeb403b346a421e805a8a48289bddc8868d1307f35cd37f7d6ab60ecf466c0651c93dc1ace24b99971a3a131f0d12d6261
+EBUILD compiler-rt-9.0.0.ebuild 2966 BLAKE2B 242c593f1dda27843a3bd6c929ea535d8455435392f48fb2581bddc3e9e6ed81bca70838d94553892c82e306ad40ec5a9ca0a639e97c2ff422b2febde226cb02 SHA512 3edb443f357d3e2508b08616259e668b5f49281a90ccd32c6c5d290c6ec4dd2b500f28cc631974806d8c7006340c21b45034b76ebe4026eb88cd116be49c2e88
+EBUILD compiler-rt-9.0.1.9999.ebuild 2946 BLAKE2B 94fd398f887d1d5726a8397621864353d72b081b57e981bb2cc77199cb42419f590c0f45cb7c2e3ea8ad431efccef0091557d7169b009c5796a92d384c0c84f1 SHA512 8ea75505267484b1aa9f9f873fba4bdb745903f4618d38a151cfb1f66b9e251c5f6647731fb99d108447a4bac1d9878e06b958cf4d922cb8a4a5601d879219b0
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild
index 1f0466008d9f..459d60b022a4 100644
--- a/sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-6.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 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
index cceccb1149a5..1c2404f43c0f 100644
--- a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild
deleted file mode 100644
index 6f7b07f58986..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic llvm multiprocessing \
-	python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-		strip-unsupported-flags
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
index 4bb883a980cc..ca77d0bb9d83 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild
index 2f5058cb169f..bfb57a667381 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
index 88bfd8aa0ad2..88bfd8aa0ad2 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index c74a4f737357..9ecbea839153 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -2,6 +2,6 @@ AUX cracklib-2.9.6-CVE-2016-6318.patch 3288 BLAKE2B ed213c5d5228ded6ceed088bed2b
 AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f0200e8b3e35c376f176c137c8ab9a75e4364e4fd285ac85d1b2e59327eb34bb21f29e0b638199cf4f9c9603b8e747d52e62978fd392b13ce89d SHA512 e4a2f9f467d3f0ce8acd4c9ea6ca19787dca6bd2bfaa80ddbf9ec1214a5e2b519c088b07760349adac9bd6805a4b512c015181863d679643cc12c68104c29a6d
 DIST cracklib-2.9.6.tar.gz 642402 BLAKE2B 4d7a0d12d1e7101c82d03f76e073407481078747c283fe3251f947542017fff03fbc5e98505c6a7a8987a2bbcea99dab558c15b1eb8fd16755859ce5a4440ed2 SHA512 2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786
 DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
-EBUILD cracklib-2.9.6-r2.ebuild 2819 BLAKE2B de5f77db669ee5ad028648c0b09f9e0424aab03270d66afd0f5aa03b18f404218e0b66d5d36d9f51ba85b5e9f541d320d518c1659bf0a19e8b3ec4079a2fd405 SHA512 700b1f53f4849229317e922796ec8ae0482bd2d75594a1c80129ecf8f7733848ff88134f14d373bd4f66484e529dd79f728f6ae4c769792db93cfd41fe16a959
-EBUILD cracklib-2.9.7.ebuild 2556 BLAKE2B cfcb768e85f94cde7d5cca25adcd57523983f2552deeddb4a61c083bb8ecf781d0d9a607b7d41b4c996ccb3e46d356a5d878daab78d60f9404c2216dc5ff990a SHA512 48a2444c7882da033680373a90c4b9a999ee654d5c536cf0db3d596f3e7dd4a9297cc5788addcb6e1571593e2e8c06c0e748123e601c0ac0fbbb26f2ef482db1
+EBUILD cracklib-2.9.6-r2.ebuild 2809 BLAKE2B 530690031ed4c0ba37d56197272e86a1fea6ba3c3f8cab09e723597db84feb2d338ba8d8b555e19511ee148f9991cf8f143ebd8f9ab6759a14422fcc985dcb73 SHA512 63bb2da1e40efcf2723101765c3a8b8fe85ab8173805b92c0aab3156fd097544787278b8f3398ca27fd93367f0773f96a153ac508a641cdd42b67ffa35c6c86a
+EBUILD cracklib-2.9.7.ebuild 2546 BLAKE2B 69f64e795d0fbc7f75a7fe6d973ac146ce85a315862a9757eb8c8fa592ad92c1a1587ae9039d81aba28afc6c3d01808d59e9bc5d64e755461ca39d481f1c374e SHA512 2efbfa5f14051d76f2ede7ea348a1b52bf91b5b4e2e4a035b7756d40ac71a9171e11e2c729fb669af556696bc470d9fe8bdf2b24a27279fbea67fe6cb35359f6
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
index 896e7381b42e..cf7dcf0ea12a 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 0a330b76d928..529c4a5e8272 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 7c0fdf02492e..1b774aff51ce 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -69,23 +69,23 @@ DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea2
 DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
 DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
 EBUILD db-1.85-r3.ebuild 1325 BLAKE2B 7dfb82cdc266defa521ad8c65d504372bcfa4857eb6c4053e725c0171627057249c964afbacfd5f1afe0865daf8a5c3b3704c3832070c1579ff69fa3099bb9b1 SHA512 1c418f0f608de7a74dac4b8d3d9e7951b64cbd6b1318ee2cf0bf3d45f19e81ce9d1c33b0be6f992fdeb09762f39d87d809640f8992841250755cd85dbc740ce6
-EBUILD db-18.1.25.ebuild 6926 BLAKE2B 1d903749c308e1dc6af0395d2f1e75342514d9a09d169994822404579e8483664624f70d8d85902d8afb1d6f2570b7a6e38ad62c45d3935393dcb35f5c5b8143 SHA512 bf76a2c4419eb3abfc754d5980503b73367970c3e4c8ca3d16150cce38af619aee59a797df403d36c5691f08310fe4b849c11318e6b9168d91cb4147adc3b0d1
-EBUILD db-18.1.32.ebuild 6926 BLAKE2B 1d903749c308e1dc6af0395d2f1e75342514d9a09d169994822404579e8483664624f70d8d85902d8afb1d6f2570b7a6e38ad62c45d3935393dcb35f5c5b8143 SHA512 bf76a2c4419eb3abfc754d5980503b73367970c3e4c8ca3d16150cce38af619aee59a797df403d36c5691f08310fe4b849c11318e6b9168d91cb4147adc3b0d1
+EBUILD db-18.1.25.ebuild 6916 BLAKE2B 8a781b5bb85ce1f91c15d2a81c75d1116431671784790f0ee0ed4eba86fc1c268df3a60b4e966b4aa35525b6678de81c1d6057285d4b57ae24fb1e4890939951 SHA512 e6be3ee3b75bbec1eebcd1768e184d5ed59c01ec15de07a1c2223dba700e85945b3dc8d05655bd91a67ccd93a0e8b5cbe076e676c5f2552efa9fd66c926f2d57
+EBUILD db-18.1.32.ebuild 6916 BLAKE2B 8a781b5bb85ce1f91c15d2a81c75d1116431671784790f0ee0ed4eba86fc1c268df3a60b4e966b4aa35525b6678de81c1d6057285d4b57ae24fb1e4890939951 SHA512 e6be3ee3b75bbec1eebcd1768e184d5ed59c01ec15de07a1c2223dba700e85945b3dc8d05655bd91a67ccd93a0e8b5cbe076e676c5f2552efa9fd66c926f2d57
 EBUILD db-3.2.9_p2.ebuild 4955 BLAKE2B 6410a4491d2a774b48a4f188b4e550119ac2197a9c598d91b49f999e745de027697a4356e2f8a36d33742d42906f05208c8f349afcb71a65654bffc6da8df6d0 SHA512 a87c906e804a84de5bdbcbdf60f7c7aef03b6faf27a1137c91724d9649e9a00b5315751aca771453879fa9d36772e01ac92688e79a04585c4744b63ccb9bcdea
-EBUILD db-4.2.52_p5-r1.ebuild 5002 BLAKE2B b5fc961846e6367194c185069d1d1f0e0fa78f21efa78e833c32f91db1750918e8b281e1db537ebe053fd72ce58d943018e37da21d32c5c1a5eef6779098e486 SHA512 aaa8d1e5c44623894bfef42b701512c79f61ba87990fa30c43195fdb1b17455206baab416a5ffa798d14f8c73fdcf10b68a8fef03cd5cf70aec355374c4f583b
-EBUILD db-4.3.29_p1-r1.ebuild 4949 BLAKE2B fa025504269ff2139d313172edc04f97ce09a1fcf8505ea2de9db3301a123a824d27c52fe1b64be87062f0827be5e686b71e8002979d1ea4704ba8f0193fa25d SHA512 33a4360593e8148d1f559d10d2e0b5edd1a42d838129c5c069092d7a7af9946104b0844428f42a4ef287ff9e5ddae2343bdda93e37e70ff7e7b5ae3540a7da66
-EBUILD db-4.4.20_p4-r1.ebuild 4841 BLAKE2B 526de88f7cbc07f23ef457475e4dd061193eea011b0e5497c8a0edb00e74c3e3294c5d0bf77ab21baf437b910d73daab02183a0094221b9fa1aecbda146afa0a SHA512 62f61604fe8c2f06ff6a626638f96946b68cdec3b2d9820b0ecbf042c5ef13273fbea46e7a94e76ef318622e837f9232ed71904860724d488bce5d62281ca09c
-EBUILD db-4.5.20_p2-r1.ebuild 5108 BLAKE2B e818918c2dfbfab9b6ac88cfa29a9c85a0d47d00ba011b4fee3c3172ab8855a6bf3b7d16a9f157d14351b89625fe1ad41fd9ba7726a99bf9540ee6b64726fa50 SHA512 4ceb324645c0186e2e9e4f76f3bf0bfc61f0d140a2c77b9acd27b76c7fc2cecf902f0d45e8b5a5d241ccbb7fbe92c74253317a7d94b0abe5cc86a0cfd5184ed7
-EBUILD db-4.6.21_p4.ebuild 4837 BLAKE2B 9b1fac943f81b04b3a40475d8f81205511d9759c526730c98af361cde5248887c3ae23110b39848afe7633bcd4589a31b0fe745bbd1d86a9fd8b76ddf12214e3 SHA512 ef9f9fadf050100e345362c638945dc5c117d57eae56cf408e9945a391c290d4bf74803a96e3ede8d032c6638f89cf9a37a5af2401f11f4b549706e6567291ea
-EBUILD db-4.7.25_p4.ebuild 4602 BLAKE2B 68b270a2273cd8ba9ef9eeb1e962a8f17a0ac30a110f656c42f2bb3e54a7e5c669f110316bdf56b5ef26478f9b7817cf208e268f9be9b1dadffdbabf78879f98 SHA512 a845b722f0540e8b68d187c6f1f030b25124a382795a0215f04105724d79b3616ac83f40eed8b2400f1ebdbc7fc0c78c4bc1708f70ae4028fe7ad308dd4fa02a
-EBUILD db-4.8.30-r2.ebuild 5218 BLAKE2B 38b74feffe01c496901f3eea1e7893632177bbba533025e2a7f2914967b8d182f49e9dde2cefc4e00e6e8c4e631cb09bf803596b67ed15e347b1cbadd644d8f7 SHA512 69fdcdb96f867f9aa14169b26b0b2c6899eda31d9b0862eee7be60e7aa0f078e6e49786c7dad2cc2d966482768736447a417e4114a6bb8b16b6876cf75c7a79b
-EBUILD db-5.1.29-r1.ebuild 5966 BLAKE2B 113580ce5983024a29955a07420cb86a1b912992142539fd05593acbe6c2f83c1d23c9c8f23c731e603d1a12a318a35e17b4b108eaec62a4ccf6eed8216945f2 SHA512 5195b93449870ce85e3bb32f582b16ecb896912b8a019e22fb7186a713f2144921a20ca122f266a2754fdeb8b8e91d368e72836d36b1c56beaaf7aa8d2f077c7
-EBUILD db-5.3.28-r2.ebuild 7118 BLAKE2B 71ba02f7f0d7d8422ca349f3bc9250ff40c8f93ad507c589be167799bc6602403537125178c485312ade4df4a9050333d4c9858f1266070babc5f140fdfdb5c8 SHA512 96cff144ab08fd40db54ba608515a12afcb1ac3b680e048630e2b21ea963b0352d308de45a88eb3317fd801db69e9837e6308e70e7c39555cb97989104528c6e
-EBUILD db-5.3.28-r3.ebuild 7224 BLAKE2B ec7d43bdb928eb16c4c797530cb83f4e29e7ec4b86e69a2005328d300fdad3669def549248c57688c036a0c210c1d3fdf76b924a46d7c5c06c894841c37ad08a SHA512 2f06f627ef42baff96e4bc9706d68b28363237a351fe8dda3dd26f678cf0fd46f5db11031d160a79dad8f8acd4bd6df13a3f60835a11e0543e5e919af0381ce8
-EBUILD db-6.0.35-r1.ebuild 7229 BLAKE2B 018efbe779cd39c421aeb8335affb4afc05b0a171462cd8e9bedc6ce96e3e1dc61b65d563358644085cdf0b7b49384fa53a4b12e1a73ec7bb8be569f5f6c53bb SHA512 8fd42e2257722561c7081a940b22191a10499498a9ebb1ccadd70e93b84886cb2f79764e7b96662bb047eabe675ccf9832187cb63432e1c075f252eccf7422ca
-EBUILD db-6.0.35.ebuild 7133 BLAKE2B 49f5b9dc1a25c7a5ece19ff57085d9ae377a22d7f3bbb1192f17855804b6bec4c28a1987db50ae5f86d192680c0c82ea2f42be26903a4cd3d37a4d3c5dca533d SHA512 3416fcdfd40c2d412dd9917658b77adeada32494bfbfa843db017eee9f7233d00cbd8257455f68843c5755658ecd1bc2ccd2f457e0268a0d2674c7a983b7901f
-EBUILD db-6.1.36.ebuild 6890 BLAKE2B 64119026dd5fdc6b989572097a5a2eaec0f0302f430e95b545751d33e3c6aad65be116cf66077008f3120a17398b349f3003e1866dafdabf55c691dc006082a5 SHA512 b72f20c30c3d092afa39bcc7c2faca8282f6aca072513ccb2b415842656f092541d1878e65121f86103e5cb33280f5c18f8f2d50d6f0b3294534d2d521fc1405
-EBUILD db-6.1.38.ebuild 6890 BLAKE2B 64119026dd5fdc6b989572097a5a2eaec0f0302f430e95b545751d33e3c6aad65be116cf66077008f3120a17398b349f3003e1866dafdabf55c691dc006082a5 SHA512 b72f20c30c3d092afa39bcc7c2faca8282f6aca072513ccb2b415842656f092541d1878e65121f86103e5cb33280f5c18f8f2d50d6f0b3294534d2d521fc1405
-EBUILD db-6.2.32-r1.ebuild 6941 BLAKE2B 911dbe656e6cd8ac1e096e68db9e550ad797a0e897a64e0a86e44e6119c5ce3e4d7d175e80c6a60b053caa65739edf3b2e4fab29bdcc7db3e2c7015749088032 SHA512 40cb04c86ba8102226a79f9c76ad24df836ea8a21ebf6d89ea8a04975112cd25e08d4bcc8bbbf3403104e7814c61010142268ebe7e9a243a792b3c8fad855a02
-EBUILD db-6.2.38.ebuild 6893 BLAKE2B 93247a46fad621a68de7bc0adc3697b9cf47df61db8733cdb3751f990ec92bba9649c3526471deb1c7e849c9e6650d6421ab586aeee1ea2d604e8f6b9ce1f7a8 SHA512 0f4a08100a8c1a489f7f7dfac2fe322ca8d270c02bbee15d43c821dff8a9b32ff486bc6ca04041d58bc3517286aed2aaf21694f9c48170bf8f602dfa04a334a6
+EBUILD db-4.2.52_p5-r1.ebuild 4992 BLAKE2B b143746d1dc41eaf5d02bab1ef9e011b34497f70c35d92a0254ba733a7f16cec10edc409bc2ac7e793a29b0e467af84609634b7017dfc840c721e24c2d36ea48 SHA512 1b2103f8e9f6c555011ccd8024457cf559377f046f373d73f280fe37acd84d20e1096eb316eb126d51cb2ee9152c1c655b8e38c1a15a88d7eacc582a87bfeae5
+EBUILD db-4.3.29_p1-r1.ebuild 4939 BLAKE2B 54e56fd6e169f533ceaa501e907226565ec2307d1937f9b23e5ad4deeea2a5e6825b065399e804a6c82f12873d1da38d48fd49944115b4f9afdc398e8b314915 SHA512 feeeda60d36795315ecd46fbb540ac0d546b787de9d26763c3ad13e72ace9347d9c75ebe4dc1067e35f536295d212c9fb99badf8d79cf2740d508c5018d0e119
+EBUILD db-4.4.20_p4-r1.ebuild 4831 BLAKE2B a21d1c19b909dd3a3a091a310a624461bc82f34a2002ca11fc344f7edc4d17a9595b608490f4c8c41e77803da6ef60f91a2c9e4802174e306fecd853e4c6e387 SHA512 dc60aafa8e088cef0a73917e537baea2c70d169d1e08aa008b30afc8bdc0bd86c77eec625c324cf8542ea56e9c623660e5497f408a0372a41989185f7d3ef001
+EBUILD db-4.5.20_p2-r1.ebuild 5098 BLAKE2B 31ff955c9d7631f831df061f01144828f030a37236d8349d20eb753c1004bb3e7aa3f8faea13125a465dbc3f3c0435c7ac9ebae603ef72ed5c01787359700df4 SHA512 83c6f601c33219ed9729ce62339280830ceaf5c71a6f596aeb452d3978014fa9b6f1042d534fb2a4be332c6f8635a310c3f6b08b21d289095fa510cdbb43962d
+EBUILD db-4.6.21_p4.ebuild 4827 BLAKE2B 4aecf06bb9dbd3e4500b464dcd7eb1cb99b20748d70d5b6ebe41ff86c85a868b74e9757efc9f600a4f8fe19019a51d9ee5df907cd0d6a34dd349d44f1f815441 SHA512 8c701d71b3162b17bd01000b49735b219a4e78d11ae8a91396dbe97c5fc6bbb6da25e7ca8def6febddde39918b34fa02829f26496709dbf7e289e6812b51ad06
+EBUILD db-4.7.25_p4.ebuild 4592 BLAKE2B 4fc682600ef5683fb6ddb380719a9dead6376ebb491af01d40db0eea3c6a46e68d8d9159107e2247945498dba7e805e4aff4140484127f72c4ded21e8d88e8cc SHA512 436cf63854c1d40851f43b931fed894057d004604524f55313cc82dc7a90db97fa7cc5d1e027697b11d6db056317dc42c000abb17830fa0f9b065ce4b89e7ed8
+EBUILD db-4.8.30-r2.ebuild 5196 BLAKE2B 99242716a9c82fd3a0fa2e2b7474f278484fb50f773b1dbcd8a17210f381c3c6e8704b1da0a5c07d236763123712fe336a7e783bebce3b74f4e0516b2cc6415e SHA512 10c9bbcb431036a4cd528109c2a77eae48c0bb0e26e36cdf3079ed24bd985627ede6dd94ea2464436f28c14d5fd3a67241c6cde5289d67cf9123c532d56c0447
+EBUILD db-5.1.29-r1.ebuild 5956 BLAKE2B 67343acd2fe034d473a42e1c6432a8fb65df8ef6686926d0951c416bbc59d53864ce76b0365e29f30d11a8cc681f4621c13db5c489a1f35b7335fa6d61a42e8e SHA512 2f18a7c3cbd2985348154d3a93e71e9580ca4d9936f0b33c43ada4501599addcd6b84d13e9587443210a06e4e063dd55a8eebe9a1b9a3d6f3a6a7acdae103444
+EBUILD db-5.3.28-r2.ebuild 7108 BLAKE2B 35e029751c2f5abfa646549e5681b937fac6da97a55d8b9221a40cf59deee99838d107c1ab1ebfadcaf3a606f7063f8b72c3c8f8a64f25e62d4fa18f4b41724f SHA512 6fa45e90dbd4e10c5635044b565f7a2728d99abdd1f63206d2d43a1c3ae35fcc388528ca558afc64569cf25413779149f11cc1c9f1c46e63136fbf9bf71cf082
+EBUILD db-5.3.28-r3.ebuild 7214 BLAKE2B 5f1a55400151f58f192afcce87113d8bfb3d506be9d1217d90e319d283e40f831f14457a11f51d37706cf0138d54d0bee14198a88e5e74f995dbe44fedd3f15f SHA512 cb48b8ae56c05172a89f8edebaba06aba33b955581ac282d7d59c59d78c867fce3b56dd0c7a152bff634e2125e9b5aaca2296e3d414be5ec7003343591dfd273
+EBUILD db-6.0.35-r1.ebuild 7219 BLAKE2B 6bfcb1e611c8fa1523a64ade608dd8d01c7c4cd9d2fbd826ae476baeff4ff9df65bcddc857cf4acd7ab441190e7d2331cd7d5a38c06ebe9030317234544c245f SHA512 733baf8c48bdb34d056db66297b33bb7b44fb550289d11523df548cccd449538963813e4d243952c21d5d14cbccd2a6823036448cae6bb788f61af9923672d3d
+EBUILD db-6.0.35.ebuild 7123 BLAKE2B f245ccb914cbb46048c1e42442dd6cf3741ece89a93022b2cd9de168bf0178fc3955fed1100fc3f3dbf728a0f08d222ce3c26af1be4100ef105afc1262dc51d6 SHA512 f4f3028d60da37176746841b2ffdda2f450b1caf2fbb4c102bdeefe0ca146eef7ba6a731e61008640efa318c893189f4156d4e41e54eaef7ee77f85bc0ae1adb
+EBUILD db-6.1.36.ebuild 6880 BLAKE2B d3d2f60826f4a28890722e4476fce8a718510c496721aabe1fc5c65bac6ad7e815f22d714846ebc9bbe1fb6b4c843dacfd8b541d79857c0f07aa8e3a405d69d3 SHA512 57aaadbe2aa9e057d3932ce7a8f8afc53d753af6f88fe4b1262543cc0e3bc2b557f816271bc80c541994c2c3683e711905c498158fb9ec352cafb1751ae95f54
+EBUILD db-6.1.38.ebuild 6880 BLAKE2B d3d2f60826f4a28890722e4476fce8a718510c496721aabe1fc5c65bac6ad7e815f22d714846ebc9bbe1fb6b4c843dacfd8b541d79857c0f07aa8e3a405d69d3 SHA512 57aaadbe2aa9e057d3932ce7a8f8afc53d753af6f88fe4b1262543cc0e3bc2b557f816271bc80c541994c2c3683e711905c498158fb9ec352cafb1751ae95f54
+EBUILD db-6.2.32-r1.ebuild 6931 BLAKE2B 71d2c8f6fd6d51288f3ab588ed3ee365279a0d92e945a1cf646ef3a570f4bcbfc2890f77da43aa792133230f788b36747308b859f15d7b10aa4e41c61e368d99 SHA512 d81640d75e86a2418fede61c8b132682f64babd534b171a1f44d1f2e4513d7e8e1841169a84d600d13991c2a25002ff54db58baa55dac4f72b8b1de07582f0a2
+EBUILD db-6.2.38.ebuild 6883 BLAKE2B d95a7ae531acaefd3e98a62e85b7fa7f3e1d44b4a1614d0419c483d7ea27206ed317ce29383ac58638c01b398f3f15534ea67c7a12536c4acc4d51fe4d74fe0f SHA512 6d4f23427eccac7db7d007814c126002f1322b048615e2f45eccdfd4a86e97bf2d5973ccd5ee2369e3b013a1662371bce47905a50333dffb1d16979b536a57ae
 MISC metadata.xml 1323 BLAKE2B f954567067cc1490d6804dd9d7b612dd90733c7ab84546cbedc0075f8f3ef1faf6f1bb70bae31e83b0aa17666bd6711999b67ce4fe6c15bcffc3ba5bd8d004b7 SHA512 36f8b6db241ef960b2ac0f7bd19738066e3daadd90efbf7edc54a4774e491506d69a2207738f53643a3e52f1f35a900e4717747744bd30ca682265f50cb8884c
diff --git a/sys-libs/db/db-18.1.25.ebuild b/sys-libs/db/db-18.1.25.ebuild
index be515fd043e5..0cfe2f615c18 100644
--- a/sys-libs/db/db-18.1.25.ebuild
+++ b/sys-libs/db/db-18.1.25.ebuild
@@ -28,7 +28,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index be515fd043e5..0cfe2f615c18 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -28,7 +28,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild
index 7988c7bfe38a..f6cf119c6ae4 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild
index 5a0bcf5fd0a4..82815967b4a9 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild
index 52990c1d8c2e..05a30a452450 100644
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild
@@ -28,7 +28,7 @@ done
 
 LICENSE="Sleepycat BSD"
 SLOT="4.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index 751f308f857a..6509b9634399 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index d88b6d9dc858..ed807c87586b 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
index 807fc0adc028..7134fc1a80af 100644
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="doc java cxx tcl test rpc"
 
 # the entire testsuite needs the TCL functionality
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index bdedb3547a75..23c185000655 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="4.8"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index 5f28da0d3676..82fda831643c 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 47b37d93ea64..c96a4413498c 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index d29b9bb65a4e..3c5e21027173 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
index a2d1df993e54..70e9cbe1da32 100644
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 476381c66a90..f3644915753d 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild
index 5e8e57545531..7d292cd735b5 100644
--- a/sys-libs/db/db-6.1.36.ebuild
+++ b/sys-libs/db/db-6.1.36.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
index 5e8e57545531..7d292cd735b5 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.32-r1.ebuild b/sys-libs/db/db-6.2.32-r1.ebuild
index 156fbed4dc8a..e1114041dd5e 100644
--- a/sys-libs/db/db-6.2.32-r1.ebuild
+++ b/sys-libs/db/db-6.2.32-r1.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 65ae210435c2..635689ac65cb 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index b385000f60de..26b5ebfa7af9 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,12 +3,8 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed
 DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
-EBUILD e2fsprogs-libs-1.44.5.ebuild 2420 BLAKE2B 185bc676e63b1a9d4bbeeab3f93026d90c9f147b55b40161efb57596071e0bb9f6ef2b78a234de7d7006d9a2ac9de83d563a87f4469f8525401eb346bf1dc73e SHA512 1ac2a5bbd640ead26afbb89c5d30ea8e9c07af7754591a1bc5167e016ee0a3b16a3534cdf01a89608204bbec6e1cf556720c050d658cd1d011c5bc6eceeb44c6
-EBUILD e2fsprogs-libs-1.45.2.ebuild 2420 BLAKE2B 81ee3f5d9d59a5add241ca79bfa2a0f9a112c16c4bb0b9970a1ee196540d2d98106c6a0d43bdad610d640407b56b312d0f58a4a6062bd311dedc96b0ecd96fe2 SHA512 be072a3070da4d0017347a9b62e09a2020410b48e29c8c9e680effa4dcd31d5cecc61604402f63dfa55256ace35b9c179fb7b6773ba0eaf8249f0144c0015939
-EBUILD e2fsprogs-libs-1.45.3.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517
-<<<<<<< HEAD
-EBUILD e2fsprogs-libs-1.45.4.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517
-=======
-EBUILD e2fsprogs-libs-1.45.4.ebuild 2423 BLAKE2B 3d9b199b83dae28de8d7c3b5e02f706cda33f051f0e6cb18988b8e91c1979493715fa16b976d1561f57b49a668e09b15397aa01ad192ee9be2b7a308c3f17eb2 SHA512 2bcac2ca11986ea48e6a54c77da019881a969c6b9f2aa2a95b98e92b04bd6eda030c3b271dc185145ebb865a96c047d0fdbdefd93e7124f5c9655f2469e85ac0
->>>>>>> next
+EBUILD e2fsprogs-libs-1.44.5.ebuild 2409 BLAKE2B ca5e6323859f592666d6dedb4beaa9da7c9e824176f74c2488f057dcf696972275c204b50bbfa65c3e943a9bc0d5f9035197be1347172edb5f2067701bfb3eac SHA512 6f7676e0e299d12089f0729a186b423da58d2f6b689e0bee42968c994adafc7ab432f12d8216589d503993c10b3e5bb2cb1e6bc7bec5bfcb3648da8ce8c307bc
+EBUILD e2fsprogs-libs-1.45.2.ebuild 2409 BLAKE2B 17bbfab5da7d135492e007479a9fd880e090e9eef000afa37bffae3af862e7f1b805341ade7723353deb89536779570c63d197781a1a3fc8d0e896d4a0782c2a SHA512 d4590a8108e941e40041f210dc80674522ec3ac9b1a3f4f78ba754446acf4a4deefce2486a20220e5bbdfd1f62a07842714f6697d17035419cca35faaca2b1be
+EBUILD e2fsprogs-libs-1.45.3.ebuild 2422 BLAKE2B 25eac7e393f359b5fd1093309582a404cabe6756cbcc831c8fb3580e8b0603d1d1322ad7e2d185741b3778340419f8d4221c5db4525b0754322a217f3e80ed3b SHA512 981063c8ebe1cd74a44d2b8039e20864e838853aae967f21b1c4839c93a93f3763d9854de102ac622fad5691491469c49887c0a099db47913d7c2cfc238f5f45
+EBUILD e2fsprogs-libs-1.45.4.ebuild 2410 BLAKE2B 77a4df3b77766eeff45ea8a698b454aa35e05b705d64b59c1900d70a6645239dbcd58d328cc98f15afad7edb0c31bed82e0c4e23be093ce65a216fdd56ea015f SHA512 cb83e7fc42bced941421ced0ffdcae4a3edc7b46662617a1ce5ffdeaf8dcbacc69b78ad9dc03bd5ead79d9d989bf8920eb3c5ff50e1e609f69ca29dc644e82ca
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
index cb2148f93d6a..2dcb1838de26 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
@@ -11,11 +11,11 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
index 4553bbd8c0c2..610d4705abb0 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
@@ -11,11 +11,11 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
index 336f8a744c79..a65bd89cf144 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
@@ -11,11 +11,11 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index 74adcf9a648d..79663f659096 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -11,15 +11,11 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
-=======
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
->>>>>>> next
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index a4d63a800728..9fd75fe7af67 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -7,9 +7,9 @@ DIST gdbm-1.17.tar.gz 938173 BLAKE2B bef5d449b250af139e5c660ba700694bac28af3e7f2
 DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.18.tar.gz 939352 BLAKE2B c4b84abc6bda852c486634cf03668f189f57debe4034244c51e738f1ff791469e7b1cb6514ae03514f5288b550a436dccaaee79b9de5594a5b307d84be2ad88d SHA512 57c7e5dc52464e97ad955e28d49fdb3557d8e3bdf280f7d3cee69539e4878f055db17cb9dd591f82fadb8fa5041a5a56d8a571d34f6e115470a3a82537f872a8
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
-EBUILD gdbm-1.13-r2.ebuild 1869 BLAKE2B 0c220c469ec135903641104cf2f687750052834376eac68a5cda7d273eaa4691dc4aa9f351c081f376528d2c0b77fa27548d893fc8618fddb8d041f967e260e2 SHA512 73174f6f5c573ef0a8792cd3fd134014f7af5fd0e8c2d02d9e6caae37d2f996e28ac49875a8ce16776ad91484b788b6b738cb8938347a8270db7779508ef75af
-EBUILD gdbm-1.14.1.ebuild 1791 BLAKE2B 56327cb26054ba570692c6b206fbd1e698308f12a3565e152d5a336302c1bc9818fa94409eb476cdc69b108ecff49601490835345d1ecd99d0586b1818586ae9 SHA512 4957bc4de68792e165fe85bc778aca6866e3a5eb6ed60a53ce527d7baa5fa94f1643e7f585dab45b450ab12d6c81e9061422966683e4a90b519492afb1bfdbb4
-EBUILD gdbm-1.17.ebuild 1387 BLAKE2B 47b5fe9adc9d98df70a8948fb0c1ac3a74f799198d6017ce9bd354a1376e9582e1110a1df20a89f632605273c03bde7144cadc9bc87cd0db7b2542cb1b420cd4 SHA512 1d80d5d4a4ed31e4615d9651a3514f47cb0cbb5d901b57c88e3940b70acbd126ade9d34f365c785792937b0e88f8547cc83d2188173ddb7d50f76bf8b6a9edb2
-EBUILD gdbm-1.18.1.ebuild 1335 BLAKE2B 83ab521fb0fd5654a981f085d288a7b86311d803717127fe7e544343ab769ae780890453bbe913c2aba131ecff6bb0be4929335f50f6458e78ff4008c7ae0b25 SHA512 1c9953f67dc85d67d43a572ddaf4e4dd466039db905ec9b1c4e725b61a42c650a0fdc8147dafb859b25dbdbaec751af9f3fb17edd54b254451b94cadcd145653
-EBUILD gdbm-1.18.ebuild 1331 BLAKE2B aafde0cf49fb1e5340367cd23edae15e0701860905e5690d464ecdf2e3efe1355753ddfa6eb4269a8f3a51406e827aa57854dc8ab86b494a040ccec8638d618b SHA512 79dacd54ba6128066d0bb0914dc1db98683c64620696071c4eac9f803f75bfe38971dcbd0c4d18a8639514056e7aaa45638cb1648725236c9b5d310a804ba897
+EBUILD gdbm-1.13-r2.ebuild 1847 BLAKE2B 93d6849394f9da0af3e45d421198ced5bc16d82f963f196c21a39164910b20b79c56e903b5104f8e1b6358691519a2aa09fb74126b2bcf3b16e704896f142606 SHA512 be21cedd6dc355503b6fa41c3faea036af31e7c6cc5515a79eaee23805c2c034f7dbf0c37944a7b7c63ff65d88d865a5c197132440b1b5364ef4ac31447dcb1c
+EBUILD gdbm-1.14.1.ebuild 1769 BLAKE2B 3caa98c88d1ffc4f229cb6ab4eeffde2db20f5893035bdf7fdcba64a032740ebb838098e9805aec784f983666312df3112ea4e7bdd70d9fdd6ee59477dbff659 SHA512 e5ea573946cf5038bc0588d2a30ece6adefe3f980823d784e31d0a5e0362a556a6c67d4ce772ba22c467a3d2201a221528c914429f26bbddf8c5b0cdf461b5f3
+EBUILD gdbm-1.17.ebuild 1365 BLAKE2B 0fc50ea6f4f93feadef093fc3c9e0a90e3c884b3f6e42c7241822bd3758e0b17376f070e04f2e8ffc42652aaa34de50e8b85b41ec2f4c7c8d71fb6f61e216497 SHA512 beb214cc57561af36420d58e2ae138d371cb3dad574af64dada58c689b659a283d9863c79ebc94ab537e4c30bc2057360335c4d576cfb22e5dfc4a51b1866214
+EBUILD gdbm-1.18.1.ebuild 1313 BLAKE2B 91c8af4949aab3752e837843d47ba59046399ce0f4ce543ecd65ef4f2573627048ce18c0ab86b788e7c01dcb4731ae475a2be2072faa3ff560d96504caf30b12 SHA512 187891382309a023acf08b68b759d60348d351ced29e857e077e98be2900a2d9978b449800345b7024fd105256f4df9ddc0a1134864215446713671446c119ae
+EBUILD gdbm-1.18.ebuild 1309 BLAKE2B 72554e37990080bd2601ad248308d18688c1d4fc87cacf960c8716d8894a9da8918b48090f3f11a5128a408d988c566657383f61f6cee454a1c733c54dfdb9d2 SHA512 0fd7d924173ff0c22b7645fb11f0203c6120ace5dae1aa5d98851ecc81934f85cf84e09496044bcf42e33fde46479df637f9eecf964e9982eb37ca20e384dd80
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index ace347b33e7a..521dc60f2f46 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/1.13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.14.1.ebuild b/sys-libs/gdbm/gdbm-1.14.1.ebuild
index 2f088cfc2824..57f48be157d4 100644
--- a/sys-libs/gdbm/gdbm-1.14.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/5" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.17.ebuild b/sys-libs/gdbm/gdbm-1.17.ebuild
index ffa342ee72d9..17c5c7089041 100644
--- a/sys-libs/gdbm/gdbm-1.17.ebuild
+++ b/sys-libs/gdbm/gdbm-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.18.1.ebuild b/sys-libs/gdbm/gdbm-1.18.1.ebuild
index b263ef55ae84..46bf73930608 100644
--- a/sys-libs/gdbm/gdbm-1.18.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.18.ebuild b/sys-libs/gdbm/gdbm-1.18.ebuild
index 3fa72df7cb18..42d02cb592a6 100644
--- a/sys-libs/gdbm/gdbm-1.18.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index abf08e3a1e39..67928a4cbf36 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,4 @@
+AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c526838600d0393de47a0e59ca3e05651bd28becb401021ddd2f6ef77b8740ca4e400f094ab5fd196f092cf25b20729eb4d42e2a200b9e03 SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67
 AUX 2.19/glibc-2.19-kernel-2.6.16-compat.patch 3214 BLAKE2B 64af88703bddaa301ce25d4400e00140fae536882443510466510766a60ac1cf4ceca35ca0ad4384f0cdc05b79352ac7da92f555561d1f6cdd65f7cc8464c6d7 SHA512 c21d80b7ae5b2691e5b6d43a42153193822ccc2b4418728edd5f2fa72412992d103b61418b57f9cf26e72378b24aa7cbaed05eeb31a4ec312a715d258cf5232b
 AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
@@ -24,12 +25,12 @@ DIST glibc-2.30-patches-1.tar.xz 19364 BLAKE2B 853ae651cf48a78796ac0a3c9c8409873
 DIST glibc-2.30-patches-2.tar.xz 19588 BLAKE2B 672343ef8a44486304f03091844635febef9d1bc8000ab3382d702dcc1111a107b5e758355beaef8db5012f7e324e4c2365e10fc642b01c9f9a3a315de2dc7f6 SHA512 494155147b56e094a4427aed79e278b4a350928ddaff84330d6a40fad079131a4574f20c591dc95e572391b68ef72c49790571ee5323a2a541ec0757bcaeb161
 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
 DIST glibc-9999-patches-14.tar.xz 17908 BLAKE2B a6e1f22a4358111ff757431c5d42fd020f6095584c3517aa854ea266129d1a177a7c09b310643f1cea32ffaf253806ac08f3aed864fb477097aaa2c4010450f4 SHA512 ef28b409b26472ec1d868167345aecfee70b1edf1863374dc2f25892f40c10f0826620a8b22fbbc9f737c8f611569b3412e8e2ea041da1ad1ef7f6398b82cddc
-EBUILD glibc-2.19-r2.ebuild 37249 BLAKE2B 477834110e0ff22d012c892243ef5405ac700c54924e4f03fbed65701c31c3cd445c332d20fb4dee3728893d1a94ce2ef26bb164f7b8ae027651b9f1687d08d6 SHA512 1afce121f756cda0fce819a5227533daa74180dbdd9029aa1c6c0fb4210543b9e5d1e13cc7e6571f38221a4f4740a7e82f03a420e670368c35070cd2431e202d
+EBUILD glibc-2.19-r2.ebuild 37294 BLAKE2B 61b3d7264b4591a645540b7be6b7f7c617dba61af38972ff9547d48bbf90b959e634391a4fbd950de631f092d23f4585b85e8b1eda5386dd57db5d201c7a306a SHA512 620140ba758d17e0d1edcc08e71477c5f9b240a2b86b170898841a9abc7e3090b5f3ec3730f44ff3315453696d1818c6f6c5e205544bb76efd3c562b05f2abf8
 EBUILD glibc-2.24-r4.ebuild 4945 BLAKE2B abeea3d030413af56ead335673e72fe6231de26f9d770b58928300bc8f8632c1eb1a7d65ed1b8e7c0ccc32f1283cd2e72a30253900fcce1c8cb34c9afe8aca83 SHA512 6d4e53d4ffb0789a4f92fd171058997ad2ec52b9c6cd5e8086cf79ab44dddeb0e14158a1c2e2cdc9a462e9b6a77fabde696b174c757ecd143d28b7cd606abd3a
 EBUILD glibc-2.25-r11.ebuild 4932 BLAKE2B bdc57cade5e96352ecb62e032f0ad048ae1f95383e66745b76f291f58b153f7ae5c37ad96a94b628c9b115db11d1bf9cb093da1eb5d47f7a70bff59dd296a805 SHA512 486937b13919c3c64539a2da3ebb32f8bd8a1b2b7286562d3525a111f23cd34df90ffb0fe10b793c30dc51af767ee580b9dcebbf390fdf2544c1fe2f20240414
-EBUILD glibc-2.26-r7.ebuild 25458 BLAKE2B 5e00db722b4bc65203203e7463e897f6212b62f10a7c5c084a9db99c1daf23b5f4a6041a15f5e347869878f87889974bdee200ebeaca6b83e21f905571050c7d SHA512 42cc1e283e62753760bab06ac35be1686b939bd49976e43b484963416886f867b2fda3360eea6d16065217a3ef8e3fc3fb7b4073767b13c25e8e23575d01baaa
-EBUILD glibc-2.27-r6.ebuild 40826 BLAKE2B 3eddb89bf0490e6c209e4d989975c17c64abdb323495e388a19727d6e79270a9b819909a85b34b86a9678f3020a1cf02f894e367bdf6779f77892e259230ddf9 SHA512 78c14022ce6aa26e4c9e52e83150cb57902a71f029607f0e0c703bd3c2ed9f8a20c4084e5754141d4e2bc35ed0ba6d0780d2789edfa9f6cf4b9f531713e45ea5
-EBUILD glibc-2.28-r6.ebuild 40596 BLAKE2B a3399bbdc64ae30dd885b7f4541be593bab6c551896ea4c954c224f716bae1e487640046cb1c95cdda074d71abc2bdf123850be49bdbe0c9802b127601829ca5 SHA512 898bb933c6b1f55042b14c46539efe6790558de54e140ffe5f6941fdfb0545c736611335b526f381f4cdab81bdc85f663b207fe6a34d2d5d66e432dd64dca012
+EBUILD glibc-2.26-r7.ebuild 25504 BLAKE2B fb61b5f6d84c58a183e5bff7143e11105c9a5ce6afcde505aede6cbaf48524e64aebe22eb47b877736fe82ca2a1eb4c6e9de7bff4d24dfe418bc2fcd89a2b276 SHA512 5ec483b841d43b8bcd9626d2ee94e56c6c58138c06a62b9bd53752396fe96e7e9c8dac565fd7de1dd30b04caaec790aec666b6e54870e37f4b2beb9d1644cd02
+EBUILD glibc-2.27-r6.ebuild 40871 BLAKE2B ca9730540a24b18d1da227e39ee5679012e8e28a8a787b21aefdf294b0668c28a1268103e459d52b233dce783cdfd1cf2fae6c582fd3a947dced3b9d7f0b138d SHA512 0965ba376cc7a55aa5cf960071a3d38c54ef180a443e3b8953d57e9e790a7365838ba24ca24750150d306db5fbd069e686add8ecc1c61c052f8756005ab62265
+EBUILD glibc-2.28-r6.ebuild 40641 BLAKE2B 0fb54fd95d02a5a6afc214625e743d5c2693809e274b7e2ab9664ae9f38056ba977cae6bc5751a0fe8208764da93ef9749d54f4bb5863c2026bb40c75cdf6869 SHA512 4e2e8bae3c31efce1a72c7baab698131f3903e69ba358a25090df3cd99d78ff7555cb366d48c7226e475cc43d06b437ba51a942365689c7f32de89fa8c18d941
 EBUILD glibc-2.29-r2.ebuild 41930 BLAKE2B bcb1911a391d7b7d60741a3a8f0084613894fd1fc6d74086433f8eac5afa1a834c4ffbb786fa9590f84b1c0dd619f7957863ef4d389a810df28474125146c8a6 SHA512 f3565011646ed6b5d1107fa32c0ba288235669f966a9fd15050e9d913e362c2bef68cc1565b527bf732ab53fa111f7ab5910a05212fc6383732568501a7eaeb7
 EBUILD glibc-2.29-r4.ebuild 42236 BLAKE2B 13a3249b2e56420e8587aeabded76157b2fa2a4f7bff84c25e9883af5334acb9a9e42d0d3f00abeaa3274f6b7d115afc9777b3deb0395cf91e67c140b08651f1 SHA512 1efb98c9cebfe87dcac0e51f7bb6294ac1e4e9cd5957830e3724fd45ff492195e5db450b590c7f4001bb54338902ed904bec2e34f50cc4a9d98a1e5e4eb140cc
 EBUILD glibc-2.29-r5.ebuild 42233 BLAKE2B 6a5918963b4f90b4e888bdb0c6153f50b536525db0fa7686c85cc0d79fc1fcfc1a3832145d2daea73cd8720bc8ffa92b3af4c17a27f59c5d141025f761067051 SHA512 f6bf65bf58c10803ab27e4b43167fa8bd6553bb7f4106732cab6fcb411e3289cb9aeb37bf3728a7d6c638851dfd7c2b267ead97716b23bf67513b6be8d475f6d
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
new file mode 100644
index 000000000000..72a616a046a8
--- /dev/null
+++ b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/503838
+http://gcc.gnu.org/PR60465
+https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
+https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
+
+newer versions of gcc generate relocations in the elf_get_dynamic_info func
+which glibc relies on to populate some info structs.  those structs are then
+used by ldso to process relocations in itself.  glibc requires that there are
+no relocations until that point (*after* elf_get_dynamic_info), so we end up
+crashing during elf_get_dynamic_info because the relocation has not yet been
+processed.
+
+this hack shuffles the code in a way that tricks gcc into not generating the
+relocation.  we need to figure out something better for upstream.
+
+--- a/elf/get-dynamic-info.h
++++ b/elf/get-dynamic-info.h
+@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
+ 	info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ 	     + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
+       else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
+-	info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+-	     + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++	{
++	  d_tag_utype i =
++	      DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
++	      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
++	  info[i] = dyn;
++	}
+       ++dyn;
+     }
+ 
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index 75f849f69dc2..0fedbb8e9409 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -539,7 +539,7 @@ sanity_prechecks() {
 		if has_version ">${CATEGORY}/${P}-r10000" ; then
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			die "Aborting to save your system."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
 		fi
 
 		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index bfbe9b01b033..34d8fb8a7ac9 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -122,7 +122,7 @@ pkg_pretend() {
 		if has_version ">${CATEGORY}/${P}-r10000" ; then
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror " Downgrading glibc is not supported and a sure way to destruction"
-			die "Aborting to save your system"
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
 		fi
 
 		if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n'
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index 42be8144de45..f1409e36cf34 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -607,7 +607,7 @@ sanity_prechecks() {
 		if has_version ">${CATEGORY}/${P}-r10000" ; then
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			die "Aborting to save your system."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
 		fi
 
 		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index d40991f16ab9..aa318b7e0f1b 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -598,7 +598,7 @@ sanity_prechecks() {
 		if has_version ">${CATEGORY}/${P}-r10000" ; then
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			die "Aborting to save your system."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
 		fi
 
 		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 46a5c6d52ede..628c500484b7 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,5 +1,7 @@
 DIST gwenhywfar-4.20.0.tar.gz 2379537 BLAKE2B 7e3439959f61c28d8845ee8355b21b71446f3108f5e344ee600eda58cdccb31cfe93a45cdc9ef8b682fbb3171d20658766918924b48150fea5f2abc1eaa76af1 SHA512 bc1d47c39654940198396f1bdb9f4a87ff4e0e6b07cb4525c10f7f8e6ce93445d5b9d85586a47c93c558e86eb826f7006eca29b93fad6371dfe72830bf9b88e1
 DIST gwenhywfar-4.20.2.tar.gz 2350327 BLAKE2B 1209bc46fe16e4a76886327bdcc0c9dde7bc135851bea27caa1795f8d652b968842e5191817e255044034827fc2f7e8c392f45ce52c85eb4d9382609f7238e53 SHA512 9012b82b4aa5229576951ebc835621f18a19f817a689f149b120710fadf8cc3d60481a6724967db44fb04c5eedf3e96d7ec919933ff325c9b4b8dad9c7fe870b
+DIST gwenhywfar-4.99.22rc6.tar.gz 2329266 BLAKE2B d530342481f7d2cf082fbcc9dde64a5a4ff9859da08aa386c993c31b52c3f72a5d2044f45cd2f9cfdce643875bf6f2062dd43b025588806f9d0d80784ce9a818 SHA512 acf62f9e15743c461907c078d747342d3e50667ae9ef82b0139729e1714b831faabe00046bcc8d8738855e4290b1e7c022b07d6b4baeeadca8f230ffc5d70dc5
 EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
-EBUILD gwenhywfar-4.20.2.ebuild 2636 BLAKE2B 1fd36dfb1d0fe69e2d9c6ce8cefa8903188f7de34a5c256ba7fb0276d0016b39668fe0e53c420452fc621ed85b396fb7b116aec5ff4eab078adbfb9db45312d9 SHA512 3d2cca45d992407814a12de2344964a5bcabe9ec8cf8b9bff2e973a89c09c9cf4f06d4251d3473ede382c507bcb40463221f861b5624babfa30a3def19f9f84f
+EBUILD gwenhywfar-4.20.2-r1.ebuild 2723 BLAKE2B c7640c0c22779ce813fe64d398dc1c1464830a03a9e8abf7ec8569ae21ded84d4e07fc1168d8001626a26b6c087110307a3acf20631616a9bf0afbdbf180ebe2 SHA512 9c9fa5af0789d0005d5e10501d44d1fdc306362893b83913c4f8fd1532053624502a86bcc9d3ae615dcafdc8957d9361d3ecc11b272d85cfae83985dcbfaa633
+EBUILD gwenhywfar-4.99.22_rc6.ebuild 2778 BLAKE2B a627219b41fd9b28122abce2d3794726a7bad5337394ce07f436f169b8e454b282f20ac6788c3024c4d7f2ca966db4bcd0979edda771374be36102f407e07fd5 SHA512 fcb201f52d3cbd4f9546d438aa15972c7d2b0b67852aee3fba7007a3d421ad94a1e71114c99d71e03dfb8c2a49c61e5a594204c75488303bb59024cef6f72245
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.20.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.20.2-r1.ebuild
index b20b4023391c..2aad87d84934 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-4.20.2.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.20.2-r1.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error
 	libressl? ( dev-libs/libressl:0= )
@@ -54,10 +54,14 @@ RDEPEND="
 	)
 	sensors? ( dev-qt/qtsensors:5 )
 	serialport? ( dev-qt/qtserialport:5 )
-	test? ( dev-qt/qttest:5 )
 	webkit? ( dev-qt/qtwebkit:5 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
+"
 
 # broken upstream, reported but got no reply
 RESTRICT="test"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.99.22_rc6.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.99.22_rc6.ebuild
new file mode 100644
index 000000000000..894c1cf04c8d
--- /dev/null
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.99.22_rc6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_rc/rc}"
+inherit qmake-utils
+
+DESCRIPTION="Multi-platform helper library for other libraries"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/202/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/78" # correspond with libgwenhywfar.so version
+# KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
+
+REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-libs/gnutls:=
+	virtual/libiconv
+	virtual/libintl
+	virtual/opengl
+	designer? ( dev-qt/designer:5 )
+	fox? ( x11-libs/fox:1.6 )
+	gtk? ( x11-libs/gtk+:3 )
+	qml? ( dev-qt/qtdeclarative:5 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)
+	sensors? ( dev-qt/qtsensors:5 )
+	serialport? ( dev-qt/qtserialport:5 )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
+"
+
+# broken upstream, reported but got no reply
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	disableQtModule() {
+		local module
+		for module in ${@}; do
+			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
+		done
+	}
+
+	use designer || disableQtModule designer uitools
+	use qml || disableQtModule qml qmltest
+	use sensors || disableQtModule sensors
+	use serialport || disableQtModule serialport
+	use test || disableQtModule testlib
+	use webkit || disableQtModule webkit webkitwidgets
+
+	local guis=()
+	use fox && guis+=( fox16 )
+	use gtk && guis+=( gtk3 )
+	use qt5 && guis+=( qt5 )
+
+	local myeconfargs=(
+		--enable-ssl
+		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+	)
+	use qt5 && myeconfargs+=(
+		--with-qt5-moc="$(qt5_get_bindir)/moc"
+		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
+	)
+
+	guis_config="--with-guis=${guis[@]}"
+	econf "${myeconfargs[@]}" "${guis_config}"
+}
+
+src_compile() {
+	emake
+	use doc && emake srcdoc
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install-srcdoc
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index 9ff26c146a88..a8babb84025c 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,3 +1,5 @@
 DIST kpmcore-4.0.0.tar.xz 417784 BLAKE2B deffb82b3ec5029ce845a398728b31b4da1b1b69377684a982b0d8067cfddc9ccb2ab2f4369faeb289b4aa54841940aae5a69051a30e4895b840c51393b0c487 SHA512 16f0a8ecae35c214272f28c49b5fff3d2d5e0959b9dceba392b9b6186d44e10d11fcf16ef0ad1da42f49f0c631ccb858d726a92d7c2f22125dae07fd4d2c5500
+DIST kpmcore-4.0.1.tar.xz 416932 BLAKE2B db429a9a51baf2d3f83d36479c05ac28c1d742dfc9e0dda51486d17958c95751da6295fe9e915359717eebbab3877464284b871dd8ded5a87c01c590cf4eac85 SHA512 982ad77246f59ade74edba15effca6490ac9ac7bb6db7f6194bcdbfddfa735c9bc1b58020affccd945fcdfc96fce3488167f492d6a13dcd6d19c5692505303ac
 EBUILD kpmcore-4.0.0.ebuild 844 BLAKE2B c00be8ec09e14d56485588e343733027536eb07c79fd5513e81a9da223c608423bfd59676d27a235698a17e12be1b043d3b48f9878f4dcfe01af24ad9c03c294 SHA512 633c53cee2cef545b816da77e712bad4ac2da3dfe251ac31203ed700ebc486aad3ae738fc71710cabb065da750adcafa3b6002e6580b184eb7afe5f1b2937138
+EBUILD kpmcore-4.0.1.ebuild 820 BLAKE2B 9ab00e632080f0e814687bdcd15b5ff05a56a3e2d29b61a23da34b1c117bbfa3536fff3590a0e8e2ce6d50517b8955f742b4039bdd78029005ba47db5e2b553d SHA512 979fd99c05cbcb12520789f303a066ec881a15484aed24c17f3fc4806d4566310b8b7921d42cedad5cff28c85b3420680b647b7f1797771c82b6561eeefcb54d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-4.0.1.ebuild b/sys-libs/kpmcore/kpmcore-4.0.1.ebuild
new file mode 100644
index 000000000000..9e74614109c4
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-4.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Library for managing partitions"
+HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
+LICENSE="GPL-3"
+SLOT="5/8"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	|| (
+		app-crypt/qca[botan]
+		app-crypt/qca[ssl]
+	)
+	>=sys-apps/util-linux-2.33.2
+"
+RDEPEND="${DEPEND}"
+
+# bug 689468, tests need polkit etc.
+RESTRICT+=" test"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 8ea9a3f62fde..1e3f74a9ed0d 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -17,15 +17,15 @@ DIST ldb-1.5.5.tar.gz 1629070 BLAKE2B 374042c77c9ec7bd88ad1d97757f171ae831a63075
 DIST ldb-1.6.3.tar.gz 1628668 BLAKE2B e9b6535eddf49496151e544f6879641c58a614f6de95463f7d0bf1953744953a5d55dde935d39b690d4c87e66914d8de0f0f5d4816a61fdecc81f8797584013e SHA512 a41b1fd2afa9a02dec37519f28e0e720b649c2a0aa6caebeb6697dbefdc6a055ef26500c5ccb0439b495d8c03218920b389fb9601d1cf5ca4d5046f192a5fefd
 DIST ldb-2.0.5.tar.gz 1669846 BLAKE2B d68046b385955c376118cb60e16939115332d88e8e67d157029397915c3e8f3d754abc9d93c64250ce990f7b82fb3947bdf5fba0f6f8bc457bc6dfd08e8bc534 SHA512 de9325f8bdd9ac782b3f8633444780f4aaa030e2c74c643220e845d9a779f8c8e174f0b9d9d8668de028cb832eb9d81965cb8e4471d90f9344dc48877a3abbe8
 DIST ldb-2.0.7.tar.gz 1674063 BLAKE2B e61f7bf4cfefcb5c1bf735c19a00027ce20ef393b613117e5637f7680ba7fcab1798744505b0db88e8bbdab41e0264e0fd1e643110ec47864de02ef315bd0dfd SHA512 0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a
-EBUILD ldb-1.1.29-r1.ebuild 2553 BLAKE2B 6e77ff3e4104829ac2555d8d6101acd72fd1d911cd0655a56ca4d49dd9c17f3b216bcab97717a90da10bf34f53d992176e58e1deeba50a660a3b76ee8717a9b7 SHA512 006f2462061ed3a4d988fec903fbde1bd09e9e6af0aad823056149b7b3d1b9c38c9a4ac21e35b02585c722d478ea70b6af8e379f9fec9d161e3fa28d20301759
-EBUILD ldb-1.1.31.ebuild 2687 BLAKE2B e73862e80290279281942008ee500b877497cca22d3d8d31ea648f898e398fd780b595f6571e7f18bc51c9c83a573619472be9df14cd5cb516dd3c102c3b9be4 SHA512 bb16dc9c4a84b6c7174e0364237e7147138c90b1fc25f5635f923bfb6b2bf0871ebbab2e72f23522d6a7647e007c4fa5e7941611281040420c8850beda47f8c9
-EBUILD ldb-1.2.4.ebuild 2615 BLAKE2B 00c6367deafa557c937672d501cb815bab81a48fe2a754a5f7a7cde7d37df458707f5693348aa0980864f0de99cbfcde694700efddb2d3b292046a76b6536216 SHA512 7986afc96409a48acf6fa484bd441a00387c39ab3d1961ea1bbaf6550a74830ef47b7f41e274b2b1bb9c2dcf52947acd722f85f65b9b78fb00ff5f6cb53d0179
-EBUILD ldb-1.3.6.ebuild 2562 BLAKE2B f268d0fe7467c236f2b4c4ef82ca5d8c2b64f8b024e68a4b39e95494b79e427916aaf530e264ddd1a8c8fb72831bc81707b9c6b923ee2f57bbeae5d2d16638e8 SHA512 e3f7d92e8dd25c28100df928e5fcc9b6c2923ccadeed3ed3b3452d0b239caac93bc88eefc909695c9c8ffa590554b1798350b6301d1537167bc04a6f94746442
-EBUILD ldb-1.3.8.ebuild 2568 BLAKE2B 70a6e2fbe4a120c37e97f724b308b051f4ff6affbf5b5800491e0e21e5f1bfdd864b9e0822830d9b9846e40201abd9ff1298bc3874a2c6fc127f7145d9d0aaef SHA512 53d06ad156952198db0a10472a4a78c910fda0fe4e7a9caf1f5938be916a41f5e4f242e865f0fd5df72ceab084ae75687b813597338a9509a54c3ea4f8c1f428
-EBUILD ldb-1.4.7.ebuild 2662 BLAKE2B 0ac8736523b19c57bae4ce81f2bf49aa6f5a0afc9a4698c96bf5ed240feddb0323dc1214525aba6171582bfdabf988c55861150c78be0834c514a157adae4b4d SHA512 dddb70565ce98942ecbdffa9114effa9ba9547d9517f893ddfdd63498e1b0728fe9725a1f622b9580da4323b14f0a72c8e77e0014b94b54bf54c6ffce069eb07
-EBUILD ldb-1.5.4.ebuild 2670 BLAKE2B 92adb14f3d666618f7e47eac844db836fb3af68ddb4c979d8dc6fcaa092df30686447e153584cc6ff6f25274c2243fe00de14539ad438f82b425a8b890b11b1f SHA512 10ff985fb74cb70b1ac96882d13e2697dd1eddee2f4c60a54929d5188ed5c5cac28c6dc4e23dc37b357a8e5e757ea82be0b582bca716c34e50d8dfb096cad996
-EBUILD ldb-1.5.5.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
-EBUILD ldb-1.6.3.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
-EBUILD ldb-2.0.5.ebuild 2669 BLAKE2B 20600ca8a56727fd4984e107dfb28569dc850c79c0b719ffa95201d8932916c51e44bc5a0fc2084537c1c4ced2ec290c6f9a16a22f2cf8433fa6f82f862ed717 SHA512 7e75e5505fd1193e3b604b5ea52945342c9264a38b8d2b0d27031a6cf4e291c826ca1945e72cbd8bd600eeba8fa49deebc45a413818f0976e219b166506c9645
-EBUILD ldb-2.0.7.ebuild 2669 BLAKE2B c8ed063507dadd7d69098b2f830e46558ab2e527006c0bd6f96fd2ccc9906cc5f8f9a11bc05943ae21de08d37e16e8262729d25119923c98eb09c6b41b0a0bf7 SHA512 3976d24cdcdd1d6159c80d71ec4bddb25fcf20f2ef2ba5d67a17f4748ff147e1a2d09820417947be6cdf514b83b9129fcf2339a7b83aa28c0f8f0d64c3bb1f92
+EBUILD ldb-1.1.29-r1.ebuild 2531 BLAKE2B d6efba4a507cdff74607aa0cb879ec57484899338484ef3fe2722cbfd880359fb5efbff481c099dd0cab4e78a429e0b587096e82806f565648ab2a883bbfcff5 SHA512 328107ca1c2938f9fa7e2c8f8dad0f03e405440cfbcfce0fbb1194889499be51126bb319a040d97c7b8c94e21439a2a41337407af4843fa501f3e567e464e558
+EBUILD ldb-1.1.31.ebuild 2665 BLAKE2B 05df725cd7827565bbfa3292b8d94e6ca1c7e257c26451ce4fa9b4817c1cd83f2cb1227b23cb06131af2d9c02129b155c1fd56050e67131934e1e4a83f7f9df0 SHA512 6f7746e2d6d8ae4405ada1597d75a6345b6043b653cced671fccd6bcee34bf627d9fcd9670a63e3ce4233dbefa33a0493d1df8418a7062cbd2f995960edf76e4
+EBUILD ldb-1.2.4.ebuild 2593 BLAKE2B 61f60e67593d2c60da0dac603249b210527d7c7ecd305d031dc9bef7965dcf0292928a811d8075a9fba2523a07f3f7c7b0f9058dec960bc95e9cccc82245b981 SHA512 4e68eee121bb9cfa147e996470b738a9ca8d73336dc982df01bd73689f10a9e837edd31ba3a988e522e90b1577b09d680cafc6bd1fc824327bded7c88533c169
+EBUILD ldb-1.3.6.ebuild 2540 BLAKE2B 6383c2b1c2ca31db675ad6565bf8b9da414a0182ff9a4a53c22c9886999161a4acddeb3b6ce7f2866ae360b1765d4697ad669cad8b33066cbe569e1e203337a6 SHA512 2c940f146e02db9f5e5e1ea66d544459c0e6b5e5a62571f990edb8bbf9d92c483d6b92923086f7e730d939bcfc16d2198b5026e15636518a3a172a24cc61ee38
+EBUILD ldb-1.3.8.ebuild 2546 BLAKE2B 443f011a12e589fc21d83e24d5c0d5c6a2a70e056bc7b1e3d27ce5223854708f3c827af48a0cd05ee11e4cfa388755dcfabc5db741248e929c5b67aa39175268 SHA512 30d55c78fa1499237be138fa095fd09175ad73ce669c852547636e696b1bf834a422977ae582a798a968af0de656e87eab881f65052fff64d26781f5e0fcd508
+EBUILD ldb-1.4.7.ebuild 2640 BLAKE2B 608e1e98a68c5c0c34d91bb4725d19a5527e126c1ac3a96cc101ca4bcab1528caf0519f9394d63240b089627c6188257abfefc3df158dfbaa83222e4fa73893f SHA512 cd9f3c4a8bdfa8188d2cce093fd6c82d7e1ee65f68ee77116de782e7c2a77ef1ccebd28fc79199e0d195031c0c311e96989ed09a6493a03393f4d1a0d8a4179e
+EBUILD ldb-1.5.4.ebuild 2648 BLAKE2B 0ebca0ef5c3263d08bf27e1f71f11423ea4136722da6f6ac443ccf6efbef093568a446c8a8c9d3c779ad7157601c62e0d61defbe7bbb003f5c500ddf8226fc5c SHA512 ef72e32f0492e3815b6bf01528f35278576057784e4c7ecf77fd71521a3a0e654b46de4eee5e81411a64d8ae7bf9304bb9aa5769061c895f0a19c26ba9194f98
+EBUILD ldb-1.5.5.ebuild 2649 BLAKE2B e76bc8d41842c8ea45b50ab578bf3c01227bae4a12b4d2f9278f902b04718f0da76a14316244e502dc6cbaa3380af0d3db97df1ca37f63f8b708d7b5e94fcf44 SHA512 dddfeb53f88a65f159cf21eaac12176d64a75cdcc420f62bfea5ff18b4ed5efbebb47f33ff6802fc995ef854df4591f54cff0be22271f6234be28ae7eb25d765
+EBUILD ldb-1.6.3.ebuild 2649 BLAKE2B e76bc8d41842c8ea45b50ab578bf3c01227bae4a12b4d2f9278f902b04718f0da76a14316244e502dc6cbaa3380af0d3db97df1ca37f63f8b708d7b5e94fcf44 SHA512 dddfeb53f88a65f159cf21eaac12176d64a75cdcc420f62bfea5ff18b4ed5efbebb47f33ff6802fc995ef854df4591f54cff0be22271f6234be28ae7eb25d765
+EBUILD ldb-2.0.5.ebuild 2647 BLAKE2B 519224f2cf6089a2c426378861cf8bd3e9db5e2ae197cba57e357855a51c6ebf5ebea89d749612a6a340d8731e9568931c330c6844cbbe43cc6c3c4da671c7b0 SHA512 4064fdc1438aed061aba647ef53f32ab420f280ee21949139ca200046fb727a745cac9bce8b9bde735e9da8ec1f992afc5dd8f071781259c91b530062da7ff0c
+EBUILD ldb-2.0.7.ebuild 2647 BLAKE2B 5e27534b7f8b79f1b9cf66a26764cf744435fa7d825869f744fe129d161393e261902327b3f836d7c977f23b732bb01bd462af17d037ecde3bbd20bbe2cdc608 SHA512 4d8e5e8a8b306eb09e9a61a3aef6cc49a921eafe7b923145b69d19b602b1844e7acc41491b143edad14dfeaae01d5f97ec02c94ad25561f9fbfb0e5f6f44d4d9
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index e660a17da8f4..49de3add19b0 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc +ldap python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.1.31.ebuild b/sys-libs/ldb/ldb-1.1.31.ebuild
index 59cf95d34626..74645d7ca7f3 100644
--- a/sys-libs/ldb/ldb-1.1.31.ebuild
+++ b/sys-libs/ldb/ldb-1.1.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.2.4.ebuild b/sys-libs/ldb/ldb-1.2.4.ebuild
index ec5e00cfcdc4..1d8b072e20ec 100644
--- a/sys-libs/ldb/ldb-1.2.4.ebuild
+++ b/sys-libs/ldb/ldb-1.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.3.6.ebuild b/sys-libs/ldb/ldb-1.3.6.ebuild
index ab0d9089b736..bdef2b0a6ef1 100644
--- a/sys-libs/ldb/ldb-1.3.6.ebuild
+++ b/sys-libs/ldb/ldb-1.3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +ldap python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.3.8.ebuild b/sys-libs/ldb/ldb-1.3.8.ebuild
index 21e1ebbd999c..f149a8b31982 100644
--- a/sys-libs/ldb/ldb-1.3.8.ebuild
+++ b/sys-libs/ldb/ldb-1.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.4.7.ebuild b/sys-libs/ldb/ldb-1.4.7.ebuild
index deef89dbbf01..e58458823b0e 100644
--- a/sys-libs/ldb/ldb-1.4.7.ebuild
+++ b/sys-libs/ldb/ldb-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.5.4.ebuild b/sys-libs/ldb/ldb-1.5.4.ebuild
index 48861f54ad11..01c20ded00f1 100644
--- a/sys-libs/ldb/ldb-1.5.4.ebuild
+++ b/sys-libs/ldb/ldb-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.5.5.ebuild b/sys-libs/ldb/ldb-1.5.5.ebuild
index 102b52891a13..98ffabd8dd96 100644
--- a/sys-libs/ldb/ldb-1.5.5.ebuild
+++ b/sys-libs/ldb/ldb-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.6.3.ebuild b/sys-libs/ldb/ldb-1.6.3.ebuild
index 102b52891a13..98ffabd8dd96 100644
--- a/sys-libs/ldb/ldb-1.6.3.ebuild
+++ b/sys-libs/ldb/ldb-1.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-2.0.5.ebuild b/sys-libs/ldb/ldb-2.0.5.ebuild
index d6605ba80356..ffaef6ea6ed1 100644
--- a/sys-libs/ldb/ldb-2.0.5.ebuild
+++ b/sys-libs/ldb/ldb-2.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/ldb/ldb-2.0.7.ebuild b/sys-libs/ldb/ldb-2.0.7.ebuild
index f9b1e7524441..dd375bd49233 100644
--- a/sys-libs/ldb/ldb-2.0.7.ebuild
+++ b/sys-libs/ldb/ldb-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +ldap +lmdb python"
 
 RDEPEND="
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 2fd31859b309..efc304ef4749 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -2,7 +2,7 @@ DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1
 DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45
 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
 EBUILD libblockdev-2.20-r2.ebuild 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084
-EBUILD libblockdev-2.22.ebuild 2498 BLAKE2B 249e31af2e2e8f0d19dc37d3dfd069a32e8bc6ec2d4cc8edae1d232a64c5c844fb5cf97b4e1d648f5b45405e2e0292b2c84ca7dd7fb9542deb0391f3d4a4a982 SHA512 0b54fd3f202027e4c7d95b381ab4503a32cb294a8e3419896621e0c3770b6ed32f7ac87d2aff9c751e3888b9c1ba7885c9275482525ac729345f7eab76f580c2
-EBUILD libblockdev-2.23.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
-EBUILD libblockdev-9999.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
+EBUILD libblockdev-2.22.ebuild 2497 BLAKE2B 7ef6a8b19de6e99df9f7682c4a6c5d6eaaf7f355c6430ae71d89b5a8c7396b0b05e19e2f9ca1789c299987309477abf2f9a0f6da55695e85c67c11529371bacd SHA512 be6fe140870202e20f5907960879ac0ca682b834b2e982a976739b2c34d25e3378b3000df3591964bcdf7be61f9bc84e2cd5b2d3bf2a51476b14a6729e571739
+EBUILD libblockdev-2.23.ebuild 2560 BLAKE2B 206091bbcc7694d2e42131bcf14d4069f21a03e5dbf2610bf16c271c3697fbd918ca28bb6219add2d2daff43b0da6b374e21f1b37f8ca304af451d0a4f72d815 SHA512 390dcca4aeb8acfd838c896a131b40cc9d01f0980d924915fbec9342963b884505ced96e07057066ea5af723d6933e74a6e0265c3dce6ca9de9d97827775a1f2
+EBUILD libblockdev-9999.ebuild 2560 BLAKE2B 206091bbcc7694d2e42131bcf14d4069f21a03e5dbf2610bf16c271c3697fbd918ca28bb6219add2d2daff43b0da6b374e21f1b37f8ca304af451d0a4f72d815 SHA512 390dcca4aeb8acfd838c896a131b40cc9d01f0980d924915fbec9342963b884505ced96e07057066ea5af723d6933e74a6e0265c3dce6ca9de9d97827775a1f2
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.22.ebuild b/sys-libs/libblockdev/libblockdev-2.22.ebuild
index 043dd58c3e88..cf78fd034653 100644
--- a/sys-libs/libblockdev/libblockdev-2.22.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.22.ebuild
@@ -13,7 +13,6 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
 	BDEPEND="
 		sys-devel/autoconf-archive
-		gtk-doc? ( dev-util/gtk-doc )
 	"
 else
 	MY_PV="${PV}-1"
@@ -60,6 +59,7 @@ DEPEND="
 BDEPEND+="
 	>=dev-libs/gobject-introspection-1.3.0
 	dev-util/gtk-doc-am
+	gtk-doc? ( dev-util/gtk-doc )
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild
index 6108db98a24f..cd986a9091b1 100644
--- a/sys-libs/libblockdev/libblockdev-2.23.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild
@@ -13,7 +13,6 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
 	BDEPEND="
 		sys-devel/autoconf-archive
-		gtk-doc? ( dev-util/gtk-doc )
 	"
 else
 	MY_PV="${PV}-1"
@@ -59,6 +58,7 @@ DEPEND="
 
 BDEPEND+="
 	dev-util/gtk-doc-am
+	gtk-doc? ( dev-util/gtk-doc )
 	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
 "
 
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 6108db98a24f..cd986a9091b1 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -13,7 +13,6 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
 	BDEPEND="
 		sys-devel/autoconf-archive
-		gtk-doc? ( dev-util/gtk-doc )
 	"
 else
 	MY_PV="${PV}-1"
@@ -59,6 +58,7 @@ DEPEND="
 
 BDEPEND+="
 	dev-util/gtk-doc-am
+	gtk-doc? ( dev-util/gtk-doc )
 	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
 "
 
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index dfd22127a1ae..8973fcc5a18b 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,5 +1,7 @@
+DIST libcap-ng-0.7.10.tar.gz 450243 BLAKE2B 8eb21b0309e46b05fa42752b9c814d90bc1eda4852ac7a4975868c279764431a8d5eafc53e50998470f622e2a59e2b4c6c2ac1ac20525c6fcd0633b09b113012 SHA512 1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def
 DIST libcap-ng-0.7.8.tar.gz 447946 BLAKE2B a26af2dcdd1af26cf03ca668dc95eed7bc1d0344729031497f46bba865bcb23ded2f1ea2ca5cb500b9419bbbd7ed75501921485257a3c8930d156a94e0a2c1c1 SHA512 c32a4c5780c183b13611615abe9061221fd8987188b08828d1617cdaee338ad8de67b3430aa83bde60128efc76449a688546bfbf697f0847b6a835cb1a868756
 DIST libcap-ng-0.7.9.tar.gz 449038 BLAKE2B 3f84e5078d5d443cb61358c49405e4f16ff82a56e1c96d5127b522613b1b5c56a566a01b14b40055eca85f13b37f3d795248a506c54ac4612ab184a94addc365 SHA512 095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259
+EBUILD libcap-ng-0.7.10.ebuild 2209 BLAKE2B 0f6d25562ae6615d4ce8895f74a8467dc8cfd3cb1cea5b3eb5b13f75c31b90483c2fa868bd35d64b658f92b7b94f383d1f120822c30854465f14fe279ac977de SHA512 e11f77e450af23539de6ee26e4f0afeef2c278b16f2ac8cf6b7a7b3dab7c1d62af8531793e24afe3b05c26f75c2fd3d28c50135fd6965341e735915c6c3a4c44
 EBUILD libcap-ng-0.7.8.ebuild 2292 BLAKE2B 8ee760e4d10a5ae652d30cb824852d60228c4ce7cd8e9339cd223527bb73b5348f2178597c9daf6e30620090e76ea13f539c44b78434acb5db8db909f0773ce4 SHA512 fd1f7e43556763f0512464c2a03e33815df1d4517f2558ab84cf4aeaeefc0ed6f92fb771f121656b9e62ab461d74355311bb1e6a49b166862fa87f6a8edc3b3a
 EBUILD libcap-ng-0.7.9.ebuild 2209 BLAKE2B d99748aa43de737a364f480007cf8a6957e5143f1866a5e724b4a9bff867c6e55e39d94cfce40a7744f4633b5c4d5046f6869d75d175564ef1335b2b2aea8072 SHA512 73845fe25ca5416a9b2cb04b59667c5bb2781f8ad982c6093c723be67371e486423151772c35f0f396532e6f2266578ba61c46f66cea6ec831ca2cc75045b4fc
 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
new file mode 100644
index 000000000000..e73f7cf226b4
--- /dev/null
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools flag-o-matic python-r1
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
+SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? ( >=dev-lang/swig-2 )"
+
+src_prepare() {
+	default
+	if use prefix ; then
+		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
+		eautomake #668722
+	fi
+}
+
+src_configure() {
+	use sparc && replace-flags -O? -O0
+
+	local ECONF_SOURCE="${S}"
+
+	local myconf=(
+		$(use_enable static-libs static)
+	)
+
+	local pythonconf=( --without-python --without-python3 )
+
+	# set up python bindings build(s)
+	if use python ; then
+		setup_python_flags_configure() {
+			if python_is_python3; then
+				pythonconf=( --without-python --with-python3 )
+			else
+				pythonconf=( --with-python --without-python3 )
+				local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+			fi
+			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+		}
+
+		python_foreach_impl setup_python_flags_configure
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}"
+	fi
+}
+
+src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions."
+		return
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" check
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index a5b26b2af959..c271e81edd7f 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -4,6 +4,6 @@ AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032
 AUX libcap-2.26-no-perl.patch 2483 BLAKE2B 34d20ca017119a40e31e2da64786a93c1d5468558e8dfcfb15f3758b6648aaad38bf333c11b35a2c8c4cb66d823e4daefed93b7073a0a65225fe9ef3494ff9ef SHA512 750a64c7b45fd145a043f29b8262c9f972aa4dcfb76afed9e440365c0e55d67d0103491e67a34f0f24ee580656e2fffd589b46b0c5a04b4c9e05b5dac6bbe994
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
-EBUILD libcap-2.26-r2.ebuild 2031 BLAKE2B 11a03a442a8859efef3eb93c16858d74292a30384db6a219250eb68f745a647de6431adbb9225c2f1672bec5448978dc35a9edd6581fc502648f9fdd0a992c60 SHA512 1935cba9a14be5431255bd36be8942be541812a1d1610646bee1d659a931f79285179ceb3f44001b5f3061461374b5c2b013693880a60e65d2adaa6df9cef40e
-EBUILD libcap-2.27.ebuild 2044 BLAKE2B 405ef4470f9c2dc7da9034bcbc3abb7863a3ff8c1cf62636a7c5fd7ecca3ee1c2e6871b1b7d7d542c18902400510d60da914255ad2e4930bcb8002e30fbc0f08 SHA512 344bc5bd41b3c499d36cace315c0b93fdf9f05a48effebb7fdb29489de884071904aec29d8531c74c789a348567c743f4dbfbe92a240fe6673dc97de144a2757
+EBUILD libcap-2.26-r2.ebuild 2043 BLAKE2B 40b475415abc00cb2c5c622739d4928f34a5e1eb217a3b7bf14634de1c405f56d1dcf840e0b53a88cc4656c7ebb8ff74fb8df297f806cd58e8f1e05af011a057 SHA512 d99b520b61447d2ac5113ce8969402a6a9992800a1cde89ae472005facb23bfcd6b5969bcc7a136f9a1c6e0b760ab9ff7c58975fa158c5c3c70c0da58bd20361
+EBUILD libcap-2.27.ebuild 2056 BLAKE2B 19560d3a95c3e03ab3c86d39d0724d20fdee80fcb4114ed850038a4e6f4139ed96fcc4723745b52a18064fddeac0485a9fc3c307a9d575267ef8e32a81a9754e SHA512 ed311603a2654b268332f006ba27a414a063ebe29e7a3399377a0ee41309b805f4327122c8735c825e225bf5f797f8a672e41221bcfeac493d6be6597fbf00cf
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/libcap-2.26-r2.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
index 868775df0ffc..da5b4be3fdfe 100644
--- a/sys-libs/libcap/libcap-2.26-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
-SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
@@ -18,7 +18,7 @@ IUSE="pam static-libs"
 # While the build system optionally uses gperf, we don't DEPEND on it because
 # the build automatically falls back when it's unavailable.  #604802
 RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam[${MULTILIB_USEDEP}] )"
+	pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
 
diff --git a/sys-libs/libcap/libcap-2.27.ebuild b/sys-libs/libcap/libcap-2.27.ebuild
index c91fbb991dc4..0253dcbb5c62 100644
--- a/sys-libs/libcap/libcap-2.27.ebuild
+++ b/sys-libs/libcap/libcap-2.27.ebuild
@@ -7,7 +7,7 @@ inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
-SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
@@ -18,7 +18,7 @@ IUSE="pam static-libs"
 # While the build system optionally uses gperf, we don't DEPEND on it because
 # the build automatically falls back when it's unavailable.  #604802
 RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam[${MULTILIB_USEDEP}] )"
+	pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
 
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 429f5f3ba113..e261b4078d27 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,3 +1,5 @@
 DIST libchipcard-5.0.4.tar.gz 801499 BLAKE2B 7966002dbf5c9eb7a53490aa8df68765901d7ebb7c7a16d8b24bf087a9886883aeb8a5c4f4be21ca5740215ce4f1b8d0023409f7b0f843ce1ce894a2cc115f40 SHA512 3b5b049f8ed676994c00ca758248c842de1119a0cee9e55682971839dc72cca226910559763bf858ceb126d998284b0c9f37459e0c87831d52ac39b6c4317293
+DIST libchipcard-5.1.3beta.tar.gz 834775 BLAKE2B 91206b300ccb2789ec8b43cdc41e8b04300d91f30d41aebfe80792b6cac3aa34c694852f9956a96b8d58fc5534cdd19d8dea76329788a1cf9826748b5533639b SHA512 f30bcacaf2f9b8cc4ac3719a3ff5e2afdf70173ed03c83436771f3a2f4bc4c96685a6f4c8006aa01ad1d6c1642d1052e398ff13d655b6ba2f4392174d4bf91ff
 EBUILD libchipcard-5.0.4.ebuild 1084 BLAKE2B 72ae66970873a1b840557c9c933c4fd7f530471f43f73f66f8926c8f6728e02e3a7d2f7a6b95d1ced5323af260a61343ca8390924e65fcc4aa1742fe0c4b2bcf SHA512 7c04abecae8f198ec389a5954a7e565fc501938d1796b4005b0273a0b76ed7c9b57e40e5a94d46b53b126356c36af5adefbe5588e00b9c54bf4a4f8b695dcf29
+EBUILD libchipcard-5.1.3_beta.ebuild 1125 BLAKE2B 3cbaaed42ae541df4bf11dc82523082280f6d7213821a06ceb7832525f871f3fb7ab1de91d35503835183115493e6f142b7f4600ea1c2fd4204dffd079835c0c SHA512 cb5f0de8d9688c32646cd8c73e4f37b86006cab74546cc098b8bbe9c57a9bdf5b567e37521032265b0f3ebf68dc56434a7a5ae61fb5b919de715cb0c3eb4fe6a
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.1.3_beta.ebuild b/sys-libs/libchipcard/libchipcard-5.1.3_beta.ebuild
new file mode 100644
index 000000000000..8d480701f630
--- /dev/null
+++ b/sys-libs/libchipcard/libchipcard-5.1.3_beta.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_beta/beta}"
+
+DESCRIPTION="Library for accessing chip cards via chip card readers (terminals)"
+HOMEPAGE="https://www.aquamaniac.de/rdm/projects/libchipcard"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/138/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=sys-apps/pcsc-lite-1.6.2
+	>=sys-libs/gwenhywfar-4.99.22_rc6:=
+	sys-libs/zlib
+	virtual/libintl"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/{CERTIFICATES,CONFIG,IPCCOMMANDS} )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-docpath=/usr/share/doc/${PF}/apidoc
+		$(use_enable doc full-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h,xml} tutorials/README
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 9b8c4630ab1e..fbc2cca0a670 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,14 +1,12 @@
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
-DIST libcxx-8.0.0.src.tar.xz 1752308 BLAKE2B 1e8cd8c7100f5f8b943ba8f38b0b59a0fd5e5bea834953483a67502f67de3eb51eba4ed4be17cdb54406da4ad7ebc6fef33934c59db982afa55856ce9f1f46ff SHA512 2e0fcd3e78f7e15ea894e52c51351daef8e3a2aaf53b3df7497b11403d28f5269ff49a4674bacea1d565a5faa2b24502caaaeff9cd48518f0d141563d8f9cc03
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
 EBUILD libcxx-10.0.0.9999.ebuild 6803 BLAKE2B 21e8cbd81082a98caad8f9232bf654f94a77b75f68b8f0aa4afa9e757c72e40c6f78fd43e943ff0ddd3d2f51d553c58935110fafd863eeef99b864aee97cd6f5 SHA512 ffca4505e93a04d62295cc2d82c423c6bb4c855148f5f45d744149ff4cb06ba2b89d4e9c18d7ad18f618f87de8affa16a86549cadb3562de3f9fecebab8013a8
-EBUILD libcxx-6.0.1.ebuild 6746 BLAKE2B 616128b9d49049ac6de90b84f89a48c7033f5927edc5e15674df5e3a2225630f59a99c8047c71d9128304d726241ceaa1cefabf8d44e4b2d6a491611f63bee88 SHA512 3df9e7e79b62893441212fe7baa51190ac69f0bf64332718ae53596a043dc3583b8125bbcf7339cca7cf9937aa870ea0d8b12670700962c1cb22892f706e3129
-EBUILD libcxx-7.1.0.ebuild 6746 BLAKE2B e087e9098950a12f1054141f9d7a3a447193dfc387124711b5eb90c49a6bd323f8e02fcfe31cdba355626719766dd52f8cf9f0357ab366d16de8f5abf72c881c SHA512 051bf7bed481f0f013e87da5f087286ad2826b80c61514008fc1d31a5d5333423df72197229820b7ec413633413afb9a05779fee52063ac358b11774d09bf680
-EBUILD libcxx-8.0.0.ebuild 6750 BLAKE2B 6e03588334d2af0c0ce2e02ff2e7a8f9f9817a494fc6445a4fecfb1381884eb4a92921d7b06d5c12f36795acac5f2ee90a3794665419e9bc6ed2bde99a4f7259 SHA512 4bc27a7e3974d83a661887ca32f414b1697f0470ba8d9505f1ea795537d252cd336feb8a8db71f456821b2d9f38613458af888f530663df78a371f7e1391d897
-EBUILD libcxx-8.0.1.ebuild 6785 BLAKE2B 5866b64326efe6a5bdbb4adec40711f93bd3a975b97899b34997557158320a6fae6a7bc066a6f04d99074157dc1e7cfa3980486c3b73fa53d09c6af4b6802092 SHA512 15eb3670016e6a1feb6ae58f38b77e48274c71cbd78e75b2113975b74e63ce28a5bb0b7f344794e7cda42feb3620334eb6ec878586f025d3d3ff2ec1f47c31b4
-EBUILD libcxx-9.0.0.9999.ebuild 6828 BLAKE2B 4a4b10af19556d92f66c9c482fff2466ea0665dc8a0d94ab9a148fa7c4ed564d812f806efbfd70100dd5f88f5fe29e63569f0728acfad86fee66bb3f6065c1e6 SHA512 dc978bd17e4242e857e6186e2bb9f4d6fdee1fb0bd8fb760e46ae33b542b67f0c992805295b8e0908c1cf9a04c309295531807c21b9f27581d7156aeba4183ae
-EBUILD libcxx-9.0.0.ebuild 6817 BLAKE2B 50ac564c7f8b0b4bbd401de81626ca22bbc24892b14479ef54e072533efd65686799e1f5c62adf14e2fe58adee11009199540e79db05fb10f34b672272a205f9 SHA512 af1d6fbd771745efab13610fdcf57d3c11cecc42a48716d55037fbac768a44d6f46fd25ad4aa2d115c7b9a1e370f4766668851f92c1ec264927d84b9b8f3bc22
-MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
+EBUILD libcxx-6.0.1.ebuild 6734 BLAKE2B 5871a241d06ab0a449a2a375d3dd89d1b79f7d0712954061df88da89e350612ac00f7e9252ca8e93e9373fe45a66f89730d304865f713a75c6f1ab43565054f1 SHA512 af9fb74c62ecf1a5b188752ddc9fe0bf6ab3443f25704b024c6544b150cd33bcc92492e172119685d3fec2032689a4382dab6bb9f3662f4412323c4f6537c552
+EBUILD libcxx-7.1.0.ebuild 6734 BLAKE2B ccf745bc3f3ea12361f877637970090b3588febd096fff2118359afc1664a2c5eb7e55e90372a5f5dc711b7a12310fcbe9fd2fd7f047b9bce117b8c99c7da393 SHA512 cea3065bf397c3d1615ac3d6a92910bc84ae439597c4972fdcd4eb41ce0fb1dd34dbdbd1cdfb95c0f46fb8a217f31f5b23da4c358204b349d48e1d433a3d9735
+EBUILD libcxx-8.0.1.ebuild 6773 BLAKE2B b1f95dfaa74faf6ec4299c7241330d5047c1eabc69351f2bbeea296c41a3671c87e99689cda85c65aa29c513eca148321806719f15229b283b0c82a5f9bd1c93 SHA512 0060d986d79514416681cab707ed8075a7f8c461146457724acfbd04e269836827b4adbf791b1afb3a4b8fec13d44678c459861b749ce4001fd5c4a65b97121c
+EBUILD libcxx-9.0.0.ebuild 6805 BLAKE2B c1f695c9c64d6f73bb05719f0018cf1621a956c9c88ac4224a8793e75c9d6fa0555ac3ccc0454b5a708b2bc36ee9cce10cc7757f6706e1fbfa8f071139af603e SHA512 e8fa03cc96bf92f981c47b7fd857d8cc085688eb8d6e376ef43e91298e6818e7da6ae19c96c9aad7bd1f4edf2ac9ce50c649134468c9070decde05e4b86f919a
+EBUILD libcxx-9.0.1.9999.ebuild 6828 BLAKE2B 4a4b10af19556d92f66c9c482fff2466ea0665dc8a0d94ab9a148fa7c4ed564d812f806efbfd70100dd5f88f5fe29e63569f0728acfad86fee66bb3f6065c1e6 SHA512 dc978bd17e4242e857e6186e2bb9f4d6fdee1fb0bd8fb760e46ae33b542b67f0c992805295b8e0908c1cf9a04c309295531807c21b9f27581d7156aeba4183ae
+MISC metadata.xml 751 BLAKE2B cc513b45c7283d41728236781558b47c535885612a93bcae2a41be20531bab0e01c159e918670c91ce7b4addb0390d5996ea735fc5856b61af7cf28a9b6286a9 SHA512 3620f5415cc80bc99f16eaaf98a712f1288895bdf1e98898103d680304930db89c3b8b55ca3f4d20d4738fc3aa3e314b81c9989971b23d7f66e2137095a35d4d
diff --git a/sys-libs/libcxx/libcxx-6.0.1.ebuild b/sys-libs/libcxx/libcxx-6.0.1.ebuild
index 5d8314c5988a..23be36cbff62 100644
--- a/sys-libs/libcxx/libcxx-6.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
+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-7.1.0.ebuild b/sys-libs/libcxx/libcxx-7.1.0.ebuild
index 6ef14eac495c..1da0523e159e 100644
--- a/sys-libs/libcxx/libcxx-7.1.0.ebuild
+++ b/sys-libs/libcxx/libcxx-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm 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-8.0.0.ebuild b/sys-libs/libcxx/libcxx-8.0.0.ebuild
deleted file mode 100644
index 29aa632a979e..000000000000
--- a/sys-libs/libcxx/libcxx-8.0.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ninja provides better scalability and cleaner verbose output, and is used
-# throughout all LLVM projects.
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-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}] )
-	libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
-# llvm-6 for new lit options
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
-	app-arch/xz-utils
-	>=sys-devel/llvm-6"
-
-S=${WORKDIR}/${P/_/}.src
-
-DOCS=( CREDITS.TXT )
-
-PATCHES=(
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-)
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
-		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
-		eerror "conformant compilers). Please use gcc-config to switch to"
-		eerror "gcc-4.7 or later version."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	elif use libcxxrt; then
-		cxxabi=libcxxrt
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			   ${LDFLAGS} -print-libgcc-file-name)
-			if [[ ${compiler_rt} == *libclang_rt* ]]; then
-				want_gcc_s=OFF
-				extra_libs+=( "${compiler_rt}" )
-			fi
-		fi
-	fi
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-	)
-
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cmake-utils_src_make check-libcxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	gen_shared_ldscript
-	use static-libs && gen_static_ldscript
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-8.0.1.ebuild b/sys-libs/libcxx/libcxx-8.0.1.ebuild
index c772def7a373..d126d9a2b013 100644
--- a/sys-libs/libcxx/libcxx-8.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm 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-9.0.0.ebuild b/sys-libs/libcxx/libcxx-9.0.0.ebuild
index d3f71fd82120..a4e2b51d8abe 100644
--- a/sys-libs/libcxx/libcxx-9.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~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-9.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
index 5a84e2f5f998..5a84e2f5f998 100644
--- a/sys-libs/libcxx/libcxx-9.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index df0c52dcfcdf..4fcb5c088f9e 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Alexis Ballier</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>bsd@gentoo.org</email>
-		<name>BSD Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>llvm@gentoo.org</email>
 		<name>LLVM Project</name>
 	</maintainer>
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 9ed95abb0827..e04be32d42f6 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,18 +1,15 @@
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
-DIST libcxx-8.0.0.src.tar.xz 1752308 BLAKE2B 1e8cd8c7100f5f8b943ba8f38b0b59a0fd5e5bea834953483a67502f67de3eb51eba4ed4be17cdb54406da4ad7ebc6fef33934c59db982afa55856ce9f1f46ff SHA512 2e0fcd3e78f7e15ea894e52c51351daef8e3a2aaf53b3df7497b11403d28f5269ff49a4674bacea1d565a5faa2b24502caaaeff9cd48518f0d141563d8f9cc03
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
 DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
 DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102
-DIST libcxxabi-8.0.0.src.tar.xz 539040 BLAKE2B 847d848e4ed66212789c50137e9556abed601ab4f30765b8b4453f0bc2609e2d1ef516b2f504ee2331a53706940b814545423da05392aed24bf290e6757b52f6 SHA512 9ee2e6d5899529be45b2e5edc395606fa9040d25789b3da1ae0182113626e7624cbb071eae525c478293a7b371876e41614348ee5808f90f3f9c7b08837e1055
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625
 EBUILD libcxxabi-10.0.0.9999.ebuild 3345 BLAKE2B 8b4b5f91395ee60cf13cc42445a3e2ceaa5a4a871537334ec4c22e9f09fedb76ea34e6a48a7da1565f28f7cb9468cbc130f3b9767778ddf69b7991f983cf3c72 SHA512 e4c09e3a7e3d3ba33c27da7bd9a55e46998f3699a26ce9fb5490d8268b010e7ce85fdbe9d74225e9d362a76c875f2a6ce72cb4f5af1f4ddc923128d0da342748
-EBUILD libcxxabi-6.0.1.ebuild 3172 BLAKE2B 0078aa6ca753285439a17dea5af0c66a991a1844b7bd487c0f51b95d9c8007a4d077515d3282cea8a044692a3d14f869f2b651bed3a7ba5e6acd20629bfd2e5b SHA512 b1168935e250e2a83356061456bef94635a1bb797abeb725f201298de3f6c90e285714799de4d79f30bd33f2a9ad9cfbdad2f4339100023485aee4554c36c133
-EBUILD libcxxabi-7.1.0.ebuild 3172 BLAKE2B 30e97968b51e591f16c35210769cff521422a286ddbca210c160f5bdec24b7013e061072506e598a64c27cd35b32c9dc3dec6d2522199b36342b826159aa12e4 SHA512 2bb020717a54495463fb598b4333b35bd9f8dbf55f5bf8742f524dc042cda1bc2b31e4a3f13bf1f7fd74197238913f33fbe6165adf6ae2ac7fc828d3d8cabb83
-EBUILD libcxxabi-8.0.0.ebuild 3176 BLAKE2B 709c55c2aedd2490ef6a982f41fa0b3977c1109ef480aba56cbfd248c40027349daa0dd477adefd5c37b8dbac8485cb8ab3c470e440b4be050ff52c0815bd59c SHA512 76237682c5e3d09cd259a03184fc35def96a90ac2bf42efe869be7d2f2ebdde05dca1e9f2efb5a08a41e7b461d4bbcb5dacd2d1ff8d3128ae65a1dfb2683f92f
-EBUILD libcxxabi-8.0.1.ebuild 3238 BLAKE2B 3a87356a00001119c332dd47564c43484dca924755b42da1cab40d635ab5c547c4e1ccc48d9887d32c02ed0bce749bfec756b04273b0aebae8ff89d3f0160a13 SHA512 998b7fa2ce1e76b6414ef62a244c0f6a286cc7c37f14fd847c68282dade49b22765e125c2df19f3637e218b9c90635c2020ee5d2fd97316f071eed6337d8c9a0
-EBUILD libcxxabi-9.0.0.9999.ebuild 3370 BLAKE2B c4801a06980d20f44eafbd27972f6e6bf2fa9cac94ada72adfb0b0cfe4d20b2ec00962b60515430b59e7e0f889a5d4f5e95031755a465805bbe4bd11156c1f55 SHA512 531f690ce002740d7dfb81f6922e606990120d65c24734f44960d7d8e15b647ffb0edb82d507e076c6fad89ebc86375d99c6515381cff3cc89fdc7942ab198aa
-EBUILD libcxxabi-9.0.0.ebuild 3252 BLAKE2B 17c19f5106b674fe1e450ddb9d0b0890a346fd07f7a0525a3adc59402202daf323306dd5a98e9d08c5e8ef1711eb41367856f167f157a2d052643d65734ff850 SHA512 79ecafec8261b665dc445cd4de02d56f95a5f0e3301c3a5233a580efafda593e9e1f6725dc9b0cda025b9ba482c331f388febf8b679b8793595a93b462f2669a
+EBUILD libcxxabi-6.0.1.ebuild 3160 BLAKE2B f71f407049fde2c3310ffd6626e19398abef0d5d521b1e88ac7139dc45a44e8a8ef67bceddbbbc3e653bf8dd824cd1e429be4e4de4805384b27207b26a3d6299 SHA512 4ff855c703b50eb2165cc9b0942a5de556ea3fd07a9a56b468d72df113473d3ec249ed4887e7b353138dc218a767e299fec9dd43650e1794e39a4455c8f0f68d
+EBUILD libcxxabi-7.1.0.ebuild 3160 BLAKE2B 5b90f5ce5637b75316cc992dd50105c87e7e55c8bd608a5d0280556ca14e57b2be47d5a81bbef0be37c8ace675887bdd4e44029e8efb8cd4f7a69b7eb6eef488 SHA512 8a03888a55c60959802824e54c78bdc9b8e74501bdd8b5a47bbc619290e03e8815658e5f33f9fdc9befc66f9fc36ff5ac2d36008824e3800f76b299508e706e0
+EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
+EBUILD libcxxabi-9.0.0.ebuild 3240 BLAKE2B a8dfb09b9bf64e1859253df979bc93d5e2e8bc18a42535eff27199b30cf96aa0df8058b71228eaf6ee3005851add1195c1b90215e7c39f0e36fb3b06237de49f SHA512 edc9a0fa432c26492f8c9739933f4d20aa9d95833b5abdfb260cb8583351d91e8aa1da96563a7e2b0b4e2033696a5700a07605bb90b999657fdfa17a85eb8f5f
+EBUILD libcxxabi-9.0.1.9999.ebuild 3370 BLAKE2B c4801a06980d20f44eafbd27972f6e6bf2fa9cac94ada72adfb0b0cfe4d20b2ec00962b60515430b59e7e0f889a5d4f5e95031755a465805bbe4bd11156c1f55 SHA512 531f690ce002740d7dfb81f6922e606990120d65c24734f44960d7d8e15b647ffb0edb82d507e076c6fad89ebc86375d99c6515381cff3cc89fdc7942ab198aa
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild
index 0e684ef4a591..1d40c35736c8 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild
index 702c51358cee..d6df94417435 100644
--- a/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild
deleted file mode 100644
index e366f2ae0e75..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-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="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-IUSE="+libunwind +static-libs test elibc_musl"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
-	)"
-# llvm-6 for new lit options
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	mv "${LIBCXX_P}" libcxx || die
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
index 1369f2b70048..74465117dda3 100644
--- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
index ba72310b7a37..61f520b98588 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
index 70fcb998c05d..70fcb998c05d 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 463bf0b3e528..a95d05b0f87d 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -2,6 +2,6 @@ AUX Makefile 513 BLAKE2B 582a1ee9c7cf3f50a3508470e68c987f7566a6b85fd525b9c5649d5
 AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768ffe4244e5fd883bc4a8ec5ef3e41537734899353127801004659ab8a6890b0c4fea46b8bba4591 SHA512 fc93c26e4df1c5eca2f99ad3058e2d129fa85a876c9d3d6fcc9e456f397455ebd136b88b3c0ed8d27003dc7a00a985094b6c711fb34316d9fef39e1ab2aadaba
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
-EBUILD libcxxrt-0.0_p20180311.ebuild 2301 BLAKE2B 7fbe868bd62ce114c9945b6237b09a7a64090e0f6604b0f2e5866cd89ede75544aa860645869503db6760b1a059eaa0664d55bac50fcd1948af947591030672a SHA512 af17a37e2af2b2e6eced1cccf72a8ccc84e95a26d008d466f7ecf3bf5519648323fad9bbf44fac03c98fb810196e7b12ccccb05c90381badebf268897226ce2e
-EBUILD libcxxrt-9999.ebuild 2282 BLAKE2B 90380383d29d75b333eba9a510236f76a89673deb2a6b3b4d946eb15d3ec12df54e95121bf2e2cb6938bdeb961f0789f203585b494ef757f4f1d888bccf1f695 SHA512 b76d1a9bcd2e4d065e358f6fd856baeb762af5e7bec05caeaf0bbfe9037573a59d6158783df5950017330b578d3cff101caff18d65db1644543563a8ff360060
-MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
+EBUILD libcxxrt-0.0_p20180311.ebuild 2279 BLAKE2B ec5e6ecfe5131bbbc3e661f7b5c7e388d141c61fe582dbc374bd39a03a9bfb2245c244770dd06beda54ebc802385932eaf2ee3c0b8b0f74a948822d81dcf0005 SHA512 5a7aa41ffe3e3417fd6717ad40e78ae704679e5c8ef123619ff648dac7306075f5cd1515ebbf21379ca044f68c2c5e608398c17dd6591e767d5f66deb69456b1
+EBUILD libcxxrt-9999.ebuild 2260 BLAKE2B 0604d76d0f839b3c3614173ac8c2fc831665a8cbd1e80375fa3ca653436591d8ae4dd5c42995d2cadf3e9c63451e0201a9918c5352a90054abd31aa566f59108 SHA512 8fd87230bc41487a5a466fc45f2c99a6a8d99008cb0c5d13b9758eee5a4458e567dac780e2057b07feaa9ed06caa07a3bdee89cc167a7b5dff9f541f3b293204
+MISC metadata.xml 663 BLAKE2B e23670c740126eaef944e0e78026ac1cd79c4a338158cf99a610fda7fc38e74c3206b03b48bcac22f5f268f1620494a9ccd6b01594c06c18f45a01b0054d9cf5 SHA512 a109b71b8c259c0c71de830bcb2397b6f98879e5c00a85bfb46ed89b0ca0b01cb9ec788f41721fd419b2d912a8574c229d4961e7df74e49e3c6cd6801a13bd7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index f5a189ddbb2e..bb89489c09da 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 else
 	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index 65477176decd..5374e99ec390 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 else
 	KEYWORDS=""
 fi
diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml
index 58657121adb2..cb5673e8a934 100644
--- a/sys-libs/libcxxrt/metadata.xml
+++ b/sys-libs/libcxxrt/metadata.xml
@@ -5,10 +5,6 @@
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
-  <maintainer type="project">
-    <email>bsd@gentoo.org</email>
-    <name>BSD Project</name>
-  </maintainer>
   <maintainer type="person">
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
diff --git a/sys-libs/libieee1284/Manifest b/sys-libs/libieee1284/Manifest
index 0ee9569af71e..2bdea3c88233 100644
--- a/sys-libs/libieee1284/Manifest
+++ b/sys-libs/libieee1284/Manifest
@@ -1,5 +1,5 @@
 DIST libieee1284-0.2.11.tar.bz2 278804 BLAKE2B 6bdc7051c91c7d1b7e601eb17823c4dbd17ca1f049a2af8487518649ec33fd5948d184b97764934371ea11d3871e82059cb0a5bd5501e1881e191791992e9d7b SHA512 06cc3049ce15613d34e39dc71bc572843c61ab64077c29ef9a6257edb0849c98565ff612a4cf787bc9642a39f1c89b7c47a20fb27f2318105be82aad8d472bb9
-EBUILD libieee1284-0.2.11-r4.ebuild 1035 BLAKE2B 904c2f05a42e00a356186301d46b79470cc341185ce021932f79d26d15a9645f03647d44d672b038730c49d3c12576635870dcbc941df535323583a95484bd7f SHA512 c5d6d887bbb6a6b7b23ad38dd4bac6cfacca97f308a2769c4ed9bbab04ae232c284b46649d5520cd6e1bd4dad2d1a580f587d7f8c37443b39d91a65f32fc4d5a
-EBUILD libieee1284-0.2.11-r5.ebuild 1023 BLAKE2B 0b57d2430bb408476917bb5a7c8abd07b176921e3370ca4c4f6e840048b8ba9a13bd5718daefd939460d91d3068834c2dafdb2d355ff26fdffc9d206bd9dec32 SHA512 27088685b501ea1d18ad0933052df67ba98886554c563d5c3520708753ceeae04b0773aba13c30738e9df23faafea4d1af89fbea5c90e3f199b650396943ce11
-EBUILD libieee1284-0.2.11-r6.ebuild 1041 BLAKE2B e2855d80ba6328be8485f340253f9dc0c43d123afce909743fff65ccd5d331602359e0c11cff8fba224be3863e069ec762e1e09f43158ead6582d83609f5bbe9 SHA512 fe9b948135304499f488dce04010aaf6bfe8edde7e7c242af508fb0142e7acbf5b8ac599a4b28b38d6112315d3c017abef4b53ae254c69202c1e1023fa0d290f
+EBUILD libieee1284-0.2.11-r4.ebuild 1025 BLAKE2B e50142b0567c2d6b2fcec53bc8e3a459856d026e2d9c1ba9199b23369ca4f301b8988aca7fcfd6b9dc2e4a55c51c461ac2712d769544a3dd1ac399a46efa9b94 SHA512 8095ceaa46d5f7a5c951b06d630011ab314129ba3fe47f045ca2aeddf9feac5f1dd84bd2d19cb258808ef25f4d99e5279875f6aa20e3f02569034f31a17b9304
+EBUILD libieee1284-0.2.11-r5.ebuild 1013 BLAKE2B 902fe1fccb3fe1c1bc93427ebbcb6dc64f5c1604c9bf186d8a46b3428852bd1e16e50d4e74eff66583c71d762bcad319c3ed771e639da3bfb66bc0d019ed80ce SHA512 a0402f7479b19387069e6a11040bc3227da357fb32b0d3dd00619baaaeddfa2c8c02fa562b01079d0218767774b60b55c3b05baa3f487ea8602634cd434e4005
+EBUILD libieee1284-0.2.11-r6.ebuild 1031 BLAKE2B 3a97190fec0c07adb48ad6e067ac4a6e231355625770711177090e7a2c84cfcf4c39dda602af6bcfba1264b877819277114fac193b215e9e11d03c6edff018fa SHA512 25fe6c91c02dd2ae8517c261ccdfd73e6f4f123f4e42d947f99571d8d947d465833c45acb911772fe046008174657655bdd26a6ed02b7915f2740e011862cb18
 MISC metadata.xml 331 BLAKE2B 72d060e5e77b6247387c4a7da0c70c86902f650cb90e37ddb1342c743d8160803edc6f2884549e13cc55b5e0507fde4253f0e4898c36cb5653d0fce7f4d23c58 SHA512 f0855a91eb73804b3df9fcf9c821fdbfca67206c57152e7db3346c195ae3c8a204a7f0179c2449861799ff081d468dbd7709768d50073838bba19a447f252b5c
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
index 598e04de9d58..1074e8dacdb0 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r5.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r5.ebuild
index 678129500cbe..1512eba8b60a 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r5.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r6.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r6.ebuild
index eddd151383f9..ff524ed34eda 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r6.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest
index d18f2224d9bc..7564783facb2 100644
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -1,3 +1,3 @@
 DIST libixp-0.5_p20110208.tar.xz 655956 BLAKE2B 0c2195a3f793dab19bd08acd3758105f9bd4a57a8e1bcbac1f8fcdbba8e2ecd25280468019ef069810267246995e53a078835515effeb8a4f523c834ac0ef020 SHA512 c5cf13b54ab2fca66b6c0ace0f3067e46a461d62727e93235e60382d3665edd40751d404f3f590c9d7692a5b8cb7d1fefb05adb2c36d7941bf04e37d13a4a48a
-EBUILD libixp-0.5_p20110208-r3.ebuild 1121 BLAKE2B 195e478111e6b6441a7a06fd82863f80dfccb5c136888fbe9bf7467734de4ca120396db2a0888200f757dcd6d8aff999e376b5e231bac3a81ff8f1c194e60bdd SHA512 c30a271e2bbfe3cde6f20b19d41a9feec6c66906aa76ddd81bf0bf969da221bd058b4af980ef07cb0f557918d24bb6ee2606400c8468a76a7a0b7afd7e617ecd
+EBUILD libixp-0.5_p20110208-r3.ebuild 1111 BLAKE2B 0bde380fdf1d6ad6a053368f3c50de23bffbae9294afdff1995158868759088afb7db9e46d3d205b7306bede9a8d4cbffa34c937ed64ff9a4705d91acae96974 SHA512 10b82ffdf90f4bcf27625c8441c40af0b25c92e6b2d43271f3bd345ec4366b486f9db5bac09ecf66a8aabcdd0d4c36cb1bcc301156a5991b45929d5251476527
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
index ac977ca3ebbd..8c7dc645c040 100644
--- a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
+++ b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-libs/libmath++/Manifest b/sys-libs/libmath++/Manifest
deleted file mode 100644
index ec48871ddce6..000000000000
--- a/sys-libs/libmath++/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libmath++-0.0.4.tar.gz 51107 BLAKE2B 7aa9656129a0f1106f6a08f4e9747e93a67ed67e5cda27c3aedf2aa893de169f366755144a9155c156c185faf6eded2434bcb53dbed250d1c8fd88349fd9a3d4 SHA512 4ee86f365f9eb4f8a122beef430041b5133da1b780a595627ec43c53bb45a6b5a5836a1f2453d2c93f6771ff45683b1143a1d1432f3904ba5b6317c50f010bbc
-EBUILD libmath++-0.0.4-r1.ebuild 1050 BLAKE2B a46477d2c5c108356db10d9b816563b4793b42003de3df577db7ea624e68edd12bd00835501b61ef2bc0065cb83fea840a2a184451810e5a86fe532299c16225 SHA512 8fc750078987c8c48149981b93166efd71a0b7e8655496e2912f6272d73ead783daa7975392a29204b929c22a0a278a4b70d3c9c49eb80004caeb3e7850f1545
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild b/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild
deleted file mode 100644
index 790fb2088a69..000000000000
--- a/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1 # bug #474098
-inherit autotools-utils
-
-DESCRIPTION="C++ Template math library, for symbolic and numeric calculus applications"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ppc ~s390 x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# Autotools 1.13 compatibility, bug #471950
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die 'sed on configure.in failed'
-
-	autotools-utils_src_prepare
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use doc; then
-		pushd "${AUTOTOOLS_BUILD_DIR}" >/dev/null
-		emake -C doc api-doc
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use doc; then
-		pushd "${AUTOTOOLS_BUILD_DIR}" >/dev/null
-		dohtml -r doc/user-api/*
-		popd >/dev/null
-	fi
-}
diff --git a/sys-libs/libmath++/metadata.xml b/sys-libs/libmath++/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-libs/libmath++/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 4249ea606fba..0eb0f664c5ee 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,13 +1,11 @@
 DIST openmp-6.0.1.src.tar.xz 2048320 BLAKE2B 08b3a7051c985903f78331f55a1c6e928399b87c862c43c991e9bf78b66b6e412fc96f202b82c051176dbbe02422f8ceb7414f44ea8f3522f418e515c0f70c62 SHA512 abb956583e5d11d0c6f6d97183c081d658616a74933be884a591eaa3d8c4bb04f08f02016d2c86d7384c7ff1aa44fb949b0d967fc0ff50e3132aaba412e9add8
 DIST openmp-7.1.0.src.tar.xz 909320 BLAKE2B 7a5fd4374992b7c440ff27917c0af6a2ec64aaeb2fda645f75b5affd4981e3ceef7f15cba61c37934c5b35be543af315cc4bff2937545fbf5eaa6593f1aa8b83 SHA512 57f18beede401c1c39766e13a03b52083a0f7b437758069f66b73d6d1388dc51e48c34b0a7ecd3552244fd35e2db57388642588febef413c161f5c5411ab1e5d
-DIST openmp-8.0.0.src.tar.xz 934384 BLAKE2B f473fad9e8bcab1ad0c6ffab7cee471065d615947964177194f829847d41e726fb435562f1637f2a65d3ae84e01a8077662de047443f33d089948e2efb58906c SHA512 0fff071c9dbf118bc1908e433d6ce571f47a4f2dbc5bf2d843151889e3414473bb5a9c97dc0b6dc6d1bd9ab0c6e365cae625f97d1b11d5d6ae059fa5a0496cb3
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
 DIST openmp-9.0.0.src.tar.xz 939036 BLAKE2B 3eee75f05f65a294db6e65c29b8871bb2dd4e0ee753447d2356010ca1a114f3ad2dc54c2f39ad7ffcebd510d912e96f54a2884ecdc7f50864f909184c707e7a5 SHA512 0be0e95026db574ad75d4a9d2fe4234056d16dc4fe24760f3e9e39f3e10099c7eea4ff76d7236e5a570809111fa18fa017cb679391c16a995ba0c194eb9391d4
 EBUILD libomp-10.0.0.9999.ebuild 3155 BLAKE2B 69fed2b801866cb8025f1dcb450bfac5f4c7a8b70ae4454712581515ccedd8ea997cc89eec1201035e3817c53931d2cca97305ea1287980e38f509a02980502f SHA512 da65a9cdaae4969510462a3321bcdf29e8548bc00dd53e489509d5518842162897113f291f28b9a4bac511df4eb72eade4183d9ed9e7521ad14f611e7d979489
-EBUILD libomp-6.0.1-r1.ebuild 3261 BLAKE2B dc43e11cbd716285018a3857b33378715338350269cbfee3292c44ebb0d10584ea1f505962c34fc9c5a58771d6abb52f444467e79834e9a04d594c914af46a2f SHA512 eb901f8810fa552cad6d6510f54f30824a1d7f7931ccc1cf6bb02a2ed22a9e9af3d924bfbc09921510d2972ac4ca36fb1df4d6b7d52342a346fb8b5cfa0ac436
-EBUILD libomp-7.1.0.ebuild 3262 BLAKE2B 67e9c0dc1f9e20dcd68904dbaab30c9de6311f2deef536b7e2026150f1d80a98870351a12cbbd97800c79b19250e2e4348e319b3204a92be04122ac4d295261c SHA512 f5984db2dfbb23c610960a7799fceea7e6bf46285d98e2200653978382cd9b5b2510a18ea912e0d10aa36c6a593c7487e764437e714532af3f91159e3f950cba
-EBUILD libomp-8.0.0.ebuild 3266 BLAKE2B 8cd6a5dfac53b82e0a92d647ae9b453a664f5b5fa8156c8185ccecf394f313ae826e29634b14126a53ce36498c485b658b36141ddd5895635437b59beabea001 SHA512 6fb36d649ce586f638f0846e26d7346ae9faeae571b1e61b2509b810a04e899b63293653d6b3af51924cbd2c1477f359b8e004f57cedf20385698eb8657caef5
-EBUILD libomp-8.0.1.ebuild 3292 BLAKE2B db26c9f6c3b3020b179a9a2e09ed56025d1f728eeb37a2a756737b960f2bbf058e77907e838c0ea607239c467e18e167f63127abebcb29543afbbb45456ffc95 SHA512 ddfe70504b99e551b3a3effc3cf5d689868d6b1ec06a2ed2b446c46ffa0f95c119c0a3bc211e59c1181bbe3a10e6747e126b36635fe2846084c2c9897d9a58b5
-EBUILD libomp-9.0.0.9999.ebuild 3180 BLAKE2B be06f2136d959c7a4f119b2197d3fc3e5039b1f5a02decab3602c3dba659f9427cf7f778f66f4cb1db8e6c6f795b22a16a08671f7e79a82887a3697440399deb SHA512 fb9766b7223f5104d427b97804801c34f735ee94d7b2eee27ffb9e9f7a60aeb9f61fa77df698435c8fbc0661a7f038a4e81f5acc937f6e317d886d02017f03b1
-EBUILD libomp-9.0.0.ebuild 3208 BLAKE2B 277d9eefeda231db4ff978e19b8f0a41c1e0eb722a2b5f8a18f4c820f4609432af107a7caa977f61e06be7f15a40d4a32da11a4ab5d1e781408b8495ff4286e4 SHA512 b21e1f5e9bb950df7fe02443aa65463639470c680e43d44836d5f2b1b822228ecf20ebddc5904fcbfd3f4d908c805dbd932393dd5db104993760f4c3e0bb159c
+EBUILD libomp-6.0.1-r1.ebuild 3249 BLAKE2B c0128b595df288ca5d233d0de9f3dd1c6d60be6796530e3944d3cfe8b6aa983ba634714a0f1b8cdd5fd51a719c0547a34ab788c3fb2456d84b055d3b58c38f7b SHA512 c6f934694852f6c4ac474d04ab3b33204d5094c2a42f8935f6744e74041e2cfb6f9746b53dadadfeb1c5892efdf97c8d33865f72a9e4baa048984470a3efbcef
+EBUILD libomp-7.1.0.ebuild 3250 BLAKE2B c01271dec02e6315408cf8751580a870f0a8a08f8a7d7801efd6780049676742acc10a284ab21eff5d178570f59995cc0c388adf7d4cbafe5a07324c63de7402 SHA512 463b486bdb6fbd4b85d0935905e7b80d7c28a3279159a15182ecc364aa56eff268ba6e1dd4c4e38d90c3229b057dcbc6037419442e9aae137afd71e69816bd45
+EBUILD libomp-8.0.1.ebuild 3280 BLAKE2B ad34cfd8d5043c0fa706e292f78c5458c659b26ce260c4a049a9e8ecc88f3c268d0b4849c269a41e95255c8ca72f8db0b1f57eb342a4af0980dd34bce77c3c69 SHA512 fbe46c483dcf27d5598058b6f6394811d1e2fd2ce73cb3c34bf6519d2de0ba274562cd4d1caaae3737b70a6188c36079547518ec3a47afadf69c4696d9ec5634
+EBUILD libomp-9.0.0.ebuild 3196 BLAKE2B 75685b504c261bd35e6f4fb949be3d1bdd7e4e07261c9c25a56ce545232c73125fab53d464aa4fdfb41e22136178fc045b589e34d458d6b40810891da823217f SHA512 ea159d7eee24eb8c44fd4e5bd359e129db6089120b92a3ae99892e98d4ae879c01defffe509de227c3dadef5c2f722c46cac3d2bc3e06292ef601ef431cdde9e
+EBUILD libomp-9.0.1.9999.ebuild 3180 BLAKE2B be06f2136d959c7a4f119b2197d3fc3e5039b1f5a02decab3602c3dba659f9427cf7f778f66f4cb1db8e6c6f795b22a16a08671f7e79a82887a3697440399deb SHA512 fb9766b7223f5104d427b97804801c34f735ee94d7b2eee27ffb9e9f7a60aeb9f61fa77df698435c8fbc0661a7f038a4e81f5acc937f6e317d886d02017f03b1
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-6.0.1-r1.ebuild b/sys-libs/libomp/libomp-6.0.1-r1.ebuild
index 1dfb63c9f830..abc8941fe1ff 100644
--- a/sys-libs/libomp/libomp-6.0.1-r1.ebuild
+++ b/sys-libs/libomp/libomp-6.0.1-r1.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 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-7.1.0.ebuild b/sys-libs/libomp/libomp-7.1.0.ebuild
index a52e23876b75..8946c652275f 100644
--- a/sys-libs/libomp/libomp-7.1.0.ebuild
+++ b/sys-libs/libomp/libomp-7.1.0.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 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-8.0.0.ebuild b/sys-libs/libomp/libomp-8.0.0.ebuild
deleted file mode 100644
index d472c4f23795..000000000000
--- a/sys-libs/libomp/libomp-8.0.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib linux-info multiprocessing python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
-
-# Additional licenses:
-# - MIT-licensed Intel code,
-# - LLVM Software Grant from Intel.
-
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
-IUSE="cuda hwloc kernel_linux offload ompt test"
-# CUDA works only with the x86_64 ABI
-REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		virtual/libelf:=[${MULTILIB_USEDEP}]
-		virtual/libffi:=[${MULTILIB_USEDEP}]
-		cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	)"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		>=sys-devel/clang-6
-	)"
-
-S=${WORKDIR}/openmp-${PV/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-	)
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake-utils_src_make check-libomp
-}
diff --git a/sys-libs/libomp/libomp-8.0.1.ebuild b/sys-libs/libomp/libomp-8.0.1.ebuild
index 7cd25fdba874..e80ec0c8aeaa 100644
--- a/sys-libs/libomp/libomp-8.0.1.ebuild
+++ b/sys-libs/libomp/libomp-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-9.0.0.ebuild b/sys-libs/libomp/libomp-9.0.0.ebuild
index 66370efbadfe..f182d3947149 100644
--- a/sys-libs/libomp/libomp-9.0.0.ebuild
+++ b/sys-libs/libomp/libomp-9.0.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-9.0.0.9999.ebuild b/sys-libs/libomp/libomp-9.0.1.9999.ebuild
index 024defb5b3be..024defb5b3be 100644
--- a/sys-libs/libomp/libomp-9.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1.9999.ebuild
diff --git a/sys-libs/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index fd18861214aa..5b2cb00a2d5b 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -1,7 +1,7 @@
 DIST libraw1394-2.1.0.tar.xz 291456 BLAKE2B 8fa19d9f4348b7cb0b78e0789c1a7c112bad475064c1c2cc4a44a39fb859b9c056c97b88983940110b8f484e309f7bf3a27b18b50603f600b8f4fc585c7987e1 SHA512 04295c2b4391b1c61cc1c65dbe5921f5e208bbb311104366d5756a82a6c53f1339c368fe76077318b22e2402fd8f679236606d0be4898728a9dba2d7a8989b9e
 DIST libraw1394-2.1.1.tar.xz 309396 BLAKE2B 2460e8b9f848d30c74fb93c78e38ef818a09d714faa66f872dbb822daef0e7e144a2e18a898235915ddfc462ee68385c2ef24ca5217cf314847808678fc1d21f SHA512 ed6acf10e50593e6070764e57cb6cc0eabb6f2bc4b4ed805a55cdfc37109c1975eb597dfbef9b6f8bc73a9e9270e7d643956489f54682f4c670fa510ef726fbe
 DIST libraw1394-2.1.2.tar.xz 313120 BLAKE2B 73addee88d2463ecebc4a0bca14d8f4c285c8e7060e3ded49bacbb818049e436bdaf98bde26469ec03e1baf196f67fec59e90201347f34a5810b8704108c8d7f SHA512 1ef38961b747c4ebb18d823a4c38d5bf019f8bd0ac55547838d153b1899b91ae0ff56f5b6732e309d6975b55725d1ce989917ffcf605cf64f7d33624f54f0567
-EBUILD libraw1394-2.1.0-r1.ebuild 501 BLAKE2B a245b59b3801a13239582a5d04a90121648312328fb1a06fc1176c09e11daa80f597f4b86c463681861de80cc32a20c7e54e7d4f838420deaf55d1bc6b0a6a2b SHA512 f7655c91f7a2fa6bbcf90ff75150e3c7344d8909fc7251c8ea17a8a0da01008cefe59c00254ba4fea5a08cd054decb3ddc0a0e960bc2995025d94363426231c5
-EBUILD libraw1394-2.1.1.ebuild 510 BLAKE2B 025b80e26bf96410baa577578624cc902b83abe35561c67e6c74f9f83f9ee5f5740fe1d4654613eb58caabbdc9c6f64624a07fd7fe9a234322691d1fe1715cda SHA512 643bd13a6b83006af482905c932d4e15e77daef6b6d70a5046fd0f5a6990504e073d7ef3410a6cbc6a3a7bf6a36b1952eafb964e12a743ebbc72b677b8387eb4
-EBUILD libraw1394-2.1.2.ebuild 513 BLAKE2B c95d924471f3999431dff508442b4134b637795c68ded271cd9c19a4b97fcc81c94512644df9f9f2fea090660fb9e76752eff228d4a28b840c67d17ac930b59a SHA512 c829ac48114c394b8ef2ca5bb09a98b30e7c004fe42c88437acd4721813db0c9559aace95780ad2f6df7029ed57734059828c58722a8b1c3bde5a8e0dc912814
+EBUILD libraw1394-2.1.0-r1.ebuild 512 BLAKE2B bdeacafa839a6f0c67c8bec76ab8dd3c7f392e38bdebcbc50bf7cdedca51b2f746ece83e20d16720168354b3f720a50a77abbeb53e94dc3b335267a4f52a9801 SHA512 d2db649a2965f05791a4f2d5e29f277998fd9a40a56f73a9bcc1e51c71199ab2f6f917460b8f5b83645de4803149dc89f3940958f208507e3e9d1bc0ca985262
+EBUILD libraw1394-2.1.1.ebuild 521 BLAKE2B 727c89d51ba6865502accbcb4bdfb519ba8b3681a80d555216a84ec64c4cd507066e80ae6f0a048906054cde86857b7054137725482c1770b73af30776fa07a1 SHA512 27debfd5049bfeb50899084311ab1035128a9ac0335de5b9c5f0ea76e84906b6745a7430f3bf527fbf46f190875cca9bcb94eaf6d614aef0d533bb373e231cf7
+EBUILD libraw1394-2.1.2.ebuild 524 BLAKE2B 135a53734dc88a23d1b5f86daaf2973cf5d9992a9a905c52d43a2baa1b53f2f3420f08346d7f9fd64263ecc2c0b1a1aca4c2eb7e0a4b64ab3bd131fa0edb4d87 SHA512 b61e305f55580d2832f172095521651544bc02f5378d0e6c4c33d0c85b47790d2e99eb17c36c147efdd669e1a8d722ce54b37c467b3f768a8087c3db9aeb937a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
index 90b9144911a3..da2d4beba9b8 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools-multilib
 
 DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="https://ieee1394.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/libs/ieee1394/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
index ec729644728f..816da911e438 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
@@ -9,7 +9,7 @@ inherit autotools-multilib
 
 DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="https://ieee1394.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/libs/ieee1394/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
index 9a642a8bf06d..49545cdd7aca 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
@@ -9,7 +9,7 @@ inherit autotools-multilib
 
 DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="https://ieee1394.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/libs/ieee1394/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 3310e2a9d280..b5c27299afa7 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -9,5 +9,5 @@ DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f394023
 EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
 EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
 EBUILD libsmbios-2.4.1.ebuild 1716 BLAKE2B f30f7e7cf6c28b86f6340da66f566f788d9f25bbff53658ab7b5ffdfd7b36082daee2d27f8cd5990a610e9c9e989a1a369711461ac190c3377410587fe2da2e4 SHA512 aeadb26492b8710afc3151b1a1af199a33fb1a9e66b12aa5955501b1e3db1b75d98a552065b7376d038bc19ea246cef1b8af53a2245b0017c21b32dd2910f7f3
-EBUILD libsmbios-2.4.2.ebuild 1702 BLAKE2B 893ce499fd0f61a4bf59f8612335a67b65d73207d2e96b06a35a8aed0458a948eb98e4bc7db60c03b59c68c04d28970cc41f4addb99be1a83671085c66928e1d SHA512 7e2b78fbff37708d40248c6f246ec10b397adddab28bdde290c528af526ad8cb84eb2ac1e8324b64d2fcc0c2072e7c6c6a32d560915496796cc490c0407c0470
+EBUILD libsmbios-2.4.2.ebuild 1701 BLAKE2B daa5433df2c08a7f2fbc864e980a2f336035b537d89955e631858ff248e290059ff028764fae614d89b35d87ed1967ebde83fd39513998f967e729874247578e SHA512 4729d2e31e69c0e96dfb3ac9a52cdada7042b98abde5e91b73fe3480a77bf2da164bae6170a292a077312ebd42fc46031578f2c586f25e8a322ac5d06d94c0f5
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
index fa2eba174659..4a5c54da1b98 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 38360808196b..ceb7139779ad 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,5 +1,4 @@
 DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-EBUILD libstdc++-v3-3.3.6-r1.ebuild 4919 BLAKE2B 2d66b29068ea1bbadc1e9f9ec97f88e099cf3f429565d9728429e71913fefe7ac7133efe42cf39dedbd721331a15b0cc2327c25b91a2c4316d86f96e70cfdf3a SHA512 de6d5d3933651bd06d64f3e67727974719afe18da5fa773f58f3ccbfbda6c4876453fb73bfac7db4477eaf888ee484e1f7d6832696d6ffa4960fb7f06cadb704
-EBUILD libstdc++-v3-3.3.6-r2.ebuild 4938 BLAKE2B 222a516b4f8b9f7696d8f3f834b5562b31d895cd9a183b0e44ba9519435b5b8899f0c9a2cdfc0e3800995cdda6f5355a1512fa834b7a26664007195a59cbc86b SHA512 d962fc372ce53452c58bdf650e96e6825d6b26fe83e21b48a2949af161ddbb2ca43b0c11000b21f64be759ec6ee94bbcabe96409fd160b6b1eb14596ae26fdf6
+EBUILD libstdc++-v3-3.3.6-r2.ebuild 4903 BLAKE2B de1ae46e51894965a95123ac4e293b17ad3688371367a63661aab200f797d68f07f19d9a7afde895921bf1f121f34b7b6e7316a058b92ceeb7558d1ddb233b62 SHA512 399917ce88dfa3113fff48e0f68d68f053117db591512bb453e07c11e2d2a852b81ae683604458a4e101359ee31959bf6537de54e94fc5633edae60f20d20260
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
deleted file mode 100644
index 76f9525d87d0..000000000000
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic libtool multilib
-
-transform_known_flags() {
-	declare setting
-
-	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
-	replace-cpu-flags k8 athlon64 opteron x86-64
-
-	# gcc 3.3 doesn't support -march=pentium-m
-	replace-cpu-flags pentium-m pentium3m pentium3
-
-	#GCC 3.3 does not understand G3, G4, G5 on ppc
-	replace-cpu-flags G3 750
-	replace-cpu-flags G4 7400
-	replace-cpu-flags G5 7400
-
-	filter-flags -fdiagnostics-show-option
-}
-
-is_arch_allowed() {
-	i386_processor_table="i386 i486 i586 pentium pentium-mmx winchip-c6 \
-		winchip2 c3 i686 pentiumpro pentium2 pentium3 pentium4 prescott \
-		nocona k6 k6-2 k6-3 athlon athlon-tbird x86-64 athlon-4 athlon-xp \
-		athlon-mp"
-
-	for proc in ${i386_processor_table} ; do
-		[ "${proc}" == "${1}" ] && return 0
-	done
-
-	mips_processor_table="mips1 mips2 mips3 mips4 mips32 mips64 r3000 r2000 \
-		r3900 r6000 r4000 vr4100 vr4111 vr4120 vr4300 r4400 r4600 orion \
-		r4650 r8000 vr5000 vr5400 vr5500 4kc 4kp 5kc 20kc sr71000 sb1"
-
-	for proc in ${mips_processor_table} ; do
-		[ "${proc}" == "${1}" ] && return 0
-	done
-
-	rs6000_processor_table="common power power2 power3 power4 powerpc \
-		powerpc64 rios rios1 rsc rsc1 rios2 rs64a 401 403 405 505 601 602 \
-		603 603e ec603e 604 604e 620 630 740 750 7400 7450 8540 801 821 823 \
-		860"
-
-	for proc in ${rs6000_processor_table} ; do
-		[ "${proc}" == "${1}" ] && return 0
-	done
-
-	return 1
-}
-
-do_filter_flags() {
-	declare setting
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
-	setting="`get-flag mtune`"
-	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
-
-	# in gcc 3.3 there is a bug on ppc64 where if -mcpu is used
-	# the compiler incorrectly assumes the code you are about to build
-	# is 32 bit
-	use ppc64 && setting="`get-flag mcpu`"
-	[ ! -z "${setting}" ] && filter-flags -mcpu="${setting}"
-
-	# only allow the flags that we -know- are supported
-	transform_known_flags
-	setting="`get-flag march`"
-	if [ ! -z "${setting}" ] ; then
-		is_arch_allowed "${setting}" || filter-flags -march="${setting}"
-	fi
-	setting="`get-flag mcpu`"
-	if [ ! -z "${setting}" ] ; then
-		is_arch_allowed "${setting}" || filter-flags -mcpu="${setting}"
-	fi
-
-	# xgcc wont understand gcc 3.4 flags...
-	filter-flags -fno-unit-at-a-time
-	filter-flags -funit-at-a-time
-	filter-flags -fweb
-	filter-flags -fno-web
-	filter-flags -mno-tls-direct-seg-refs
-
-	# xgcc isnt patched with propolice
-	filter-flags -fstack-protector-all
-	filter-flags -fno-stack-protector-all
-	filter-flags -fstack-protector
-	filter-flags -fno-stack-protector
-
-	# xgcc isnt patched with the gcc symbol visibility patch
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	# Bug #269433 & #290202
-	filter-flags -fno-strict-overflow
-	filter-flags -fstrict-overflow
-
-	# Bug #442784
-	filter-flags '-W*'
-
-	filter-flags -frecord-gcc-switches
-	filter-flags '-fdiagnostics-color*'
-
-	# Bug #610064
-	filter-flags '-fstack-check*'
-
-	# ...sure, why not?
-	strip-unsupported-flags
-
-	strip-flags
-}
-
-PATCH_VER="1.10"
-
-DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++"
-HOMEPAGE="https://gcc.gnu.org/libstdc++/"
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2
-	mirror://gentoo/gcc-${PV}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~mips ppc -ppc64 sparc x86 ~x86-fbsd"
-IUSE="multilib nls"
-
-DEPEND="sys-devel/bison"
-RDEPEND=""
-
-S=${WORKDIR}/gcc-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
-	elibtoolize --portage --shallow
-	./contrib/gcc_update --touch
-	mkdir -p "${WORKDIR}"/build
-
-	if use multilib && [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		# ugh, this shit has to match the way we've hacked gcc else
-		# the build falls apart #259215
-		sed -i \
-			-e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \
-			"${S}"/gcc/config/i386/t-linux64 \
-			|| die "sed failed!"
-	fi
-}
-
-src_compile() {
-	cd "${WORKDIR}"/build
-	do_filter_flags
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--with-system-zlib \
-		--enable-languages=c++ \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-__cxa_atexit \
-		$(use_enable multilib) \
-		$(use_enable nls) \
-		$(use_with !nls included-gettext)
-
-	touch "${S}"/gcc/c-gperf.h
-
-	emake all-target-libstdc++-v3 || die
-}
-
-src_install() {
-	emake -j1 \
-		-C "${WORKDIR}"/build \
-		DESTDIR="${D}" \
-		install-target-libstdc++-v3 || die
-
-	# scrub everything but the library we care about
-	pushd "${D}" >/dev/null
-	mv usr/lib* . || die
-	rm -rf usr
-	rm -f lib*/*.{a,la,so} || die
-	dodir /usr
-	mv lib* usr/ || die
-}
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
index b89d40642ecd..7540af559883 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~mips ~ppc -ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="multilib nls"
 
 DEPEND="sys-devel/bison"
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 8aff7d10deb8..b95d80d258fc 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -10,8 +10,8 @@ AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
 DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f84d3173dc3a2e9fd54486a18d99713df152d810db4eb3e36df4afa7df1b544e6c9271479e2fcbffe473a17c4372 SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
-EBUILD libunwind-1.1-r1.ebuild 2451 BLAKE2B 65ee170114b63d5405fb81ff6287cd9486d519c56bc5a5e05bdaea40036168f85093f057d2c22de54813c6d08a7b4269331be313df2a88b5d071ccdf1e35be72 SHA512 692315630f4bf8c422cd0ebc46b91a6dbaae1cee4e464c4d2c7d24842c906b426fe0511bb7220b65f2f248921a91aaa8a1eca00de77c625d16cc2443246528ac
-EBUILD libunwind-1.2.1-r1.ebuild 3185 BLAKE2B 0ab1544607e8d04dea1e24ec4396599bf81209891e100e8776fe0c5bdc816802ccf1df90cb535db42bdab46b5939ab1274d7888c6e844cfdbde02a548523251d SHA512 b590b26028a727e329e1558430d2b978e5a6db811cb1ddb1b7e6fe1110b108b36e39f651ced071d641bba45158610fd45e36c78f6084344aef47ce837b065292
-EBUILD libunwind-1.2.1-r2.ebuild 3246 BLAKE2B 5017270dade9c6c7a4ad6649253eecccef430979eb90b761a78ff8b476d03ed5e3e2415be7693072f0dc0631971e439a1017c01ac48a16bd6a26beee97b98601 SHA512 3e16f8ee57a886d02f4eac63247191f232ed3cdac9d2f40e6824db806dbed4127386c79c0b9642f63435b5cd6c3f4bef5599df24b92b45c86c8fe5575bc7678a
-EBUILD libunwind-1.2.1-r3.ebuild 3290 BLAKE2B c60f5134abe1a3ff6deff4253476d83b1b9e9d061f2c13ab6276b57d2b090c45f938ba557e68000b67d3be5f213680f425c1ad9f562f108556f2d2b7acdddc21 SHA512 65b2394cecc345b519c7ff5647003c17be6dd79b90cc8c055b9c19c8a4b48d2b8080a6f5731ea1d57959b80c0d33f2736dc3b160d65b996ed233f33496337ed3
+EBUILD libunwind-1.1-r1.ebuild 2429 BLAKE2B c903745f6d196f2d95254b84a9329600f4b7347574ac67883e3e24414f35919cf95bb4b12f360e331c12bc2647fa591481711618da763573fd3e7dc30581e351 SHA512 2d5b0179022f21794e6b3a115e487b797fec328001451125bbb451a06f28463efc84b8ec70f2827a974d91d767325cf1c073793a5d87de8678259c8e358494c6
+EBUILD libunwind-1.2.1-r1.ebuild 3163 BLAKE2B 1b160324a293b2897a0690daa05637630734b621df5f996b025b5dab9ecd9d420b703b3a827e3985dc3721ff5e4b1bb1aee559d79082755b7d6c6a14b7f177f5 SHA512 4c87ef071250f453f14a4a8279fd07f3b65c7f48c75600ed60be6f3c40762cab10690590b7433ad1abd6eb3a712fc69981382ee1e1b7ed55b28326100c8e8591
+EBUILD libunwind-1.2.1-r2.ebuild 3224 BLAKE2B 0b25a6c74b58e078e1801719167dd7b6bfacce677d184cdf3cacbb871b6e48e463c1eb2d5d009e3fb0b8e4adf4fb8c641744043a1469c1199042bbbb3d073991 SHA512 e1949212aec5f4ff2355748e8cc4128928c656984b4164777f5931bec2271f59fb65c58b9fe2f0f16855df549cbf3f462a2558cbebb488adbbea3747804f2183
+EBUILD libunwind-1.2.1-r3.ebuild 3261 BLAKE2B 5db36c0b03414855f985fbe240522189645a9d6d594626d91e1896542dc8f4e223c544fbb555d6645eb81be9eb46632f62957a031ba2fdf4717ffc03d596e39b SHA512 ce631136be34cca61bad7e6046b6af9bd5f9c82206f858997b642a96455c95bbbdb35fa9b1578995a7dda9cf9e524029f021c557e35f44edc69cbc89a68680c5
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
index 230f072ca584..d6226861dbdd 100644
--- a/sys-libs/libunwind/libunwind-1.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/libunwind/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame libatomic lzma +static-libs"
 
 RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index 064296cc115d..6616144a4868 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild
index 8842f71d786e..a64db840b93d 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
index 518da3a72e5d..800ad13d87d9 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index b8d00694b690..94d589ef5bd2 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,3 +1,3 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
-EBUILD libutempter-1.1.6-r2.ebuild 1700 BLAKE2B 816a23d7d191ec7d86e700ca0c39c01994c21847fb088de981774ecd8860f4a8d63387ca47ecfa0d5972d34721cfc23fa947df15475287f4fc9777439248b2a0 SHA512 0989bf1f30a55aea2b98c2943c6d3d450bfccd7e2fb26dc38edce1dd46e5ad3cf5be53137ebbb4cd0cac7fec632a36b5c522c592e1973f455af48a6b23500b1b
+EBUILD libutempter-1.1.6-r2.ebuild 1690 BLAKE2B 1c110e9832a618caa98b985ce4f1c35a738302ec8b3481bd2f696d6048c93edce51dc94eccf12d5b50784848bddb409e93e7b01d58754aee79ec320254f975ca SHA512 5d0b08ae6b45b949ee7b10e52af47db713f2211d001dd629d4c1db0af19f17e40f0cd9e2749325cbfb2b555b561ea24c3e2d44c42c2aa2561949b6e4a9699d45
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
index c9b09addc178..59d01cd79e1b 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs elibc_FreeBSD"
 
 RDEPEND="!sys-apps/utempter"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 06de8a15596c..e6973b840882 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,23 +1,19 @@
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
-DIST libcxx-8.0.0.src.tar.xz 1752308 BLAKE2B 1e8cd8c7100f5f8b943ba8f38b0b59a0fd5e5bea834953483a67502f67de3eb51eba4ed4be17cdb54406da4ad7ebc6fef33934c59db982afa55856ce9f1f46ff SHA512 2e0fcd3e78f7e15ea894e52c51351daef8e3a2aaf53b3df7497b11403d28f5269ff49a4674bacea1d565a5faa2b24502caaaeff9cd48518f0d141563d8f9cc03
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
 DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
 DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102
-DIST libcxxabi-8.0.0.src.tar.xz 539040 BLAKE2B 847d848e4ed66212789c50137e9556abed601ab4f30765b8b4453f0bc2609e2d1ef516b2f504ee2331a53706940b814545423da05392aed24bf290e6757b52f6 SHA512 9ee2e6d5899529be45b2e5edc395606fa9040d25789b3da1ae0182113626e7624cbb071eae525c478293a7b371876e41614348ee5808f90f3f9c7b08837e1055
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625
 DIST libunwind-6.0.1.src.tar.xz 77036 BLAKE2B b6c293285896c8ff1f64bb56eee5a88b102b7ed9902d46436ee3cb79f204f230fd08a07d39c7fa9aeeddd093036f2bb9af38dd54268099ea9e51e12a71ff4adb SHA512 78568c28720abdd1f8471c462421df9965e05e1db048689d16ac85378716c4080ec1723af78e9f61d133b0ff82ac8c1f0dde7fd42d194485f62c1a17c02db37f
 DIST libunwind-7.1.0.src.tar.xz 79780 BLAKE2B 8f15dcf4a9c8cb45f17c72bf058eed13a6cd52842ee8630781c3104be77d9a868e241eafd34a31b23aeff18dc49743dd5a566ce4cb866a170f1d09899584e2dd SHA512 8ebfeb821013167e866986a2f9cc6459e43d82f73560a15ee7e0d604a974e1c656f824c9f7ccb47da4b4830ad9a99c663961bdf7642cd105e666b8a8fdf7d03c
-DIST libunwind-8.0.0.src.tar.xz 86484 BLAKE2B 74f52fbda056b98cb8a2af652270dc4404177be4fd24a3d030f43e908ef912b875f6471819d364d2ee00c6edbec78d25647f023830c6ddc1c032added1059582 SHA512 8c10e986b4123b6db9f010f053d9c67786fd739d0990146c481f7eaf69ae44fdbcb99dfad9b240b369c3f93be05dfeaf0bd977685360be94e2872ddb04019380
 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
 DIST libunwind-9.0.0.src.tar.xz 90372 BLAKE2B 2ac6dafa53e030dd63a7e0eb4b9ee2c665a5aa64b95324d04604efce7fce6f101fc3685723e39ae0a0819bd16c9e4e366d28dfedae6748423c74f79e6a8b38b5 SHA512 55b44439b76638a7c5ea25dd3713a3f6a2d54bcfb7bf34d3388753f0d25be2e843b5f05dc1c0052d7a9cd5a141c6818f4da42bc9174a16d89e819ea262ad5706
 EBUILD llvm-libunwind-10.0.0.9999.ebuild 3929 BLAKE2B a92ae89cd9516548251e40503e9cf1b31e99860d40b44f74a4ebd6edb4ad6ab7da88e958747182f256553e99e6fc9ba44babe8cad45dee8d545d078234c86110 SHA512 44eb3c311abf4fc94a622631a0377c8fd41c01a5eff5302b68936240cc44aae0bd2832a4c011fd7c1c94ad8e7f8b123ca89f549a72188ec8b99e2613a33151cb
-EBUILD llvm-libunwind-6.0.1.ebuild 3738 BLAKE2B 5c58eb49bac3d30643ea2d82f5e59add83fff5154ab335180778b3c7c9e7cf87b2423ee76401dd25a2fc89f5a492440236ad47328dcf05af87d4961c2c2f1761 SHA512 712fc6d98152c397f7436ffbccf62646ee53e14a5b9fc2c491b3c0d8dcfa40e81b16a4d9b7d5b1d81769282ead75d93994606fe6cf3ee08d80eaa5707f182d8e
-EBUILD llvm-libunwind-7.1.0.ebuild 3739 BLAKE2B 160c33fd885e26e19ad02304ee792cb26868e92bcce527246e726e5415c63c071cc72858d35bf4d03111d0e85756b744e00f4f0ec89523232e088d3342f61adb SHA512 260d39e26ae10d62261c2cd348ec487cdc8950997c04b73b3773482fb8f54cc5518dfff58943727892fb7ba57752e1bfe785b2b621c4f00f3bdcdd909ab266c8
-EBUILD llvm-libunwind-8.0.0.ebuild 3742 BLAKE2B 2284e1919e3a6dfacafc424dd0c7cf43f1eb5810ca061096801867397b40989989c4ededb3aa60261046313df3064cece909a2f9343d2225e9e7e273c7a693e9 SHA512 69d4b2bcc157f2851a1b88ac0db3a18391b1e1bc8867f7725804133fd8b91cd128299c182c7d718c98cfb062d456d14181f9fd2885cb2c32e32bb3b96843728d
-EBUILD llvm-libunwind-8.0.1.ebuild 3837 BLAKE2B 81ec8216aa9c67d6b34635d44c9c5ba7acb26ffc251fd5b3ef68628bc5b86c53351530f83daf93cbab0c6cf81d4fbf316e291f71b284a0249e056b406337528e SHA512 8c528b201d6bb5b032407a297dfb34140463ca81a5725873bd17b7131cd36cbb543dc98dba342c44e5aef1f27485b46dd56c267b3657a72676e0714803144b5c
-EBUILD llvm-libunwind-9.0.0.9999.ebuild 3954 BLAKE2B 1972aae13ad8154f0d2962b5980731b50d63bc84cbd5ac8a0e38590a36a0a1b9ad426b13a7e9433a634d1260e3c9752d9eb1bdc2d06c8a89319be370cdbbcedd SHA512 31be0e16f14579a50a0c0b59786e17835243f206702c6cbaa054343fb35087f5ed382148529de78cb9718031be729c850da7d717d5994b51220f29897f45a5ca
-EBUILD llvm-libunwind-9.0.0.ebuild 3805 BLAKE2B f808df859eb25a4728dc92ba345bbfc33af5f6500c4a6214c69ee788663544e355460ee433de48f2a958eda3f8855c1ee03b38d232437b46045b6a3719154dce SHA512 3ea874076bf30f39aa7cefcf245e94767fffdac4177ab96633d6f35100d3e346540a71c7632f1784beb57040925e4713315023e3aea32f5ddd2a3838132f3d3d
+EBUILD llvm-libunwind-6.0.1.ebuild 3726 BLAKE2B eff574b04142b578a05b50aa9834a2b494361001e99a729c648cb34b72293d32703cc0d7d918e628a5746ba3d1e18efb063b198677ec7320e7564fce6ce137f4 SHA512 465c752552f5e28e9c995922c26fc9e4e3c13b7fa612c24a894a9580473924e0f90cd34a13f914af7a426e0c317f9c1104c2baf01bc202a4872a3a178ce1b3ce
+EBUILD llvm-libunwind-7.1.0.ebuild 3727 BLAKE2B 433bf5d3eebf17face5bf31030c5079ccb8cc99cf4a9e37fcfb9699b43e75702f3a6cd462c8cd8654666f76efb9f87960b171b5acf2b61b798fd7869f3bdd008 SHA512 5c5fc9dce356d1534089e724b898ef2f76cf8963fe4fa66bdba37255c609ca6f3e0dca3f50e746e6d8c2da9fc187975bf1f6345816f90dc3f65b02a81dfa1223
+EBUILD llvm-libunwind-8.0.1.ebuild 3825 BLAKE2B 6b967ef98ef57ba33f91acd00c692a0856139ce86f743b41c4c863680256b7f74f690cd18fdc23202b784c41cf6bccebb812a69ceded3fe41285f17667ed3606 SHA512 db2d412d9238f0e4aa686088b9195c57170562ebcf69a226bdc28fbd56196b8f39b900e87d5b4daf78c8a3f93f0d84bc14d4f28b5ce1df9307b29dfda7b19751
+EBUILD llvm-libunwind-9.0.0.ebuild 3793 BLAKE2B c2ca1210f696425d0ec738627586257ffe02db1f5995926e84f1272310994bc83a477e840fe17df0aee9ff85e832d32166ef3e234b313f5590f86b213840c8df SHA512 970cd8f2674f48a98fc60ff3ccb27ec56e202bea0d8b64c8b0a4594b49691213cc1cb4ebe406c01d4d76559959721c86de8136315d0f181102f9878829391340
+EBUILD llvm-libunwind-9.0.1.9999.ebuild 3954 BLAKE2B 1972aae13ad8154f0d2962b5980731b50d63bc84cbd5ac8a0e38590a36a0a1b9ad426b13a7e9433a634d1260e3c9752d9eb1bdc2d06c8a89319be370cdbbcedd SHA512 31be0e16f14579a50a0c0b59786e17835243f206702c6cbaa054343fb35087f5ed382148529de78cb9718031be729c850da7d717d5994b51220f29897f45a5ca
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild
index 2ac9e687d9ae..7644854d75dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
index c5a939132d64..70b4f4994acf 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0.ebuild
deleted file mode 100644
index 09e5e125f4eb..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=libunwind-${PV/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-LIBCXXABI_P=libcxxabi-${PV/_/}.src
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? (
-		https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
-		https://releases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-IUSE="debug +static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv "${LIBCXX_P}" libcxx || die
-		mv "${LIBCXXABI_P}" libcxxabi || die
-	fi
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-multilib_src_test() {
-	# build local copies of libc++ & libc++abi for testing to avoid
-	# circular deps
-	build_libcxxabi
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	cmake-utils_src_make check-unwind
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# install headers like sys-libs/libunwind
-	doheader "${S}"/include/*.h
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
index d40ab635edcb..9cfbcd0af6b1 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild
index ba254599999a..68e91d4eeac9 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild
index 1e3f2baa716b..1e3f2baa716b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild
diff --git a/sys-libs/lrmi/Manifest b/sys-libs/lrmi/Manifest
deleted file mode 100644
index 634cace34495..000000000000
--- a/sys-libs/lrmi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX lrmi-0.10-kernel-2.6.26.patch 593 BLAKE2B 52fae57ae84163945c6dfd0e0aacddd03c70eaab1018b6edcd2ac79e6641159c45dfbb725c2e1d6e34ecb85e4ecc6916a249aef66059d16f54898a3a0b18e9a5 SHA512 286d0a0381a8939a6d4b1af695ed2312bf397a21c07607ec589c9ada9c6b2d8bb38227d2b831f1951b090437417f20fe863bae99659f7b70a24a90c3793ed4ad
-AUX lrmi-0.10-ldflags.patch 934 BLAKE2B 0d1819cc275ac6e144716921d517f5f70d995a707e750646a10d8781a0927f7004a5e1fe7780f237cab108ded97f12d77195046e412d013f8d4302ed70940e95 SHA512 e00b164b1dd4e44549f3c78602ca5e030b130b5f201bc610652d1befe7ea400edaf0a58754ff9a06b5c4f5c81ddb770eb2ca2acdf3f33b6b38bf4005cae1c3d1
-DIST lrmi-0.10.tar.gz 10271 BLAKE2B 7c8c5856dd3bf7fc977b303db4c0c2a419a6331ddc117ae6356bd48311a6871d6452ac681e3dbb8e32d4fdd99e1d2268604bf29ac52327457467e8bbf2fb5d95 SHA512 61d4f228ab712376cb8d47ef9e1049c89b9916f2fc04723ced03524b716f5e034ffb8ce7aa9b2b4d9d67aa93608020fc7dd1fb7a9778f211eb25a22713a538f1
-EBUILD lrmi-0.10-r1.ebuild 933 BLAKE2B 5875d255ae0b8c4569009e9fe0a6ce6f6b7d6d6b3c5595ad9928ad529744bd69530bf09e0689f9ad0bfea9ffb86456226454df359fca39a8f30df6fff1a918b7 SHA512 b5f78529fd5b2f7903e0864a8bf40bf9bf5add00393c12bfadf4ec3cb9d48d9f0479c5c1aed124cdf220fb89b22a6f190aec09f9ecc22a1ea943004944cd6939
-MISC metadata.xml 324 BLAKE2B 8ab6c94e9f9fa8fd2b77dfa267818dedd511389346b8fe45f3f1f494f8921671a0e9577f6038d3feafef74ec37bb6dbc12e0e2f9bc431bc29c639a5d44fc08e3 SHA512 74a5d88a930a6b5367b61de0a0587a8438ee8d83e19a85bc9832db44481532e3a491da16b2788ae70164bf370280ed44a8245eb1505d113b8a293a3d38c6a5e1
diff --git a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch
deleted file mode 100644
index 9547439376a3..000000000000
--- a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naurp lrmi-0.10-orig/lrmi.c lrmi-0.10/lrmi.c
---- lrmi-0.10-orig/lrmi.c	2008-08-23 14:39:44.000000000 +0200
-+++ lrmi-0.10/lrmi.c	2008-08-23 14:40:25.000000000 +0200
-@@ -61,6 +61,14 @@ OTHER DEALINGS IN THE SOFTWARE.
- 
- #include "lrmi.h"
- 
-+/* 2.6.26+ kernels don't define the legacy masks. */
-+#if defined(__linux__) && !defined(TF_MASK)
-+	#define TF_MASK X86_EFLAGS_TF
-+	#define IF_MASK X86_EFLAGS_IF
-+	#define VIF_MASK X86_EFLAGS_VIF
-+	#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- #define REAL_MEM_BASE 	((void *)0x10000)
- #define REAL_MEM_SIZE 	0x40000
- #define REAL_MEM_BLOCKS 	0x100
diff --git a/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch b/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch
deleted file mode 100644
index b23bd9c5cdf8..000000000000
--- a/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naurp lrmi-0.10-orig/Makefile lrmi-0.10/Makefile
---- lrmi-0.10-orig/Makefile	2010-08-20 15:03:17.093144820 +0200
-+++ lrmi-0.10/Makefile	2010-08-20 15:03:47.761144267 +0200
-@@ -2,6 +2,7 @@ LIBDIR ?= /usr/local/lib
- INCDIR ?= /usr/local/include
- 
- CFLAGS = -g -Wall
-+LDFLAGS = 
- 
- sources = lrmi.c
- objects = lrmi.o
-@@ -26,12 +27,12 @@ liblrmi.a: $(objects)
- 
- liblrmi.so: $(pic_objects)
- #	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^
--	$(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) $(LDFLAGS) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^
- 	ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR)
- 	ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
- 
- vbetest: vbetest.c liblrmi.a
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- install:
- 	mkdir -p $(LIBDIR)
diff --git a/sys-libs/lrmi/lrmi-0.10-r1.ebuild b/sys-libs/lrmi/lrmi-0.10-r1.ebuild
deleted file mode 100644
index 5968e63998d3..000000000000
--- a/sys-libs/lrmi/lrmi-0.10-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="library for calling real mode BIOS routines under Linux"
-HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
-SRC_URI="mirror://sourceforge/lrmi/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-kernel-2.6.26.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-	emake CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin vbetest || die "dobin failed."
-	dolib.a liblrmi.a || die "dolib.a failed."
-	dolib.so liblrmi.so.${PV} || die "dolib.so failed."
-	dosym liblrmi.so.${PV} /usr/lib/liblrmi.so
-	dosym liblrmi.so.${PV} /usr/lib/liblrmi.so.${PV%%.*}
-
-	insinto /usr/include
-	doins lrmi.h vbe.h || die "doins failed."
-}
diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
deleted file mode 100644
index 89ed3cff124d..000000000000
--- a/sys-libs/lrmi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">lrmi</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
new file mode 100644
index 000000000000..64be5ad84071
--- /dev/null
+++ b/sys-libs/ncurses-compat/Manifest
@@ -0,0 +1,10 @@
+AUX ncurses-5.7-nongnu.patch 361 BLAKE2B 9260be98295203137327e37a15480bf96742ec5a62a693af04e929ba7ac8528e2810b267960d7cde5b20e8ee72bb447e34a681b567e74d5e4e9325a3613292c1 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f
+AUX ncurses-5.8-gfbsd.patch 695 BLAKE2B 0a7e27a1e7327cee5eafc34e702742b544d59960de52e316753eeffd5eac5efbdcd7fca910fe31b5a7e8b2aa4e4d8095db6f91fd3fc974244ffd3531d44074b9 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2
+AUX ncurses-5.9-fix-clang-build.patch 1291 BLAKE2B a0fdd4eced0f52ae8368c02e5de66be4aa3ed7a021d6842c982c5ad293f258face7632b42cba51f9194fcdb5479717ca92b3802f5291d15795387b99d11aae10 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1
+AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f68ebef9a974265e4f002a4789f5e3629a68eb455e45f6cc43f7b05a9eb6db6675dc0c9b83d61785fc10d67fb4b SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c
+AUX ncurses-5.9-no-I-usr-include.patch 1431 BLAKE2B 1dcc533936ba22fcb07a3ad4252391becb57aec0878304254236148c9d022ebf4d7d698c97e9f199baf83995e4de72ff7979539dae1a4222dbadeab93d643bf4 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805
+AUX ncurses-5.9-pkg-config.patch 1022 BLAKE2B dcaa045919e22eb174cb7c155ef05fa7c2c29d64eb586947f2afb243a13dfdc503460452be0f8075bc91b166d5b7f12ea34b39234d0832ef6bd432496932719f SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6
+AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 BLAKE2B b88b028246c4177cac148837063b8dd76fa8dc215cb47ace2dd58b38eb8547273ac29930e2fe1c209bc8047462fe1319ac253955af445674410e21e8fe1c39b9 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131
+DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
+EBUILD ncurses-compat-5.9.ebuild 5312 BLAKE2B bf0dfb4a46d22726833ce3aeb799c6421a61c48aefc3c577432833c1701bee05682fdeb681d56416fcf42e81e6d2a8aa6cf4ca7347c0b16ec7f107f64883fa91 SHA512 534468aaec1773329c0237a9b5726bf0c2e58ee6149821266589c6d25cd53ac2d80feb0a676bbeedc38ecab9ed3d3ffac8b162e12cd6e9f9333d751136da7eb5
+MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.7-nongnu.patch b/sys-libs/ncurses-compat/files/ncurses-5.7-nongnu.patch
new file mode 100644
index 000000000000..3f4a40520009
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-5.7-nongnu.patch
@@ -0,0 +1,11 @@
+--- ncurses-5.7/ncurses/curses.priv.h
++++ ncurses-5.7/ncurses/curses.priv.h
+@@ -1452,6 +1452,8 @@ extern NCURSES_EXPORT(void) _nc_expanded
+ 
+ /* charable.c */
+ #if USE_WIDEC_SUPPORT
++#include <wchar.h>
++
+ extern NCURSES_EXPORT(bool) _nc_is_charable(wchar_t);
+ extern NCURSES_EXPORT(int) _nc_to_char(wint_t);
+ extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int);
diff --git a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses-compat/files/ncurses-5.8-gfbsd.patch
index 0200a14462af..0200a14462af 100644
--- a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch
+++ b/sys-libs/ncurses-compat/files/ncurses-5.8-gfbsd.patch
diff --git a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-fix-clang-build.patch
index 0c6ca7acc4fc..0c6ca7acc4fc 100644
--- a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch
+++ b/sys-libs/ncurses-compat/files/ncurses-5.9-fix-clang-build.patch
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.9-gcc-5.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-gcc-5.patch
new file mode 100644
index 000000000000..2448229b88e1
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-5.9-gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-no-I-usr-include.patch
index 5c968e76c378..5c968e76c378 100644
--- a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch
+++ b/sys-libs/ncurses-compat/files/ncurses-5.9-no-I-usr-include.patch
diff --git a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-pkg-config.patch
index 7c3c04a449f8..7c3c04a449f8 100644
--- a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch
+++ b/sys-libs/ncurses-compat/files/ncurses-5.9-pkg-config.patch
diff --git a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-rxvt-unicode-9.15.patch
index b6d1924cbe7e..b6d1924cbe7e 100644
--- a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch
+++ b/sys-libs/ncurses-compat/files/ncurses-5.9-rxvt-unicode-9.15.patch
diff --git a/sys-libs/ncurses-compat/metadata.xml b/sys-libs/ncurses-compat/metadata.xml
new file mode 100644
index 000000000000..471b2667ab5b
--- /dev/null
+++ b/sys-libs/ncurses-compat/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="tinfo">
+		Build curses library (libncurses) sep from the low-level terminfo
+		library (libtinfo) -- usually needed only for binary packages -- but
+		it is binary compatible in either mode
+	</flag>
+</use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
index 8c033aaf8855..581e2a795c7f 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
@@ -8,7 +8,7 @@ EAPI="5"
 inherit eutils toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
-MY_P=${PN}-${MY_PV}
+MY_P=ncurses-${MY_PV}
 DESCRIPTION="console display library"
 HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
 SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
@@ -16,24 +16,25 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
 # Block the ncurses-5 that installs the same lib. #557472
 RDEPEND="${DEPEND}
-	!<sys-libs/ncurses-6:0"
+	!<sys-libs/ncurses-6:0
+	!sys-libs/ncurses:5"
 
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.8-gfbsd.patch
-	"${FILESDIR}"/${PN}-5.7-nongnu.patch
-	"${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
-	"${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
-	"${FILESDIR}"/${PN}-5.9-pkg-config.patch
-	"${FILESDIR}"/${P}-no-I-usr-include.patch #522586
-	"${FILESDIR}"/${P}-gcc-5.patch #545114
+	"${FILESDIR}"/ncurses-5.8-gfbsd.patch
+	"${FILESDIR}"/ncurses-5.7-nongnu.patch
+	"${FILESDIR}"/ncurses-5.9-rxvt-unicode-9.15.patch #192083 #383871
+	"${FILESDIR}"/ncurses-5.9-fix-clang-build.patch #417763
+	"${FILESDIR}"/ncurses-5.9-pkg-config.patch
+	"${FILESDIR}"/ncurses-5.9-no-I-usr-include.patch #522586
+	"${FILESDIR}"/ncurses-5.9-gcc-5.patch #545114
 )
 
 src_prepare() {
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 3f67676c2050..1f60d01fdc34 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,19 +1,12 @@
 AUX ncurses-5.7-nongnu.patch 361 BLAKE2B 9260be98295203137327e37a15480bf96742ec5a62a693af04e929ba7ac8528e2810b267960d7cde5b20e8ee72bb447e34a681b567e74d5e4e9325a3613292c1 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f
-AUX ncurses-5.8-gfbsd.patch 695 BLAKE2B 0a7e27a1e7327cee5eafc34e702742b544d59960de52e316753eeffd5eac5efbdcd7fca910fe31b5a7e8b2aa4e4d8095db6f91fd3fc974244ffd3531d44074b9 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2
-AUX ncurses-5.9-fix-clang-build.patch 1291 BLAKE2B a0fdd4eced0f52ae8368c02e5de66be4aa3ed7a021d6842c982c5ad293f258face7632b42cba51f9194fcdb5479717ca92b3802f5291d15795387b99d11aae10 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1
 AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f68ebef9a974265e4f002a4789f5e3629a68eb455e45f6cc43f7b05a9eb6db6675dc0c9b83d61785fc10d67fb4b SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c
-AUX ncurses-5.9-no-I-usr-include.patch 1431 BLAKE2B 1dcc533936ba22fcb07a3ad4252391becb57aec0878304254236148c9d022ebf4d7d698c97e9f199baf83995e4de72ff7979539dae1a4222dbadeab93d643bf4 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805
-AUX ncurses-5.9-pkg-config.patch 1022 BLAKE2B dcaa045919e22eb174cb7c155ef05fa7c2c29d64eb586947f2afb243a13dfdc503460452be0f8075bc91b166d5b7f12ea34b39234d0832ef6bd432496932719f SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6
-AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 BLAKE2B b88b028246c4177cac148837063b8dd76fa8dc215cb47ace2dd58b38eb8547273ac29930e2fe1c209bc8047462fe1319ac253955af445674410e21e8fe1c39b9 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131
 AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983df744d40573b4fc2488d3f26f40ed77aba2d15da2a006e56217216740e26a295c9ab9c4be78df201514040376a986cf1b30 SHA512 db333b400ad23110bff80d86eca39e5656870caa06083b6d7098503fe34a46e387d207b135bf9aa9a0a1f2eca2a9b094f1d189ea8f8a17caaec4fc14b819fcc4
 AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3
 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
-DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.1-20181020-patch.sh.bz2 361598 BLAKE2B e74f6b4e81c822ae500724ebe707031d3157190e96256656940241e4485fa3d96669e069e764cecc829d9fccccc11caaab8c68ae489b083ade4f286647ac74af SHA512 e54bf83cae5bae3ddb909b9bbe91f549b366a5c60b6274f6b27a3f28b5f9f1afe7263487db842f8cbc22a93e0ef17f0fd518a0585523116e192174f44423ae4a
 DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
-EBUILD ncurses-5.9-r101.ebuild 5287 BLAKE2B 7429e04203c35510eec381f3ac1fe28292b191c1b0d3f37d467e97b90c3d53d03a564745a1cafbb6a6032a895af7cc4e172afd9d91ac9315463786f545117e47 SHA512 98daead57237d72df9450e95d75f25949cb0056973e29801f06bb6352e66b3e9d94212c555a72e6fbef66fa778a74acc2c2a5a9027bfda719593acb062356df6
-EBUILD ncurses-6.1_p20181020.ebuild 9288 BLAKE2B 5e37b4794b93a896942a7cd2510e1696128bf4b3d9f84be6016a1aaacc6a9a1c9fef134c4ec2812541720863dab20fa303582eb3ad3a41dd55b4da7cb261c9d4 SHA512 07fccd57e13ef6732a69c0bc1865b8f6d446097f919fde7d830469867cc15f791e4692f2b051a9b37cc39fd1d9f2d5234855404242ecd284b5f5a8f75573a612
-EBUILD ncurses-6.1_p20190609.ebuild 9497 BLAKE2B 7e273a1ebb12f343e92e822cc72d944aeeb10deb356de599d2e3141454ec443445ac21812e185e2e67bbd659baf037ef0f2c17063eff5643d661416039a6e066 SHA512 63e9874446bf271fa3341f707c76a5eb06f4c7388e788a24666e2605ea1f7a0f42dd58a4f6ca735c107fb43558d279dde58009dd049277f9e2c377ead2df9254
+EBUILD ncurses-6.1_p20181020.ebuild 9266 BLAKE2B cc7015640fd3b0dea4308fc98d5d8808bd7b135a862f05cace6ed42591812440625769a31678401f0f7a70ef0a68790da3cf5edbc66bb074daa131837a583115 SHA512 cdd25af39c5dda0bce9314c90017c7aef211d5bb181669a9845ca688c3ee2485d0bbe00641ed9069f2922db6f7adae6b52977d9337e55778c0c0880d3a220f0d
+EBUILD ncurses-6.1_p20190609.ebuild 9475 BLAKE2B bf2620b1c2f9e1b00b72d50a44461349b039b70667895d2f2666c9c72bc3f401c391374098bcb7308ad817b8e04e911235c7d35434d5c9185d3de712882382b5 SHA512 d798106f13616c652e4fc3701ecf0a11c695107232da6757ec2b13f4a6813cbaac87376e1ac12dc96b6f7899d8555a92a78e11f3d84f9d660fa7f23c43c55144
 MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
index a9a949c75088..1b10aae31358 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
index 544b0dc04db8..e654cb4dc623 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index b4988e81971b..6f40cecaaf81 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -6,30 +6,9 @@ AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d8
 AUX readline-7.0-mingw.patch 4464 BLAKE2B 00ca79f7ee128a78d76c3e0adcb8b51f6d3027718cc3a7b2b11660cd4aa9c61b4da15c893c9ad0595becf2c393c0d9e7597b5a772085bfc82974568c30f5b381 SHA512 f416f265c51f4cb05467c29c29abcaabf40ae29d66bb5d3288d35403ccc26903f2a22afef43382e39d7b13ba62732082c60d8f8d10abf7cf7955ee50fc23531b
 AUX readline-7.0-missing-echo-proto.patch 466 BLAKE2B 251660f1321a36231774d5f03fea971a047688918a8f6498e019cadca43314097aee89ef8a96b104a5382ba0baa1037d500143f4d66e881da76d23f9385faaa9 SHA512 a8458bf62c73f79b980f375b98b33a6fbef59dec28386cd5266e4742a9cf70673e567f999d5682e538a2a47388d6f123d8a4fe4cfe34f19c28d4dafd93a9e10a
 AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb4cd0cd0b25afa82d6fe8697dcb34aa541279010b308427c411a7133c481dd778551069893ad965ce6d3a4a9ff83 SHA512 81695abab2e9fba1b17a4c194b7c72eeb23bbc3ab84cb0716c08388c0ee60adb770ae8efcbbb6a2c7c6adab93dcff12e3a16d0423cf52a0166b38c9efee5c221
-DIST readline-4.3.tar.gz 961662 BLAKE2B a7267200b79c8010d08f8aaa4e0ed357eaddb970287b262404074a1e50b0d7865bcee5492730808dc998799a1b64685d3bd91fb7098d1da778e40a2364f16126 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182
-DIST readline-5.2.tar.gz 2037705 BLAKE2B df1012925f7cac8aa5d513097de97fa55c801993fbcf651e64468c0255cb27f7a2357613f8ab67791ab7799def57bde34376d3c41e65285689318f4b9cbedf84 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379
 DIST readline-6.3.tar.gz 2468560 BLAKE2B 24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
 DIST readline-7.0.tar.gz 2910016 BLAKE2B 679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4 SHA512 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
-DIST readline43-001 1126 BLAKE2B 42e7637b71936b59334dae72589b8b44256af7d3c79bec28490e13fa1fea954ce42afc1f51bb1d592da14c403d0c64565fa8823874d305ad385962b462536b5f SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc
-DIST readline43-002 738 BLAKE2B b4aca8deb8e32c94228c41e6a1e9dd2865e01662b6a8e28307e64b260f4a614d17949cab68aea0c4d2c9ca32a888f11a753cf6849a0a95fc5e9b315ea7e20a1d SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2
-DIST readline43-003 2202 BLAKE2B 435bf8c01a2c8419e97550c421945e11ad0d6f3326181c2e9e9c66d8baf12b4dc30894bad590532f917bbf30568e93439b49054c7b023179d5dd95aa309a8f8d SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e
-DIST readline43-004 3140 BLAKE2B 1032175956801dbf7435a2a162066c69b73d6c066bab7a1e80277c6190f6f81fc30ae002df7e32c98d6a43c11313de97937168fb149c323785a46747102cb4ed SHA512 8bc87915f5340f7f88266af0bb3aa976b40d8636373def11ec23dc412d112bc314eeac5ee2832be7993a03f2d0e38643964e838d69321c7d3e2e9ea1c606df79
-DIST readline43-005 1056 BLAKE2B 67905f87ec2042cc403cc1f8de2efccd74273aeddb4f32109ee226915f816a24f55102a130e66cb1b216115b619a3642901a892311e100f7ee95a39bcfcc725d SHA512 853fcb9cacce7a9ad0d29abe979a60291253fcb3fcae1fc067718a75d123ceb16e60d11a31583c8b5bd217d5f2460ebc77d8d2c89487a7331627348d5901281c
-DIST readline52-001 874 BLAKE2B c1ad1cc90dadcc01fa14a3315eb6317ad7640d1503d0d31309d912a19d295ad7eef1d8155a619c61728f78e5455b3e12d0d52cfef5aa7a2c06fecc9b5fe806d2 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c
-DIST readline52-002 1433 BLAKE2B 90ff0d1cff96d3f06e33d25570519aff602fc71f65ae508dc565586a0d729674011619ad973a321b2ebc84a184b6eb487a0eceff02c1cbbf641759136ddcd8c0 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31
-DIST readline52-003 1204 BLAKE2B c6327edd4c483ba122fa68cb5a06825e8bd0df83ff87294347a1fd923111b5dc7c309c9b6f9fbd9a53ba36a4a53e57d00fdbfec441012be37298bba2fec0d0be SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c
-DIST readline52-004 2192 BLAKE2B 0bd5fba77facfe4a445b19394b1de5186fe976d038283342a9f0d068a2e69e55127fdfd7c7fe67c3549b16f8d3d807d61b9bebdbc23c5adbd188ab8969621298 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02
-DIST readline52-005 8029 BLAKE2B 16c9208e451630566595c668b3f69d49257186543dd82e70d34d422c9e59cc57b6d5b0ed2be0c0afb769021c832915c3f9cfb3889e7ebcfb4a653658dbf26ea8 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521
-DIST readline52-006 2820 BLAKE2B 4b6dbd3ad093f31deaeee388854e471d38859252ad127e319dc65de42ae98746cd2d1783df09cbd7f1379d8d4171b74f31da07f9560c2bb882bd374502d08dc9 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93
-DIST readline52-007 1523 BLAKE2B 8a7a47bf5647b162f36c32c5572481803f3bc6f203db55780f706aed2881ee1a21f4be8f47677ce3d6609ff8d4128e0a068c32d765fc6ed64239673ce7c12b21 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f
-DIST readline52-008 2277 BLAKE2B c03d7f8f7d4e1b6215552dd9c11f0766d9c413633a052ee2364f007767bb0ac323727320f84292eb2d4cece5c696bbce32b59bf74daa7b8f05d8ff864a8a87ad SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93
-DIST readline52-009 1332 BLAKE2B 79a59ff0b88c243abc1772ebd2ac20db02e714193c0db173d449df45d7da043e3641cfa8ee21a7e4d1682bb380364ae9bfd80699b35af79f9213fd6a93ae65c5 SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be
-DIST readline52-010 1543 BLAKE2B 72d41d913e89ade35d5771090e6ed138b52cc405bf81924aaf42e6e99587d38dd5b9678f3f98a47019663295f619a5323a8e177c33c84d02235e6d7013d53c02 SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8
-DIST readline52-011 886 BLAKE2B d1c308f766e25e7f8105264ace08a6e979b4b7781ff39ac2b2fb63ef98e35971c012a69a4cb037fb9d984531aa6f50d530f40853d535127eb188ae3876002a6f SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae
-DIST readline52-012 3870 BLAKE2B d448fd35898a182aec77fda4db392d308bbbd2f3619318c13362c5ccb9c62271ddfd843420deedb85a7bbcd3ac8b1380c15f5c535c157a5a164564ec97e681a8 SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3
-DIST readline52-013 5147 BLAKE2B e111ac594922d5cb095b33bdca3e0a1255db597f68c577df85ea9675a003763f7572ad31f094249be3d643ec6f8277509a09c2dcff8fbb980e516a9ecfef672e SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f
-DIST readline52-014 1244 BLAKE2B 421af06b92cfc59b2ec0fa9ae59c99e91a26542210f258667d5a44a8b1a119da7b58d2a0410f7690eeb5ace98a2797bddabaabf28175d650cb48c974f522ae59 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0
 DIST readline63-001 1366 BLAKE2B 82af5be99597719329db3f1d6049e75a5654ccf6597cf557c71ad7ada0ac03be87381a7738931eb78716de65902ae87498f574b84150a69eae9cc308c4bfffdd SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2
 DIST readline63-002 1297 BLAKE2B 5ace4a81381910ee48dee8cdbb2ca95a1bef2d1f8acca6d39a910c078c86de10a0fc29486939b336110ecb0281b3edb16e4b985f41e7ee161904728f289fff04 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4
 DIST readline63-003 985 BLAKE2B cf2cda505b100d5f820d8bfc99eed6b50e65c92b6a495073352fc7385c6456478594e5c2dc293ce556b66853dff705050fb97982aa25fce452ae53d2cb272cf4 SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12
@@ -44,10 +23,8 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393
 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
 DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
-EBUILD readline-4.3_p5.ebuild 1535 BLAKE2B 626e1d99e3f42b9d4ee863b64c6bf013c45e71d4441255ac3fd069880796829fa8e17b00a2f175b34ef46cd1c8662dd84c9ada5d01fb72a3b4e857df4c2227f5 SHA512 d11c9b5046aa86ecc6e8b59e8e18dfd34f649192a3cbe0cfd054d3d05bdd7f197a63610c14a578bdbef00c9ef47527a729d1a3780f1f8b3374dac77465a68f33
-EBUILD readline-5.2_p14.ebuild 1592 BLAKE2B e93c757eef8ee119694e15c59723e77caba29346451703b892bd14587bdf9c40d6aae273dc812575f55ac074ef43f6a6b90fee28278eec339416f4363b94cd2c SHA512 67c02062b1a08fa8fd8345de9826676cee2aacead0fa8210c75657401ea7049eea124d649cae5650e04da2877d58f507adc9bf0f12c7fa19a7f6348586a86b38
-EBUILD readline-6.3_p8-r3.ebuild 4390 BLAKE2B 2121e1c1d5b045fa0ae14db133a80e4b5290e0ce37e8a5e0406c7245a1cb21455573d1468221def3830c4290c49b0cb1189c020727f0292c3c639e82d9f9e7ac SHA512 90c7643acf92343a49ede4f776c23e16c8070018d912a2872cd555a88ea9f56b6b207cc415f451d1a1341e2c64aa41a7b126938f5436c9e866b4c2a7ee3ae3bb
-EBUILD readline-7.0_p5.ebuild 4843 BLAKE2B 77f5eca75e11a2a2c3de59020a3030593670e402c2c58efe786507a3cbbda015f9714f187434d53eeb13b9d47a3fb8ae9f2a032c67272326e076fe56c44333cb SHA512 b116fd9a52913d615845f23ab5d37bca0b478b03779ed7aa229dc929565e47bcd757625f636088788721debd43171e133ea5f40e685918f6df519dd670e7db78
-EBUILD readline-8.0.ebuild 4812 BLAKE2B 34c5b37ae51086570439f333067a8276f2160c9ab7d2b6e1a4639164ce9d199b253689dd69beba935231b251729b8af36ee938c12bba03d1440ae463b8f8f128 SHA512 c1afbacd9c1297570a6c8a116faad750a3236e25b7ec30bf2861492e0c3578d2002e9995c11aa9cce86c88cb5567c89c6f9b6343fc4d57f98a5edf5bb8e83c3b
-EBUILD readline-8.0_p1.ebuild 4840 BLAKE2B d0dddfb82d703dd45801ff9079861a0213cb11063fa7608a195eb30b97b4d7e635eef028ff8f17daf37716b701ce514284bb7422ee5720c2bbcd7203a42dec1d SHA512 a8079e8578f0cc5c7fc616a76d69135fb3e95965328cd38097398458f760f812612951381b143106612f316068871a941d5d0c1b3ec396fbc457f4fd902e79b4
+EBUILD readline-6.3_p8-r3.ebuild 4368 BLAKE2B b9308a93bbedafd88a53d72b7011c2e0c57c8ba3be64cc19769ccd72ee22bf32e314def9607477d3e1749064245b6e32311c35efeeb20f715fcf2b67e38328c2 SHA512 adca104b265358729e3e736bbb5c1261c3f63b76e8d32db1b460060d9481f4bf7ee3d2d0d662659fc8b1a841bfb80bfb1b4394f4885160070a570031ef270f8a
+EBUILD readline-7.0_p5.ebuild 4821 BLAKE2B ec04ad644d658e46329030b2b970c9b6b69b41d81fe24c90902170976f65dc276cd0fdde91a24ec3e811c6259af9481835c693ef1d7120c85d2091b08f98a26d SHA512 b64a43ce5eafa885a6b8665735241c85b75d5d9523cc62e60b73e4dba7bfee8be655a41f9bdf0eff99c7e57c761de26f9ac860126c901af673fe0af93803c78d
+EBUILD readline-8.0.ebuild 4790 BLAKE2B 42833b30980fc6593bf4d21a74866467f23c5814c7eed4f26cfbe16343f78c99ae2b4c340e2f8b893a8ba728e6f677ffda22e451eca6bc539a0ac8113a6a5f79 SHA512 f8763e2bb3900626e4392bf0afb8672778f105bcaad146b61a78cab36f6b4a5fcf14b019a202c514b73f64353af0b42ac320c81fc9ca12881c034f82daec7ec6
+EBUILD readline-8.0_p1.ebuild 4818 BLAKE2B 9088e7a27a355c2ee20e5ce491196b806df4480597a949c2a3191f306845abda51669aac2e9bfecd44fcd62a914f66c1ea789393ed6bf62bd1e2a66afab8181a SHA512 d414288e8c571712d311c874c1150ba1271bc48e574f3768eca30e4d8a99548b83d840a8e6356782d80d8bdec9de15ec39cbf93aa35c4ceaba1d53a03f767c58
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-4.3_p5.ebuild b/sys-libs/readline/readline-4.3_p5.ebuild
deleted file mode 100644
index b6d4ad8af9fb..000000000000
--- a/sys-libs/readline/readline-4.3_p5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This version is just for the ABI .4 library
-
-EAPI="5"
-
-inherit eutils multilib-minimal flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-2"
-SLOT="${PV:0:1}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	# force ncurses linking #71420
-	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
-}
-
-multilib_src_configure() {
-	append-cppflags -D_GNU_SOURCE
-	ECONF_SOURCE=${S} \
-	econf --with-curses --disable-static
-}
-
-multilib_src_compile() {
-	emake -C shlib
-}
-
-multilib_src_install() {
-	emake -C shlib DESTDIR="${D}" install
-	rm -f "${D}"/usr/lib*/*.so
-}
diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild
deleted file mode 100644
index bbe793e7bbb4..000000000000
--- a/sys-libs/readline/readline-5.2_p14.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This version is just for the ABI .5 library
-
-EAPI="5"
-
-inherit eutils multilib-minimal flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-2"
-SLOT="${PV:0:1}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	# force ncurses linking #71420
-	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
-}
-
-multilib_src_configure() {
-	append-cppflags -D_GNU_SOURCE
-	ECONF_SOURCE=${S} \
-	econf --with-curses --disable-static
-}
-
-multilib_src_compile() {
-	emake -C shlib
-}
-
-multilib_src_install() {
-	emake -C shlib DESTDIR="${D}" install
-	rm -f "${D}"/usr/lib*/*.so
-}
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index c1b3a99dc272..91d56d5d37ca 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-7.0_p5.ebuild b/sys-libs/readline/readline-7.0_p5.ebuild
index 793265ec6aed..04e6ade437a4 100644
--- a/sys-libs/readline/readline-7.0_p5.ebuild
+++ b/sys-libs/readline/readline-7.0_p5.ebuild
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-8.0.ebuild b/sys-libs/readline/readline-8.0.ebuild
index 4b5b5879c559..000bd8c3d8d7 100644
--- a/sys-libs/readline/readline-8.0.ebuild
+++ b/sys-libs/readline/readline-8.0.ebuild
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
index b000aa3b553c..ccd33bb415ff 100644
--- a/sys-libs/readline/readline-8.0_p1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1.ebuild
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/rvm/Manifest b/sys-libs/rvm/Manifest
deleted file mode 100644
index 90d777cfcc98..000000000000
--- a/sys-libs/rvm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rvm-1.17.tar.gz 558574 BLAKE2B f4fbb7fd71c1c275c43689afa9b58624d8cf7e6f283b296602bd56cb8a1645e32d725561d5cc8934429d29fa20587af4620ca471378a7693936ab731986df372 SHA512 31956541e1e254fe9ecf3310e43f7395c847bab87e57bffe6e4f678a0077a21d0fb6af90e9bd79c599fc7f66255cd25dc99f85439c9e827319ff2c8bff4feb5d
-EBUILD rvm-1.17-r1.ebuild 451 BLAKE2B 09ad979f9f5b7049f36c171ea75bf1e874b6a77c9edd6943da482526e3f3db765eea0f2655a0eaa7ef33a83280f69301363b3089647159c65ca1ae54a2097b87 SHA512 b983f2b45dab2e653b1190708c8336e2e36a0984a240074516aa3bcf1f07ad818d1b95da1a22aeab8857e0eabc8c7b2ebd6f2f29a4f0068efbf21d7bb757f428
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/rvm/metadata.xml b/sys-libs/rvm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-libs/rvm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-libs/rvm/rvm-1.17-r1.ebuild b/sys-libs/rvm/rvm-1.17-r1.ebuild
deleted file mode 100644
index 5f036225c9ae..000000000000
--- a/sys-libs/rvm/rvm-1.17-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Recoverable Virtual Memory (used by Coda)"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/rvm/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/lwp-2.5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS )
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index b68f89995e4a..2cc8fcef4793 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,4 +1,4 @@
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
-EBUILD slang-2.3.2.ebuild 2285 BLAKE2B 15b3327e801b226e2b783a0a2db467557931be00d2dc6bc7c186e8a6d0ccbd2f39b7ed4e6f0baa6fe89e8daceb6929cf0e6bedfa3d22bd08d3e5ba050af30fe6 SHA512 e7c739ccf31f1936ff6e42e4420ac45eb88b86a812998a703446746951743dc7e39d897b3f3c4e289cfac093ffafaed43f62d82106c8a5eb7141e291b3192f49
+EBUILD slang-2.3.2.ebuild 2263 BLAKE2B f124f916f16b1e97f3454296cd9593cd7ff4638f20947b6c447fb1f743b808bef3a0ab4cab837efee08fb2d443fc1f143bab777536ebb1d116006e8eb0ccfb44 SHA512 550a2fbd436865b4d6d16bdc54e0f09a2fb6d2f9505ad9d8774007e506070e0056119e07cfb9ede527e1b2aec1d90a205e461c93236bb926615c3087ac392f36
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
index 47202fea1ca7..53e42c82e2b9 100644
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then
 else
 	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/system-config-base/Manifest b/sys-libs/system-config-base/Manifest
deleted file mode 100644
index 9380313c62c3..000000000000
--- a/sys-libs/system-config-base/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1-r1-pam-0.99.8.0-r2-compat.patch 365 BLAKE2B 5f5e911ee41469ccab97b3b52a246a4199f362c76444d72b1fc3169d7e6a7a9826f3d42ca2284147faa2a40121dfc854c3f2b70538bc07a7e1a6dce9cf760462 SHA512 810d36519db977c3d43f17d7e8f744ce67b160e6e5465b3da1d298f3f793be9325befc1943176f0260979e16bed52d92ab428b3b7c177dbcb08e5ec873b8ed27
-AUX config-util 232 BLAKE2B 59449268f8f7ab6909d5bcafd9875e8e254924c22defdec1431fa55218a9ec5ba309d7db5637e0db3f5f92f4d13903d891286506bf5681a534fc69bfc081c9da SHA512 ff1ff0f0d64a31ca4f792c3d3155c8e0c0439f0afc36a4734d3cf7ab3256561455e4964b1d96aa4c6695e4fb4e556bda6ccfd8ff8938cbeb13c888221b58fda9
-EBUILD system-config-base-1-r1.ebuild 877 BLAKE2B d7b5ae9acce9f9958c711fcb15be8d0edf2698f81fd1ef57cec562153eeb0d7eaa37ac411436ff3b2ee1c1ffdb531aec36c19e805c7d08a2952e17f1cd61ec27 SHA512 d6db0f0fb44156424bc90be352231a9f048d6ada913b7169678d3abac4f88181c32195725824c4fb82b760d594e6234dc43a1f16fb840c06e9b0392241c1bb5e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/system-config-base/files/1-r1-pam-0.99.8.0-r2-compat.patch b/sys-libs/system-config-base/files/1-r1-pam-0.99.8.0-r2-compat.patch
deleted file mode 100644
index 821bc7e29f5e..000000000000
--- a/sys-libs/system-config-base/files/1-r1-pam-0.99.8.0-r2-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config-util.orig	2007-07-14 12:56:13.000000000 -0700
-+++ config-util	2007-07-14 12:56:18.000000000 -0700
-@@ -1,8 +1,6 @@
- #%PAM-1.0
- auth		sufficient	pam_rootok.so
--auth		sufficient	pam_timestamp.so
- auth		include		system-auth
- account		required	pam_permit.so
- session		required	pam_permit.so
- session		optional	pam_xauth.so
--session		optional	pam_timestamp.so
diff --git a/sys-libs/system-config-base/files/config-util b/sys-libs/system-config-base/files/config-util
deleted file mode 100644
index 8e70d9aba1da..000000000000
--- a/sys-libs/system-config-base/files/config-util
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		sufficient	pam_timestamp.so
-auth		include		system-auth
-account		required	pam_permit.so
-session		required	pam_permit.so
-session		optional	pam_xauth.so
-session		optional	pam_timestamp.so
diff --git a/sys-libs/system-config-base/metadata.xml b/sys-libs/system-config-base/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-libs/system-config-base/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-libs/system-config-base/system-config-base-1-r1.ebuild b/sys-libs/system-config-base/system-config-base-1-r1.ebuild
deleted file mode 100644
index 54fa40661fd7..000000000000
--- a/sys-libs/system-config-base/system-config-base-1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam
-
-DESCRIPTION="system-config-* layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/pam"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${FILESDIR}"/config-util . || die "failed to copy config-util"
-	epatch "${FILESDIR}"/${PVR}-pam-0.99.8.0-r2-compat.patch
-}
-
-src_install() {
-	dopamd config-util
-}
-
-pkg_postinst() {
-	if [ "$(stat -c%a ${ROOT}etc/default/useradd)" != "644" ] ; then
-		echo
-		ewarn
-		ewarn "Your ${ROOT}etc/default/useradd file must be world-readable"
-		ewarn "for the system-config-* utilities to work properly."
-		ewarn "If you did not change them on purpose, consider running:"
-		ewarn
-		ewarn " chmod 0644 ${ROOT}etc/default/useradd"
-		echo
-	fi
-}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 1be4a20c68a2..a4c301c30bb8 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -3,9 +3,9 @@ DIST talloc-2.1.16.tar.gz 634906 BLAKE2B 5f9f2e5ad53944d9a7b5bdb990aa6ab65a3f0d9
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 DIST talloc-2.2.0.tar.gz 633467 BLAKE2B efdb53dbd4d43ce5d682faec01fb53d9c4b5dd7e97cf125e12661e7432bb968f577416cccbd8ee5003811bdd03dcc949b2e7a06312c497fb9eef54667209a653 SHA512 e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388
 DIST talloc-2.3.0.tar.gz 642364 BLAKE2B 148ad3b478617c34c16c2ef454796a5dc918fc0a3e91bd965943ba66860b9b7df21fd2b69f5481f46a712a55a8f1a5e39db9f4ac779896d17d090290292b2ed6 SHA512 f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837
-EBUILD talloc-2.1.14.ebuild 2428 BLAKE2B 1c2e8e21042957a9d95ed3d70b60708e66764d488781aa7c022d5b85c1707983a3dd7053cfc747f41651c5351f423f2c5d3f350059b5b9abea39472eb1a44193 SHA512 742db47be8ccfbd887c9de07425df86de883b2d06c9a626404c4cf5e4b896f4e4c97451d8f47dbd5abee670df0e87bef880b3205a075773265a765a6dc3cca26
-EBUILD talloc-2.1.16.ebuild 2513 BLAKE2B e964cab897cdb8c81026453b5e93be852bfbc18bd905e1cc33d8fb6ce385cf9d29792f373da0158e54812a100e4c501d46115dedf59dc6f13be1792387fa279a SHA512 c3cfa0e4680e6d6c34d79e4e569f92fc719cbff4763ccaeafd31f495308a1f2849b0fcf4dde853089dbd7850236fccf164d91d647cccadf07dd620d164298400
-EBUILD talloc-2.1.9.ebuild 2464 BLAKE2B 45c4b0941d72cca82bc5b1ed376cdc55268b064ea5de412e19aff23c7c230b00997ed8673637025a4377283de06646e02bcd5df1047018a493f8ba10d4a42eb5 SHA512 2cfcbe1828a508e6e0c4ea0136f1896e7767c2e8a7493c28c269cfe7ce52e24c97e238946ded2aafbc43a36520010bd7351e5b98a693ca411d0dd6d686337138
-EBUILD talloc-2.2.0.ebuild 2577 BLAKE2B 497e92e4cfb306e9c6d3058bd8069e0b1f855bb0b672a717c607e31b939b55964b51a030a0f2fbf5e2a9af931adb3ddbde3e80ec2f58c27d07d92fefdcc152f9 SHA512 82e354452f3d80cd8be969d12e14509f37343708ca573ac8957cc4c9538e0477a397693351d2c9c9490644ae8d722f19602032c1fbcc8de11ddd0f3383533c3b
-EBUILD talloc-2.3.0.ebuild 2578 BLAKE2B 394e9c02640c54af327edebcda7afb7ff2c33257156975974f5403982b7d987d00f5c8e58413b0cad39bf5e43167a42e604167b92955960a0f8f6ec124394117 SHA512 41bcc9d45cbd3125957816f6e5fa5ff57b6cb73aeb66a084cb70746b985b330e2c221b6e8d66e1d0dc2c4526e62f0f63237cb6953331dee8c205e61c7b7a22a5
+EBUILD talloc-2.1.14.ebuild 2406 BLAKE2B e47759baa6f8b010122d558ddc662fe137d95b778698acc50727d313161aa48c628c91be7fa8b07d936687e3a161ae200047865beedc48264fca3f684c990741 SHA512 faa3d8c4980117f8f9f4ea4f74354a1fc1b053d2ead9c0af9c42b8a722d15d00a654aa7cb622d2c6280475a755a0f156ba70a819804ff3c52e3708c218fe805b
+EBUILD talloc-2.1.16.ebuild 2491 BLAKE2B c0b6dff8e854ff435102c3c110c5ccc4219f235f2faa306e5bc65110529b4713f8c15dcb6f29abf230ed0a2a291c8b4e4b76f64cc1329f81ffda295941006caa SHA512 c97996251c1c6259118aae3751ae33af205db7529840c0c41a79583ea1479b1b5c46e14bbf2f726d154a70eaaea8c384abc97275fbce5f01f2ebde856f86eba4
+EBUILD talloc-2.1.9.ebuild 2442 BLAKE2B e0dfd5acb21db0e2b30964b8f044a4ead59bbb88b4f137677b16447d5335bd7e1669df66e4ff3bd8af3a301c8c89d17f0f50f18764821ef305b1a4e5d561da1c SHA512 5ba1bcefa06d03a291fd8d27a2035f7c99b7c25bbe938e24eb6d2fba5e677b3c166c2ce5e632cf33017d5e45579ad854535a6fdc8017f92a454aeaa4b789fa69
+EBUILD talloc-2.2.0.ebuild 2555 BLAKE2B 70bb4477604f93036452abd70bb4e2dbfd8c67c0c7870cf120b260e02bb2cc2e94a764e4d4999016e1bb37be9243b7e2a971d0ba14277ac1246a31d0d0c2f18a SHA512 d4bf630e2ffeded1a10dab5af367324565d26cc5b780463e0e169e1251bfc4bca98a8b524e4ec18927a850c6ccb50ca5d638c1ec03bb59900f34d8551ba96a9b
+EBUILD talloc-2.3.0.ebuild 2556 BLAKE2B 28920b24e7d276b3b42f1fa0a85a35166287aefa2bbe2d16b883e23661da8f59744b0ee957c8e3129a0797ff0b3106b608fee6ab795d48c1a65aa80aec0dc39b SHA512 4ad8901d9aa82d1d8ff7aeb939fe67364161321752787575fd6f0e3b48fbcc1621a51cf800471aeb7e2dd495f55f3c9d39b05ae61b9d565a250f07e03440d72c
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.14.ebuild b/sys-libs/talloc/talloc-2.1.14.ebuild
index a84b21497d83..e194a48bfa98 100644
--- a/sys-libs/talloc/talloc-2.1.14.ebuild
+++ b/sys-libs/talloc/talloc-2.1.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.1.16.ebuild b/sys-libs/talloc/talloc-2.1.16.ebuild
index 077f0c05371a..4371686a3c75 100644
--- a/sys-libs/talloc/talloc-2.1.16.ebuild
+++ b/sys-libs/talloc/talloc-2.1.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.1.9.ebuild b/sys-libs/talloc/talloc-2.1.9.ebuild
index 7623c6403f44..ee19333d1874 100644
--- a/sys-libs/talloc/talloc-2.1.9.ebuild
+++ b/sys-libs/talloc/talloc-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.2.0.ebuild b/sys-libs/talloc/talloc-2.2.0.ebuild
index 6a3eb17a1f8e..6a68ab00a0fa 100644
--- a/sys-libs/talloc/talloc-2.2.0.ebuild
+++ b/sys-libs/talloc/talloc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.3.0.ebuild b/sys-libs/talloc/talloc-2.3.0.ebuild
index 320f1bbb31d1..50742d617000 100644
--- a/sys-libs/talloc/talloc-2.3.0.ebuild
+++ b/sys-libs/talloc/talloc-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 33aff7b83f23..fd5292b96982 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -3,9 +3,9 @@ DIST tdb-1.3.16.tar.gz 504330 BLAKE2B 686b6b3d026094a0219f2c5d76f7258cf2f96538f6
 DIST tdb-1.3.18.tar.gz 697970 BLAKE2B a6dff8dbe444ce35f6470dae7da1b6719052fb2030fd5526157c67374b0f54fb815c8f799060ea2a811e85ce208f626f18a48df9169e3f45d3f92998246b81cd SHA512 9b856b2a5b2d852ff0048ba7b1700ea46b8dad5d4e94027472fdce9f1db4b5afba9aec127b7a4c2a38d4722c8e0ea78c1734d102fa134ac802eace6b24358034
 DIST tdb-1.4.0.tar.gz 696994 BLAKE2B f1dc29d3a66bd898f0e69f195879aea56235c1b6f542c532b4335d87482a5a2d8a8bc9bd5b463a0a110431535a2b0ccebb779449536696e0b5aa7ea5f3bce02c SHA512 3c5e17f8011e61e855a745dbff18ba9f778534f34e1538a68c8854d8d1022494bcc3bf7a19f2b79c478e091b1b6b183723fe27b935c4cc6d058b6b147b6a325e
 DIST tdb-1.4.2.tar.gz 706236 BLAKE2B 5ec8938f2e62c146c73d8ef01dd73bc44f38df2ea65b9cd62694bfc532315ab8b0594975e5edfccd84f3ad504dbfc6eb08be96d9d0e5b679f2613c2f69a5f58b SHA512 1d1f83e1b79cc6ea2b5cbc755de4a370fb95ef0f592f3bd2b6d23b1be18555cd417a9254fdf276dc6bd7f3368af82a4569c1f1cdde13d98405a5d38f1291d832
-EBUILD tdb-1.3.13.ebuild 1391 BLAKE2B 4be42a42cdd19e1d7dd1daae48a4267deb895ef0063d17f8676be06cb107215bfcc8623096e3b3e27d100723c58941f24c8d53c4b377f14b7e39592c5b6ffe69 SHA512 313984b1ffbdd4a200b5de2af741d4fd11e3bf31f9410776e704b5d3bbf4bbc36fe68fb32d2fd713967d74668f3f92eed5b0754780e319232e117cb18d611d1e
-EBUILD tdb-1.3.16.ebuild 1387 BLAKE2B 850b09c126d0fb37c712c0644d5625710a2a8e50d6afbe42cd7bda39bef3b370c5f75ab6f49c16ed561b0eaa20d644b846d362b8dd39919b95f470c8bca8b11c SHA512 d949fe01f13419c886e20b323dc42591ebc0fe83792f893d69f851451c9c59defae060187c72a0853975268f61aeb7786ad418b4d7ef7aab8b5bda3c5718b097
-EBUILD tdb-1.3.18.ebuild 1415 BLAKE2B 6d8e4445727e2fc2cdb1fecc26d3812a6597bb4653d3f0d644d598c55ee259783c21b4eb219634b109f3c8ad47faf61c29a54e016daa7d31ee33a800166202f7 SHA512 cd39f0acdf6398778682ece69c604a91560a0145cb3a4048791df21987c635489cb1698d96e8f12954dcd3e5549edb6ee2f6df9b0f4722c79a469ccb91877693
-EBUILD tdb-1.4.0.ebuild 1414 BLAKE2B ea602298422a15bb79a67d5306994aaf621f79e82e21bbe8ae8ac166b58c6ab18df90d5284ba67bffd65c9c291dfb585c54829db36eb533056a8cfc4aed2438c SHA512 81488f28112855b8c341b9331b95f2c63f19bc7ceb7541640682b404e129b70067dba293461ff5425d0d5a343cc155949b21f0409500ec2e9f71976775f38785
-EBUILD tdb-1.4.2.ebuild 1415 BLAKE2B 6d8e4445727e2fc2cdb1fecc26d3812a6597bb4653d3f0d644d598c55ee259783c21b4eb219634b109f3c8ad47faf61c29a54e016daa7d31ee33a800166202f7 SHA512 cd39f0acdf6398778682ece69c604a91560a0145cb3a4048791df21987c635489cb1698d96e8f12954dcd3e5549edb6ee2f6df9b0f4722c79a469ccb91877693
+EBUILD tdb-1.3.13.ebuild 1369 BLAKE2B 2a879b59b193e97a380f4a8650f3779a5be8aee89ba37d3c49e5bbfb3f281f9e44680cf2ec3f3884ed7984171c60ba645acf7015f4660037e96f731bd7fbabe1 SHA512 83682c2f962ea258ad2c8e4fe1d1f955f61cdd68cfcf6163b881ab9f7a9039e21806565f2508983657bbb0aaebb36e7a03c935817b18a52165f1c4bea8ff3322
+EBUILD tdb-1.3.16.ebuild 1365 BLAKE2B 81363e33a477a476cb65c6d25901a3aaa536e34a7c700fd4b1bb79e1b7900672abfaff10ed78699b8d4e7325967f97125a1ca262fda6bebc9984936b6112134c SHA512 d73d8f8759cedcf2f66d2bc02e7dded4229bf464b881b25eebdee65365fce43f58f5943e04eddb67433754cf598b1ec7f26e466489a2e8cdd4e6934cbebb8732
+EBUILD tdb-1.3.18.ebuild 1393 BLAKE2B c5be10723d078b5c7c552577136eb676d9ab707487e14d9429f641f7258d60870b9ab5f1cad541dfb4fcdec59bc9bafc436932d0a88fa28bd6b161d4928945ee SHA512 2df1b4d2c43a20658f74e19d3d893f5e2ba833881ccd51d5eb37014e4e3114c20ce5740d7fbe127e3746bafebca9519e40b7fe8d72c903ee945cb89b313bb39b
+EBUILD tdb-1.4.0.ebuild 1392 BLAKE2B eab5b380f1816791cd644788a76a5babae371cac677ea2966d0943cae638ede9e4f5e90c1b12bc1e25913de78588395136f4eb6711b601d68e0d0b5d26bc16c0 SHA512 e6afbea6afcb743a3057205f62c71ed26d9e57b154e438a725f3343386f874114b2b3abba3fe731a8f337b6fed0287400571f7e83361fba801ff66c82a68f548
+EBUILD tdb-1.4.2.ebuild 1393 BLAKE2B c5be10723d078b5c7c552577136eb676d9ab707487e14d9429f641f7258d60870b9ab5f1cad541dfb4fcdec59bc9bafc436932d0a88fa28bd6b161d4928945ee SHA512 2df1b4d2c43a20658f74e19d3d893f5e2ba833881ccd51d5eb37014e4e3114c20ce5740d7fbe127e3746bafebca9519e40b7fe8d72c903ee945cb89b313bb39b
 MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb
diff --git a/sys-libs/tdb/tdb-1.3.13.ebuild b/sys-libs/tdb/tdb-1.3.13.ebuild
index 85b35507812d..5dd93a183dfd 100644
--- a/sys-libs/tdb/tdb-1.3.13.ebuild
+++ b/sys-libs/tdb/tdb-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.16.ebuild b/sys-libs/tdb/tdb-1.3.16.ebuild
index d49ac27363a0..a22451fcc1be 100644
--- a/sys-libs/tdb/tdb-1.3.16.ebuild
+++ b/sys-libs/tdb/tdb-1.3.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.18.ebuild b/sys-libs/tdb/tdb-1.3.18.ebuild
index 8e8d3ce12a4b..14fa96eebe5d 100644
--- a/sys-libs/tdb/tdb-1.3.18.ebuild
+++ b/sys-libs/tdb/tdb-1.3.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.0.ebuild b/sys-libs/tdb/tdb-1.4.0.ebuild
index 34fec6070bec..434f4b4bae55 100644
--- a/sys-libs/tdb/tdb-1.4.0.ebuild
+++ b/sys-libs/tdb/tdb-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.2.ebuild b/sys-libs/tdb/tdb-1.4.2.ebuild
index 8e8d3ce12a4b..14fa96eebe5d 100644
--- a/sys-libs/tdb/tdb-1.4.2.ebuild
+++ b/sys-libs/tdb/tdb-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 218ee31aa534..1df78d2b8274 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -4,10 +4,10 @@ DIST tevent-0.9.31.tar.gz 587784 BLAKE2B 0e562600ae8ba4dae194b1a28a020f5618b1566
 DIST tevent-0.9.37.tar.gz 603859 BLAKE2B 2210416b09c3f83cf68a9f686d1d582891cd22b4547eb0e5237288dca6a0b94619769060c541e0cfc3ccce79246b1140875109934e009015b8e04a31a94d6792 SHA512 5d4833403e1c2f2749f00a389e4757261a4f22cd3a67c906001b36a8b622cc68a38e86d4eb475848a2121ebba054a7e7dac7f486d9f2906a401c3cc97fb447f4
 DIST tevent-0.9.38.tar.gz 794856 BLAKE2B 1198de5e68cec39bac3931aa5c26ee26aa5fd713d9cbc72bd90d5dd9c787d617d17c57d8393a845800168452cd8092d38ddc480d3bbe176dfe364d6c9a211094 SHA512 f475a7b7c261368bd641992c8f657c081bbbe783535ff435a7b68f7749d0e5873d57d05cf6ce80a28ccc9f11033022d28e9ae357b03854109c2c279a003d2035
 DIST tevent-0.9.39.tar.gz 795796 BLAKE2B a352d2730f4d480f18559ac01b82354914ebf3ced0438bc6813e8cddc8e2ac1a5bcd867a00441cf243753daa299b6e61ad6328d5e3f7370483f01d468d7e2621 SHA512 72f48493aa3ef2efb78fa4e8cbeca8a66871e6835b51307ce08864ed0a778ccfd5f62d6768099f06680915375ee78c3b889514e247bcfe797889f16388c321b0
-EBUILD tevent-0.10.0.ebuild 1658 BLAKE2B c629f184dc7b7a3211e24ce6589a54629f9937c25e26d54d914af5b1e82e8407ecbe5dda54479c9f463a58e1a6bf7d7d34e9860367a0c5b52c16234acede7b1a SHA512 83611a0f9ce82f0843acb806c81c20b2a020ecb7a7ccf9767d3408913aff576e2f2e4a3babbe40e77451af8015427263feb7dc2ddbe3f2b16ad8615e587e843d
-EBUILD tevent-0.9.28.ebuild 1351 BLAKE2B 5f8842ad3a96cf6b876ac5eaff3db571a3f3618a52086ec40ed2f0ffec40d2a75a9e2407a168439b3889ba33398c6d614d81733e4623802e061f40ad8b4523b1 SHA512 f5ff723d46ca75a3f422130b67b1ae2c5012a976719e91ef3067de9d12ebb88a868a179ca8733db40860b0673a9813d693ee0d5dc48b137d7956ebb821cc74d1
-EBUILD tevent-0.9.31-r1.ebuild 1430 BLAKE2B 3a523b7520a21ca164cd29e6da78eaae0fbeb16258674d465ace09a1be0a0b30c25489f34257e4ca69a54568c411ec05fc6569921b0bc119f04f8a6b96a6c745 SHA512 335b5b67361f7013b33fbc1283e370b25c6efaa1c24c07be06165e98c74cdc16aed85351f11333bd64d4600ab639b3a3a89125ba5e8210b27ef90988a5f5ce9a
-EBUILD tevent-0.9.37.ebuild 1631 BLAKE2B 85ef973535a079b5f9b5b968f9987bbda5746a1dfe4e4278fe5a4611a2e4774284cf9a5ac7cc5e6e7f330fdca82cdd9273f07ac403af7452126cf4e5912e6aed SHA512 85cfdf253c5ed37f8ee7be7178db17874e37f9f95704dcf96b1a6b5d94431d8fbd6aeba906d28b12618b6d7215bba48a3705031ecd72368bd53eae6cc6b4b426
-EBUILD tevent-0.9.38.ebuild 1660 BLAKE2B 860ef27adcf90e99752891df2d3f465f3c8aaf9258e9d257c8c114416c2913d0b814786937207957f7042464db277d689e8ae56a0accf7fb557f537cc23c2f0b SHA512 0ebe4a9647977d8a0ac7aa7b85ec475465d04388fb3b189affb6c1d046d1b92a66104454c28372fdc8e4cdb831eca8fb5c731498f07adbf523891e06a1510606
-EBUILD tevent-0.9.39.ebuild 1667 BLAKE2B ed10b3458a3623adae8ea5f42d0d49edf3dc5ce73d5ccfa7b337bfed1c41cbddba1716f66f2d0fa798ac334b56ca60e8ef40c9e6527840b59bee98e1ff1415b4 SHA512 8fdf688c358d762120baf3fbb47b7e1855b4edb9ad43b2affa1410303b51ef11332e1f02a1c41ba7f60855dcbff5bdb2a3fe395a97c04a8e8b44ede20232e56e
+EBUILD tevent-0.10.0.ebuild 1636 BLAKE2B 5eed3cacd8e082cb98cf8452f245d291c2977f341e9b4d0b0b149610bca5e9337a19dcb833104a2ce6aaef2755f95d667e6d9b3670c76a96a57c52a07062c96b SHA512 f40fe584cdd01e0ab5bef4a5a076501e5d5cf146a72e69a170aed48314c665a151ff6dc672b39fa86ca9f3b7c8a43ad288fa64cfdcb34fc27fcabda07a5dcd02
+EBUILD tevent-0.9.28.ebuild 1329 BLAKE2B c2318f7711e86a8aab8a4f535c7aff9d5c6d16c8716ac7010a830ec8f8765961832011eca0ca024da272201c90fdac9c618d08b16a037ce4a7693d2406f2e2a2 SHA512 f752b9ca75bb34dfa1a50d29e11e91bf4b022116c8f97e4b82c2830a26b0fe253f7fe51461302d42c22b511a2f78108bd5190c45811ffa19e0691087bb07f744
+EBUILD tevent-0.9.31-r1.ebuild 1408 BLAKE2B 078ae3d6da81680ecca2917150e204b0cb7714105325716cc8dedea420f9ab8d294840e9c7a589094782e459ae8d81c7004798eb4af7dbc4867ab4c51443f2c3 SHA512 af5e9cce3d24ed7c0849854e83beae321475a2a1cd0ab19816fe6dabd5257241a24714245b4a8f7460b94064cb63a0a3d5c54b5677921289864c522a036da1e4
+EBUILD tevent-0.9.37.ebuild 1609 BLAKE2B 4e4068500bdceb6bea30f0a33bc3e70659798886dfdd78b92a011192fce34b8aea4b7c96bb18a080a8e44a773fb7241dbcd49c9ae460986c2c68e8d638807f85 SHA512 24f3374305dc70e31070bc3c8da181f1c96a0323f7baee96768372609b33e48eb27b16093bb58670743fdff280afae6e3841aa8840c8dc4e0dc48928d2b4bcfa
+EBUILD tevent-0.9.38.ebuild 1638 BLAKE2B d4140ad5ba3d525364fb3a137d427081ce88a81e59f0972b6836a48834fdafcb4b546fc4cd4367410bda8546c5b2be6a221be78e47d67bcc8ee119724599ff7f SHA512 9792166c117b0f1ee166598c34ffa2718b750f300f6dc06ae0309588b020570c5155cf2f317d7ea51e2cf4af524808bffa25b5fc7d54a79142a6fee77ca86434
+EBUILD tevent-0.9.39.ebuild 1645 BLAKE2B 483f1a05fbc05e64430aadac751d8c2a50d9c7ccd01f4bd98b9c0311141049aca512bdcfb077c3faf9e8030d36dcc24ac705d31562bb5583af5f611cec8ca1fe SHA512 f4ddd0d3e6a1e34fdee633a10e8a4b3e7b0194bc7759cb714419c33dfeaf3ebe568a6b9390378b20d0b0e67eb0ed434473a35ac35981554bde7209d89669c1c4
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.10.0.ebuild b/sys-libs/tevent/tevent-0.10.0.ebuild
index 4dfc6c59d638..f256490ae30b 100644
--- a/sys-libs/tevent/tevent-0.10.0.ebuild
+++ b/sys-libs/tevent/tevent-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="elibc_glibc python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.28.ebuild b/sys-libs/tevent/tevent-0.9.28.ebuild
index 61b6c9c77bea..aae0d3979897 100644
--- a/sys-libs/tevent/tevent-0.9.28.ebuild
+++ b/sys-libs/tevent/tevent-0.9.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
 IUSE="python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.31-r1.ebuild b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
index d53cf5a4a69e..0997facac158 100644
--- a/sys-libs/tevent/tevent-0.9.31-r1.ebuild
+++ b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE="python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.37.ebuild b/sys-libs/tevent/tevent-0.9.37.ebuild
index fdc078963323..56a3b6bbd36d 100644
--- a/sys-libs/tevent/tevent-0.9.37.ebuild
+++ b/sys-libs/tevent/tevent-0.9.37.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 IUSE="elibc_glibc python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.38.ebuild b/sys-libs/tevent/tevent-0.9.38.ebuild
index d5dee6633a53..624b563f50d5 100644
--- a/sys-libs/tevent/tevent-0.9.38.ebuild
+++ b/sys-libs/tevent/tevent-0.9.38.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="elibc_glibc python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.39.ebuild b/sys-libs/tevent/tevent-0.9.39.ebuild
index 4934730d2d82..f2c0a5df200f 100644
--- a/sys-libs/tevent/tevent-0.9.39.ebuild
+++ b/sys-libs/tevent/tevent-0.9.39.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="elibc_glibc python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 7e1f6041e5b1..664017881945 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -4,8 +4,8 @@ DIST tzcode2019b.tar.gz 251196 BLAKE2B 73ed8d44675a25e0497b77cc20ca3cc5b137297e4
 DIST tzdata2018i.tar.gz 377009 BLAKE2B fa28fdac145756368d4760c418742efd558e63fd9900fc4649971b683b162df5e566c6214a79ec46b48fc65af488a7e0e95ddb6176a4f9adb5b39bc634426143 SHA512 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
 DIST tzdata2019a.tar.gz 378961 BLAKE2B f8ab67f1fac34ab81fa9995cd70399728e6755303354e29e90ef8c3c513806c2849f5332d170f52f99554ba387ea2cf2667cf70be6b85b68e25061d93879e3cd SHA512 d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa
 DIST tzdata2019b.tar.gz 384667 BLAKE2B c045d137cbb09e1109916dfdb1265ceb560d589ded9b05aa0cfe75f5fcb19057ded4d4f12f47c895020ed02bc4138de995eadac497eb3663579b094164d7e3ad SHA512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
-EBUILD timezone-data-2018i.ebuild 5143 BLAKE2B e7efbbee53cdcdd6b4ab6cbfacdfb8477115b3f3bc2b3271d3037373e6ea81dc23c2c3a22769a03718fb0c9678ca2fdb79eca9040c279e83eb11d371932bc977 SHA512 d476f2d61a2e2d006934c8cc92aacc7b300d5bfce9538806561294ec8ef5a80c1c500435fc256209f8a8e964091735d7199b38d94060cb6a5e0417b2cefc843e
-EBUILD timezone-data-2019a.ebuild 5153 BLAKE2B ef8003807fe60e87b11a2d7a175d3c2c9711982463e01078bd13472d0c45bd3b9bd56ec8ca66a0228cd841f92ccbf8e7c77566660e5ac030dc4e789cd00a9d20 SHA512 cd6e1f4ed84d00f92b09d7c1d8caa74dd9610d8de92209a7f8031160a3aa919f269e8856dc249d742923f3f12e601f3c8c9f9e814555dce6d6d46d46e4f00cb7
-EBUILD timezone-data-2019b-r1.ebuild 5163 BLAKE2B 62b5e5dcde9c34ea67e243ef8342646b1fb935e5a4004c9bf301c6bd252c6013273155906056f16f818417729fd6801495c67c464f360cb5b1609379dedf2435 SHA512 877c65bc7c7ff13176371c5107f61ec83ca9aec90fa3f1529550af597e0dd1221c42e34c165bca83572d21a1ba2835fcc394ce6b0815218abd611bcaaa6ef2a1
-EBUILD timezone-data-2019b-r2.ebuild 5169 BLAKE2B 616427115cce5a56819e26456fb3581b4755aa4274d5ee16b6a504462736161cf43965a21ab4501ccb2b4cec6816a804cdcd171ddd3f0ee31a52e6020a738ebf SHA512 b062cfebcba4914260961afcdf7077da9d61d8c5b2d9282e600510142786727d0864b80e76132a18be4a43f68af2ab2a99da42b5955201d30a93605f17f4dbfa
+EBUILD timezone-data-2018i.ebuild 5121 BLAKE2B 478d7e834cdaeba67c66dd956e1b56b0eedf1c22dd0a07f0217db1825315882e1f764986f92017e8910e6aa7b9a8f066d4f9714b913f89a58e9e035ce634267a SHA512 580e9391d3fb13e5a0c3591a160cfff66a1e85a370037eb77664298710b61e9e5a37d44965d574483aad433e53e94d6db1cc1865e69494d095b613337976f69c
+EBUILD timezone-data-2019a.ebuild 5131 BLAKE2B c83b1ee77fdffaccdc59a929a4ca81a0a0544a5d7be384d77ec3b8fe06533016806e34a68e7e5fb63164f23244beb35a0ee38f855cb682aa411fd38d907935ce SHA512 4efc8cbcf7802eaa6faee906ebb4d7e4cc70aac0898c5c90f68a33402049663f24521ae783dc0bec6036facdb713e7aa7363e8f5c3e26241b20f9f0753589b49
+EBUILD timezone-data-2019b-r1.ebuild 5141 BLAKE2B c8e9680e6cb20c79f2ab2dd29d512e26bbf1b443fe98088c1590fb584fce81f6ae0068d6ca677780bff45175eef95551923218bc92906ac23a1ec6fcc334a6cf SHA512 5a58e8e37e6f37ee95a7c63de4430b04e44a44f8afbae16f8b4f091586e3c575ca206374436c8bceae398b8c259273100241b5bb758d8bdeace7b5e7fba13b74
+EBUILD timezone-data-2019b-r2.ebuild 5147 BLAKE2B a28bfe85abb42616d502b13f12feb6d114e1f75669ffdc16719ae242baf87eb5297d5881600e8c1913f243a0b2fc1729cff354cf23a5fe048ac0a482df29dc2f SHA512 673950debd438fe6d4090df36b5a02a9ed4efdd399b5db4f55fa9beb582a03681a9d981d5fb440dfbedb85bd2ec680f1c50b67c4fc79e7a502eb4b500e9c072a
 MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2018i.ebuild b/sys-libs/timezone-data/timezone-data-2018i.ebuild
index 213d07853966..d8b9ee541e00 100644
--- a/sys-libs/timezone-data/timezone-data-2018i.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2018i.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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-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/timezone-data/timezone-data-2019a.ebuild b/sys-libs/timezone-data/timezone-data-2019a.ebuild
index cbf1424b2db2..5833d2e70930 100644
--- a/sys-libs/timezone-data/timezone-data-2019a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390  sh  sparc  x86 ~amd64-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 ~riscv s390  sh  sparc  x86 ~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/timezone-data/timezone-data-2019b-r1.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
index 3713320fda3c..b108efea881f 100644
--- a/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390  sh  sparc  x86 ~amd64-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 ~riscv s390  sh  sparc  x86 ~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/timezone-data/timezone-data-2019b-r2.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
index f51150fcc58c..e1f454ccb948 100644
--- a/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-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 ~riscv ~s390 ~sh ~sparc ~x86 ~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/zlib/Manifest b/sys-libs/zlib/Manifest
index 3b275df6e15f..e50bdea98327 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
 AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD zlib-1.2.11-r2.ebuild 3123 BLAKE2B b9d708466ece40f1ced085985c56870f71374eadd7efd80adbf9f1759be8e18e4acfd6b546bc8bf628d5ea301749a7f035a58ac9a8d7b52a4e239e5c048a248a SHA512 04ad0313217f53447d1170f59eb50846929a5bad00dc4e367eca88d507ed0ef18c3cf2efc1f0b9796fad1bec45f6e5df5515e33808ffd973c06b00108f393c08
+EBUILD zlib-1.2.11-r2.ebuild 3101 BLAKE2B c53e08cad8a08e0e8092f4ce161b33dfe27103a1bab670aeabc7ba5dd9dc3483c3f390f5484a1ccb3cd3316c21a60f4d37c3940ccbb90744dadacb4a9d352a73 SHA512 db677f86a7b95425ea1239ad2cef589d76ff08ee24cf29aa92b76a5c1c597f70929c36e9329a76558339742846aecadf6d435d864b4348395bacd4e6643082c4
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index 022493b56080..14bd33c0c41b 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /sys-libs
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)