gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-libs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
118 files changed, 1427 insertions, 1596 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 0d6c61d6e157..2dac1f7aeff6 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 71aca7842298..0f43debaf69f 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,12 +1,12 @@
-DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
-DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
 DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-EBUILD binutils-libs-2.32-r1.ebuild 3674 BLAKE2B b2109ac10a9c0e2f79b4342fbe1b3d11273167cd3bd91e7d3a3282d3656ad58ecf7461a2b323b87abba8b02ef6649fb6cb04d282980763396f934bdff994d68c SHA512 030897408d1c5bd33c3d82b4de5e14cc034bcb17251efa2bb468de623a7e6ec57d891e199b879f45aa043ee5396c14b6a1914ccfbfc8403fe798e8f960dd3e21
+DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
+DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
 EBUILD binutils-libs-2.34-r1.ebuild 3694 BLAKE2B 26b6971b41cedd7a9cc13b5782cc845c81117ddda176fe757e2fce315cbcca3c466e080d8bc0a017ad9b763f8efe4871032d33d928d59b116d930396f46042bd SHA512 0e86a001fd345759cec21d20c5e99bedd8111a7704ef9555756e65f4d6aa7e11dbd3cb391e22462d8705afa1363bf2a937e8727d5bc1abeebe8535aff848cdb4
-EBUILD binutils-libs-2.34.ebuild 3611 BLAKE2B add6cdcffe47e1666118939c6bfacd05317fe38dabe34a46a85d47113ca62de800d07e46e86e2f6a526fd1ffb586f0b059224491e1957e73878d4245cba5a0a6 SHA512 e9a329164cd52d95b1d452fd54c3f58cb4656ab1af90a8af0553be36e9b574a3dec9e0dfc228b2ecfde295e77007bd6f319aecd2d2166cb6b8fe48aac1f8ed4c
+EBUILD binutils-libs-2.34-r2.ebuild 3572 BLAKE2B f952d9612e34cd837c30e929bbb5a77e304423f01ea0cde86412812fa1b951c61d2f5aa9f720fbefb9ede9b2660251e81de59a36625ad64630ba1bc751b0c9a1 SHA512 8bb277dc39b6177797b98c0f5eb79f9cf116cc682c05e4dbd2ed93f9bebd2c5ba4dcb85df7155a9ca3ed64a25b4b0563e7bba8a1beaa05f7f86fa6baed28581b
+EBUILD binutils-libs-2.35.ebuild 3573 BLAKE2B 23f988a36b4e7334644d5a17efb566140ef430aeee100e235f85470fe9c9a318d6804440f20d4da0858a118128d456ef23434bf08fc5ffe7adff228a02c69a4a SHA512 0d0cd1c97bf4c97aea8905dbd23a964565aaa43358553b282f62bbbc05122a93410d59f3ef06bfdd975e7f4e556d239a5b073b97d3969c4d8bdf5ab03ecc8f42
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index c7a023759fa5..953c5f6dcfa1 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PATCH_VER=1
-PATCH_DEV=slyfox
+PATCH_VER=6
+PATCH_DEV=dilfridge
 
 inherit eutils libtool toolchain-funcs multilib-minimal
 
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
@@ -38,9 +38,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
 	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-
 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.ebuild
index 9479eb9e2157..0decbf620dd1 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PATCH_VER=2
+PATCH_VER=1
 PATCH_DEV=dilfridge
 
 inherit eutils libtool toolchain-funcs multilib-minimal
@@ -21,15 +21,14 @@ 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 sparc x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 # Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -39,9 +38,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
 	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-
 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 6862b0cf3757..4b233fd7bd50 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,14 +1,13 @@
-DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
-DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4556 BLAKE2B 4225214ff8c747f43086919b5315d804bfceeca54a1fda9203247e81d8a87e5643f44ed6f906b472e90178eef656655439df70f66defb09e8c61673c90405282 SHA512 2d1defafbcc4e1f2cb56b242124b2bde9a78c4afec5edd6b0b27b804c0f8842a0e1bac18e02704e73cd413c0613ccd7e006052693324ba469fb7411c9da94e40
-EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
-EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
-EBUILD compiler-rt-sanitizers-10.0.1_rc2.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
-EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
-EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5281 BLAKE2B 7041973d68007ccc56115a9748e901dc07b9228a8c513c30c234fd98253fb04072fc19faff4bcbb544dea7ac5aa2b17c7ce545083949ab6d54020c9dfa02bfa7 SHA512 19f5be642bc47a77beca5241f95b58c8b11fb580dee1db829eadbda00542d56a7b17cccc300b1eb7ebde2ec419f38e677d9800de00067e66df98f7cfdd2d47cd
+EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4552 BLAKE2B 5b4130f8f81fa91932b4c814bbbd3b8c3636f881c097463faf2914ecf3d9eab8d741130fe99ace77faf7c4180606f9e0785acdc037c2ca2226f220b925e0fc23 SHA512 b17034bf3dd2596a07c78f523c2ed64329f18086f7d5ee2861793a3484b1c5c6a7c890820ba2e1cb4e64497d88ca39308be84a7751812789fccb16542c1097a5
+EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4506 BLAKE2B 0f3d65941cad595661d1601af70092150a21ceeeafcf96825caa9b8d4cdef34eb3f9b0eacedf3d55fbf94aad14091b8f50c1aa7c4134ae19e37c7a2bcf853642 SHA512 02b3ac613c225c0b610497bbc003485208f0ca301962f38ab1324ec8f01a192d96c9d7cb17ebcb7c7d45e804eedf4592a5a9338d6eab7cd071ff41eef75f68f2
+EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
+EBUILD compiler-rt-sanitizers-11.0.0_rc1.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
+EBUILD compiler-rt-sanitizers-11.0.0_rc2.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
+EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
 EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4847 BLAKE2B cc23d456a4c52596858a405bc74c3c5db35c4fe116685cba4982e2753ba01941bd2c166f56e4278c79e02b06229e90a7fba9fce923360dba8bbf516c8a665ae6 SHA512 dc11719f142cfa56c86373e7e6dba88957511218a654c138ab37d3de01a60bd77f8dd4bc90ed634156d0952b350dce1bad08f8a2db1a7d207335596cdd0bd4d6
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
index 94b1abe37b20..802b49fc4517 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~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.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
index a02fbc489eb8..b9be9bf67b85 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
@@ -1,27 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${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
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
-	test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+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 ) )"
@@ -30,7 +23,8 @@ RESTRICT="!test? ( test ) !clang? ( test )"
 CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	clang? ( sys-devel/clang )
 	elibc_glibc? ( net-libs/libtirpc )
 	test? (
@@ -40,11 +34,6 @@ DEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -67,33 +56,15 @@ 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
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
 
-	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
+	llvm.org_src_prepare
 }
 
 src_configure() {
 	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
 
 	if use clang; then
 		local -x CC=${CHOST}-clang
@@ -108,8 +79,9 @@ src_configure() {
 		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# built-ins installed by sys-libs/compiler-rt
+		# builtins & crt installed by sys-libs/compiler-rt
 		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
@@ -119,7 +91,7 @@ src_configure() {
 		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)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			# they are created during src_test()
 			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
@@ -140,7 +112,7 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use test; then
 		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
@@ -172,5 +144,5 @@ src_test() {
 	# wipe LD_PRELOAD to make ASAN happy
 	local -x LD_PRELOAD=
 
-	cmake-utils_src_make check-all
+	cmake_build check-all
 }
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
index 006db04567ad..cecd595ac6c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
@@ -56,6 +56,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc1.ebuild
index 006db04567ad..cecd595ac6c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc1.ebuild
@@ -56,6 +56,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc2.ebuild
index 006db04567ad..cecd595ac6c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc2.ebuild
@@ -56,6 +56,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
index 006db04567ad..cecd595ac6c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
@@ -56,6 +56,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index f7d04a6d2a1c..c6507654e259 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,13 +1,13 @@
-DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.ebuild 2922 BLAKE2B 309e52728be136e6f5758a068065c618ea2c0f7fd321c746bf1b0eb04407b9b5276d6a0f2db92c2703ac82913b882ad7561beda212eb95cb42b36b333cb73bcd SHA512 70aa10d4fcf551efded8c73a406775d10754a3e21c4ddff860ccdb03c1c5caaece851883dfcbe5afe6a36254fd66d112beb180e8f501baf956ba81376d64954a
-EBUILD compiler-rt-10.0.1.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
-EBUILD compiler-rt-10.0.1_rc1.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
-EBUILD compiler-rt-10.0.1_rc2.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-10.0.0.ebuild 2918 BLAKE2B b815aee19b40b970d1331e5e5c71ffe7b9279b900b3392fbfd627b661214f0a6d4e8e4818e24a3a781c2da768f42bba2f44d5e84fadbad7dba669a94bb9132fb SHA512 79b57e3f8af6f135300441670dcba927843182518c070d6767bc3c866a9fdfdd0bcf9be14c4cd5a1d9d51cc592a443c0c02af635942d7e30bf4adef34d558c45
+EBUILD compiler-rt-10.0.1.ebuild 2775 BLAKE2B 216c7c154b0afe7ee0863d05f13b8a4da030bd2f81d2f7bb3960325a9b16da3385aa1f1bd2b091860686a5162cf23bca83a99d378fc5c2804322f3b28eb48579 SHA512 d523f56eb105fda013c775c422564d54545532a991af6ad587fc147a74270b3add6859602df81b6e5fe521d35f725722a788c288f43290bee95255d8c3c4d182
 EBUILD compiler-rt-11.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
-EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
+EBUILD compiler-rt-11.0.0_rc1.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-11.0.0_rc2.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-12.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
index f238f8a5a4b8..a4a199c2ed96 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~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.1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
index 403e394f7446..bd92186599db 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
@@ -1,42 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
-inherit cmake-utils flag-o-matic llvm multiprocessing \
-	python-any-r1 toolchain-funcs
-
-MY_P=${P}.src
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~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
+	>=sys-devel/llvm-6"
+BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -97,19 +88,19 @@ src_configure() {
 	if use test; then
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			-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
+	cmake_src_configure
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
 
-	cmake-utils_src_make check-builtins
+	cmake_build check-builtins
 }
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc1.ebuild
index c83c56ecf249..c83c56ecf249 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc1.ebuild
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc2.ebuild
index c83c56ecf249..c83c56ecf249 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc2.ebuild
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index c83c56ecf249..c83c56ecf249 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index ad2305c41012..6254b4796406 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,6 +1,6 @@
 AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-libs-1.45.5.ebuild 2218 BLAKE2B 25ef186951ef58eb15f500c536ad3f8f39297208f87197c81e094d499fb47379074024b9ba0126d64e711ef62bbf37dc0063320f04d6cb2ae5904b619c9743a2 SHA512 356fd05f5995ff4c90a964ba1271dc6c0730d997506e16c2253ea1c048df0a413afd3b9ff0a0de3c7b22ed50895ae66efb96e01b6db6799053cf32af4c91fb50
-EBUILD e2fsprogs-libs-1.45.6.ebuild 2227 BLAKE2B e469ba0db1f533fe014e1058b68b34f290f9602ae1d1e7f9c20b9404768619133d77ef5c1a71d479a4619b8f7cd23a65667fd516797d8ac12baf2bd73a8bf601 SHA512 2344a9f504bf99e7aa0d84f171d2f14d5ca62eb05078ae9f778058b07d36c307ececea85f74702a059ac0c4b0c258dd8acf5431bdd56f0cbbbaf0d8519ed7858
+EBUILD e2fsprogs-libs-1.45.5.ebuild 2171 BLAKE2B 666f31c2f29829fd98411374162546453e4566019e8baa25e51da08d7e5e4451668fc2388a47dedf733122fca61ae02b6ba13e8201508c54808f2b066dcb31c4 SHA512 1efd1c66e49d2260cfbb279a316a7793cd4f3a1b9a23523e78ab60dec8657e016ded37ffe3814f1bd021ec4cfd4ec122834b892063a3ba9f576a1e718caf1569
+EBUILD e2fsprogs-libs-1.45.6.ebuild 2180 BLAKE2B e527d9b5bcce0c7d746394ef8fbdbe885849bd3b1623fd387e735fdb84d0d30b49d1a1e9fddbd1b70395e71b8cc4940b659d55b3d1868fe7cb44cbb5e7f97b6a SHA512 dfbc65f6d1624ddd251c159ccfd13624c070c81fc8a49d03e8e20266e9d337c3e420a6df48def81c19f6e330343571e0367ff8b5c85890e6b5e83e1077062f13
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
index 4d8e8d0d7e00..021b9b7ef4d8 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
@@ -10,8 +10,7 @@ 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
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
index cd86eb815c29..6b12701dcace 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
@@ -10,8 +10,7 @@ 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
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index d23219e39112..236b9812bf16 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,3 +1,3 @@
 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
-EBUILD efivar-37.ebuild 852 BLAKE2B 1c2125271fbf43908ba94726e47a34156251e0b388d7fd940889fd170a7ca638cf1b147e4393e39f3e1bb7347c72e47c667eb3e5fac017dcc53e23f456a40f96 SHA512 367c1cdb46abd3b0ec2d06de39c1c92ddb54680869920afd5fef54eb4c9b778722514dd2fbd3180a63539e303b42cdf527054096707a8cd1789f4d42eb0b53a8
+EBUILD efivar-37.ebuild 851 BLAKE2B 3f7366ea1c6820c5b659c3b58089ef5309c3c37ebdcd439cfdfbf1738eee1167b894cb3980aa46c0050e68ed2f5b69c5139ad0e9d2d054822e52398a40080ce5 SHA512 dbeec90f5c52abb1d614cb9dbbedf4c708e5bac624ca25b66fa4b56c85b0f5c3a244b56d9a93c7e90b67510b4d4973fb030aaccc93130e8458b4e69ddcf80ca8
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild
index 237f2835e604..d85015b8778f 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index b32756e94db2..19091f68540e 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -11,6 +11,6 @@ DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bd
 EBUILD gdbm-1.13-r2.ebuild 1844 BLAKE2B 4ab07bf0205140ff52040f07a994be6e83703d5ad75dfd7fae9e0f933355b8526a514b4da56ef64f63c6abcdbff5f6e7173963249ba20dfbc13d9bcedd2d0476 SHA512 5e158e014d255146c7b6d7d749777862d0259b71dc4e61162bc6b1a60be947c2425028fce020405276a38d4492baec10af19395df519c1cf8387f098ab58e5af
 EBUILD gdbm-1.14.1.ebuild 1762 BLAKE2B 573c5b48f5e65f1c00ea6dbed01f9af99db7873c0a9f51028eda17589d11c11b82444418d99cd24234d0bd96c3daf28920718aed6e00371766a67a34ff38442d SHA512 c5e4335786ad8b8fb4fc38f2b2a4a9f0db5a60bbb0e3c99fba80c74301c657f4b0f13f8a3f4d39a0a7ee27eeaa5727795be69c05332ad463464babde6ea31b5f
 EBUILD gdbm-1.17.ebuild 1358 BLAKE2B 663f146c1603834593e9f03fc037b5b54f73880458d00678447026253eaa0df7c2f0f874a694c7dc8a325e965b1fa2416cd7bcb11a91cabfc4b1dc086253ff51 SHA512 49fc0a53786f46aab733e30301e8547a98b338ba1f3c29f5e42e361a776514750744196538fe6a87027dba8e263f690bae6b4af2c5d37b4e43456fb6c299e703
-EBUILD gdbm-1.18.1.ebuild 1360 BLAKE2B 2e5b2f50505cd7f428e0337d3fa0089d497cffdac7bcf1075e77f9ddc55489668e5024cf6f80e6eaa386901d27170af8f26076df0ad12e1a1333ab268dcd8c62 SHA512 4b808ef47a8f5037c9ea2a87d84863a304c0e479039f0af7fe70028f50c363c25b6176867f0ff14bd7a24fa4f6994a59a75397b5d8daff26aef37a2e4af88eb8
+EBUILD gdbm-1.18.1.ebuild 1351 BLAKE2B 21f14dc56f13ec11b74e9380a5ae0a763f1f949c4b54ec6c41b7ed7d4cab4d7d564470290ccf5ddff4aeae50865c57370362b70c7b72992c3640e215c85cde80 SHA512 afc83c99588beee7921fe53aad3759916f891eb5f9d409c420e8e6b2eb4e1736e57a677bfa84dfe0a9ec18eeff8bf1037d5e3537676b341c55256b4571b21cab
 EBUILD gdbm-1.18.ebuild 1302 BLAKE2B d78144e2bbac7b03e9152defa9b480521f5910bf9f80d7d1af09c3c9599e38f82f5751f5e24da37179b45735b478d9ec77f5780dbbe0da33889cb04b21382444 SHA512 b2092b8159ca3d236abd1f80346f5df48ff8935f4d8da1a320b4926b4fe6eb64f55af739bea346dd373a2c0eac8e11a49e48dc47c8713e4aa8c8720c94b53e48
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.18.1.ebuild b/sys-libs/gdbm/gdbm-1.18.1.ebuild
index 5b38687c43c9..13d849c90bf2 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 ~sparc ~x86 ~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 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 71de4a766526..197258dc101b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,17 +15,17 @@ DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1
 DIST glibc-2.30-patches-10.tar.xz 72808 BLAKE2B a7a95c99482524b2896d15539766f1e6b1fe34a22f32119248c6dd44f42632076e86fdcbbdc2d604ec73ceccdd8a7f5936a62a6f4c3d039fae8f6901dfc6be77 SHA512 af5e213ff08bf38f6f529816c36b4e38df27207c2df254609ebe45b2f039ab553bbe563aa6f64b6667d328fd2c120dc21b6e2676540bdd94e58079237089eac3
 DIST glibc-2.30-sparc-reg-fix-clobber.patch 6106 BLAKE2B cad6a4cbef5d529519ef486f4ef8e189cb4d43dd67fa8f8d50d67072cbb682f60474d482a5c5152d1317de92b98851d8a88eee6b331eb5bc22de065c03c58fde SHA512 a018ef1f196257f3888af20a5cbc97892c8382a4f489da042568e087c077f30cf4dda6ac711b573e1274317866ce97cf817d92a28cf55f18f5e8d32787e6cb3f
 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
-DIST glibc-2.31-patches-5.tar.xz 52720 BLAKE2B 0e4315a79d4108e8a0eb2d849086de40a3ddebd9c09592ec5ecd02d9a0481f58588d7fca345624b0e345b077f6f3ad4257fb5949a0f05be2a004489af585a329 SHA512 c081aef22efacac19ce343ad6e55b8102869c42142dfd478e1cc03e85d6569771b52b737173df0996e273dc6ad1e8dea391658e03d5bcb69f2ed754801b3f6fa
-DIST glibc-2.31-patches-7.tar.xz 56088 BLAKE2B 5af4dc008775c7d7958fc03df3800855685d00af7312f024a966948bd85522d40f357288deb4f13281dc93ace1b08cf40edf0b4c573dcba789887e86b45ce6ed SHA512 059082e5ce052189ed0c36ee97d7295f88cbb9e20dcb5677565a65d60cba11ff969d4382b6c6a69b8d6255da7274c205cf5c167fe76a24db3b9765f1633a9962
-DIST glibc-2.31-sparc-patch1-reg-kabi.patch 8525 BLAKE2B 2600ba4b0e24df2054a6e77ef79b6e5312e5594714d78015c4a949bb2c9b29c9535121bed9d633215710f6f50525fa0d2864aea43abbfeae281a6cc3dab71e5d SHA512 8dab29ea2e9e809806df17f3b707e7be27ac37121d0e3c6ee52fd41c1d6891bf71c0d8c154593754531aee96f8c866e06646f149c8bdd602521b703471d56bd2
-DIST glibc-2.31-sparc-patch2-reg-fix-clobber.patch 6864 BLAKE2B a39a10ff204d74289278125d7f2686db01874e998cb27b46b3b8b9597b5a2eae3b975a5ab08a8f5dd83693455891f6862b6eb70654f215c2ce6c5da222be96a1 SHA512 69bba011a30177386193ac4ac14a4e731c45b12dbb3745619ee802459aa75d6bbd37e62e979ec9790f691edb5f9077d37ee668b8df406f8f1c4d4316ef8c0aa7
+DIST glibc-2.31-patches-8.tar.xz 60868 BLAKE2B c641a77cab0b3e5379a6911a548483266110d747300f6bd4c138754cc35aff266088be8682ba45ac105c946ee309db0bc094b0c3bc48fd4303c925a7594e17e2 SHA512 1bc069d487ff9d4cd33c5d293bb0789114f65af5179b3d9df8ff0a9f043d5ffbcd030d8eabc90b329c896dfdd0409c4b8dac371eafdd380ecc660b9540320637
 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
+DIST glibc-2.32-patches-1.tar.xz 7640 BLAKE2B 849bdc1108e1f68f307bb9673f5ecda7c5470815f7d2de7956d529b638aafd4a8f37c22f79bc89d8e5f2efd51878927d3999d80586ec1074c46a52b6e148ea18 SHA512 a206d69693c3d9c527e17307b413aed05bcdefdf2537bb16af97ef31e85e4c48812971b60c00107b6a7c4bdc83c7e8ba1c9ea96f5641520852f98928f1018349
+DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
+DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 EBUILD glibc-2.19-r2.ebuild 38264 BLAKE2B 935f298661a925624e86efbcbce2a98db4c7136a7bf280971a7022b72130b3b7a05ae8ab876cea12c3d0000ebeba70cdb0c2db084322d1f33a2685d637d8864d SHA512 bad1c42660e84e8035699b91bad4a8765657f87251b6d68e795255209c2bf696cca0ad17f8e77a024e68d93120be2030ed7f4ad1bfd26774f0ec486c59f5641f
 EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd
 EBUILD glibc-2.30-r8.ebuild 43113 BLAKE2B e567ea4544419609ce3f02ac06ce8ee2175d11502e947187334ec02cca11dacbb5453d514fe8b1c77418259e8f0bbd4306cdfa6aa573426e95ba56f910a9534c SHA512 b85c7656eb09b9702d352b2e20c334d70b764ddedacc6a218b3a921c990314ec80a4ff14e234a3bebf810f3482c45b323e9edc3c2044266341125b7095186126
-EBUILD glibc-2.30-r9.ebuild 43274 BLAKE2B bc91b14913d23e16b0f730bc1087368f2ec67a310e3a746556d1e5bc55021698b8fe9ee0d9e9485c8ff2030010775a2a4338fcd2215d2adcde19cf257343927d SHA512 95405b87f2ce225ed967fcfd924f098c56707dd12ecf41f41feb7379b212da9ae3bf5b75d55a2c217726dd78d6f07818634224479988a8061028b7c082508946
-EBUILD glibc-2.31-r4.ebuild 44247 BLAKE2B a2339a7458fae41e4abb71d3a87a814ff69752eeaf896995b8393afad12e77aa3d253649ea74db40d1cf228ec15fa643f9d75295ea64df9cc712e3edc2f7e45e SHA512 74cfff2226e8f6e016576d249ec38de06cfbf8e6ccd89d2305688a2aa2b1df278bfd8d905de8b38dc1a74b334b188d580fc4baafa82fb118bf245267fb87fef0
-EBUILD glibc-2.31-r5.ebuild 44322 BLAKE2B 9b730259a4465dbedf8a3199f6d0820901d86791fa16cf373b1f3633ea827cc6eefa253683312b758836059a3d4355b857dc510e2662111c4848398caa24f639 SHA512 31e6281c082509067e650e7c050eee83e4b0bb837756880cb62352c962f95a46ace159bd73c8ad3041293a908c3d3612bbfc9be25c9da7704dd9eacc50908aff
-EBUILD glibc-9999.ebuild 44334 BLAKE2B 86aaa3348cf24be6ff081719233b300e6ff84980c80fa81bd00d36364802ad918ba3d2d7d51ed2f122e359ac6251b9fd85882c1e6ff2b35ca52f53031af8779a SHA512 f343775d16babf5b62a7981348fc6d45f6d436df80ef514c931fb121e30afcc911c5f5ba4182dc3bb4639e576bc01fc02236a8180987800cdee83c15cf227d57
+EBUILD glibc-2.30-r9.ebuild 43269 BLAKE2B cfc1ca115def60424b14d76270e0b57dec754992bec50d52110e437c62a68bea860062e65705ba64ddd3e8156e61b6542227678a3613c782f441411d606b286b SHA512 37fe44bf17fe1d3b8f001dfea6326a64c21843a07bb2dc0229856c53eca8d2a6ec13687c3fd038a47045db817f8242deb7d30219b8f08b4b051cd86ccdbe1310
+EBUILD glibc-2.31-r6.ebuild 44378 BLAKE2B 0e123cb1baaecf80c587133becb26ffa8cf01da7f407f3741fb6f2557262fb404381130c3bf280f515b176bee39a8a52d98fc935ad0a23861a78caca2fada551 SHA512 1a1728a26509339e261aed4aaebc4870cf1d9154cd736726b66856b5065c824625f65b60d8e3030287283dad509f624e6fe3e13dc3dd4b0abb45b2f670bc3dc9
+EBUILD glibc-2.32.ebuild 44384 BLAKE2B 114aaddf3c1e3b2f9cf905e77d6b23ebccc4c72ba0e1eb0441cd80ddab36c6fa1e8888b10cf1ee75952be0b298edb019428e7e5c5ebc56e032c32321e9646ef7 SHA512 223b77b5b1b818490fed1250e66b7f25f230560bc2cf090e565d563a5c3018de0c31613b0c10e3449a692d3cee2b2a67764238c4408bfb84d886b9f9b5e00f1f
+EBUILD glibc-9999.ebuild 44099 BLAKE2B 0a69313853d99e0c7fda2ed4a6c555f575054523638ccb246be80e87b5d48d34b10e0e78040c5ceb77747651acc45dfb41e4aad2f73bc23fdb7fab4f863b4f29 SHA512 81aae4bd77a3271d70251aa1660b0e89a4d7392769aeb98e6afa1175f2f3a81e35f90236534115bcbabe9ede3ee49edbdd768ee605c026b5700dd974ad179b1e
 MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-2.30-r9.ebuild b/sys-libs/glibc/glibc-2.30-r9.ebuild
index 11a2b4d878ce..2a22b0bde8ed 100644
--- a/sys-libs/glibc/glibc-2.30-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r9.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/glibc/glibc-2.31-r4.ebuild b/sys-libs/glibc/glibc-2.31-r6.ebuild
index f4831ba151d2..3ac5fb0e9b15 100644
--- a/sys-libs/glibc/glibc-2.31-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r6.ebuild
@@ -15,13 +15,16 @@ SLOT="2.2"
 
 EMULTILIB_PKG="true"
 
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=8
+PATCH_DEV=dilfridge
+
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	# needs minimal testing
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
 
 RELEASE_VER=${PV}
@@ -30,17 +33,8 @@ GCC_BOOTSTRAP_VER=20180511
 
 LOCALE_GEN_VER=2.00
 
-# Gentoo patchset
-PATCH_VER=5
-PATCH_DEV=dilfridge
-
-SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-SRC_URI+="
-	https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch1-reg-kabi.patch
-	https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch2-reg-fix-clobber.patch
-"
 
 IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
 
@@ -303,16 +297,18 @@ setup_target_flags() {
 				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
 			fi
 		;;
-		ia64)
-			# Workaround GPREL22 overflow by slightly pessimizing global
-			# references to go via 64-bit relocations instead of 22-bit ones.
-			# This allows building glibc on ia64 without an overflow: #723268
-			append-flags -fcommon
-		;;
 		mips)
 			# The mips abi cannot support the GNU style hashes. #233233
 			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
 		;;
+		ppc)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
 		sparc)
 			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
 			filter-flags "-fcall-used-g7"
@@ -734,24 +730,36 @@ src_unpack() {
 
 	setup_env
 
-	if [[ -n ${EGIT_REPO_URI} ]] ; then
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
 		git-r3_src_unpack
 	else
 		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
 	fi
 
 	cd "${WORKDIR}" || die
-	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-
 	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
 }
 
 src_prepare() {
+	local patchsetname
 	if ! use vanilla ; then
-		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		elog "Applying Gentoo Glibc Patchset ${patchsetname}"
 		eapply "${WORKDIR}"/patches
-		eapply "${DISTDIR}"/glibc-2.31-sparc-patch1-reg-kabi.patch
-		eapply "${DISTDIR}"/glibc-2.31-sparc-patch2-reg-fix-clobber.patch
 		einfo "Done."
 	fi
 
@@ -763,6 +771,7 @@ src_prepare() {
 	find . -name configure -exec touch {} +
 
 	# move the external locale-gen to its old place
+	mkdir extra || die
 	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
 
 	eprefixify extra/locale/locale-gen
diff --git a/sys-libs/glibc/glibc-2.31-r5.ebuild b/sys-libs/glibc/glibc-2.32.ebuild
index 897a2582eb9c..062f5445621b 100644
--- a/sys-libs/glibc/glibc-2.31-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.32.ebuild
@@ -16,7 +16,7 @@ SLOT="2.2"
 EMULTILIB_PKG="true"
 
 # Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=7
+PATCH_VER=1
 PATCH_DEV=dilfridge
 
 if [[ ${PV} == 9999* ]]; then
@@ -31,7 +31,7 @@ RELEASE_VER=${PV}
 
 GCC_BOOTSTRAP_VER=20180511
 
-LOCALE_GEN_VER=2.00
+LOCALE_GEN_VER=2.10
 
 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
@@ -297,16 +297,18 @@ setup_target_flags() {
 				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
 			fi
 		;;
-		ia64)
-			# Workaround GPREL22 overflow by slightly pessimizing global
-			# references to go via 64-bit relocations instead of 22-bit ones.
-			# This allows building glibc on ia64 without an overflow: #723268
-			append-flags -fcommon
-		;;
 		mips)
 			# The mips abi cannot support the GNU style hashes. #233233
 			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
 		;;
+		ppc)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
 		sparc)
 			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
 			filter-flags "-fcall-used-g7"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index ca5f697b063a..67b4c1240006 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -32,7 +32,7 @@ RELEASE_VER=${PV}
 
 GCC_BOOTSTRAP_VER=20180511
 
-LOCALE_GEN_VER=2.00
+LOCALE_GEN_VER=2.10
 
 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
@@ -298,16 +298,18 @@ setup_target_flags() {
 				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
 			fi
 		;;
-		ia64)
-			# Workaround GPREL22 overflow by slightly pessimizing global
-			# references to go via 64-bit relocations instead of 22-bit ones.
-			# This allows building glibc on ia64 without an overflow: #723268
-			append-flags -fcommon
-		;;
 		mips)
 			# The mips abi cannot support the GNU style hashes. #233233
 			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
 		;;
+		ppc)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
 		sparc)
 			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
 			filter-flags "-fcall-used-g7"
@@ -845,14 +847,6 @@ glibc_do_configure() {
 			# https://sourceware.org/PR24202
 			myconf+=( --enable-stack-protector=no )
 			;;
-		powerpc-*)
-			# Currently gcc on powerpc32 generates invalid code for
-			# __builtin_return_address(0) calls. Normally programs
-			# don't do that but malloc hooks in glibc do:
-			# https://gcc.gnu.org/PR81996
-			# https://bugs.gentoo.org/629054
-			myconf+=( --enable-stack-protector=no )
-			;;
 		*)
 			# Use '=strong' instead of '=all' to protect only functions
 			# worth protecting from stack smashes.
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index b93f2e5d97ed..a8a367bd3864 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,11 +1,9 @@
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
-DIST ldb-2.0.10.tar.gz 1676630 BLAKE2B 9ae9e6579fd7b15b91a4c0f52ad5ea3a9ba3135efe408b76db53db211a48d3952a790f2f856e5f9573174b2203840b7d6a6ad10976a4b6bf3e0d294731b89b31 SHA512 51954969e3121295ea99856c254f455cb746102e9d7895fbd7c66997f33763ae4522ed456e4bae7921b2edd73575a0a10738d21a90a067a57ff770cf0fe35aef
 DIST ldb-2.0.12.tar.gz 1680114 BLAKE2B 44d7b8f9ff0c1d2adc59378b9da814fb280043c8bbf5ea59920a23448db5abdd53b69c93002e2d621268610ee202377a35676ecf6bd6601d2a2ef9269e71dd6c SHA512 9f26dadee16c50844b28edf03a05ad11067bfb7678cc3e8baf278709a813498a620db3dad463bfe54adb6a44cb5b551cf1224bc30316be5fc8d29ef17295bdd8
-DIST ldb-2.1.3.tar.gz 1673208 BLAKE2B 32723fb8cbf404258a1334589e08f1a1b1ee78a6260327e4793d338f73132ae89a5655f77ef4160a0c4b751f5e33e841420c2027034c78d371bf5fd7f3931a37 SHA512 3f5adf5ed6c98cefce56ba47c986c5d59619731def8fa66440957aba1483de19bcfdc4ec5498d34db70753312b1ad47b864020269df924d3d431c8d4d223af10
 DIST ldb-2.1.4.tar.gz 1673335 BLAKE2B 581ea127715d82d849f78c11fc66eb278e45f6c9ff9b379d5a3cfaa8c9c424004614a5a9c2120710d23feb1252294e2abd4983158a2a46e5d70180ad3c765dbd SHA512 7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e
-EBUILD ldb-2.0.10.ebuild 2688 BLAKE2B ecc1ec7275796e6de5af9be875671301aa38da49e2345408d5f9054657ed4775d21cd1456a474217def897ccbd02e44be18a14cad14dd58ccaa816d8be968a9f SHA512 9c3320b50fdbb0e7912b731d6c6905de97b065c2c049ec046e35f09e296f0b1f350120062c3d1e3b29ada3e4fbff90e5d8576bc96397dc89c9536882d2a770bb
-EBUILD ldb-2.0.12.ebuild 2695 BLAKE2B 9ef1575d86dbe106a307851c63a8bbe84bc948a13c5837fb3a09caf996ed8e8f9b37ec76fcebc2faf423db3a0f7558464d150a1f64e142d94022a5607a1a1bf6 SHA512 fee1fd6ebdbd919332ae2b35506b9e69856761d340fd6ad117b27ce2f08c31a9eda4f4bb156a64e2f01ac35c95bec438a60d58fb696639376f32dde98ab02fc9
-EBUILD ldb-2.1.3.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
-EBUILD ldb-2.1.4.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
+DIST ldb-2.2.0.tar.gz 1676551 BLAKE2B 1ad84372b024e1ed680a09d215324027c9a37883204c2e69bb39d28a280cba639a4a46ec12b12d89f291f5505f55849eee880345412c6d95d9b6d6e9c00a4fd9 SHA512 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69
+EBUILD ldb-2.0.12-r1.ebuild 2819 BLAKE2B 84a079740d46a4eb3db474c3fee68ce8797ab66e62cd34db73a77eb8b42c530c711a9440780447b3c1861f9abdb1dd5578ad6acb7c3551b594df84cfd828109f SHA512 9b22bc0bc7b6568edb97900837b4385823ef2ff06ae3a9efeba35cc91ef56906e2d099ee777510376a6c26518e93df5930b345b569cd13646127864596da996c
+EBUILD ldb-2.1.4-r1.ebuild 2826 BLAKE2B 39118d964d6497cb1e1184f0bee5cb0736766bc956c769c6c21ca427166406a69f8a35b6d804014f46ea5a8bdf83933111b1e50df493be04159571467b140653 SHA512 fc3b82d24b418d04bd09894a6ec27f2405a3ae91d9e3db0c94f52888867decad1053d0f42f12c7f824673a96adf8bbc2d5272ac84e2020c1e7140357402f7653
+EBUILD ldb-2.2.0-r1.ebuild 2826 BLAKE2B 39118d964d6497cb1e1184f0bee5cb0736766bc956c769c6c21ca427166406a69f8a35b6d804014f46ea5a8bdf83933111b1e50df493be04159571467b140653 SHA512 fc3b82d24b418d04bd09894a6ec27f2405a3ae91d9e3db0c94f52888867decad1053d0f42f12c7f824673a96adf8bbc2d5272ac84e2020c1e7140357402f7653
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.0.10.ebuild b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
index ef525af0a11a..e436f29893c4 100644
--- a/sys-libs/ldb/ldb-2.0.10.ebuild
+++ b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
@@ -37,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
@@ -50,6 +51,10 @@ PATCHES=(
 )
 
 pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
 	python-single-r1_pkg_setup
 }
 
@@ -97,6 +102,8 @@ multilib_src_install() {
 		docinto html
 		dodoc -r apidocs/html/*
 	fi
+
+	use python && python_optimize #726454
 }
 
 pkg_postinst() {
diff --git a/sys-libs/ldb/ldb-2.0.12.ebuild b/sys-libs/ldb/ldb-2.0.12.ebuild
deleted file mode 100644
index 484c8a1afd84..000000000000
--- a/sys-libs/ldb/ldb-2.0.12.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-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 ~sparc ~x86"
-IUSE="doc +ldap +lmdb python test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.2.0[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.2[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.0[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/*
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-2.1.4.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
index e1deb520305b..ac64906fee13 100644
--- a/sys-libs/ldb/ldb-2.1.4.ebuild
+++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
@@ -37,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
@@ -50,6 +51,10 @@ PATCHES=(
 )
 
 pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
 	python-single-r1_pkg_setup
 }
 
@@ -97,6 +102,8 @@ multilib_src_install() {
 		docinto html
 		dodoc -r apidocs/html/*
 	fi
+
+	use python && python_optimize #726454
 }
 
 pkg_postinst() {
diff --git a/sys-libs/ldb/ldb-2.1.3.ebuild b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
index e1deb520305b..ac64906fee13 100644
--- a/sys-libs/ldb/ldb-2.1.3.ebuild
+++ b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
@@ -37,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
@@ -50,6 +51,10 @@ PATCHES=(
 )
 
 pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
 	python-single-r1_pkg_setup
 }
 
@@ -97,6 +102,8 @@ multilib_src_install() {
 		docinto html
 		dodoc -r apidocs/html/*
 	fi
+
+	use python && python_optimize #726454
 }
 
 pkg_postinst() {
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 7cfec11f1e70..6d6455a80a71 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +1,7 @@
 AUX libblockdev-2.23-avoid_bashisms.patch 1760 BLAKE2B 37cdc9ca0a002525646f6a9de162b6a30f3ae9fd331232e3c5bbe287fac687a1ccc496036f94cfa568100c095b7e947e6f6b5ed00a8d926857c102de7b8ce53b SHA512 abba5f533c35e5be47e83e86d3ccc630e122adb465741bfc888d0f6bee2fdcc96ec820626dd02e08fc46a01d30a04652f1d587a9ddef7bb9c58bec7b9053f767
 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
 DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
-EBUILD libblockdev-2.23-r1.ebuild 2634 BLAKE2B d1260e7a462fa469ef96026b57073f094ba270a50166f59fc4727686946f15cd50cee2bfdace38c763bad4035c25e4496da6a42883227d237a5bc7a1c5d6e655 SHA512 2bd2d27d1e052e906ac3f0ca27a45590d45be55d30e4f7af485fc9580d7dec2235bba49730dddccc7bf6ec46d5df489b15cd9f3d7606fb1deab9a959d033a799
-EBUILD libblockdev-2.24.ebuild 2606 BLAKE2B f4780c6c02ca95eca1a1b8968c0a28741f06e785e7c7f920d8d9b7dd27f29f1f932e07037db6873a872bba840b522d39e85c034a87929515744562892d236ccc SHA512 eb41e982a8e9607fbd0272aced19f3fecce0a35486cc841af45f4b000eadc1551d0a131d7ac1d480747b38ad0be67b23c216be9d959ad19bdc37721580ce2dc2
-EBUILD libblockdev-9999.ebuild 2606 BLAKE2B f4780c6c02ca95eca1a1b8968c0a28741f06e785e7c7f920d8d9b7dd27f29f1f932e07037db6873a872bba840b522d39e85c034a87929515744562892d236ccc SHA512 eb41e982a8e9607fbd0272aced19f3fecce0a35486cc841af45f4b000eadc1551d0a131d7ac1d480747b38ad0be67b23c216be9d959ad19bdc37721580ce2dc2
+EBUILD libblockdev-2.23-r1.ebuild 2512 BLAKE2B d47de2cc84c6cfca8e68e6539c072d9932aa8d7ff2cc46450c902227092c2b3128933e6a0ce547353fe1d3d9186cdf0528713535b989a29c52658d924cf42ef8 SHA512 04bd40bf41e1b211ad6c308f1d63439af274e512e290f8fb1d1641a120aecb5e635314a2445882c5a9990afd58c0c16c6e00eb6d2bc914cc8f3aa67aefce068a
+EBUILD libblockdev-2.24.ebuild 2477 BLAKE2B ff1c9978db9683397c24ebf3b42c821236d2e9126e707723cd358f4cd57fefd994facf6363e41c1a8a20471216e8d6438c2cd8e35c0e301844d67f92d6a57eca SHA512 2f7c2e978fe914d5938c5e673e41d3ff0951a3f01b8018a003e1776573a2658663b480d6839b00dab119cd20b29607f6deaed26628b0e84cd2bb45f1dd29ab2d
+EBUILD libblockdev-9999.ebuild 2484 BLAKE2B da622bb77661e14833e82443b0bf382e631339fe770f236b48e0a54e2cee53c4eb6748b9c3432ebdfaa3209db5223051528ef89e66d26691f952f1341d836834 SHA512 26cf1d35b8156fc71aabddc47f7224757d82786704fe2c6a6b36481a2595c43e46b26de5edc01832db3c337f61f1a01d659fe525070bdd524995f4fab8f594d1
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
index 105df4812baa..6007c32f473d 100644
--- a/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
@@ -98,18 +98,9 @@ src_configure() {
 		$(use_with lvm lvm-dbus)
 		$(use_with tools)
 		$(use_with vdo)
+		--without-python2
+		--with-python3
 	)
-	if python_is_python3 ; then
-		myeconfargs+=(
-			--without-python2
-			--with-python3
-		)
-	else
-		myeconfargs+=(
-			--with-python2
-			--without-python3
-		)
-	fi
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
index 1ea252a8b26c..2d41db827580 100644
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild
@@ -19,7 +19,7 @@ else
 	#MY_P="${PN}-${MY_PV}"
 	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 	#S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2+"
@@ -96,18 +96,9 @@ src_configure() {
 		$(use_with lvm lvm-dbus)
 		$(use_with tools)
 		$(use_with vdo)
+		--without-python2
+		--with-python3
 	)
-	if python_is_python3 ; then
-		myeconfargs+=(
-			--without-python2
-			--with-python3
-		)
-	else
-		myeconfargs+=(
-			--with-python2
-			--without-python3
-		)
-	fi
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 1ea252a8b26c..214de07c57c9 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -96,18 +96,9 @@ src_configure() {
 		$(use_with lvm lvm-dbus)
 		$(use_with tools)
 		$(use_with vdo)
+		--without-python2
+		--with-python3
 	)
-	if python_is_python3 ; then
-		myeconfargs+=(
-			--without-python2
-			--with-python3
-		)
-	else
-		myeconfargs+=(
-			--with-python2
-			--without-python3
-		)
-	fi
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 1d4af62ec976..8f00b2c065fc 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,3 +1,5 @@
 DIST libcap-ng-0.7.10.tar.gz 450243 BLAKE2B 8eb21b0309e46b05fa42752b9c814d90bc1eda4852ac7a4975868c279764431a8d5eafc53e50998470f622e2a59e2b4c6c2ac1ac20525c6fcd0633b09b113012 SHA512 1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def
-EBUILD libcap-ng-0.7.10.ebuild 2191 BLAKE2B 76779d0489c6501a913a5319fd8a28628db2d081a8b1f61453ae6ac600b7e9efa1c36bd98893cd6a52e2ad4e735ae731d5ea230f36abcd8e5210341b92901a82 SHA512 1de671f3b2d169bb8bde780fd7cfffc426516f32aeee26abdfd22386b44c0e80b8c3e4ea2477dc1b7c118626d43f85830e67e2def0e76445b0532c54d62c6b17
+DIST libcap-ng-0.7.11.tar.gz 450541 BLAKE2B 66217f7fb9e3b3876ada6f355a2b69f16fda4ab3ab490e524358c4120583280ce6497770ec6452596426594b877d79c0e03db10d6413c1cf20bd01e996f7347b SHA512 150c4f48d7334966aa7af683e46bc3b8b4d4a2e80be826e6f6a61a0ea0666e2f4dafcd012c536fa321c4954c00059c689cc8d6dc089000ca1dca2fd52e3efe9c
+EBUILD libcap-ng-0.7.10.ebuild 2051 BLAKE2B 0af271d6ac33450aea40a2a30babe0aa35944ae805a7ce19cb68811aaa37d2232ae661d43206c7ada85f41e97ade23d502e7fe572981ced38555bbc5337ff0e9 SHA512 67c4fe214505c9be91fdcf3b71962619533669ec1383d23391d96b8d9624201bd18096fea674aee55f6ab34a7e8a32a61c96ef5282e59de2ac29c566f523dea4
+EBUILD libcap-ng-0.7.11.ebuild 2059 BLAKE2B 1449b5306be6edf0ff31c2065ee8752be4404e85cd00c43a30e9ee7f40f5e188cda77119b201683b49d26abfbd83dd62b38067d2dacb23f9c30735a4fb776a14 SHA512 31618b5b583ae3bdb8025dcb706abdda819f965c59a993de0acd2c81ad905754151db3a23dc519f73c2aa9d4a92ec094a17b57e4cd10c8bdaca451de4ef4dacc
 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
index dda9a06b3dae..ffc8687f1aad 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
@@ -19,8 +19,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
+	sys-kernel/linux-headers"
+BDEPEND="python? ( >=dev-lang/swig-2 )"
 
 src_prepare() {
 	default
@@ -44,12 +44,7 @@ src_configure() {
 	# 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
+			pythonconf=( --without-python --with-python3 )
 			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
 		}
 
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
new file mode 100644
index 000000000000..846ebcd8aae4
--- /dev/null
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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 ~sparc ~x86 ~x86-linux"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="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() {
+			pythonconf=( --without-python --with-python3 )
+			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 edb437e0bb9d..57ae8eeca760 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,14 +2,17 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-build-system-fixes.patch 4705 BLAKE2B be3c05b5c798411cc03458c1ce71956ddf2996db71d349e6733a082ec90b264d6a24aa6abaff4b44a65502dc9cd49fe749f11d2fc41fa45879fa0cb6bde2b6ef SHA512 c99df67dfdceefeea3c3033a38e94a93cd7a9c4ed6e74f42c3b7198d66deee4b5d4aa91c540a48b12749ce3285c0ac3f11d0ecc33b913c3f0169578ae28745da
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.26-no-perl.patch 2483 BLAKE2B 34d20ca017119a40e31e2da64786a93c1d5468558e8dfcfb15f3758b6648aaad38bf333c11b35a2c8c4cb66d823e4daefed93b7073a0a65225fe9ef3494ff9ef SHA512 750a64c7b45fd145a043f29b8262c9f972aa4dcfb76afed9e440365c0e55d67d0103491e67a34f0f24ee580656e2fffd589b46b0c5a04b4c9e05b5dac6bbe994
-AUX libcap-2.28-no_perl.patch 2599 BLAKE2B 55a6ef3573517e7cd7f367b811a5b6edc2b91974a23e99a31e1704dd5bcda90dfa3b7fde69c37f48c8ad1d97d0c8d68441830f7cc94adacb50cb54246519cb89 SHA512 40d739250a3508538f7083da700efe47628acd6b213e806b5c9d321ce55ce870dd58073459991b235d3cd3190b53e62e1fcc11f79779bda9239f3e042fb9428b
-AUX libcap-2.34-build-system-fixes.patch 6993 BLAKE2B 66f003f78f3176be90f9e71f6ff1fc3de6005201be398583c3a79854e7b08a6bda384bb49bf24b24994bf4f5d2dfe9c6e82a7351483acad504628d6610a19094 SHA512 2f59a6831ed9b0116fa48becec66fa48fd8668254d3085d45e2c3ab198bde3148617bd7c852b8c7e1ab48d8a563116505e46dddc59d6d1a4eb18d02f86523804
+AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
+AUX libcap-2.39-build-system-fixes.patch 6890 BLAKE2B 175a11c83400e4e1ed1983020b174011c630745ada66b9b18f1dc4d91c4e5f09d3c8b2236c03588efaae894cc2e52c71c23a8368139e3e6b4877347ca1e7e14b SHA512 30bc0d1c18d449ee91ae118ecad34bec87bd282c9139997d6dcba2b6cb5392614df92ed05ae71cd8a092c19c9e6e202d46e7188408bde855f0ea6816f9a5e3cf
+AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
-DIST libcap-2.34.tar.xz 111556 BLAKE2B 083599a899e5cc8942aedc3c932627d8608ea9cdc4eefe716e5fe2fb195276be26373697aa5bb3e84b801ccabb08f78c44f67ed82ea5c383a7c6a4d86f9e06b4 SHA512 6604aeab3de547e16e3c63e35cf41a5aaacf0cb52ffc818c822ada88595437986df731990d4b288eb72f9150de41fb8a93a6a727b936058e88b49b86352c4771
-DIST libcap-2.36.tar.xz 112612 BLAKE2B fec0997eba7af6e9df83ce91235bdd96e98d7284268f0e3d3f4ef41e7b5e0621649a90069f2a162bcecf387c156ff481be379012fc57bbbc59309b850fe879ae SHA512 0193bd1b1b6223260a629458a37db581a0ff61f1d23f439fd2bdd0e6f3acb30ce996fb0f4f86c59670183d9f42932ae1e817e44e6b64f4ff49d61ea3a4a10aa5
+DIST libcap-2.41.tar.xz 139812 BLAKE2B 96630d2ff45e3cc40f18d0a739796bbed4c5b246a48db64b81870c6f200c6cedfed74ed0267261c3de712e9d14799015ccd1a2391e9a2a9c6d5c250864bf841f SHA512 efb778f1fee3da9ccbcc5c05d0e33dfced55a7fdfe17e1f40f121b6ec08b891c0cd95e91e5b6dce84a9cdb62d40f20efe2b26454013e1e898c25c3f9550af0f9
+DIST libcap-2.42.tar.xz 141288 BLAKE2B 1ee5c3934ba88a8127a6d96780a539d8b291e99d2e621660338fb9a9d511470bedfc3406af0bc787fda0ee0c54ce491d65a11a3e92a8da9f5d494c0931de77db SHA512 2abe2d106583a48e3ee0dbc0f82e5ec92a3209cad2abcc1690a12f33364a1dab467b624670a1cdcac0c8d12761e86d5a05bca90aa4199fee75d46e181a695d50
+DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
 EBUILD libcap-2.26-r2.ebuild 2064 BLAKE2B aa5abfd36287b9c97d2d738b7ee22c79861a657cb59752bb6bf41b3d161db25d87f3440c5458bccd6a0c7912fc96b200a8f8bf37f8c2adcfd635e99a8adf5c44 SHA512 f68fa911a03fe962f0b23851c951d25900f1d61750263763e9b9c8a144aa93070c4018552d3b90cafa72254aa5e459489b6c33d3fb27cebc1fd214b817b253fb
 EBUILD libcap-2.27.ebuild 2073 BLAKE2B 97374abb2a068288ec1456020d3896bf59ef358715b749e8fd01c6dab55001944f658623aef58b1415cdb434d441728f0b3c264034d6e71850919c71f0f6a29f SHA512 e76a058c37dd0f4eeae4efebba9f92c4c0f3a8cf924a461870795d6405b832124e79031f3f3e4723eca749cdd8795ec9aa022ca257f10b1d7df3d31912983d46
-EBUILD libcap-2.34.ebuild 2181 BLAKE2B 7ba9a0776b869e13f99e923d6cc81e1b2f6b0f29101149297b91508ca7577bcb56f7c9edb8025ace9928cc805995a6b5373448d3baf3fcecee60edd20042f199 SHA512 991999593030f1af2f999de2d0cdec7973acc915b92b4a6227679194ba5f0ca11f74840c38e813379b07f34cca450b3824133482193f27db9d6b15b285933fef
-EBUILD libcap-2.36.ebuild 2181 BLAKE2B 7ba9a0776b869e13f99e923d6cc81e1b2f6b0f29101149297b91508ca7577bcb56f7c9edb8025ace9928cc805995a6b5373448d3baf3fcecee60edd20042f199 SHA512 991999593030f1af2f999de2d0cdec7973acc915b92b4a6227679194ba5f0ca11f74840c38e813379b07f34cca450b3824133482193f27db9d6b15b285933fef
+EBUILD libcap-2.41.ebuild 2181 BLAKE2B 74eddd214dab22c022b4ef8c9947651f7aa18b758956f8d00399c9e7ac8b4a84502f4e236a43d542bfa234a8b084608e4dba875b5bb9277dcb85f273015657bd SHA512 6da0c74cd79261791e0b46f5baf5c46ae068e72a0c0ea831acabf5f37af4e9b7d83387468603fea7f6549aa91ae3aae7e2efaf05a36e580505892695f640713d
+EBUILD libcap-2.42.ebuild 2181 BLAKE2B c9a26f0bea1a14794fa3692057aa7742cd3f4237279b44f941271c94ce57515505141f6f74718730a159e2a801c3cd13ca0a01db2dfff2eeab8c578628adcc43 SHA512 52e5a0b1bdd050b8e55e6380881bcb45697bec2a03bb8d1c39f3200c36c55ff82c736842117a0c3db03ea5164698a50cda610a72fc7e9cecec3d6e718ccc8ed7
+EBUILD libcap-2.43.ebuild 2181 BLAKE2B c9a26f0bea1a14794fa3692057aa7742cd3f4237279b44f941271c94ce57515505141f6f74718730a159e2a801c3cd13ca0a01db2dfff2eeab8c578628adcc43 SHA512 52e5a0b1bdd050b8e55e6380881bcb45697bec2a03bb8d1c39f3200c36c55ff82c736842117a0c3db03ea5164698a50cda610a72fc7e9cecec3d6e718ccc8ed7
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.28-no_perl.patch b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
index d8a20c2e1310..f3e0c468c869 100644
--- a/sys-libs/libcap/files/libcap-2.28-no_perl.patch
+++ b/sys-libs/libcap/files/libcap-2.38-no_perl.patch
@@ -1,4 +1,4 @@
-From 71ed151782c55b69ad4ce87658c0ce2ccc9c4a86 Mon Sep 17 00:00:00 2001
+From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Wed, 21 Nov 2018 11:00:54 +0100
 Subject: [PATCH] use awk/sed instead of perl for creating header files
@@ -11,14 +11,15 @@ Forward ported from libcap-2.22 to libcap-2.26
 and incorporated the gperf-3.1 fix provided by Mike Gilbert
 <floppym@gentoo.org>
 Forward ported from libcap-2.26 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.38
 
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
- libcap/Makefile | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
+ libcap/Makefile | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
 
 diff --git a/libcap/Makefile b/libcap/Makefile
-index 93f43bf..e2e371d 100644
+index 3d6463d..df2526c 100644
 --- a/libcap/Makefile
 +++ b/libcap/Makefile
 @@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
@@ -28,18 +29,14 @@ index 93f43bf..e2e371d 100644
 +AWK = awk
 +SED = sed
  
- all: $(MINLIBNAME) $(STALIBNAME) libcap.pc $(STAPSXLIBNAME)
+ all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME)
  
-@@ -46,12 +48,22 @@ cap_names.h: _makenames
+@@ -55,17 +57,27 @@ cap_names.h: _makenames
  	./_makenames > cap_names.h
  
  $(GPERF_OUTPUT): cap_names.list.h
 -	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
 -	sed -e 's/unsigned int len/size_t len/' -i $@
--
--cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
--	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
--	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@
 +	(printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \
 +	$(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
 +	gperf \
@@ -52,13 +49,23 @@ index 93f43bf..e2e371d 100644
 +		--hash-function-name=__cap_hash_name \
 +		--lookup-function-name="__cap_lookup_name" \
 +		-c -t -m20 $(INDENT) > $@
+ 
+-# Intention is that libcap keeps up with torvalds' tree, as reflected
+-# by this maintained version of the kernel header. libcap dynamically
+-# trims the meaning of "all" capabilities down to that of the running
+-# kernel as of 2.30.
+ UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h
+ cap_names.list.h: Makefile $(UAPI_HEADER)
+ 	@echo "=> making $@ from $(UAPI_HEADER)"
+-	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@
++	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@
 +
 +cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile
 +	@echo "=> making $@ from $<"
 +	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@
  
- $(STALIBNAME): $(CAPOBJS)
+ $(STACAPLIBNAME): $(CAPOBJS)
  	$(AR) rcs $@ $^
 -- 
-2.24.0
+2.27.0
 
diff --git a/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.39-build-system-fixes.patch
index 126e538633b5..7ae18107f9a5 100644
--- a/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.39-build-system-fixes.patch
@@ -1,4 +1,4 @@
-From ac790bb368d309d1d2add15bbb59559d53cb05bb Mon Sep 17 00:00:00 2001
+From cc1012914a4041eb2b5fb30057f28f62c1788662 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Tue, 5 May 2020 09:52:40 +0200
 Subject: [PATCH] build system fixes
@@ -19,6 +19,8 @@ Forward ported from libcap-2.25 to libcap-2.28
 Forward ported from libcap-2.28 to libcap-2.29
 Forward ported from libcap-2.29 to libcap-2.33
 Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
 
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
@@ -27,14 +29,14 @@ Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
  libcap/Makefile  |  7 ++++---
  pam_cap/Makefile |  8 +++++---
  progs/Makefile   |  2 +-
- tests/Makefile   |  8 +++++---
- 6 files changed, 28 insertions(+), 22 deletions(-)
+ tests/Makefile   |  6 ++++--
+ 6 files changed, 27 insertions(+), 21 deletions(-)
 
 diff --git a/Make.Rules b/Make.Rules
-index 0fbfba0..755581d 100644
+index 98fb9db..889798e 100644
 --- a/Make.Rules
 +++ b/Make.Rules
-@@ -47,36 +47,38 @@ MINOR=34
+@@ -52,37 +52,39 @@ GOMAJOR=0
  # Compilation specifics
  
  KERNEL_HEADERS := $(topdir)/libcap/include/uapi
@@ -79,25 +81,26 @@ index 0fbfba0..755581d 100644
  INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  
--GOLANG := $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
-+GOLANG ?= $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ GO := go
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
  ifeq ($(GOLANG),yes)
- GOROOT := $(shell go env GOROOT)
- GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+ GOROOT := $(shell $(GO) env GOROOT)
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
 diff --git a/Makefile b/Makefile
-index d8cf49c..c0b10a0 100644
+index e148633..b29f5f1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -16,7 +16,6 @@ endif
- ifeq ($(GOLANG),yes)
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
  	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
  endif
 -	$(MAKE) -C tests $@
  	$(MAKE) -C progs $@
  	$(MAKE) -C doc $@
  	$(MAKE) -C kdebug $@
 diff --git a/libcap/Makefile b/libcap/Makefile
-index c2cb0d1..406dfe5 100644
+index 4321c2f..3d6463d 100644
 --- a/libcap/Makefile
 +++ b/libcap/Makefile
 @@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
@@ -117,7 +120,7 @@ index c2cb0d1..406dfe5 100644
  
  cap_names.h: _makenames
  	./_makenames > cap_names.h
-@@ -75,10 +76,10 @@ $(MINLIBNAME): $(CAPOBJS)
+@@ -80,10 +81,10 @@ $(MINLIBNAME): $(CAPOBJS)
  	ln -sf $(MAJLIBNAME) $(LIBNAME)
  
  %.o: %.c $(INCLS)
@@ -177,10 +180,10 @@ index 076e44f..fd13351 100644
  install: all
  	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
 diff --git a/tests/Makefile b/tests/Makefile
-index 3fedeca..3645ddd 100644
+index bfedbc2..2b9a801 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -16,6 +16,8 @@ test: run_psx_test run_libcap_psx_test
+@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
  
  sudotest: test run_libcap_launch_test run_libcap_launch_test
  
@@ -188,15 +191,10 @@ index 3fedeca..3645ddd 100644
 +
  install: all
  
- run_psx_test: psx_test psx_test_wrap
-@@ -23,16 +25,16 @@ run_psx_test: psx_test psx_test_wrap
- 	./psx_test_wrap
+ run_psx_test: psx_test
+ 	./psx_test
  
  psx_test: psx_test.c $(DEPS)
--	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB)
- 
- psx_test_wrap: psx_test.c $(DEPS)
 -	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
  
@@ -210,5 +208,5 @@ index 3fedeca..3645ddd 100644
  run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
  	sudo ./libcap_launch_test
 -- 
-2.26.2
+2.27.0
 
diff --git a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
new file mode 100644
index 000000000000..10959cf93395
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
@@ -0,0 +1,200 @@
+From 8599fc87e91b7903cfb1877983615dadcbcc1b29 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 5 May 2020 09:52:40 +0200
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people.  Specifically:
+        - allow toolchain vars to be set via environment
+        - CC / BUILD_CC / AR / RANLIB
+        - CFLAGS / CPPFLAGS / LDFLAGS
+        - split CPPFLAGS out of CFLAGS
+        - break -fPIC out of global CFLAGS and only use where needed
+        - use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.24 to libcap-2.25
+Forward ported from libcap-2.25 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.29
+Forward ported from libcap-2.29 to libcap-2.33
+Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
+Forward ported from libcap-2.39 to libcap-2.42
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Make.Rules       | 12 +++++++-----
+ Makefile         |  1 -
+ libcap/Makefile  |  7 ++++---
+ pam_cap/Makefile |  8 +++++---
+ progs/Makefile   |  2 +-
+ tests/Makefile   |  6 ++++--
+ 6 files changed, 21 insertions(+), 15 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 8440e18..67fd4a6 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -52,13 +52,12 @@ GOMAJOR=0
+ # Compilation specifics
+ 
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC ?= $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS ?= -O2 $(DEFINES)
+ BUILD_CC ?= $(CC)
+-BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
++BUILD_CFLAGS ?= $(CFLAGS)
+ AR ?= $(CROSS_COMPILE)ar
+ RANLIB ?= $(CROSS_COMPILE)ranlib
+ DEBUG = -g #-DDEBUG
+@@ -73,16 +72,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
+ 
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+-SYSTEM_HEADERS = /usr/include
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ 
+ GO := go
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ ifeq ($(GOLANG),yes)
+ GOROOT := $(shell $(GO) env GOROOT)
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+diff --git a/Makefile b/Makefile
+index 03d7748..4437468 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
+ 	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
+ endif
+-	$(MAKE) -C tests $@
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 	$(MAKE) -C kdebug $@
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 81b089e..63fe555 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+ 
+ all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
+ 
+@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in
+ 		$< >$@
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ cap_test: cap_test.c libcap.h
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile
+index 56604fd..2da4674 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -3,6 +3,8 @@
+ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testlink
+ 
+@@ -16,16 +18,16 @@ install: all
+ # written (and you know why it fails), email me and explain why. Thanks!
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
++	$(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ test_pam_cap: test_pam_cap.c pam_cap.c
+ 	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
+ 
+ testlink: test.c pam_cap.o
+-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+ 
+ test: pam_cap.so
+ 	make testlink
+diff --git a/progs/Makefile b/progs/Makefile
+index 076e44f..fd13351 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS)
+ 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
++	$(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+diff --git a/tests/Makefile b/tests/Makefile
+index bfedbc2..2b9a801 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
+ 
+ sudotest: test run_libcap_launch_test run_libcap_launch_test
+ 
++CFLAGS += -fPIC
++
+ install: all
+ 
+ run_psx_test: psx_test
+ 	./psx_test
+ 
+ psx_test: psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ run_libcap_psx_test: libcap_psx_test
+ 	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+ 
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
+ 	sudo ./libcap_launch_test
+-- 
+2.28.0
+
diff --git a/sys-libs/libcap/libcap-2.34.ebuild b/sys-libs/libcap/libcap-2.41.ebuild
index 3546067e15c6..0b09bd935e0d 100644
--- a/sys-libs/libcap/libcap-2.34.ebuild
+++ b/sys-libs/libcap/libcap-2.41.ebuild
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.34-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.28-no_perl.patch
+	"${FILESDIR}"/${PN}-2.39-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
 )
diff --git a/sys-libs/libcap/libcap-2.36.ebuild b/sys-libs/libcap/libcap-2.42.ebuild
index 3546067e15c6..acba4de6b6cd 100644
--- a/sys-libs/libcap/libcap-2.36.ebuild
+++ b/sys-libs/libcap/libcap-2.42.ebuild
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.34-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.28-no_perl.patch
+	"${FILESDIR}"/${PN}-2.42-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
 )
diff --git a/sys-libs/libcap/libcap-2.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
new file mode 100644
index 000000000000..acba4de6b6cd
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.43.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+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 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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}]"
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	${PDEPEND}
+	sys-kernel/linux-headers"
+
+# Requires test suite being run as root (via sudo)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.42-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+	"${FILESDIR}"/${PN}-2.21-include.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG=no
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	if ! use static-libs ; then
+		# Don't remove libpsx.a!
+		# See https://bugs.gentoo.org/703912
+		rm "${ED}"/usr/$(get_libdir)/libcap.a || die
+	fi
+
+	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
+		rm -r "${ED}"/usr/$(get_libdir)/security || die
+	fi
+
+	if use pam; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 733c1db53887..090192c86488 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,14 +1,14 @@
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
-DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxx-10.0.0.ebuild 6083 BLAKE2B 9b77da1fa6e8bea1f096596a6f8fc3f7df4bf930fcaf16d939f27c35c6cdbfc443621b62e21f5fb3224706610b161f18b39efa2dd0698016b9c27bdffb438c70 SHA512 8cbb92ced5d5c44fc6af89dbc6b5cd4da4aea5306700e02a9e29ca8ce58d46a6678f2f00fdb2263410422ee034dbb050731743d6093bf5fe4cba8c9ff2dfe3c6
-EBUILD libcxx-10.0.1.9999.ebuild 5948 BLAKE2B c21e547b5380231c33457b609f1eb08af7270270c3f1309f17bf751f18b0e06ac0a18ba7a136f76dbaafa3c59e7be91c3829cd35b147da751dfebbc2b075ffc1 SHA512 e6c2c6b3d42cc3af2296d1847ea147ca07f550af1d0b9b7ce7e7a6b1fa034f9da391768bdc4e541da0e6e74912553ddfa1775a0128dc9b798185572919dbc8eb
-EBUILD libcxx-10.0.1_rc1.ebuild 5948 BLAKE2B c21e547b5380231c33457b609f1eb08af7270270c3f1309f17bf751f18b0e06ac0a18ba7a136f76dbaafa3c59e7be91c3829cd35b147da751dfebbc2b075ffc1 SHA512 e6c2c6b3d42cc3af2296d1847ea147ca07f550af1d0b9b7ce7e7a6b1fa034f9da391768bdc4e541da0e6e74912553ddfa1775a0128dc9b798185572919dbc8eb
-EBUILD libcxx-10.0.1_rc2.ebuild 5948 BLAKE2B c21e547b5380231c33457b609f1eb08af7270270c3f1309f17bf751f18b0e06ac0a18ba7a136f76dbaafa3c59e7be91c3829cd35b147da751dfebbc2b075ffc1 SHA512 e6c2c6b3d42cc3af2296d1847ea147ca07f550af1d0b9b7ce7e7a6b1fa034f9da391768bdc4e541da0e6e74912553ddfa1775a0128dc9b798185572919dbc8eb
-EBUILD libcxx-11.0.0.9999.ebuild 5995 BLAKE2B f07fbdeb0e743d0d6b72a26af6f7ab81f790b45419b909b7ba83b444875e51c64f62c33a2255ec81ffedfcaa4f1bd6906cf238754b71d9916ef1527f079b4a49 SHA512 a9138e1818fb59be2b03e3c681a50d7862358aa4f32590f796f166ead82fc5f341e9ddbeb0729347eee29cd6d84072079cd2e839c7f45d3b6a2d3f7abcac48ed
-EBUILD libcxx-8.0.1.ebuild 6539 BLAKE2B 4903d2f0c2102d4c2d373d1ce17d092adddc666e982593bab358af93360c72de2e80b1476383609ee01decaae9c08dd6ae1d473d58caefeb325cabc1042cb9b1 SHA512 5c3627016de412cfe281b2cf7579c4f68a7ae4ba087cf5ab567f0fc24c5585939ec5f7044134df4d2bcd67e5d19e1344e43b37de485f9f2572c04aa405cf8c22
+EBUILD libcxx-10.0.0.ebuild 6080 BLAKE2B 51e502d81dfd67727be527ed485ed932893cfc321ba49259873dade51218a4278b20941c14a970d995b80e71e0307230ec9a6107bb0b0a8003d92c00ab419834 SHA512 f1c43ea15b0f894586c032813b9ad5cc07f41bf0dce1f84e246212a55aaa40b377819665fed2d46eecafb16f0f138aeeee5903e2925b306253dad5e8571e9068
+EBUILD libcxx-10.0.1.ebuild 5971 BLAKE2B e4d7b88fd26c592fc449c52c367a740bbb83764312b60d5f789fdc0f8cd8068fd07c0873e6079e75556091171988d28a35091a99fa5226df739ccc0bdc526bd2 SHA512 47ee0620bc89d4e5b647b660375eb33c1fd4f74d033df4509c4e35b87a4255639dd1e8e28b6991df3d166610199bc54247a3c904489461fcd2193b294ea04f18
+EBUILD libcxx-11.0.0.9999.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
+EBUILD libcxx-11.0.0_rc1.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
+EBUILD libcxx-11.0.0_rc2.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
+EBUILD libcxx-12.0.0.9999.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
 EBUILD libcxx-9.0.1.ebuild 6398 BLAKE2B 0bf084d925f6633809763077300f2221bd7fd67f2d29b1f4febc436b7ff658c51deb7b614807eb9459f466a120e9f7420cf047a1f5583effd48544bdc51aa344 SHA512 77898701b515982851e2e49436705c9166f9c82c011b967b942f3c4f8d2466692e89883d18b28b1ad886692d37b02234a14a80c965c12fc2675fc40baacceebc
 MISC metadata.xml 731 BLAKE2B a6e96906bc2bff950c1b193b01feeb456b064fa585042566eae77dbe9a207bb08dfd083a3ab5fede2133a80b905a61c6dd541f9196e585c60b5629dd04a06213 SHA512 0a25560aa3eff5355137dadbb9cc48e384d2885b89075a97a8dafc7ac0ebe4ec5fde5b171a3416490264791a734c4405ec8a42dfc98e7e830c30ef0cfef58b6f
diff --git a/sys-libs/libcxx/libcxx-10.0.0.ebuild b/sys-libs/libcxx/libcxx-10.0.0.ebuild
index 28d80ab3f631..2fdacef86681 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.1.ebuild
index f96a537e3541..f933ab2e515f 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index 01acafa1f815..22c6462abd9d 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -9,8 +9,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-# libcxxabi is required unconditionally now
-LLVM_COMPONENTS=( libcxx{,abi} )
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-11.0.0_rc1.ebuild
index f96a537e3541..22c6462abd9d 100644
--- a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0_rc1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx )
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -137,7 +137,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-libcxx
+	cmake_build check-cxx
 }
 
 # Usage: deps
diff --git a/sys-libs/libcxx/libcxx-10.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-11.0.0_rc2.ebuild
index f96a537e3541..22c6462abd9d 100644
--- a/sys-libs/libcxx/libcxx-10.0.1_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0_rc2.ebuild
@@ -9,7 +9,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx )
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -137,7 +137,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-libcxx
+	cmake_build check-cxx
 }
 
 # Usage: deps
diff --git a/sys-libs/libcxx/libcxx-8.0.1.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
index f1ddc2f89dd0..22c6462abd9d 100644
--- a/sys-libs/libcxx/libcxx-8.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
@@ -1,57 +1,38 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# 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 )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
-inherit cmake-multilib llvm multiprocessing python-any-r1 \
-	toolchain-funcs
-
-MY_P=${P}.src
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
-REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
-	?? ( libcxxabi libcxxrt )"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
 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] ) )"
+	!libcxxabi? ( >=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}/${MY_P}
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 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}]"
 }
@@ -60,7 +41,7 @@ pkg_setup() {
 	llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 
-	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
+	if ! use libcxxabi && ! 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."
@@ -68,6 +49,14 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	llvm.org_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -80,9 +69,6 @@ src_configure() {
 	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++
@@ -95,7 +81,7 @@ 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
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
 	if use libunwind; then
 		# work-around missing -lunwind upstream
 		extra_libs+=( -lunwind )
@@ -106,6 +92,7 @@ multilib_src_configure() {
 			   ${LDFLAGS} -print-libgcc-file-name)
 			if [[ ${compiler_rt} == *libclang_rt* ]]; then
 				want_gcc_s=OFF
+				want_compiler_rt=ON
 				extra_libs+=( "${compiler_rt}" )
 			fi
 		fi
@@ -132,25 +119,25 @@ multilib_src_configure() {
 		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
 		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
 		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
 		-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}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
-	cmake-utils_src_make check-libcxx
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
 }
 
 # Usage: deps
@@ -170,7 +157,7 @@ END_LDSCRIPT
 
 gen_static_ldscript() {
 	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
 
 	# Move it first.
 	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
@@ -187,7 +174,7 @@ gen_static_ldscript() {
 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")")
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.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)"
@@ -196,7 +183,7 @@ gen_shared_ldscript() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	gen_shared_ldscript
 	use static-libs && gen_static_ldscript
 }
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 90d9adc94b4c..9692f5e625ca 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,14 +1,13 @@
-DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
-DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxxabi-10.0.0.ebuild 3393 BLAKE2B cb5b02ea687c5138cf6bf12274a8b8ec1da5c44daaeca70c562984a35d926c43a1d3a9650a894211d74e866c0adc30c5f460ce79179f1c8752f472efb8638b3c SHA512 d9523bfce7fea9c57b2fd58e861e7fd8983e8bfc1d8f7f714e14c487040a6b0d08345258d4300bf693c58a28324b298fa43bb009083610975acf2c135b3373f8
-EBUILD libcxxabi-10.0.1.9999.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1
-EBUILD libcxxabi-10.0.1_rc1.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1
-EBUILD libcxxabi-10.0.1_rc2.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1
-EBUILD libcxxabi-11.0.0.9999.ebuild 3216 BLAKE2B b5e0ffc7235b3ec87d689f0cbfb048002f76796aad0a0ddfb111716a3bab3d212cb540afa1d89c107edf1d9fa0f8d5c09c96aa3f31ab6a6f9153a501bf9aa423 SHA512 54eb611fac1f62c1251730f1eb374660255f64bcc42996fe37bb0a0a126350925dd0015b7f66414d439048f5adc0cf6df764dce0dd3c21e992e28541d1e4dc25
-EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
+EBUILD libcxxabi-10.0.0.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
+EBUILD libcxxabi-10.0.1.ebuild 3242 BLAKE2B 75a91dbc67b0033c9a81479d8a364226b439fc15d72bdfa95b4385b6152645950ad330264c8bf779f1a79e9a1884cc7dc3010f7aa40ac7030f4732015d694243 SHA512 2a3eacc76503381558fae5987481e8a708cef274b388553162f8c2424d1465f1cff6e336bcbebeb4a79377c92236069cc4ddded8c518b394776ed844b315bcec
+EBUILD libcxxabi-11.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-11.0.0_rc1.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-11.0.0_rc2.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-12.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
index 2ecc31cb4a44..0812b96e62d8 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
index 41a864c31acd..dd5f660654b1 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index 534db9954d2c..4b304417a9c3 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
 # libcxx is needed uncondtionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild
index 41a864c31acd..4b304417a9c3 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
 # libcxx is needed uncondtionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -106,7 +107,7 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-libcxxabi
+	cmake_build check-cxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc2.ebuild
index 41a864c31acd..4b304417a9c3 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc2.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
 # libcxx is needed uncondtionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -106,7 +107,7 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-libcxxabi
+	cmake_build check-cxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
index 74465117dda3..4b304417a9c3 100644
--- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${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
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXX_P}.tar.xz"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS=""
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
@@ -33,15 +29,11 @@ RDEPEND="
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	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}]"
 }
@@ -51,12 +43,17 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	default
-	mv "${LIBCXX_P}" libcxx || die
-}
-
 multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
@@ -64,6 +61,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
 		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
 		# upstream is omitting standard search path for this
@@ -72,16 +70,14 @@ multilib_src_configure() {
 	)
 	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}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxx() {
@@ -90,8 +86,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXX_CXX_ABI=libcxxabi
 		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
@@ -101,8 +97,8 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 multilib_src_test() {
@@ -110,7 +106,8 @@ multilib_src_test() {
 	build_libcxx
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
-	cmake-utils_src_make check-libcxxabi
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index 6788d3ff2acc..85665bf4ff15 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -2,5 +2,5 @@ AUX libhx-3.22-no-lyx.patch 495 BLAKE2B ae31b2ada8230a223413e4f7470b7743592191e8
 DIST libHX-3.22.tar.xz 875516 BLAKE2B 1a782834bb792898275ed549eff1b70b3356f9efe7b58e6aa48e34492b3ad8b5e8a66a142643ad6c13163e5eab6762fdcebd3fe4897d8b0d3f75c80f7ef60b6c SHA512 4a50b7171be9f60e1a1bfefb0641f74fa8879c0edb258533ee04ec89617802c48358dc244497fb18d02dc37f828f79f7c52dd5ce2a07d8a2f5e6e6f7b4e97646
 DIST libHX-3.24.tar.xz 876992 BLAKE2B 518b99e78acc0cb412f444c0dacaae830a853294a0ee549facfbe65a423a9f32d0388e30e255c87c3f5325102bea45e5e9d72d3fce5b89139b689fddcb299f93 SHA512 faf7af53b628efe1531568ccb2b7e9910db833b14583ab1487eb6a554b407a7546bc75348f7d2344c29ab53fd2df061f6f8de8db634bbd62c3672dc4347d27e4
 EBUILD libhx-3.22-r1.ebuild 709 BLAKE2B f7a01fb27edd2031018031ac5fb2f6e8598c66b8766661e400bfd90dd2766d1fc953030d4aefa3f2f4cbf844d7a0b9713a56bfd83409ae8913b6f807b9a7d219 SHA512 47abb821f0e087b219f82cfc900727d4548e60ad80c40f852280be5a275943cb55a47dea155ae25d78725d8ef26cca9b4a93825998ead6d4b91c16389859cd0b
-EBUILD libhx-3.24.ebuild 717 BLAKE2B 7e1fe97ca9d55e316515a1726e2ada842db30087ced54cb272ab17fb352c5470cb8fef626c0d48927f47e0dde9844679690e36568f1989871c2561dc1a5f97c9 SHA512 aec3f99b530a79b3dbc8cc13bbe3de57ce7def62b0c29e6f8c9d5be7a434f16a1aa3ebdd40509de96171c412ee506e6a965d4218c0b7b54dd66d43d198b6a395
+EBUILD libhx-3.24.ebuild 715 BLAKE2B 7126386f55a104a6c4acb34e37cea593d19abe8c5c2f39e85dd97e64994c6606b1c4c107cb2de5633bb7cb04a589f3f25fc56aac865700cf087a8e6cf3af734b SHA512 21690472f32d85174965638b40a4298592f96ea901a68994e9781d8189eab5a76d79e79721422f326651a9c09eedf47dad1467587ce992545b4035cf6b0f065d
 MISC metadata.xml 398 BLAKE2B f72cf11453ffa182e00a8c32e0f1160e2d0ad9f5659ebc76e4139e5494eb3f7e4f5256a7a92e70ebe5b82912a57dd45ca02317557c789958091d2b68a28d884f SHA512 74a2fb87430a3e105fcfdacdbd594f9f64710749760ec4b49f6c7c3fec64f59641c5204b72481d436ae8abd46438b27d04d392ce7d93be68613608909c772fd0
diff --git a/sys-libs/libhx/libhx-3.24.ebuild b/sys-libs/libhx/libhx-3.24.ebuild
index 6360828e2bdb..150e714d3ad1 100644
--- a/sys-libs/libhx/libhx-3.24.ebuild
+++ b/sys-libs/libhx/libhx-3.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
index 0ee54c1e6f88..e67008e4402f 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -6,5 +6,5 @@ AUX libnih-1.0.3-pkg-config.patch 393 BLAKE2B 77ed2af4429624e03e86f00cdb58c015f1
 AUX libnih-1.0.3-signal-race.patch 1432 BLAKE2B b08b7356d2fae755fbe45b2a45b4081c9e1b27ab5aa3a1f71a6945ced5048bc587883de5b9181887a8124f4fc025bcbea4e668ae0e93d5b97e56f67788dd42a8 SHA512 5bd1ff4d7774db62cb6f54721c3b30b5fba1f085a69b28da12f85f448efacb6efd0dd9b9b61801ceb3fc94ca1616fb898bdce33e873f9e57486e44f26c063ed5
 DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
 EBUILD libnih-1.0.3-r3.ebuild 1499 BLAKE2B 81ebd631c031c5f18ca79c582cd582c21b5d605e65976c48f0a75623ed0469bee634387ef976f2c8910ac2365c9944cd9cbd960836704908a4af9c6e62fb113e SHA512 845a2a47d3e193f3c09e5c0486252da24c246dccd409b56d702725995ee1845e719c14fa3ecba6916d2f986aed9762e6f0776792d64206a68af1314a4885fc3d
-EBUILD libnih-1.0.3-r4.ebuild 1555 BLAKE2B 950ef019b57994e8b2e1b921f0eef8e0af2ccddfb3974a33fe710c26fb2eb8ab4278f7252a3662aba2dca682ecbd3be7cf6e28adde89d28588df1ea2d09409fe SHA512 d8f2060c866dc2f04cb89dd59c68e1e40d35922493baa25a853e07cdeb19e5ab008dbd5caa2898c4f283ef863509dfefd418f3b928cec7fb64e843f3b939d9df
+EBUILD libnih-1.0.3-r4.ebuild 1554 BLAKE2B 567a5f2c72519457a1e035bc23c6568245ec7bf4c6179d9a8531ccfb8393e2dc42c39c982c94e3561934e93060c9c6d139874479dc8fb2c82c6e6c257c005fc1 SHA512 5791a42e4a742e86e6d7910781abccd3f3f875229b9015f902a4bbb75bba970308dd10337edc79a2473e3c1ecff8df5ba344719a28cc106e7a65bc162ed1c6e2
 MISC metadata.xml 241 BLAKE2B 02f7c7b912751df8725055416a093647e79dfdbf7f06c9f56246c67f6a1176997454dd3aaaa493ecf7d00d8ae295066e2861ac10bee860a94eef6085437561af SHA512 31e21c0bed310c4a025385f24c5b76f2e588999912fa548ca343947d95ad448b3a1232211cd4427607550c0f5de2e562e2b4e492415b6d207c954a516b811a84
diff --git a/sys-libs/libnih/libnih-1.0.3-r4.ebuild b/sys-libs/libnih/libnih-1.0.3-r4.ebuild
index e391515b3bb0..57cef452203c 100644
--- a/sys-libs/libnih/libnih-1.0.3-r4.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="+dbus nls static-libs +threads"
 
 # The configure phase will check for valgrind headers, and the tests will use
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index ad12298c6867..3b77e3ff7d7c 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,13 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
-EBUILD libomp-10.0.0.ebuild 3017 BLAKE2B 412add0a83096c046ba687d300f14b74d69f251972a423fae97fa3aa643be419e07a1b585707ee2d38eb76ee63f553893259d58216a7acacbd90fa5676ac5a31 SHA512 d23397aa74609682b863b5dd313d16ab6a07ddf8482c28c5548a1c042171f6913f39fb3de87accaafad9053277aa5e36a7351dc878f240dd788331c20c7a136b
-EBUILD libomp-10.0.1.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
-EBUILD libomp-10.0.1_rc1.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
-EBUILD libomp-10.0.1_rc2.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-10.0.0.ebuild 3013 BLAKE2B cebd2bde8d98f6b4941f8c5000295424ee995ca2601224ae0ba535ae3fd327065688d481a498953450364b7725d60b4beea386f859660cac70292882365b8d79 SHA512 1938aff720e1e87fa290076f204feab09eaee1ff6152e65466fc1905a7afb03064a51ed39d3653d17ccf06a68344e2662a148d6913f7eb60797ded593146b8be
+EBUILD libomp-10.0.1.ebuild 2898 BLAKE2B d29654544c5fdf2f2a8724d66547c73f4fb1d0292a78c93e2d0ea3a074d4deba7717db2dd7d311e2c26c4d9d92a0c6e031402894a1afe6769017ee3235875b7c SHA512 19faa4324b1e79ec6e116f29aa25d9aef777a410241c572c1610fbaf8f7ceec56267cec1a3ec7ccb2d3e734fca633848c5029b9adcf3640a78368361a2365d3d
 EBUILD libomp-11.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
-EBUILD libomp-8.0.1.ebuild 3261 BLAKE2B 07d184e3032f81108f842255cd67669eec67cd7da4efbcfae92acc3dae17210522b1d2de6c4ee8067193e8c62883eacc2e12fa94bca050e77dbea257ed4cf60b SHA512 41892cf4263e67877309296ae1bc4ac6002142f6d72255bebaf2c86e3541e4eef556a3bf4489a83a23fde5297bd3c93f564bc92c48f63a7d2acbccb1eacada4a
+EBUILD libomp-11.0.0_rc1.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-11.0.0_rc2.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-12.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-9.0.1.ebuild 3011 BLAKE2B 33ccc441765ab33b61c9739e999039b24437c6f79b89a4db5ee1575b072fd3af609d5c8c583331db81b0b5a24a2a85cc359b4df312330b5732a24c7a8ebe3021 SHA512 404f3df2df27e031b59c4f827b13b2d9ce2b6af4126abdd1d6a233cfe0ec26ede61d01ddf6ca3434b6698ac6407ce8b4a845070b875f92eff4d961280c95ed5a
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild
index 11b2e0535d25..3e9988c75e68 100644
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~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.1.ebuild b/sys-libs/libomp/libomp-10.0.1.ebuild
index 0cb1ed1a721c..c5e2c2a87a89 100644
--- a/sys-libs/libomp/libomp-8.0.1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1.ebuild
@@ -1,27 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
 
-inherit cmake-multilib linux-info multiprocessing python-any-r1
-
-MY_P=openmp-${PV}.src
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
-
-# Additional licenses:
-# - MIT-licensed Intel code,
-# - LLVM Software Grant from Intel.
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~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 ) )"
@@ -38,19 +31,14 @@ RDEPEND="
 # - 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
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
 	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
 	)"
 
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -100,17 +88,17 @@ multilib_src_configure() {
 	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_LIT_ARGS="$(get_lit_flags)"
 
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
 
-	cmake-utils_src_make check-libomp
+	cmake_build check-libomp
 }
diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-11.0.0_rc1.ebuild
index 5bffd6685f64..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0_rc1.ebuild
diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild b/sys-libs/libomp/libomp-11.0.0_rc2.ebuild
index 5bffd6685f64..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0_rc2.ebuild
diff --git a/sys-libs/libomp/libomp-10.0.1_rc2.ebuild b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
index 5bffd6685f64..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-10.0.1_rc2.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 8cb384fdfe8d..86b7b83fe5df 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
 DIST libosinfo-1.6.0.tar.gz 1024787 BLAKE2B 4d0783b41f8c9ed7472c798acede0cd1f3808858ab954e838e8d7543dc50a9819d1f26b0cb02a97c8ed8ebee47db1b915aab5daadc0be2742e8f5c1ba8451a75 SHA512 53359095e40ef12e0cc142ddc92119b4a753bb47a728f13a8ff500a19108a44eb1f6ebe4ed67b04347a707dd0c0d55bcfe6815b57d187237dddd7376ebe9cf5e
+DIST libosinfo-1.8.0.tar.xz 273324 BLAKE2B 0d289df4eb1eb0f9793227b7925cfc37e253a4db0da5c420e7b058d4c060ae50a5609bd25f7d07822e0110e535561f675cf8eddbe6bce0875757f10ee30b2c22 SHA512 1d831443af9eea6a5ba1edccafcd47e56fc55e3cc43c0572044abc9c70c4eb8bbe0d95019d42bbdc3b680a2f52511863412ea9587c6eb553353b3802e94b2960
 EBUILD libosinfo-1.6.0.ebuild 1455 BLAKE2B 303988e1c94622f9819071aec92f0cb3659b9cf5ac025406a85839ed0ddb8f187fd77b7f9c11bb898802d36d49f508da06fd42a27eaa2b696e797a8fd5588ac3 SHA512 5b3da89d1da8fd76f72523262249e45b719d6e23f3f2983b9780a41fcadde2b8e6447645368c2c86527a4c3ebc40569e121a0af65ad402b810b3854d7f8b1714
+EBUILD libosinfo-1.8.0-r1.ebuild 1520 BLAKE2B 809038bc8375c036f98850b2bfcfcdb94c861e252599cba1ad9da2d5e0ad7ef8afaeff4085dd9f265fe5de26017d38d13cb35561551c8acb346f215c978411e8 SHA512 9bf4859a74ad01b64af1cdb8a8043112be45434b4fbcb980e06dc4a3e5175d07bb0d0df83c0c50e8e1eb5d5c6c801fcb64f2e13874eb706cae76423a3d217665
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild b/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..4b5e771089fe
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_feature introspection enable-introspection)
+		$(meson_use test enable-tests)
+		$(meson_feature vala enable-vala)
+		-Dwith-pci-ids-path=/usr/share/misc/pci.ids
+		-Dwith-usb-ids-path=/usr/share/misc/usb.ids
+	)
+	meson_src_configure
+}
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 3b44616661d5..a168a9595a70 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,6 +1,6 @@
-AUX libseccomp-2.4.2-missing_SNR_ppoll_defs.patch 1228 BLAKE2B 4e1a60bec1ee6004367faa559ab15b5a14228df7abd95ec2a3a28ef08346233497573517f43e240f770893e482f4e45b75b107e6e2b5f4825e8ddfe4d14f1451 SHA512 e6d37ff50915ccc0101f1cb2aa7af5061c38d95fc8f51034f944161d5620b0bb8588c296b3be5695427ef5e0ec66b2c660ad0e408485269c0be2aa98991717aa
-DIST libseccomp-2.4.2.tar.gz 601014 BLAKE2B cff2612498a6ff3097809e9e04542e0be12c2c5d80fd51c2abd35fb6ac59f3ef7fce1c5205216876c1f67eb762d31c7df8e0f237f3957b7710148a1298502ae5 SHA512 375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb
 DIST libseccomp-2.4.3.tar.gz 598147 BLAKE2B 272c9f1ca7e4059790f633a79cae8612831aa483d28630fb85b31dc2be0192907a8897819d835b61324e0b3fb0d77b8781e2a85e9750ef8d7974d8680b8cdea3 SHA512 7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef
-EBUILD libseccomp-2.4.2-r1.ebuild 1097 BLAKE2B d72b57d2f44a2792847f2225b4bd012c54afc95f62c4d532493ce7ee827abf1bfbb04f3d52d450d3bcfc72790c562ae6c6169b16c6c5d96811b70a8e7070b913 SHA512 d3892fd1915b514dc345134b3c37b2aea3d906fd998ef5ddcc57e09513422c01710c03929ee1a2266716b7941bf70b0e4593dfd9366d1cdfebb25a5bcd807c31
-EBUILD libseccomp-2.4.3.ebuild 1040 BLAKE2B 3b47fe8281da898943b0c8886e38e35330df9f32a1253c5f5b8fc632ba999654bad4182a0ab4c2d4d30e004c95064cfbea729eebb5bc8a59a4cfffe920ac28f8 SHA512 88a050dcf1d36b223465e417f3764237ea8f6c7226e6661288ffb0d5c3c9e85307373d8ac13864553a1b7e736a20e0e3f0120b7ec5c23f83d435d4cb7a32c2f8
+DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae
+EBUILD libseccomp-2.4.3.ebuild 1032 BLAKE2B 3f2942ea4f43382a14eb139cb56b04d8dec31c9869ca21f5acc2114b647e15187348e42c60c0e5beb14e8827cff9a9c29072081cd5f5053f1dd023f9b5861046 SHA512 3baa16f3d3e6e0f897285a5243d8eef410d664bcd913e203b534bbfe978d9c351f4d5cfebff4975734e73ec5cf9b5a34d67a5ccbe7fe9365ea60d72d7ab08cb7
+EBUILD libseccomp-2.5.0.ebuild 1949 BLAKE2B ebbc4dcc9e29f097b552f5f2d408e4fb9217ba979e75592fb787c70606e14a312c0e181aedb0250261e66bd11724993c5943d2951ebf49a9aab58f420e020bcf SHA512 0b61000ce9a7cde9b0ac55c8c01f0f65eb4b012e7f4b5e76287b38105d330fecf7c12909ad720c6483b93c86ba7993531155152166e22f4897169ca737735fca
+EBUILD libseccomp-9999.ebuild 1949 BLAKE2B ebbc4dcc9e29f097b552f5f2d408e4fb9217ba979e75592fb787c70606e14a312c0e181aedb0250261e66bd11724993c5943d2951ebf49a9aab58f420e020bcf SHA512 0b61000ce9a7cde9b0ac55c8c01f0f65eb4b012e7f4b5e76287b38105d330fecf7c12909ad720c6483b93c86ba7993531155152166e22f4897169ca737735fca
 MISC metadata.xml 468 BLAKE2B f09a751736d4f5f5b5d1cacfbbce2280f2c07f2a435882e833ecd0db3f363ae9e4e7aafaea23d21946279fef27a55d93af9549d75a5f929d6a965dc82f53cfb6 SHA512 3fb402831ab2522948f9514cf0dfad2ed1b035c773eeadb78d958766b92b480b1fb55a274e0990f1913b5be5e4c7de734f8f691f4b3c111949f68f604fb3edc9
diff --git a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
deleted file mode 100644
index 9194706efa06..000000000000
--- a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e3647f5b6b52996bf30d0c2c1d1248e4182e1c1c Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Wed, 13 Nov 2019 13:36:10 +0100
-Subject: [PATCH] api: define __SNR_ppoll again
-
-Commit bf747eb21e428c2b3ead6ebcca27951b681963a0 accidentally removed the
-__SNR_ppoll definition. Add it back, using a PNR value if disabled in
-the kernel headers.
-
-Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- include/seccomp-syscalls.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h
-index 6457592..3c958df 100644
---- a/include/seccomp-syscalls.h
-+++ b/include/seccomp-syscalls.h
-@@ -272,6 +272,7 @@
- #define __PNR_timerfd_gettime64			-10238
- #define __PNR_timerfd_settime64			-10239
- #define __PNR_utimensat_time64			-10240
-+#define __PNR_ppoll				-10241
- 
- /*
-  * libseccomp syscall definitions
-@@ -1359,6 +1360,12 @@
- #define __SNR_poll			__PNR_poll
- #endif
- 
-+#ifdef __NR_ppoll
-+#define __SNR_ppoll			__NR_ppoll
-+#else
-+#define __SNR_ppoll			__PNR_ppoll
-+#endif
-+
- #ifdef __NR_ppoll_time64
- #define __SNR_ppoll_time64		__NR_ppoll_time64
- #else
diff --git a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
deleted file mode 100644
index fc6b67754358..000000000000
--- a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="high level interface to Linux seccomp filter"
-HOMEPAGE="https://github.com/seccomp/libseccomp"
-SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-# We need newer kernel headers; we don't keep strict control of the exact
-# version here, just be safe and pull in the latest stable ones. #551248
-DEPEND=">=sys-kernel/linux-headers-4.3"
-
-PATCHES=(
-	"${FILESDIR}/${P}-missing_SNR_ppoll_defs.patch"
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/_LDFLAGS/s:-static::' \
-		tools/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-python
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name libseccomp.la -delete || die
-	einstalldocs
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
index 5224cb3571a8..fb7d1492bd88 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild b/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
new file mode 100644
index 000000000000..1375d590f41a
--- /dev/null
+++ b/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 multilib-minimal
+
+DESCRIPTION="high level interface to Linux seccomp filter"
+HOMEPAGE="https://github.com/seccomp/libseccomp"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
+	PRERELEASE="2.6.0"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="python static-libs"
+
+REQUIRED_USE="
+	python? (
+		static-libs
+		${PYTHON_REQUIRED_USE}
+	)"
+
+BDEPEND="
+	dev-util/gperf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${BDEPEND}"
+RDEPEND="${DEPEND}"
+
+# We need newer kernel headers; we don't keep strict control of the exact
+# version here, just be safe and pull in the latest stable ones. #551248
+DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-python
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use python ; then
+		cd "${S}/src/python" || die
+		sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \
+			-e "/extra_objects/s,\.\.,${OLDPWD}/src," \
+			setup.py || die
+		local -x CPPFLAGS="-I${OLDPWD}/include -I../../include"
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python ; then
+		cd "${S}/src/python" || die
+		distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "${PN}.la" -delete || die
+	einstalldocs
+}
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
new file mode 100644
index 000000000000..1375d590f41a
--- /dev/null
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 multilib-minimal
+
+DESCRIPTION="high level interface to Linux seccomp filter"
+HOMEPAGE="https://github.com/seccomp/libseccomp"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
+	PRERELEASE="2.6.0"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="python static-libs"
+
+REQUIRED_USE="
+	python? (
+		static-libs
+		${PYTHON_REQUIRED_USE}
+	)"
+
+BDEPEND="
+	dev-util/gperf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${BDEPEND}"
+RDEPEND="${DEPEND}"
+
+# We need newer kernel headers; we don't keep strict control of the exact
+# version here, just be safe and pull in the latest stable ones. #551248
+DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-python
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use python ; then
+		cd "${S}/src/python" || die
+		sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \
+			-e "/extra_objects/s,\.\.,${OLDPWD}/src," \
+			setup.py || die
+		local -x CPPFLAGS="-I${OLDPWD}/include -I../../include"
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python ; then
+		cd "${S}/src/python" || die
+		distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "${PN}.la" -delete || die
+	einstalldocs
+}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index d0aefab329f3..e5f98cfbb1f4 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,13 +1,7 @@
 AUX libunwind-1.2-coredump-regs.patch 619 BLAKE2B b901d50cb7fa4ab372da26120e512da0ca506322130583623eebe31548a65f5a53249b632d71409d77a6dc00eb002beddd44f8a5d11dc82bf8450b812770a023 SHA512 48536ef54590221b42a3ca568ec781e526807b3d8aed3e33e19e6efacfa05a428a6101d3a51e79ea5d3e1d783bcba9acb92f7623c121d3e00cd3e1a17d13e282
 AUX libunwind-1.2-ia64-missing.patch 3863 BLAKE2B 384d2afd7d725f0730207b5b32ff4ffcedd852043af83b1884c7dc95116298eff41bd7f997e0ad51c9912b59e36b439eb524d3d4786f2a0a19dff32437e62003 SHA512 e8f65d706839770d993f9801371e1e294a0231c4bfe29b497e4a859567b7f5b6561b0a15d59b1626311e549fe57149046f5a76424a2ad69c521610aaa3019c17
 AUX libunwind-1.2-ia64-ptrace-coredump.patch 1445 BLAKE2B 0b4b6b5d7b3cfc8be58c3973b096ceeb19faa84f175a23f2130588351e40f94abf5c53a4eb5813d8b9da7762f032671031d2d637bd2ec445f7e4f9ea9d276773 SHA512 0bab310ff16294d7617077ffa1261fe9c1a6aaeb4339c96918869c4dd9a2b1b73fbe2ebb5c895f1a420ff7922da85cbb44ccfcd69df6e2518c1f2ff64b7b2d76
-AUX libunwind-1.2-ia64-undwarf.patch 581 BLAKE2B feed4d06edded9ed27721d3f9530d154d284410f68f0f00c7f8013d1ba506f9860c55707c3b03340eca4954ff63bcde74fe0b4a9c6c1d474305e74884df2653c SHA512 a83dd2d2bea706fb0f57b854015c6f1db882d649e931e12bb1a5524c8176e326d7d4a448f986c9475d1bd4c6e22a0e9a1c813c7a5b47fcd61457806c1f32fe85
-AUX libunwind-1.2.1-arm-__asm__.patch 2350 BLAKE2B de56de0e3bf32cc66d3b9cc85552d063e7844ac3c9fd710d776f2295cc719093baca1320db92ad5c39b93687fe3b9f807005125ace3f163792e5a9f431fad0af SHA512 8a51542afe41a94e084908afa9f8ce4f25ed5b5777744cfe0da7493c68cb74589e3937ba14eb97fe78d839c25e3dcbef0ff93d11975eff34eb1e5ce6cac20fb4
-AUX libunwind-1.2.1-fix_version_macros.patch 381 BLAKE2B 77b523a859a66297eb5677e0eedfc511b6e3cae7058b49da2da41b27d1d22d72b9a662f2b20338eaa5166bd5ae414531695f540098a1dfb674e668ed4c683079 SHA512 4178ed205046dbdf0cea6c7004b866f840e4e3b477a88c3a24f4178e4c642f9d0cfbe7c0f79c6408fad95d8f387f55c912022a78fae382d69e80cd4ff41d8bad
-AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d1506072cbf162831ba3193c0c3ed74f7091dea226c2f9cf06387574ae1d15cc1db1627137f0f80adc542fb5534cf8f6254c SHA512 fe76aef28096ccfdb5c290da631efe8f7cbef13fddb415227f97cfe974162d757a3439b542bee0fe225950200f3cec5e7eecf60c60b2584e2a922618b73e2a7b
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
-DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
 DIST libunwind-1.4.0.tar.gz 872941 BLAKE2B 39628dd46151d2748372c8f1dfa3cd39114770b85e890b048304f8395b2778a22da4cc468eb6fe1e2357a41bed5a6067e12992634859dabe30addd0fd39b4269 SHA512 60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913
-EBUILD libunwind-1.2.1-r3.ebuild 3457 BLAKE2B f4ff7968816cc26db47d9aae87c767ead7275e72c091990ccfadfc80ba93b3eb57fd2786e62597b62ec0f68e39343f157d4917ed4f92caf7e6bd3786faafc89a SHA512 c52f5bf35b19bbf76baea28d80047d799a5f611abb969f8ff15f24ecb3a73b7d0a94ff001d7e9bddae7085af0dbd3ee9e4d7ae61e4ab84b88bd5f7078435c606
-EBUILD libunwind-1.4.0.ebuild 3085 BLAKE2B bb2a6926ff85f442473cdaf239410067ab1d2621c724815b99f3bda82918581b7dcce479be88263659e1b717dc6a1cc58deb17d458391fb1e0769ce7d8ce0b11 SHA512 c1b04473d4e383267237957b2df49cc367683c48b0793fae6f7ab609c55db6d298d0dc32ffd67cdf3114ba062ec8be638bd4e716a0dd73f24316df9bfbabd25f
+EBUILD libunwind-1.4.0.ebuild 3084 BLAKE2B 2c1791c707e2b2fe38abea2faa0f904a414d49c46c61ddc8ced7603294221cdec275758f230a2696e0378db1ea0c4e26fcf66e1e9a2840e32ba90b4ce291ff9f SHA512 efc6aaa08d84b322fb31485c83881447657a6ad588cc5b29a50ff78e3a4ade8a14d4c99370eb042aa19f7baef716decedd71dc1b6697921a66f53c6b80dc87de
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch b/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
deleted file mode 100644
index 1e3e2489828e..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/mi/Gget_proc_name.c b/src/mi/Gget_proc_name.c
-index 5376f82..64d2503 100644
---- a/src/mi/Gget_proc_name.c
-+++ b/src/mi/Gget_proc_name.c
-@@ -106,8 +106,12 @@ unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len,
-   ip = tdep_get_ip (c);
-+#if !defined(__ia64)
-   if (c->dwarf.use_prev_instr)
-     --ip;
-+#endif
-   error = get_proc_name (tdep_get_as (c), ip, buf, buf_len, offp,
-                          tdep_get_as_arg (c));
-+#if !defined(__ia64)
-   if (c->dwarf.use_prev_instr && offp != NULL && error == 0)
-     *offp += 1;
-+#endif
-   return error;
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch b/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
deleted file mode 100644
index 4b6debabefcf..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/635674
-
-From ca6b6f3ad9190814ef7869e8c7e73dae0922f647 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@smile.fr>
-Date: Mon, 3 Jul 2017 15:31:10 +0200
-Subject: [PATCH] libunwind-arm: fix build failure due to asm()
-
-mesa3d on ARM build with libunwind support enabled fail to build due to asm()
-function used when building with -std=c99.
-The gcc documentation [1] suggest to use __asm__ instead of asm.
-
-Fixes:
-https://urldefense.proofpoint.com/v2/url?u=http-3A__autobuild.buildroot.net_results_3ef_3efe156b6494e4392b6c31de447ee2c72acc1a53&d=DwICAg&c=5VD0RTtNlTh3ycd41b3MUw&r=vou6lT5jmE_fWQWZZgNrsMWu4RT87QAB9V07tPHlP5U&m=BlAszRQ0vewy5vW7raCh9FmNOACKez_juz55zoiNfUs&s=4sXL6_rFriQz7qi5ygKXBIVHMc7YSdCBnkkHoi347CU&e=
-
-[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
-Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- include/libunwind-arm.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
-index f208487a..1c856faf 100644
---- a/include/libunwind-arm.h
-+++ b/include/libunwind-arm.h
-@@ -265,7 +265,7 @@ unw_tdep_context_t;
- #ifndef __thumb__
- #define unw_tdep_getcontext(uc) (({                                     \
-   unw_tdep_context_t *unw_ctx = (uc);                                   \
--  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \
-+  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \
-   __asm__ __volatile__ (                                                \
-     "stmia %[base], {r0-r15}"                                           \
-     : : [base] "r" (unw_base) : "memory");                              \
-@@ -273,7 +273,7 @@ unw_tdep_context_t;
- #else /* __thumb__ */
- #define unw_tdep_getcontext(uc) (({                                     \
-   unw_tdep_context_t *unw_ctx = (uc);                                   \
--  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \
-+  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \
-   __asm__ __volatile__ (                                                \
-     ".align 2\nbx pc\nnop\n.code 32\n"                                  \
-     "stmia %[base], {r0-r15}\n"                                         \
--- 
-2.18.0
-
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
deleted file mode 100644
index 63202937084c..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a254bbe..fe0247b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,6 @@
- define(pkg_major, 1)
--define(pkg_minor, 2.1)
--define(pkg_extra, )
-+define(pkg_minor, 2)
-+define(pkg_extra, 1)
- define(pkg_maintainer, libunwind-devel@nongnu.org)
- define(mkvers, $1.$2$3)
- dnl Process this file with autoconf to produce a configure script.
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
deleted file mode 100644
index 6b12d9712ff8..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/659732
-https://github.com/libunwind/libunwind/issues/58
-
-From a1437a3d27924e17d00021df3cc659bd998e8580 Mon Sep 17 00:00:00 2001
-From: Dave Watson <davejwatson@fb.com>
-Date: Thu, 28 Dec 2017 08:26:42 -0800
-Subject: [PATCH] Remove PROTECTED visibility
-
-This only works on bfd ld, not lld or gold.
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -43 +43 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
--#  define PROTECTED     __attribute__((visibility ("protected")))
-+#  define PROTECTED
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
deleted file mode 100644
index 873e84c38ad9..000000000000
--- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-inherit autotools eutils flag-o-matic libtool multilib-minimal
-
-DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
-HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
-SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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)
-
-# We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libunwind.h
-
-	# see libunwind.h for the full list of arch-specific headers
-	/usr/include/libunwind-aarch64.h
-	/usr/include/libunwind-arm.h
-	/usr/include/libunwind-hppa.h
-	/usr/include/libunwind-ia64.h
-	/usr/include/libunwind-mips.h
-	/usr/include/libunwind-ppc32.h
-	/usr/include/libunwind-ppc64.h
-	/usr/include/libunwind-sh.h
-	/usr/include/libunwind-tilegx.h
-	/usr/include/libunwind-x86.h
-	/usr/include/libunwind-x86_64.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
-	"${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
-	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
-	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
-	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
-	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
-	"${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
-	"${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674
-)
-
-src_prepare() {
-	default
-	chmod +x src/ia64/mk_cursor_i || die
-	# Since we have tests disabled via RESTRICT, disable building in the subdir
-	# entirely.  This worksaround some build errors too. #484846
-	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
-
-	elibtoolize
-	eautoreconf
-
-	# Let's wait for proer fix upstream in https://github.com/libunwind/libunwind/issues/154
-	# Meanwhile workaround for gcc-10 with -fcommon, bug #706560
-	append-cflags -fcommon
-}
-
-multilib_src_configure() {
-	# --enable-cxx-exceptions: always enable it, headers provide the interface
-	# and on some archs it is disabled by default causing a mismatch between the
-	# API and the ABI, bug #418253
-	# conservative-checks: validate memory addresses before use; as of 1.0.1,
-	# only x86_64 supports this, yet may be useful for debugging, couple it with
-	# debug useflag.
-	ECONF_SOURCE="${S}" \
-	ac_cv_header_atomic_ops_h=$(usex libatomic) \
-	econf \
-		--enable-cxx-exceptions \
-		--enable-coredump \
-		--enable-ptrace \
-		--enable-setjmp \
-		$(use_enable debug-frame) \
-		$(use_enable doc documentation) \
-		$(use_enable lzma minidebuginfo) \
-		$(use_enable static-libs static) \
-		$(use_enable debug conservative_checks) \
-		$(use_enable debug)
-}
-
-multilib_src_compile() {
-	# Bug 586208
-	CCACHE_NODIRECT=1 default
-}
-
-multilib_src_test() {
-	# Explicitly allow parallel build of tests.
-	# Sandbox causes some tests to freak out.
-	SANDBOX_ON=0 emake check
-}
-
-multilib_src_install() {
-	default
-	# libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
-	# shared library, so we keep it in any case
-	use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
-}
diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild
index cdf70319adf1..f3a6bbb9eff6 100644
--- a/sys-libs/libunwind/libunwind-1.4.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~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" # some tests are broken (toolchain version dependent)
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index b4d2c5285944..15698bd4f87c 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,3 +1,6 @@
 DIST liburing-0.6.tar.bz2 81429 BLAKE2B f905238a324d5e3f4fd0c572aa7db7a2c337aea282175d2a0f89802588d3900d2fb3ef8d6787aea38a406f1ccc57bf143864b708a4716783b09d4208164d2d99 SHA512 07fb0f61cc1d204bd340ef55ec65579a718ca266e4b9c8cdd6e47ae06defa3a9521e83fb3e6ed7c8910f52428dd62f4af900c4ec13c3509c7e366b4c13e7feb5
-EBUILD liburing-0.6.ebuild 989 BLAKE2B 97c9a131c3f7efb9cdd25646337006f69ca4ed6a9308eeec2f60e9228321e638d995c2121d265b225701cc85d82fc3797b9e9c9e766d43900dca68c9fe5b5692 SHA512 65177143574d8c36a2b96a18f900e186ce6f19239fb874684566b82651ea24180fbe091cfa0fc1b3bca754b5fecd6538164426e0971a4723187b9778f1ed40d1
+DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328
+EBUILD liburing-0.6.ebuild 1077 BLAKE2B 61d1f9a0da5d7e0d49a9f7eb05d97e70894160a164c9933d42fe2a49807b0cf655bd5137eec0e3decc877a8520b7532d44eae1c2fe3f923530bc4f709f3cb884 SHA512 f4c72fe74e2c9314d58cca8d1cc61422fe4db5d6f6da46ecb74cee5652ec8dfa42af55c3f7f251443edeadc5a550d5ebebcbc39e84e84b61fe16db4029aa6ee8
+EBUILD liburing-0.7.ebuild 1198 BLAKE2B 3425d5ba265d30e49bb4907921c3675899d3bcddd9be2af1c47240b9f3b0c6478027d2b32c103b03d2136c908413471b7c531aa5e9fcd3feb488f15702c15e43 SHA512 c55a8f903791084321834412707af135c319fef4928f1337c088a35b4a0fa3351b93a36c186062824b0fdbf51c2f691a1d7f48d4da23df58b50f712f7b95367f
+EBUILD liburing-9999.ebuild 1193 BLAKE2B 6d022142dfed675e6cb7c77c9f0ca635e91237f259bf138fa6a0be35f5faea3ffa108bbca48bfc83f3bad299a3dc74b9a9b13095150c112c13ab8254c1037ccc SHA512 9035300d2af584a7b15b1d03d4dfa8e6e16c1a76a093d7f860a24a5db4304676bf2988a7019590d58b44afee9369adaacf48a103ebba778ab85d2e59b7f712ee
 MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
diff --git a/sys-libs/liburing/liburing-0.6.ebuild b/sys-libs/liburing/liburing-0.6.ebuild
index 3f80273282d4..a24e746cdfc1 100644
--- a/sys-libs/liburing/liburing-0.6.ebuild
+++ b/sys-libs/liburing/liburing-0.6.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
 
 src_prepare() {
 	default
@@ -42,3 +44,7 @@ multilib_src_install_all() {
 		find "${ED}" -type f -name "*.a" -delete || die
 	fi
 }
+
+multilib_src_test() {
+	emake V=1 runtests
+}
diff --git a/sys-libs/liburing/liburing-0.7.ebuild b/sys-libs/liburing/liburing-0.7.ebuild
new file mode 100644
index 000000000000..1fdee42809ce
--- /dev/null
+++ b/sys-libs/liburing/liburing-0.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
+else
+	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	emake V=1 runtests
+}
diff --git a/sys-libs/liburing/liburing-9999.ebuild b/sys-libs/liburing/liburing-9999.ebuild
new file mode 100644
index 000000000000..3e0f86f21364
--- /dev/null
+++ b/sys-libs/liburing/liburing-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
+else
+	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	emake V=1 runtests
+}
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 5f5a9fa20985..1dc7de354641 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,5 +1,7 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
 DIST libutempter-1.2.0.tar.gz 17353 BLAKE2B 35e66a32e70fa59639f9a4fb71ba0e89c88aedac04e389cd29397c935daea66bd9f4f04795c977911f136b121d0445f79c0090a60a0353d04af98fe6b9b9ee09 SHA512 24b9fb59269b48bfee397520907c74746a7a38cf12cc002a8adcdd930460036caea7c72fe47b93badf678dc8306786bf4d87f23ee696a524bfc93722ea1eed23
+DIST libutempter-1.2.1.tar.gz 17429 BLAKE2B 88ae0a03a8a614b960082ce4d4006ec4e3eb8148b319ae964ac3ba3f684f08f5dd670e693f25d52d04a280f7b2aed6d2894cbbc0e2db3f71ab68e6910ffb58d1 SHA512 d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429
 EBUILD libutempter-1.1.6-r3.ebuild 1694 BLAKE2B 2190ccd25ddbe4c74f8ff67892c83654e7e37a89ce2b86a855bdd59fa96efd4d76edf9aa7d28bc562469b9ef0b1136263ee848717f75090635a8aceb7ad522c9 SHA512 a251f3a15cbec7df5f07c84337ec9d9dfbcbbc0908dceff6e722aff2e7689c306f4806c4b3ca3559d121b54d7b09e722b432a826513d96dff5d18bce215ebade
 EBUILD libutempter-1.2.0.ebuild 1705 BLAKE2B 0421ad465302e3e8ccbd4369b1ae44043653d751e24168189e0a2dfb1912748fb7c29b0123a27db8587f3dd53697b0fdd95063929614e009ac348b95c59ca0d3 SHA512 8687abd08901b2577f0cf47a7c9820e45858a322c5cbb854c0f72dc362c7777c48f2fd5ed208d15dd574b798f7c300ff582afaeaf01e8fdda3ca5b98be1240ed
+EBUILD libutempter-1.2.1.ebuild 1705 BLAKE2B 0421ad465302e3e8ccbd4369b1ae44043653d751e24168189e0a2dfb1912748fb7c29b0123a27db8587f3dd53697b0fdd95063929614e009ac348b95c59ca0d3 SHA512 8687abd08901b2577f0cf47a7c9820e45858a322c5cbb854c0f72dc362c7777c48f2fd5ed208d15dd574b798f7c300ff582afaeaf01e8fdda3ca5b98be1240ed
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild
new file mode 100644
index 000000000000..271a41f8bde7
--- /dev/null
+++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
+HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
+SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs elibc_FreeBSD"
+
+RDEPEND="
+	!sys-apps/utempter
+	acct-group/utmp
+"
+
+src_prepare() {
+	default
+
+	local args=(
+		-e "/^libdir /s:/usr/lib:${EPREFIX}/usr/$(get_libdir):"
+		-e '/^libexecdir /s:=.*:= $(libdir)/misc:'
+		-e '/^CFLAGS = $(RPM_OPT_FLAGS)/d'
+		-e 's:-Wl,-stats::'
+		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
+		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
+	)
+	use static-libs || args+=(
+			-e '/^STATICLIB/d'
+			-e '/INSTALL.*STATICLIB/d'
+		)
+	sed -i "${args[@]}" Makefile || die
+}
+
+src_configure() {
+	use elibc_FreeBSD && append-libs -lutil
+	tc-export AR CC
+}
+
+src_compile() {
+	emake LDLIBS="${LIBS}"
+}
+
+src_install() {
+	default
+
+	if ! use prefix ; then
+		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
+		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
+	fi
+	dodir /usr/sbin
+	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
+		chown root:utmp "${EROOT}/var/log/wtmp"
+		chmod 664 "${EROOT}/var/log/wtmp"
+	fi
+
+	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
+		chown root:utmp "${EROOT}/var/run/utmp"
+		chmod 664 "${EROOT}/var/run/utmp"
+	fi
+}
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 61521bb82165..84794409d3b8 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -10,5 +10,5 @@ DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c
 EBUILD libxcrypt-2.4.ebuild 649 BLAKE2B 672890b0c7988494047e064cccd5a53323a25a1f40b953a516547fd302abac2c435e2185f31ed3e95884b3136c843f6e1fcc701b08bfc7c68a00e1bae717c124 SHA512 1aa50cd37c918682f043abc694696f6f0b1ac20d71ca2443d776d3eebfddccddab9e8e31f19ba8b473099124fb9f1d8eccb92d2efe5e7aa1b7b1bcd6393cbbcb
 EBUILD libxcrypt-4.4.10-r1.ebuild 3662 BLAKE2B 3ca592fb85f417b6d36613123ea86067dc1153b8e59acbb76ffbfad3aa1bb3b7024907225e8bd1f401e4bfbf766072c750cf39e3f0d270920520560b61dd3140 SHA512 3002fc88260a5b3a7695de457e9bcf4b0a085de239d4bcd06d627fea29d9567734ef73e4dd5eae73c29d36928e5fb9834a3335879ef7628c23b323aff484f6a6
 EBUILD libxcrypt-4.4.12-r3.ebuild 4177 BLAKE2B e0094f7c1a9ea955a0570951c33ba4e8ed114500b2426295e106d090f4cfd73671327f7da22721714e6026375cc2cd0e8584c3460b198ef593767b82fb614e67 SHA512 d10ba7899927c3aaefeab8e7eb282cd1ca89744dfa36e715c668f4f7077b0e03027db5c1c70ebf2f82de41aa8b66ac8123c56e82cb62524fe0b70106cb55e808
-EBUILD libxcrypt-4.4.16.ebuild 4196 BLAKE2B 3fbf631539297f6e47fd1ecf5c1c2d3ea6ccf5a0871ee27ab9ff33983c7428edf99196feae611a0edbd5f6fce90620e7348e761dac3865165647d3b51bcf9084 SHA512 9586c8111b2ac6612253dd6273e54e723eaa2285172efd294620a45569f0e661c8cebfaa17b2a3f3d9326cedd00dab9cc6a469eb11089877bb318a2c36e606c8
+EBUILD libxcrypt-4.4.16.ebuild 4194 BLAKE2B 2db05b3f147b69116373aa37f83591cf9eb82dabe4ee57dcb2c39c41df7b76107e43054ea886589d6f3521a57a4dffb3ba7de9eb259c431f7375fde4cfb899f7 SHA512 288c81206e0e3c32901bacd0ce5d8b96275162801dddaed62490615297df7628f80193bfd0f36c1282d052377f4360e2e77679ffa29f7f403ecb1cd66df440fb
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
index 6046655b8148..c2e66761e433 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/besser82/libxcrypt"
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+compat split-usr +static-libs system test"
 
 DEPEND="system? (
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index ab9fed18dc5f..2938809446e7 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,15 +1,13 @@
-DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
-DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
-DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-libunwind-10.0.0.ebuild 3359 BLAKE2B 2682dbfdf653a31a7af7a1735efed5443bb16843b0f75412a842d19a5345228ebaa7219d4f9b64c0a10481fc0c2e078ee3035d6faba776d239c4badb38976bd3 SHA512 a65270d641a2f58946b733aaeab79dbb3cfa507d9291da2fd7a7a98124795d11aedb6a8351836c9de19dbd332475ae7e0a2d5f847ec42bffc2313e1b56c72e51
-EBUILD llvm-libunwind-10.0.1.9999.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
-EBUILD llvm-libunwind-10.0.1_rc1.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
-EBUILD llvm-libunwind-10.0.1_rc2.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
-EBUILD llvm-libunwind-11.0.0.9999.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
-EBUILD llvm-libunwind-8.0.1.ebuild 3815 BLAKE2B 52a00f299c179b3b826702e6b76468922745be47e97542ad2e620879c14434f7ab334089a529ed9c27584c17f8e805bad783710c288c2e5d4258487c2b502186 SHA512 b956f3a085591de5a1519c7b5830c625a085ab2f178ca5b5e7d55b6f4cb23e0b64eeb108d3d45fd18f8420da5898ec2099e6f6d68fc575e5f9bbc846b98865e2
+EBUILD llvm-libunwind-10.0.0.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
+EBUILD llvm-libunwind-10.0.1.ebuild 3190 BLAKE2B 2d61b9d911316c426585e671bdee2644ed205db842d9ae2b19641eb3412ace66721262d378b86f430c5206f67d988b3e6b6cd1d5736e1712639de6d9c5b986e8 SHA512 5dd0f352201601b2ee6d357774266e2e5962f77f888680e51806679645082134d21169eecc5d67687982cf3f1c22c7ee04e2b4aa6dd751d0dfae5ab3adf75bac
+EBUILD llvm-libunwind-11.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-11.0.0_rc1.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-11.0.0_rc2.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-12.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
 EBUILD llvm-libunwind-9.0.1.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
index c8d1dbb91a24..782f15e8964f 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
index 711bac7d068f..0035a57ad502 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
index 711bac7d068f..fff362b926dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
@@ -10,7 +10,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc1.ebuild
index 711bac7d068f..fff362b926dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc1.ebuild
@@ -10,7 +10,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc2.ebuild
index 711bac7d068f..fff362b926dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc2.ebuild
@@ -10,7 +10,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
index f31969be8e58..fff362b926dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
@@ -1,43 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=libunwind-${PV/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-LIBCXXABI_P=libcxxabi-${PV/_/}.src
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
-	test? (
-		https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXX_P}.tar.xz
-		https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXXABI_P}.tar.xz )"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS=""
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
 DEPEND="
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	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}]"
 }
@@ -46,15 +35,6 @@ 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)
 
@@ -70,18 +50,16 @@ multilib_src_configure() {
 	)
 	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
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -90,8 +68,8 @@ build_libcxxabi() {
 	local BUILD_DIR=${BUILD_DIR}/libcxxabi
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=OFF
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXXABI_INCLUDE_TESTS=OFF
 
@@ -99,8 +77,8 @@ build_libcxxabi() {
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 build_libcxx() {
@@ -109,8 +87,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXX_CXX_ABI=libcxxabi
@@ -121,8 +99,8 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 multilib_src_test() {
@@ -132,11 +110,12 @@ multilib_src_test() {
 	build_libcxx
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
-	cmake-utils_src_make check-unwind
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install headers like sys-libs/libunwind
 	doheader "${S}"/include/*.h
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index dfd30935bb08..9f5b26569797 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,7 +4,9 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
 DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
+DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
 EBUILD musl-1.1.24.ebuild 3299 BLAKE2B 17a4f78ae35c583480621880845dca6cbe55638519f25470a2bdf0922705caaeeb65a760763244b8890381714fc162487d22f07d15e20f163cb5f6cb7543b870 SHA512 984c0a1542ab23354d6e5dccad8c4ff6bab68ca9b52bba5ec36364ee997798ad0ee6f85b7ca7e66a78eead3e199c8dbe51d3e9df84d5c4df0f887428844f1ac9
 EBUILD musl-1.2.0-r1.ebuild 3258 BLAKE2B 7a8edb02b626e2cdc1ae65bfc56973c98fb874990a1ca81d3fcb1b539512efad6e5874a41bd31769965874058f27d657776137a90bdbe5d2c6eefc033c18c447 SHA512 1e7f3ff9da0870b0f42c6ae364df2155d55208ed05e445ed63862600143f01fbad428f9cb6578052f7cd7536f6cec975fc618b2b92839f04e9ba186e988e0806
+EBUILD musl-1.2.1.ebuild 3256 BLAKE2B 29ea386004127256cf45713b1f82e788c557ae9e602bf5623e1523e3ddfe4caeb87ca86d8f7edb770d8805ab046473e70df606e43c89ef45c8a7034d581da20b SHA512 f4bba2bf005d85f4edc133088405ba41ed9c5a38127f7c67796ea31767f65f475c008e06f4a95914bc5e2b8443eb30700c7a630b61778cf3f21864b233303d08
 EBUILD musl-9999.ebuild 3258 BLAKE2B 7a8edb02b626e2cdc1ae65bfc56973c98fb874990a1ca81d3fcb1b539512efad6e5874a41bd31769965874058f27d657776137a90bdbe5d2c6eefc033c18c447 SHA512 1e7f3ff9da0870b0f42c6ae364df2155d55208ed05e445ed63862600143f01fbad428f9cb6578052f7cd7536f6cec975fc618b2b92839f04e9ba186e988e0806
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.2.1.ebuild b/sys-libs/musl/musl-1.2.1.ebuild
new file mode 100644
index 000000000000..69c39b164c3f
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	# fix for #667126, copied from glibc ebuild
+	# make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		emake -C "${T}" getconf getent iconv \
+			CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS}" \
+			CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			VPATH="${DISTDIR}"
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		# Fish out of config:
+		#   ARCH = ...
+		#   SUBARCH = ...
+		# and print $(ARCH)$(SUBARCH).
+		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index ba157ea6f15d..66936b5befb5 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -5,11 +5,6 @@ AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd
 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
 AUX ncurses-6.2-no_user_ldflags_in_libs.patch 1254 BLAKE2B ccc2cd660bf102b61118f0ca170d079454b47a2eee41f9fb1e2b82dc241233adeb1481221fc25ce15b8c101cab200e5eefffde4ff0fbf102d8acf16fe222c40c SHA512 17e365302c683b7fc59b4ed870738b8ab487b9cc1e074d9629e1963120b6ea69b4c3b47b42c80524630d56e1b27519c6f8451397ae892ad759d1d0f019057418
-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
 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
-EBUILD ncurses-6.1_p20181020.ebuild 9293 BLAKE2B 8ce72eed16d81cd82a9e588782b1a2d09840f7a95a7a0358dec0fe9b77a4f46d3d50fe9ba55867b45270999f269b29ec985e1c79e6ed983a9d55a7bf1194ec20 SHA512 281e363326b0f92b0d9dc0c8e753bfec38ac6bfabca490871fda8ca7fa8f6850f7c08e647263ed8e9389370f3fde2c3c0ea5ffeee93acb629e6593d0831aa595
-EBUILD ncurses-6.1_p20190609.ebuild 9489 BLAKE2B bb0bca320c2d4d651b8176049694e2db185f28d5d150b994be8da1b571e20396cf77b95abb9c70fe09c1b2c1a298484f09358ac5fdf364de03e7f1053dc06ad7 SHA512 45aeccee896cf01e9efcc605b849a2c96b90f538d29fe4ffe8d5430b718c7bf73cf17ae4efcf74173fa1425957b8bf0a668ad107f88b9d8293ae5d81303e1d7e
 EBUILD ncurses-6.2-r1.ebuild 9544 BLAKE2B 0820025fec160513a4e8db5d1f249c6bdbf32ba992385189a8539630695d1ed65407dfa25f65ceec272c3beccde5d3576f293eeb2002f68a5a8ac48f9ff922ec SHA512 96bda407ac56dd6814fcf51361aeeeb6eca440590496f64647b4b386d5534438c2f026219093fdd2df9b471e72bdec5c62b10d701fe7be72618dd35f82ddc359
 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
deleted file mode 100644
index f9e2b3a1a1e6..000000000000
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${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"
-
-if [[ "${PV}" == *_p* ]] ; then
-	SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
-		https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
-fi
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-#	berkdb? ( sys-libs/db )"
-# Block the older ncurses that installed all files w/SLOT=5. #557472
-RDEPEND="${DEPEND}
-	!<=sys-libs/ncurses-5.9-r4:5
-	!<sys-libs/slang-2.3.2_pre23
-	!<x11-terms/rxvt-unicode-9.06-r3
-	!<x11-terms/st-0.6-r1"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7-nongnu.patch"
-	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
-	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
-	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
-	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
-	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
-)
-
-src_prepare() {
-	if [[ "${PV}" == *_p* ]] ; then
-		eapply "${WORKDIR}"/${P/_p/-}-patch.sh
-	fi
-	default
-}
-
-src_configure() {
-	unset TERMINFO #115036
-	tc-export_build_env BUILD_{CC,CPP}
-	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
-	# The naming is also important as we use these directly with filenames and when
-	# checking configure flags.
-	NCURSES_TARGETS=(
-		ncurses
-		$(usex unicode 'ncursesw' '')
-		$(usex threads 'ncursest' '')
-		$(use unicode && usex threads 'ncursestw' '')
-	)
-
-	# When installing ncurses, we have to use a compatible version of tic.
-	# This comes up when cross-compiling, doing multilib builds, upgrading,
-	# or installing for the first time.  Build a local copy of tic whenever
-	# the host version isn't available. #249363 #557598
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		local lbuildflags="-static"
-
-		# some toolchains don't quite support static linking
-		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
-		case ${CHOST} in
-			*-darwin*)  dbuildflags=     ;;
-			*-aix*)     dbuildflags=     ;;
-		esac
-		echo "int main() {}" | \
-			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
-			|| lbuildflags="${dbuildflags}"
-
-		# We can't re-use the multilib BUILD_DIR because we run outside of it.
-		BUILD_DIR="${WORKDIR}" \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		do_configure cross --without-shared --with-normal
-	fi
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
-	done
-}
-
-do_configure() {
-	local target=$1
-	shift
-
-	mkdir "${BUILD_DIR}/${target}" || die
-	cd "${BUILD_DIR}/${target}" || die
-
-	local conf=(
-		# We need the basic terminfo files in /etc, bug #37026.  We will
-		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-		# src_install() ...
-		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
-
-		# Disabled until #245417 is sorted out.
-		#$(use_with berkdb hashed-db)
-
-		# Enable installation of .pc files.
-		--enable-pc-files
-		# This path is used to control where the .pc files are installed.
-		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-
-		# Now the rest of the various standard flags.
-		--with-shared
-		--without-hashed-db
-		$(use_with ada)
-		$(use_with cxx)
-		$(use_with cxx cxx-binding)
-		--with-cxx-shared
-		$(use_with debug)
-		$(use_with profile)
-		# The configure script uses ldd to parse the linked output which
-		# is flaky for cross-compiling/multilib/ldd versions/etc...
-		$(use_with gpm gpm libgpm.so.1)
-		# Required for building  on mingw-w64, and possibly other windows
-		# platforms, bug #639670
-		$(use_enable kernel_Winnt term-driver)
-		--disable-termcap
-		--enable-symlinks
-		--with-rcs-ids
-		--with-manpage-format=normal
-		--enable-const
-		--enable-colorfgbg
-		--enable-hard-tabs
-		--enable-echo
-		$(use_enable !ada warnings)
-		$(use_with debug assertions)
-		$(use_enable !debug leaks)
-		$(use_with debug expanded)
-		$(use_with !debug macros)
-		$(multilib_native_with progs)
-		$(use_with test tests)
-		$(use_with trace)
-		$(use_with tinfo termlib)
-		--disable-stripping
-	)
-
-	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
-	else
-		conf+=( --disable-widec )
-	fi
-	if [[ ${target} == ncursest* ]] ; then
-		conf+=( --with-{pthread,reentrant} )
-	else
-		conf+=( --without-{pthread,reentrant} )
-	fi
-	# Make sure each variant goes in a unique location.
-	if [[ ${target} == "ncurses" ]] ; then
-		# "ncurses" variant goes into "${EPREFIX}"/usr/include
-		# It is needed on Prefix because the configure script appends
-		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-		conf+=( --enable-overwrite )
-	else
-		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
-	fi
-	# See comments in src_configure.
-	if [[ ${target} != "cross" ]] ; then
-		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
-	fi
-
-	# Force bash until upstream rebuilds the configure script with a newer
-	# version of autotools. #545532
-	CONFIG_SHELL=${EPREFIX}/bin/bash \
-	ECONF_SOURCE="${S}" \
-	econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-	# See comments in src_configure.
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		BUILD_DIR="${WORKDIR}" \
-		do_compile cross -C progs tic
-	fi
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
-	done
-}
-
-do_compile() {
-	local target=$1
-	shift
-
-	cd "${BUILD_DIR}/${target}" || die
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.
-	emake -j1 sources
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
-	emake "$@"
-}
-
-multilib_src_install() {
-	local target
-	for target in "${NCURSES_TARGETS[@]}" ; do
-		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
-	done
-
-	# Move main libraries into /.
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a \
-			"${NCURSES_TARGETS[@]}" \
-			$(use tinfo && usex unicode 'tinfow' '') \
-			$(usev tinfo)
-	fi
-	if ! tc-is-static-only ; then
-		# Provide a link for -lcurses.
-		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
-	fi
-	# don't delete '*.dll.a', needed for linking #631468
-	if ! use static-libs; then
-		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-	fi
-
-	# Build fails to create this ...
-	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-}
-
-multilib_src_install_all() {
-#	if ! use berkdb ; then
-		# We need the basic terminfo files in /etc for embedded/recovery. #37026
-		einfo "Installing basic terminfo files in /etc..."
-		local terms=(
-			# Dumb/simple values that show up when using the in-kernel VT.
-			ansi console dumb linux
-			vt{52,100,102,200,220}
-			# [u]rxvt users used to be pretty common.  Probably should drop this
-			# since upstream is dead and people are moving away from it.
-			rxvt{,-unicode}{,-256color}
-			# xterm users are common, as is terminals re-using/spoofing it.
-			xterm xterm-{,256}color
-			# screen is common (and reused by tmux).
-			screen{,-256color}
-			screen.xterm-256color
-		)
-		local x
-		for x in "${terms[@]}"; do
-			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-			local basedir=$(basename "$(dirname "${termfile}")")
-
-			if [[ -n ${termfile} ]] ; then
-				dodir "/etc/terminfo/${basedir}"
-				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-				dosym "../../../../etc/terminfo/${basedir}/${x}" \
-					"/usr/share/terminfo/${basedir}/${x}"
-			fi
-		done
-#	fi
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
-
-	use minimal && rm -r "${ED}"/usr/share/terminfo*
-	# Because ncurses5-config --terminfo returns the directory we keep it
-	keepdir /usr/share/terminfo #245374
-
-	cd "${S}" || die
-	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libncurses.so.5
-	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}
diff --git a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
deleted file mode 100644
index cb824856ffa7..000000000000
--- a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${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"
-
-if [[ "${PV}" == *_p* ]] ; then
-	SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
-		https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
-fi
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-#	berkdb? ( sys-libs/db )"
-# Block the older ncurses that installed all files w/SLOT=5. #557472
-RDEPEND="${DEPEND}
-	!<=sys-libs/ncurses-5.9-r4:5
-	!<sys-libs/slang-2.3.2_pre23
-	!<x11-terms/rxvt-unicode-9.06-r3
-	!<x11-terms/st-0.6-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7-nongnu.patch"
-	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
-	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
-	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
-	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
-	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
-)
-
-src_prepare() {
-	if [[ "${PV}" == *_p* ]] ; then
-		eapply "${WORKDIR}"/${P/_p/-}-patch.sh
-	fi
-	default
-}
-
-src_configure() {
-	unset TERMINFO #115036
-	tc-export_build_env BUILD_{CC,CPP}
-	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
-	# The naming is also important as we use these directly with filenames and when
-	# checking configure flags.
-	NCURSES_TARGETS=(
-		ncurses
-		$(usex unicode 'ncursesw' '')
-		$(usex threads 'ncursest' '')
-		$(use unicode && usex threads 'ncursestw' '')
-	)
-
-	# When installing ncurses, we have to use a compatible version of tic.
-	# This comes up when cross-compiling, doing multilib builds, upgrading,
-	# or installing for the first time.  Build a local copy of tic whenever
-	# the host version isn't available. #249363 #557598
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		local lbuildflags="-static"
-
-		# some toolchains don't quite support static linking
-		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
-		case ${CHOST} in
-			*-darwin*)  dbuildflags=     ;;
-			*-aix*)     dbuildflags=     ;;
-		esac
-		echo "int main() {}" | \
-			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
-			|| lbuildflags="${dbuildflags}"
-
-		# We can't re-use the multilib BUILD_DIR because we run outside of it.
-		BUILD_DIR="${WORKDIR}" \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		do_configure cross --without-shared --with-normal
-	fi
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
-	done
-}
-
-do_configure() {
-	local target=$1
-	shift
-
-	mkdir "${BUILD_DIR}/${target}" || die
-	cd "${BUILD_DIR}/${target}" || die
-
-	local conf=(
-		# We need the basic terminfo files in /etc, bug #37026.  We will
-		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-		# src_install() ...
-		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
-
-		# Disabled until #245417 is sorted out.
-		#$(use_with berkdb hashed-db)
-
-		# Enable installation of .pc files.
-		--enable-pc-files
-		# This path is used to control where the .pc files are installed.
-		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-
-		# Now the rest of the various standard flags.
-		--with-shared
-		--without-hashed-db
-		$(use_with ada)
-		$(use_with cxx)
-		$(use_with cxx cxx-binding)
-		--with-cxx-shared
-		$(use_with debug)
-		$(use_with profile)
-		# The configure script uses ldd to parse the linked output which
-		# is flaky for cross-compiling/multilib/ldd versions/etc...
-		$(use_with gpm gpm libgpm.so.1)
-		# Required for building  on mingw-w64, and possibly other windows
-		# platforms, bug #639670
-		$(use_enable kernel_Winnt term-driver)
-		--disable-termcap
-		--enable-symlinks
-		--with-rcs-ids
-		--with-manpage-format=normal
-		--enable-const
-		--enable-colorfgbg
-		--enable-hard-tabs
-		--enable-echo
-		$(use_enable !ada warnings)
-		$(use_with debug assertions)
-		$(use_enable !debug leaks)
-		$(use_with debug expanded)
-		$(use_with !debug macros)
-		$(multilib_native_with progs)
-		$(use_with test tests)
-		$(use_with trace)
-		$(use_with tinfo termlib)
-		--disable-stripping
-	)
-
-	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
-	else
-		conf+=( --disable-widec )
-	fi
-	if [[ ${target} == ncursest* ]] ; then
-		conf+=( --with-{pthread,reentrant} )
-	else
-		conf+=( --without-{pthread,reentrant} )
-	fi
-	# Make sure each variant goes in a unique location.
-	if [[ ${target} == "ncurses" ]] ; then
-		# "ncurses" variant goes into "${EPREFIX}"/usr/include
-		# It is needed on Prefix because the configure script appends
-		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-		conf+=( --enable-overwrite )
-	else
-		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
-	fi
-	# See comments in src_configure.
-	if [[ ${target} != "cross" ]] ; then
-		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
-	fi
-
-	# Force bash until upstream rebuilds the configure script with a newer
-	# version of autotools. #545532
-	CONFIG_SHELL=${EPREFIX}/bin/bash \
-	ECONF_SOURCE="${S}" \
-	econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-	# See comments in src_configure.
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		BUILD_DIR="${WORKDIR}" \
-		do_compile cross -C progs tic
-	fi
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
-	done
-}
-
-do_compile() {
-	local target=$1
-	shift
-
-	cd "${BUILD_DIR}/${target}" || die
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.
-	emake -j1 sources
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
-	emake "$@"
-}
-
-multilib_src_install() {
-	local target
-	for target in "${NCURSES_TARGETS[@]}" ; do
-		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
-	done
-
-	# Move main libraries into /.
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a \
-			"${NCURSES_TARGETS[@]}" \
-			$(use tinfo && usex unicode 'tinfow' '') \
-			$(usev tinfo)
-	fi
-	if ! tc-is-static-only ; then
-		# Provide a link for -lcurses.
-		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
-	fi
-	# don't delete '*.dll.a', needed for linking #631468
-	if ! use static-libs; then
-		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-	fi
-
-	# Build fails to create this ...
-	# -FIXME-
-	# Ugly hackaround for riscv having two parts libdir (#689240)
-	# Replace this hack with an official solution once we have one...
-	# -FIXME-
-	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-		/usr/$(get_libdir)/terminfo
-}
-
-multilib_src_install_all() {
-#	if ! use berkdb ; then
-		# We need the basic terminfo files in /etc for embedded/recovery. #37026
-		einfo "Installing basic terminfo files in /etc..."
-		local terms=(
-			# Dumb/simple values that show up when using the in-kernel VT.
-			ansi console dumb linux
-			vt{52,100,102,200,220}
-			# [u]rxvt users used to be pretty common.  Probably should drop this
-			# since upstream is dead and people are moving away from it.
-			rxvt{,-unicode}{,-256color}
-			# xterm users are common, as is terminals re-using/spoofing it.
-			xterm xterm-{,256}color
-			# screen is common (and reused by tmux).
-			screen{,-256color}
-			screen.xterm-256color
-		)
-		local x
-		for x in "${terms[@]}"; do
-			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-			local basedir=$(basename "$(dirname "${termfile}")")
-
-			if [[ -n ${termfile} ]] ; then
-				dodir "/etc/terminfo/${basedir}"
-				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-				dosym "../../../../etc/terminfo/${basedir}/${x}" \
-					"/usr/share/terminfo/${basedir}/${x}"
-			fi
-		done
-#	fi
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
-
-	use minimal && rm -r "${ED}"/usr/share/terminfo*
-	# Because ncurses5-config --terminfo returns the directory we keep it
-	keepdir /usr/share/terminfo #245374
-
-	cd "${S}" || die
-	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libncurses.so.5
-	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index a62939fe3203..4e9d629d9507 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -5,5 +5,5 @@ DIST OpenIPMI-2.0.28.tar.gz 3118911 BLAKE2B 0f4192dc536ec1767ee72cf9f0d2c3b021e5
 DIST OpenIPMI-2.0.29.tar.gz 3119530 BLAKE2B 5c60b04e828699c396cb7ce29dca7665109d7b39c3d64535fafdca328c01eab0af9cc4d7fd1a30aa254836f6ce10a16e491fb7239777dc4d57edc65c20998504 SHA512 ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10
 EBUILD openipmi-2.0.27-r1.ebuild 2322 BLAKE2B b8421f48e67af99154607e36216fa69ed62330f37314764c90ce29f623343be3fc1ede6755f6e3dd082a508db045745f7955fe9383441197006170edac0668a9 SHA512 9f9c1806008f49d31aaabfd58390ae024a5df6f1365ac287637c6748eec33b676dc7205f282c7a50f17228a5d6212b3587991870341ee95d4480bb8a3417bbce
 EBUILD openipmi-2.0.28.ebuild 2289 BLAKE2B 807965405e3d9e5465440ec86abbcb8c437b16759900e3277458b7b58f126cff2ab116613b85b9e767ffa9ead3a9d31a3e8eae92efd731ebaaa5e934bfa0b368 SHA512 5d0cb2fb2a4a048e40dd3ae322a341636a972f0cbd1dac3b2b09fa001655feffc1ace545364c75d6474c0b4c234a00fc360eb22faf096846600a3fe229ab9374
-EBUILD openipmi-2.0.29.ebuild 2289 BLAKE2B 807965405e3d9e5465440ec86abbcb8c437b16759900e3277458b7b58f126cff2ab116613b85b9e767ffa9ead3a9d31a3e8eae92efd731ebaaa5e934bfa0b368 SHA512 5d0cb2fb2a4a048e40dd3ae322a341636a972f0cbd1dac3b2b09fa001655feffc1ace545364c75d6474c0b4c234a00fc360eb22faf096846600a3fe229ab9374
+EBUILD openipmi-2.0.29.ebuild 2296 BLAKE2B a0245cccbd36a95c56a9809ed54a185a7ccc0adf8cf0ebe6ce8626e10669da4bbd1bbdf0b1f97bd80840f847d70c4a27320515496187b1b18475d3393d495abf SHA512 041c2ac382718b3d127add630342961abd755a2ca0e63f32708aa2585d5f646003bbe236306bc6c0289247d9a80ab33b23dc82aa2810fec5564dc8096a04f597
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.29.ebuild b/sys-libs/openipmi/openipmi-2.0.29.ebuild
index 99e493a94c4c..c2d149b11ce1 100644
--- a/sys-libs/openipmi/openipmi-2.0.29.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="crypt snmp perl python static-libs tcl"
 S="${WORKDIR}/${MY_P}"
 RESTRICT='test'
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index a2188382d76b..5d7161d9212a 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,8 +1,7 @@
-AUX fix-test-calls.patch 1969 BLAKE2B 13344bc09298e1ee68db1cf4b3d4c26ef430f6e6941b965edbca4b90bf8ecf762024f60b3541750fd1ae000f6bfd3f5e9792f0f0578beaccd405941f8b868397 SHA512 8051b3d8170ed4930274aa37c49d886b913a7cd043e247806a64c7929ea4c36b723e77d881c65e082f7424491cc29f0a726ddbbf401e15b6d7583f6f39342583
 AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
-DIST pam-1.4.0-doc.tar.xz 48080 BLAKE2B 48cec348c3db7ecae6ea85934fa242d908643d0a8f6d1789a8aac3b254dc21439e11066f9ff2a7238e61e5d16c41a6c49a26dbc7351fe7eb0a1fef4a2f69378e SHA512 634cbb1b948a2b1431b9ef219a4e9e63e870b34520665170f55aca10e65cd46f0c190697cafd18a42caeaec26299f63fd8ad794ae379648e767d8481af6c36f2
-DIST pam-1.4.0.tar.gz 804586 BLAKE2B 941925677c19f0a77a4fbc29f723706d5eb31b4020b0d35732ae3c00e5a623c943ea784e11aef1c2d5092d2a7fbe1724eeefa45d8d8ebd8a053a39f01a8b541c SHA512 16003f5c118125aeabf22503bc328a4bdd68b3af35d70b608a8b261adbaffae58ce490765f246c469b2ffbff67bd5216e0586ece0eb934905074423a990c2f98
+DIST pam-1.4.0_p20200809-doc.tar.xz 42680 BLAKE2B e8371bd76b589db06ce95f2d10343be163aa5149f566f7d9bd5e9cd0340b95eecedb6a7d20d299fd2188c736fca3c69c0bd2f8eea4541dfd3312227c3dcf4e2d SHA512 5007aaa811b6321f124245493c6a4bc9ae07ab4ff651fc817843e8b4a74661c07418e2479363a72c35320f0f1cb469a2494c5d354dc819b920de7d1918e6ce5e
 DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
-EBUILD pam-1.3.1_p20200128-r1.ebuild 3523 BLAKE2B fd389d7d746ad0c80a8db91a0d37094b7c7e6a824fa9b5be4a5cf59b688449ce2abc8bd93dc9b6816d092bf5283fdec9c6538cf264ff4d0b185cba3cf4c0b43b SHA512 acc60d8d7bad9a447b0323710e4c58c8ac321b73431b3fc6832696ba7e3be0a7200a7eb73b7a22e092eecb3d514a69fc5a0cd3498c40e6839217be0e74f0b44b
-EBUILD pam-1.4.0-r2.ebuild 3771 BLAKE2B a657f1dd46a011e2988be9ca97ff092fceb75b8c7a628f654462eeb3761735ea1aad76d9c7ae0b7f15c088b42097115c070304d531cca93f20d04bc5476f26f4 SHA512 9160b511d71eebdaad9148fd86d8d72dc4fd5bdbded2e0965600f150b4688621c3ec4a0b7c8880ad13648f9d6e8a89b955a5d5123080f96ce5bff5c5f36659cb
+DIST pam-d5cb4409ab6b04a6ed7c00245e2c9a430f352b16.tar.gz 810548 BLAKE2B e061528fa57ba9fcb418422d368b7bb960b5f6eec3ed4b9e438be0ec4acdaf925af3322a334ced8c498e700b090ae37f5084f13d2bf8c6874d53c58f03548bc7 SHA512 3db1e13bc8a037b22e0ae1aac0311982877a2e2d33643ee32813025f9a9c727421f2fd6c442eba936e8043c59deb476daf78fda34fc7b6b95c015614751975f4
+EBUILD pam-1.3.1_p20200128-r1.ebuild 3522 BLAKE2B 39445b685c2f2bb4237dcaa4e72eee7a426a00b4385b442a4e0c5f1092324446c62918f9642e7afe76b9b85bf2d55f6af3129c842c98450fae57bd22fa93a6d0 SHA512 7420fa938ab27a76a5a7b3c7921f815e85cf38a96b53407efbd4806ae043f84db1b3a32afa76fa400c6c279ceb6c72786cbc49e58dbbae9adc7b59459b5b7508
+EBUILD pam-1.4.0_p20200809.ebuild 3793 BLAKE2B 3501f29331acd5a98c980f699791a6cec17837454cd69737a71aeb8b0f8e4d98497b5a27c2a42b3b1902aa4cfb615e852e0a0fe7ff4baaae0542db59baa8b045 SHA512 1bcb577cd157c0ff7361995927201b9485dbb7ba39b3584a499d1b64c7790964ab7b2170bcd4827f81bab21ca19a517a19f1fdc2449ba425a5251a845048efb8
 MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/files/fix-test-calls.patch b/sys-libs/pam/files/fix-test-calls.patch
deleted file mode 100644
index 32d4c2d94997..000000000000
--- a/sys-libs/pam/files/fix-test-calls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c5700c0a04c85ace09f6a179cc7a3692c07282b0 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Mon, 15 Jun 2020 16:00:00 +0000
-Subject: [PATCH] configure.ac: fix non-portable use of test builtin
-
-Portable code should not assume that test builtin supports == operator.
-
-* configure.ac (opt_uidmin, opt_sysuidmin, opt_kerneloverflowuid): Fix
-initialization.
-
-Resolves: https://github.com/linux-pam/linux-pam/issues/241
-Fixes: 926d7935e ("pam_usertype: new module to tell if uid is in login.defs ranges")
----
- configure.ac | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c1862ea7..7737efc7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -662,21 +662,18 @@ dnl
- dnl Get values for default uid ranges in login.defs used in pam_usertype
- dnl
- AC_ARG_WITH([uidmin], AS_HELP_STRING([--with-uidmin=<number>],[default value for regular user min uid (1000)]), opt_uidmin=$withval)
--if test x"$opt_uidmin" == x; then
--    opt_uidmin=1000
--fi
-+test -n "$opt_uidmin" ||
-+          opt_uidmin=1000
- AC_DEFINE_UNQUOTED(PAM_USERTYPE_UIDMIN, $opt_uidmin, [Minimum regular user uid.])
- 
- AC_ARG_WITH([sysuidmin], AS_HELP_STRING([--with-sysuidmin=<number>],[default value for system user min uid (101)]), opt_sysuidmin=$withval)
--if test x"$opt_sysuidmin" == x; then
--    opt_sysuidmin=101
--fi
-+test -n "$opt_sysuidmin" ||
-+          opt_sysuidmin=101
- AC_DEFINE_UNQUOTED(PAM_USERTYPE_SYSUIDMIN, $opt_sysuidmin, [Minimum system user uid.])
- 
- AC_ARG_WITH([kerneloverflowuid], AS_HELP_STRING([--with-kernel-overflow-uid=<number>],[kernel overflow uid, default (uint16_t)-2=65534]), opt_kerneloverflowuid=$withval)
--if test x"$opt_kerneloverflowuid" == x; then
--    opt_kerneloverflowuid=65534
--fi
-+test -n "$opt_kerneloverflowuid" ||
-+          opt_kerneloverflowuid=65534
- AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel overflow uid.])
- 
- AC_ARG_ENABLE([tally],
diff --git a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
index 0cb0dcb2aced..c378c14137bf 100644
--- a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/$
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
 
 BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pam/pam-1.4.0-r2.ebuild b/sys-libs/pam/pam-1.4.0_p20200809.ebuild
index 95952e5cfb40..4fea18d00b1c 100644
--- a/sys-libs/pam/pam-1.4.0-r2.ebuild
+++ b/sys-libs/pam/pam-1.4.0_p20200809.ebuild
@@ -8,13 +8,14 @@ inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
 
-SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz
+COMMIT_HASH="d5cb4409ab6b04a6ed7c00245e2c9a430f352b16"
+SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz
 	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-doc.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb debug nis +pie selinux static-libs"
+IUSE="audit berkdb debug nis +pie selinux"
 
 BDEPEND="
 	dev-libs/libxslt
@@ -35,12 +36,11 @@ RDEPEND="${DEPEND}"
 
 PDEPEND=">=sys-auth/pambase-20200616"
 
-S="${WORKDIR}/linux-${P}"
+S="${WORKDIR}/linux-${PN}-${COMMIT_HASH}"
 
 src_prepare() {
 	default
 	touch ChangeLog || die
-	eapply "${FILESDIR}"/fix-test-calls.patch
 	eautoreconf
 }
 
@@ -68,6 +68,7 @@ multilib_src_configure() {
 		--disable-tally2
 		--disable-doc
 		--disable-regenerate-docu
+		--disable-static
 		--disable-Werror
 		$(use_enable audit)
 		$(use_enable berkdb db)
@@ -75,7 +76,6 @@ multilib_src_configure() {
 		$(use_enable nis)
 		$(use_enable pie)
 		$(use_enable selinux)
-		$(use_enable static-libs static)
 		--enable-isadir='.' #464016
 		)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
new file mode 100644
index 000000000000..0282b98c3a63
--- /dev/null
+++ b/sys-libs/pam_wrapper/Manifest
@@ -0,0 +1,3 @@
+DIST pam_wrapper-1.1.3.tar.gz 118034 BLAKE2B 3c05e74959f3c6dfd35575cc5f9187f4a328bfd7ce002e327fc135c82a4ff1513add87678360992d2010c124f7fd95e4bdb3c0a4d63418d9711069cbc200e417 SHA512 3b7cbd25ae7dd73f4a0c64a7762cdeb38cc7ba6e8b4e18e79aceffea09241d520aa884de88e4105b5957b2b18ec682be6568a6bfccf82b9354a3510cd2cd98eb
+EBUILD pam_wrapper-1.1.3.ebuild 1102 BLAKE2B 82db0090e910936fb1b5cd4eb210a2b7c34147c347257b09004308eca330c346234fcc19dd39c9bf849cdc3d00b5eb9663e73ecd89d8f5738e9c7052b2e56079 SHA512 c488ac32a5e040d1d3652398393cf437a24f7b3e09bcf9edc5defe15c1551f7daa764fe9f27d8b6977e80b7649de1061f5bf61f821143253839ede1f9151c1f5
+MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/pam_wrapper/metadata.xml b/sys-libs/pam_wrapper/metadata.xml
new file mode 100644
index 000000000000..48f6ca46f45a
--- /dev/null
+++ b/sys-libs/pam_wrapper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>samba@gentoo.org</email>
+    <name>Samba Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild
new file mode 100644
index 000000000000..517f2391cbeb
--- /dev/null
+++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+CMAKE_ECLASS=cmake
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="A tool to test PAM applications and PAM modules"
+HOMEPAGE="https://cwrap.org/pam_wrapper.html"
+SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
+	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-libs/pam:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local libpam="${EPREFIX}"
+	multilib_is_native_abi || libpam+="/usr"
+	libpam+="/$(get_libdir)/libpam.so.0"
+
+	local mycmakeargs=(
+		-DPAM_LIBRARY="${libpam}"
+		-DUNIT_TESTING=$(usex test)
+		-DPYTHON2_LIBRARY="/dev/null" # Disabled
+		-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON3_SITELIB="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index beb3c042df2b..7d980347b404 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,4 @@
 DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
-EBUILD timezone-data-2020a.ebuild 5134 BLAKE2B bbefd7a68861d2fc2fc2ba573ac0e6546f90c6a3021cce3f86f291ccaf9fce16f0a6a87684046304c8a05931c80d80440807414ca9ff5d553bac2e8261bf6330 SHA512 d110ec4f2eff01b16633a71ab246ab6ff71bb9881676b946643e5cbc7232fa9a6ae15be9f947a07243e47de72451546ccf62e8ddb0c06c316e0c9194a209262d
+EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
 MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild
index e508d234d92f..04def569f2a5 100644
--- a/sys-libs/timezone-data/timezone-data-2020a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020a.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 sparc x86 ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-libs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)