gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /sys-libs
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
51 files changed, 451 insertions, 433 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a34792850a8e..b215d5939dc1 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 ccd53282ce1f..71aca7842298 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -7,6 +7,6 @@ DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d08370280
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 EBUILD binutils-libs-2.32-r1.ebuild 3674 BLAKE2B b2109ac10a9c0e2f79b4342fbe1b3d11273167cd3bd91e7d3a3282d3656ad58ecf7461a2b323b87abba8b02ef6649fb6cb04d282980763396f934bdff994d68c SHA512 030897408d1c5bd33c3d82b4de5e14cc034bcb17251efa2bb468de623a7e6ec57d891e199b879f45aa043ee5396c14b6a1914ccfbfc8403fe798e8f960dd3e21
 EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
-EBUILD binutils-libs-2.34-r1.ebuild 3614 BLAKE2B e2ba8a013f729d8ca7c1e2f6656a8e380b77e3ff2988f09014c14297d81627dac8cbe1dd17ac80c2405f121465754fa41749bfcd4a99d14375bb1222724d7fce SHA512 8142031ebcff0db9c8dfcde1681f907c5dc0564c223efed67150f22dc34ae1d8caa077fc02aa12686d9401a7688fe7f94aa1f4f2702d0e3638c287620b01db2c
+EBUILD binutils-libs-2.34-r1.ebuild 3694 BLAKE2B 26b6971b41cedd7a9cc13b5782cc845c81117ddda176fe757e2fce315cbcca3c466e080d8bc0a017ad9b763f8efe4871032d33d928d59b116d930396f46042bd SHA512 0e86a001fd345759cec21d20c5e99bedd8111a7704ef9555756e65f4d6aa7e11dbd3cb391e22462d8705afa1363bf2a937e8727d5bc1abeebe8535aff848cdb4
 EBUILD binutils-libs-2.34.ebuild 3611 BLAKE2B add6cdcffe47e1666118939c6bfacd05317fe38dabe34a46a85d47113ca62de800d07e46e86e2f6a526fd1ffb586f0b059224491e1957e73878d4245cba5a0a6 SHA512 e9a329164cd52d95b1d452fd54c3f58cb4656ab1af90a8af0553be36e9b574a3dec9e0dfc228b2ecfde295e77007bd6f319aecd2d2166cb6b8fe48aac1f8ed4c
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
index 54e6d751b747..451a64346d3c 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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}]"
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 348d801b510e..bb174de6c4fd 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4557 BLAKE2B 166307f3604e487451df0b70ab48f18e0227829c847c35d6f61962515d60ec19ca876adec9feceb0405f481bbd87574038769bd08ba49f54865f6efb6f223699 SHA512 1f9892a19b9131051440c936c45a2f7ffbf12d76c9b19f2611b92365ce06f75f156e19e4b49e008ff7065a7c026fde2dd58bc93ab1d3c0b097b4cdbc1452a23a
-EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4481 BLAKE2B 3ddcb48c12169942e05ff5cb84daa5af199783913d0f5e55d19819b42a0dbe1c840ac35e1ba2e790749d8ac1ebbc37d7e8265c0db0499b88979500e59430aa26 SHA512 bd03f699f0a3635c88d4337a4182a8c3345e19262aa6bc7933143b3a8c51326f51278527c60c9f3a27e69079213be2e7f167aa595d1864dd5b61edada268705b
-EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4481 BLAKE2B 3ddcb48c12169942e05ff5cb84daa5af199783913d0f5e55d19819b42a0dbe1c840ac35e1ba2e790749d8ac1ebbc37d7e8265c0db0499b88979500e59430aa26 SHA512 bd03f699f0a3635c88d4337a4182a8c3345e19262aa6bc7933143b3a8c51326f51278527c60c9f3a27e69079213be2e7f167aa595d1864dd5b61edada268705b
-EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4481 BLAKE2B 3ddcb48c12169942e05ff5cb84daa5af199783913d0f5e55d19819b42a0dbe1c840ac35e1ba2e790749d8ac1ebbc37d7e8265c0db0499b88979500e59430aa26 SHA512 bd03f699f0a3635c88d4337a4182a8c3345e19262aa6bc7933143b3a8c51326f51278527c60c9f3a27e69079213be2e7f167aa595d1864dd5b61edada268705b
+EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
+EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
+EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
 EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5281 BLAKE2B 7041973d68007ccc56115a9748e901dc07b9228a8c513c30c234fd98253fb04072fc19faff4bcbb544dea7ac5aa2b17c7ce545083949ab6d54020c9dfa02bfa7 SHA512 19f5be642bc47a77beca5241f95b58c8b11fb580dee1db829eadbda00542d56a7b17cccc300b1eb7ebde2ec419f38e677d9800de00067e66df98f7cfdd2d47cd
 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.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
index 593a9a3363c3..125a82e8a057 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
-	multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
+	python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -60,6 +60,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -110,7 +117,7 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use test; then
 		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
@@ -142,5 +149,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-10.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
index 593a9a3363c3..125a82e8a057 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
-	multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
+	python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -60,6 +60,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -110,7 +117,7 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use test; then
 		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
@@ -142,5 +149,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 593a9a3363c3..125a82e8a057 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
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
-	multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
+	python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -60,6 +60,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -110,7 +117,7 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use test; then
 		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
@@ -142,5 +149,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/Manifest b/sys-libs/compiler-rt/Manifest
index 23c4b6050c64..97f25f67939c 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-10.0.0.ebuild 2923 BLAKE2B c5f9ed65aa52a8c464d9b9ebff0dd36d7147a5637e2c9b7bb08bf29ee204a583d226c94dbaf5c5ac2eff4b28cd07b64d65271a8dcf3345b12b9d4022827dd12c SHA512 fe6aa86d6fdb5b211326e8c3d5414f0c684d53c0c64431c043a12f0d0483ada79ab724e70f4b69589d5c5166b6867a1620517040d833bcef5c1ba6953ac5fb01
-EBUILD compiler-rt-10.0.1.9999.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
-EBUILD compiler-rt-10.0.1_rc1.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
-EBUILD compiler-rt-11.0.0.9999.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
+EBUILD compiler-rt-10.0.1.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
+EBUILD compiler-rt-10.0.1_rc1.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
+EBUILD compiler-rt-11.0.0.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
 EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
 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.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	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_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	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-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	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/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 10a564866562..ad2305c41012 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,8 +1,6 @@
 AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
-DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
 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.4.ebuild 2218 BLAKE2B 25ef186951ef58eb15f500c536ad3f8f39297208f87197c81e094d499fb47379074024b9ba0126d64e711ef62bbf37dc0063320f04d6cb2ae5904b619c9743a2 SHA512 356fd05f5995ff4c90a964ba1271dc6c0730d997506e16c2253ea1c048df0a413afd3b9ff0a0de3c7b22ed50895ae66efb96e01b6db6799053cf32af4c91fb50
 EBUILD e2fsprogs-libs-1.45.5.ebuild 2218 BLAKE2B 25ef186951ef58eb15f500c536ad3f8f39297208f87197c81e094d499fb47379074024b9ba0126d64e711ef62bbf37dc0063320f04d6cb2ae5904b619c9743a2 SHA512 356fd05f5995ff4c90a964ba1271dc6c0730d997506e16c2253ea1c048df0a413afd3b9ff0a0de3c7b22ed50895ae66efb96e01b6db6799053cf32af4c91fb50
 EBUILD e2fsprogs-libs-1.45.6.ebuild 2227 BLAKE2B e469ba0db1f533fe014e1058b68b34f290f9602ae1d1e7f9c20b9404768619133d77ef5c1a71d479a4619b8f7cd23a65667fd516797d8ac12baf2bd73a8bf601 SHA512 2344a9f504bf99e7aa0d84f171d2f14d5ca62eb05078ae9f778058b07d36c307ececea85f74702a059ac0c4b0c258dd8acf5431bdd56f0cbbbaf0d8519ed7858
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
deleted file mode 100644
index 4d8e8d0d7e00..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal usr-ldscript
-
-MY_PN=${PN%-libs}
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--disable-e2initrd-helper
-		--disable-fsck
-	)
-
-	# we use blkid/uuid from util-linux now
-	if use kernel_linux ; then
-		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
-		myconf+=( --disable-lib{blkid,uuid} )
-	fi
-
-	ac_cv_path_LDCONFIG=: \
-	ECONF_SOURCE="${S}" \
-	CC="$(tc-getCC)" \
-	BUILD_CC="$(tc-getBUILD_CC)" \
-	BUILD_LD="$(tc-getBUILD_LD)" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake -C lib/et V=1
-
-	emake -C lib/ss V=1
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check
-
-		emake -C lib/ss V=1 check
-	fi
-}
-
-multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install
-
-	emake -C lib/ss V=1 DESTDIR="${D}" install
-
-	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
-	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
-	# links to libcom_err.so).
-	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	# Package installs same header twice -- use symlink instead
-	dosym et/com_err.h /usr/include/com_err.h
-
-	einstalldocs
-}
diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index b94e2c1b67cf..5da9d002c95e 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,7 +1,3 @@
-AUX libaal-1.0.6-glibc26.patch 2471 BLAKE2B aac8ae431a32f5f9ee6a5d763b7aa1ab5e80c1531fee7cf75cb2aeb77dbaa66cf3cde5a55f3f5b824fec1e19c1133ff16ae22aedf5a4ec97842caf39a70ce3f0 SHA512 391741ed77da1c43d00df22dac8531fe3ee1f187fd449a82b6f6a9aa0f493ada19745c6ded76dcedae2a9d26df9da93dbb22c4737c0263d06983ebd0c6ac887d
-DIST libaal-1.0.6.tar.gz 345894 BLAKE2B 726eb26d80ce5cb198a059e74ded76d7ce97aabd2bd38209194462be9c6ffd5aafbfff3a35fddcae8b6b1c88ad8a378a6328217aed490f156bbb806d4ec687b9 SHA512 9b13096abcb90e75fff607ffd7b11ed8b100f349800b726acb01aca12f54abe784adb9912916fe8ed0751ebf367ecced04ab058e1e8b947f4209a5e6c390f123
 DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
-EBUILD libaal-1.0.6.ebuild 860 BLAKE2B f4e78e8d50d4b012f9100ebf01504b6ef0955c3666f0162e91d7f5c75f10cf064da7886673046b7e36b526b7c33cb9f34f3da8448bea9c45fc4d97f7541da0ad SHA512 9f43cd8fed63b027976c8171f4b86263f78afa5ea2e29eb32941dc96e1dbd490ff2d48936bda4b9860c432bf40ac64226383e1664903f2581ca72c526016e85a
 EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B fcc789a010130a7cdb2f1b25b5744169e08a631b63e689c8932df4b2cbd326c8e5c016ed3b6274f7406f0d2e4dfd30c7fc9fe728909b925945600cafe2f03f24 SHA512 62b249c7b34a9b30654c910fc4fcca2f34edf5a14aa490e9a567b61aeef830873ebe15b98106c2303ad3e60fc49e8db6ade99dfbb3189a58eaac16e24b748c95
-EBUILD libaal-1.0.7.ebuild 857 BLAKE2B ef2da28e5c7bd7165f0ef9d805d8e4fe451552a2458ee3a5ed043b68b23181a57860cce95804caec02c067a537a3a1695957bb697cfab9cb0832fd8ef74daef4 SHA512 95f513966ef1a9a14f7be7fbc27b838f69c3f8b2f43c7a1ad3b3f35c934e854de75413fc5fa04251cd2313139f6ce1c0da89a6d3e03967d570759daf4ed8003a
 MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df
diff --git a/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch b/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch
deleted file mode 100644
index 298d75ae2d74..000000000000
--- a/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Stop redefining libc definitions that cause build failures under glibc-2.26.
-
-[   46s] In file included from /usr/include/sys/types.h:156:0,
-[   46s]  from /usr/include/stdlib.h:279,
-[   46s]  from malloc.c:15:
-[   46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for 
-'int64_t'
-[   46s]  typedef __int64_t int64_t;
-[   46s]^~~
-[   46s] In file included from ../include/aal/libaal.h:17:0,
-[   46s]  from malloc.c:6:
-[   46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' 
-was here
-[   46s]  typedef long long int   int64_t;
-
-Author: Jan Engelhardt
-
----
- include/aal/types.h |   48 ++----------------------------------------------
- 1 file changed, 2 insertions(+), 46 deletions(-)
-
-Index: libaal-1.0.6/include/aal/types.h
-===================================================================
---- libaal-1.0.6.orig/include/aal/types.h
-+++ libaal-1.0.6/include/aal/types.h
-@@ -26,24 +26,7 @@
- #undef ESTRUCT
- #define ESTRUCT                 50
- 
--#ifndef __int8_t_defined
--#define __int8_t_defined
--typedef signed char             int8_t;
--typedef short int               int16_t;
--typedef int                     int32_t;
--__extension__
--typedef long long int           int64_t;
--#endif
-- 
--typedef unsigned char           uint8_t;
--typedef unsigned short int      uint16_t;
--#ifndef __uint32_t_defined
--#define __uint32_t_defined
--typedef unsigned int            uint32_t;
--__extension__
--typedef unsigned long long int  uint64_t;
--#endif
--
-+#include <stdint.h>
- #define MAX_UINT8  ((uint8_t)~0)
- #define MAX_UINT16 ((uint16_t)~0)
- #define MAX_UINT32 ((uint32_t)~0)
-@@ -53,36 +36,9 @@ typedef unsigned long long int  uint64_t
-    because we don't want use gcc builtins in minimal mode for achive as small
-    binary size as possible. */
- 
--#ifndef ENABLE_MINIMAL
- #  include <stdarg.h>
--#else
--#ifndef _VA_LIST_
--#define _VA_LIST_
--typedef char *va_list;
--#endif
--#undef va_arg
--#undef va_end
--#undef va_start
--
--#define va_end(ap)       \
--        do {} while(0);
--
--#define va_start(ap, p)  \
--        (ap = (char *)(&(p)+1))
--
--#define va_arg(ap, type) \
--        ((type *)(ap += sizeof(type)))[-1]
--#endif
--
--/* As libaal may be used without any standard headers, we need to declare NULL
--   macro here in order to avoid compilation errors. */
--#undef NULL
- 
--#if defined(__cplusplus)
--#  define NULL 0
--#else
--#  define NULL ((void *)0)
--#endif
-+#include <stdio.h>
- 
- /* Simple type for direction denoting */
- enum aal_dir {
diff --git a/sys-libs/libaal/libaal-1.0.6.ebuild b/sys-libs/libaal/libaal-1.0.6.ebuild
deleted file mode 100644
index 7c3711c17c19..000000000000
--- a/sys-libs/libaal/libaal-1.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils usr-ldscript
-
-DESCRIPTION="library required by reiser4progs"
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
-IUSE="static-libs"
-
-DEPEND="virtual/os-headers"
-
-src_prepare() {
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	printf '#!/bin/sh\n:\n' > run-ldconfig
-	epatch "${FILESDIR}"/${PN}-1.0.6-glibc26.patch
-}
-
-src_configure() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a aal{,-minimal}
-}
diff --git a/sys-libs/libaal/libaal-1.0.7.ebuild b/sys-libs/libaal/libaal-1.0.7.ebuild
deleted file mode 100644
index 0c87ceae6fdc..000000000000
--- a/sys-libs/libaal/libaal-1.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs usr-ldscript
-
-DESCRIPTION="library required by reiser4progs"
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="virtual/os-headers"
-
-src_prepare() {
-	default
-
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die
-	printf '#!/bin/sh\n:\n' > run-ldconfig || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-libminimal
-		--enable-memory-manager
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a aal{,-minimal}
-}
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index 096c0cc47bc5..31f40f14689b 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -1,3 +1,3 @@
 DIST libavc1394-0.5.4.tar.gz 341679 BLAKE2B c27cf10b8769c1602488fa1a9a2536dee169e0e07185090e719946ca1da4b210aa61b37d816fb5b019d8b199b1c9285e2b212545f4332c8aad48af39c2dadf20 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a
-EBUILD libavc1394-0.5.4-r2.ebuild 728 BLAKE2B ed102b066e03502fc81caf4bbba0cd65b5c8469949a116e7c76fdd21471416e2182c0cf79546c3740b96444ec2e1af8fe95d63c14101576e12c1f267a80c73bd SHA512 9421aeb4c34b34424f153150d7801bfd185bd306cd59ac2fcfdf8317819699cdff3c87a15ee54eaa6677ee7ea339ab839583f23f3466649fa7b169ac8118fe54
+EBUILD libavc1394-0.5.4-r2.ebuild 708 BLAKE2B e704963b43441fcea2608b308f1e118bebed0dda32b28e9eaa86c49d872c28241edd6c552ad13def8b3ea13b37ce10db562a27f822dee03e2286a3954d102870 SHA512 239e5d0b485dc7761ef059d54783ff2f9d80bcc0f08e8705214f2f5890aa9c5c20fd3f4e58d7d16a353be5f17e434746a5cefa8ba4627899505bb7629538b810
 MISC metadata.xml 330 BLAKE2B a1bbe65ce97eb3a0c038333183e4fde5b7f0f0384d2fcacb78c569f6df4afd74cfe8ab34c9404daf7bd0870b983372bc35d3e3dd3ac50793fb47fe25b509a9b7 SHA512 3b2a188bb90d59ac6acb66b90e0231db783a6364f4e91a955df28346422061b99837ecf4038f6d42eb570630029623797c0e874737151065343b63352bd082f2
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
index 33e512b651a3..86de2a87b7b9 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
-BDEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 DEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 1bb0b54fb137..37d71f001a0a 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxx-10.0.0.ebuild 6084 BLAKE2B 6c85f35df2356419ff707a588ade9937d8b5fa3857a535f29ac77312ce565a6d02247c12a84f1d2458fea352cb9d3c3c59392bb8b7caaf7e3493180c5ad663b8 SHA512 5e7149e78a8a38de75c5e7776245d6440aedf34d3883dae05f20182952c8bf9b065ed2d72c4d9a8e6a745d87716072d4bc3e18352a3747516405dc3aa2245e00
-EBUILD libcxx-10.0.1.9999.ebuild 6061 BLAKE2B 4ce9f38d1a79e97569f61c963af1be76a160ec284975b24ab7ccc21d3572d9a022ed36b87bed6105a953c901a573394451496dac278bf8f8eaed3dca9b641fb1 SHA512 4de6ee20e73fa384c94fb10a9fed2b06f489624a3727558ae8f6d2e836418d3a2fecc6c3fa5ccbcf3725391ca0ce1f3b1b5ac18038b805b05df491771df03729
-EBUILD libcxx-10.0.1_rc1.ebuild 6061 BLAKE2B 4ce9f38d1a79e97569f61c963af1be76a160ec284975b24ab7ccc21d3572d9a022ed36b87bed6105a953c901a573394451496dac278bf8f8eaed3dca9b641fb1 SHA512 4de6ee20e73fa384c94fb10a9fed2b06f489624a3727558ae8f6d2e836418d3a2fecc6c3fa5ccbcf3725391ca0ce1f3b1b5ac18038b805b05df491771df03729
-EBUILD libcxx-11.0.0.9999.ebuild 6110 BLAKE2B 191f1b89a32dc07287df12088f78aac9057582c1c688236fc354578e9f1843a6602d25705e8a204ca938fa0dc89e0654e86eab7377867c4c5a74470d960d7c11 SHA512 b4cc17e7d8f6ae569698ab5ee0d014854b648ed02585d451a5bfb1c1708bdd9bc6a573c91da9275d69a0a99059f0a1cd111153a553901f62ccd83f1fd0762957
+EBUILD libcxx-10.0.1.9999.ebuild 6175 BLAKE2B cd9d6874a410affb76581587d5bd7c72e03652dbc7a5518e40fe74158877f65f3d98a3ccc4008dd0668602c2b0df92993f7ff340177b26175c635031c97cc02a SHA512 48b6f96e787273fedbad90198ba503731cfb3fbc168ad8cf88f95d396e5208fef5c3cf570385bde6ccf1f8220ac0475b747791c86c15b6a3f4acd2788427fc51
+EBUILD libcxx-10.0.1_rc1.ebuild 6175 BLAKE2B cd9d6874a410affb76581587d5bd7c72e03652dbc7a5518e40fe74158877f65f3d98a3ccc4008dd0668602c2b0df92993f7ff340177b26175c635031c97cc02a SHA512 48b6f96e787273fedbad90198ba503731cfb3fbc168ad8cf88f95d396e5208fef5c3cf570385bde6ccf1f8220ac0475b747791c86c15b6a3f4acd2788427fc51
+EBUILD libcxx-11.0.0.9999.ebuild 6222 BLAKE2B ca7466088542877c535f9fc181bfba9a11ddd06dd02baf8a1da5e04ff0b45f7a40bb8f3518428f2f00de07e191751e1a5b20ad11ab3e20bd03b853d5dbf10d71 SHA512 ca90a9f81834c915f8e92311ae9de5e69d6dd98bd7dc2bdde19250c73ec45f9a5678ac0dfc71f64193e95edb6dd2fdfed262ebec21f36e3fed6032b5aa30935e
 EBUILD libcxx-8.0.1.ebuild 6539 BLAKE2B 4903d2f0c2102d4c2d373d1ce17d092adddc666e982593bab358af93360c72de2e80b1476383609ee01decaae9c08dd6ae1d473d58caefeb325cabc1042cb9b1 SHA512 5c3627016de412cfe281b2cf7579c4f68a7ae4ba087cf5ab567f0fc24c5585939ec5f7044134df4d2bcd67e5d19e1344e43b37de485f9f2572c04aa405cf8c22
 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.1.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
index 6e1bba971a9b..055385df1c68 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
@@ -33,12 +34,6 @@ BDEPEND="
 
 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
 
@@ -58,6 +53,17 @@ 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"
+
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -135,12 +141,12 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxx
+	cmake_build check-libcxx
 }
 
 # Usage: deps
@@ -186,7 +192,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/libcxx/libcxx-10.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
index 6e1bba971a9b..055385df1c68 100644
--- a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
@@ -33,12 +34,6 @@ BDEPEND="
 
 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
 
@@ -58,6 +53,17 @@ 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"
+
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -135,12 +141,12 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxx
+	cmake_build check-libcxx
 }
 
 # Usage: deps
@@ -186,7 +192,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/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index c8f3b48d30c5..bb151379aedf 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
@@ -34,12 +35,6 @@ BDEPEND="
 
 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
 
@@ -59,6 +54,17 @@ 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"
+
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -136,12 +142,12 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-cxx
+	cmake_build check-cxx
 }
 
 # Usage: deps
@@ -187,7 +193,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 837f21184915..8b0f61262def 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxxabi-10.0.0.ebuild 3394 BLAKE2B 47672d6e34b5961fae613e289024b3fe7266efa6c97c9560e85138f320cabf565177f4ba9349f0add7d7b653ab92905a29afe2932c840fb1dd55b028158eee85 SHA512 b3a4515a23d98e3d3888f6df6620e6731dbb0c7ea19236d97703bbd116222532a39185ecc6cd56a852656a7c315fc4a136bef07af65be9481c265ff906698618
-EBUILD libcxxabi-10.0.1.9999.ebuild 3371 BLAKE2B f1496d81d45cdbadd84b81ca7dda93e479344df3e00b86a30d73fa1e30a7368a8014f3b09311b99f58200e9f5f0aeb57218099a9897bec7467ddc2a59b47e153 SHA512 4db549482600eb9a8f9318bc4e3e41778ff45d7f80f6b79b55667f057bd62751daa820dcdf51995df4c7beda507c1ac9c0f4608e1b88559fba661b8d382729cc
-EBUILD libcxxabi-10.0.1_rc1.ebuild 3371 BLAKE2B f1496d81d45cdbadd84b81ca7dda93e479344df3e00b86a30d73fa1e30a7368a8014f3b09311b99f58200e9f5f0aeb57218099a9897bec7467ddc2a59b47e153 SHA512 4db549482600eb9a8f9318bc4e3e41778ff45d7f80f6b79b55667f057bd62751daa820dcdf51995df4c7beda507c1ac9c0f4608e1b88559fba661b8d382729cc
-EBUILD libcxxabi-11.0.0.9999.ebuild 3370 BLAKE2B ee6bc24ccb2d4a7879399077fa3c41f6937924a88d4cd9bd6bed120e6fc233dbf6f04da54ca11712d1a52479f1507ae3232b5459cda6fb26cb836bc08da94974 SHA512 5238e1a4db16e0b0ef1f0f9401e19f765f128b5619c813f6abebb22be1c4638e8e91e3f0f973805ba4b793735a15c1c2528a56d0982bffb0cccd4a6906c8ba5e
+EBUILD libcxxabi-10.0.1.9999.ebuild 3484 BLAKE2B d10d1f6603520c687a0e4fe4e0059eef59d43ebfbd3aa7cf12a8ae6bc2b08f9f18b5b1b25f217757fb1b38525f3c271d079e0f7cf1571dd237950578d9b7a24b SHA512 881dc35bcb88725df00b93e956abe376cfa8d56e4da75fc1d4082a6b7a77721c02606d8fc72fc67e21d4a5c439e3a064901e1640ba16f0beff75fa6429183a76
+EBUILD libcxxabi-10.0.1_rc1.ebuild 3484 BLAKE2B d10d1f6603520c687a0e4fe4e0059eef59d43ebfbd3aa7cf12a8ae6bc2b08f9f18b5b1b25f217757fb1b38525f3c271d079e0f7cf1571dd237950578d9b7a24b SHA512 881dc35bcb88725df00b93e956abe376cfa8d56e4da75fc1d4082a6b7a77721c02606d8fc72fc67e21d4a5c439e3a064901e1640ba16f0beff75fa6429183a76
+EBUILD libcxxabi-11.0.0.9999.ebuild 3481 BLAKE2B 8594d2d10655dd4ca92431adc1488ba9ea06081a0844a3ecb5962b857c859d3ef074407e8955b1be1e6fdbea4f67cd85bf257697abd27d642516bbba12c35abf SHA512 be90214fa0c9f4fc8027a16bc71e47c8e23ed5997cf7055e01287273755803a5bcda282b786032a6103864b5fcf6b298483b3b2753dd0962ea98cdcbd70000bf
 EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
 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.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
index de7c2b4fb58b..a1236effd156 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
@@ -44,6 +45,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -80,7 +88,7 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxx() {
@@ -100,8 +108,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 +118,7 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxxabi
+	cmake_build check-libcxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
index de7c2b4fb58b..a1236effd156 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
@@ -44,6 +45,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -80,7 +88,7 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxx() {
@@ -100,8 +108,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 +118,7 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxxabi
+	cmake_build check-libcxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index 7946dde2bb22..b4d67fc8e6d6 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
@@ -44,6 +45,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -80,7 +88,7 @@ multilib_src_configure() {
 			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxx() {
@@ -100,8 +108,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 +118,7 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-cxxabi
+	cmake_build check-cxxabi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index 2d03eb6124cd..a5c00ada5d7a 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -3,5 +3,5 @@ DIST libfaketime-0.9.7.tar.gz 56277 BLAKE2B 62e10c4b3c33c203cde023cbc4e114c2ee1a
 DIST libfaketime-0.9.8.tar.gz 70614 BLAKE2B a10a8859c216ce4c2edae3324515507f4c2b8a284d80da5a83d1b8046262ae5e624e358c809c2d473fdc21caa0d89f675beb3adfdb401411356145fdb9a1bac3 SHA512 87081024cab10462d4ed4d4ad9c3c56ab40fee3300d3a9ff180a4d96d418b3f25d80d7d5ad0a1af2fb87204f01a506d9fa273def7a8f9cc3be4cc0e9fef42aed
 EBUILD libfaketime-0.9.6-r2.ebuild 1356 BLAKE2B 3c5366d5812d8cc439972e58260db320fe3d690d309b6725e36e4f1197ee165ad7803dee4e49365b2ac0de8f72d2f70a02b6bd551250efbc0bbbf3a41fdaba2b SHA512 7b479da51c27fd659afc7d6c9c1b4c67b5f38537cad62e66d37107b0f1cf5c3c8a28668eea688fe1b9744beb4a84b71e0bf5f18c80b61338124b44e3a618f44e
 EBUILD libfaketime-0.9.7.ebuild 1383 BLAKE2B 7a61df366d1d8c8f5df3798f87d47c524a8eb5e02b90454d9b15b583d1af72a790c3e99251200f9ff854d90310f5b2cbb95b082860f18269dbf5b38e5f8f8e74 SHA512 8db6ca7f9e66b49ce4ef116ff8be3e2debc8ec1f9b31503ddd8f1a5cf785029ed4b10a7bddc7e026d548a3c00d6b7baf28ffe93dcfaac16e8d15758c5e7f955f
-EBUILD libfaketime-0.9.8.ebuild 1591 BLAKE2B 48742a25bd100d18c83ec0d59fccb8e14ae23ed65b1b802c5c5b05603a69c15d9aa58b2a8507509428bb4a8040185d9e53041c18e345866989c2ba6819e0c5a9 SHA512 b0ed55b5d293c6fea69aff017190d8871d46f95ef388529d63eb3342083db088612b4b2d04ff510fae26c70d5b3c2e894c21edc2b890a8a798784585a086afe9
+EBUILD libfaketime-0.9.8.ebuild 1598 BLAKE2B cf1ea0c67a8d1a379fb4beb4e9b7db56297db853071e95f085d033f790c2719bd2a46d5d8bf443ccad951a2e521645cdfef184414f3a84f8c1b35b1c6c0d9a5c SHA512 831313aa83d8b778fea1320dfe296d7a39644fbf70a86bcba0af36344923ae0d0733d1ce2b71ab872f6f328cfbc12ec46692466d92cb2943df3c90519630b584
 MISC metadata.xml 844 BLAKE2B 55b522c415ccd092c6f940fafffe6d3ef871259265d125844b179f00c3fce55fd4b359c1b535a0ace47722938d2d2b744cf9062e1ff3e32bbea89b9b7a200691 SHA512 77924230fc18b29ee6c5891a73acde9158dabdec2d3f892ceeb84bc6e1b6f2b977dba05382a1da67fa8db6e57ca3be2161f6218e2f52feaefef690a0e1989893
diff --git a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
index a648df00a81d..002934da696f 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index c45b0ac9d6a6..ccfa6fa9a2b7 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,10 +2,10 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 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 3038 BLAKE2B d3cad4df1dd79167157d125d41207225193aa83d5175c98124022be495a318eb00c9e46ba02e718155689944bbfef1604fef1b69eb6f9ebb80c088ab06e1deeb SHA512 81f2d41df17d0ca497428c1c5d11938d93457876b86c89bf3b35bdf8b099ae6fc52e4726742becedc1524494083e92d8fef1179277a4f9fbad78074ff1b0c330
-EBUILD libomp-10.0.1.9999.ebuild 2984 BLAKE2B f55851942ce30e6cf6f133708d68665ed9a8960769debfbbedbdda533955228f403e642fde0cdf0aeefbb127d85aa756f0d5b29d947d99592e142d92d9acad3f SHA512 64d0e6b889038adc0cfaabb9a5e7c5af55b9fd88dfceb43e52f06e94d92d099b87545f0294c67dadd14e9aa821de46cc64868a56bb172674b254ad2f2d4a2451
-EBUILD libomp-10.0.1_rc1.ebuild 2984 BLAKE2B f55851942ce30e6cf6f133708d68665ed9a8960769debfbbedbdda533955228f403e642fde0cdf0aeefbb127d85aa756f0d5b29d947d99592e142d92d9acad3f SHA512 64d0e6b889038adc0cfaabb9a5e7c5af55b9fd88dfceb43e52f06e94d92d099b87545f0294c67dadd14e9aa821de46cc64868a56bb172674b254ad2f2d4a2451
-EBUILD libomp-11.0.0.9999.ebuild 2984 BLAKE2B f55851942ce30e6cf6f133708d68665ed9a8960769debfbbedbdda533955228f403e642fde0cdf0aeefbb127d85aa756f0d5b29d947d99592e142d92d9acad3f SHA512 64d0e6b889038adc0cfaabb9a5e7c5af55b9fd88dfceb43e52f06e94d92d099b87545f0294c67dadd14e9aa821de46cc64868a56bb172674b254ad2f2d4a2451
-EBUILD libomp-8.0.1.ebuild 3281 BLAKE2B 83a61a0a2c069a17b3865a4e3f94c7d53a8601c90c40d15c6d3e0584ee0c11d4729d869025833eb73d751337fbbe0a09b5501dc210cfd58f63ea3788e26c2c6d SHA512 3ad3998d3aecb80efa7adecfb58ead560e33b14aae40212bdfff7550a5fcd0ae78cac4cafff94734e86df4ab23ae36d109a5dd4fc1a9e00a683d19b9427dab4c
-EBUILD libomp-9.0.1.ebuild 3031 BLAKE2B 47e36f589268fe0c89a97ebd76d92bc552e01acbd8bf021ca033a30ca1c1cd6a264555e1a52f179728d012137fada1b872a5ec9e9702ff719c11f5da3e901cac SHA512 9d68ac71e168fa4a36831dfd320e7d20681bedd1c982b50b3a9a3f38bc2b29bcd336cfbf4e0d14f4220deecf597416cb57ed60579668e6af60ce56fb1ceea55f
+EBUILD libomp-10.0.0.ebuild 3018 BLAKE2B bb29e082317eb219e465ad799dfeb8396595ea1eabc18d5481810d44adb28364875f96fd6dee194625892a6284d29c565149de081947bd17c1d56815fed921b1 SHA512 4bf69b6ef9c3860882a3eb95b2597678f34e3080e324c9ead8f905a47106e3252984ae7746bf93c1dd2d06abda371d905d7ad747459d076d999a4ea3f4571f28
+EBUILD libomp-10.0.1.9999.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
+EBUILD libomp-10.0.1_rc1.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
+EBUILD libomp-11.0.0.9999.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
+EBUILD libomp-8.0.1.ebuild 3261 BLAKE2B 07d184e3032f81108f842255cd67669eec67cd7da4efbcfae92acc3dae17210522b1d2de6c4ee8067193e8c62883eacc2e12fa94bca050e77dbea257ed4cf60b SHA512 41892cf4263e67877309296ae1bc4ac6002142f6d72255bebaf2c86e3541e4eef556a3bf4489a83a23fde5297bd3c93f564bc92c48f63a7d2acbccb1eacada4a
+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 74fc7dac605f..81493f7f5dc9 100644
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
index aa0be13c4ba5..01e5f189d659 100644
--- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -32,7 +33,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
@@ -66,6 +67,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -95,12 +103,12 @@ multilib_src_configure() {
 		-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_rc1.ebuild b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
index aa0be13c4ba5..01e5f189d659 100644
--- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -32,7 +33,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
@@ -66,6 +67,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -95,12 +103,12 @@ multilib_src_configure() {
 		-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-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
index aa0be13c4ba5..01e5f189d659 100644
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -32,7 +33,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
@@ -66,6 +67,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -95,12 +103,12 @@ multilib_src_configure() {
 		-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-8.0.1.ebuild b/sys-libs/libomp/libomp-8.0.1.ebuild
index add0d7125ed6..0cb1ed1a721c 100644
--- a/sys-libs/libomp/libomp-8.0.1.ebuild
+++ b/sys-libs/libomp/libomp-8.0.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
diff --git a/sys-libs/libomp/libomp-9.0.1.ebuild b/sys-libs/libomp/libomp-9.0.1.ebuild
index f8e49887b6aa..256f61807d3a 100644
--- a/sys-libs/libomp/libomp-9.0.1.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 # - sys-devel/clang provides the compiler to run tests
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	offload? ( virtual/pkgconfig )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index f6b02f297afc..41362ce0f998 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -2,5 +2,5 @@ DIST termcap-2.0.8-patches-2.tar.bz2 11589 BLAKE2B 8fec4befa009a8dd53fd949435eba
 DIST termcap-2.0.8.tar.bz2 211523 BLAKE2B 4ea7c4cdc26be4e1262a8e75e125b4349c75976c297c2389e034635d2d5324275486525fe93fd8628e8a5cd0980c7e97eba55f5a05d6b3b537337b2fb55cf2cd SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad
 DIST termtypes.tc.gz 228329 BLAKE2B 988b91c6c3c624963e078b424f24b26eb37fe32ca34b0ece0ca4ddf734ee1513f399a4f584f41a92c6ef2edb64144c13820677b419e58b4bfaf0e0fa2c5686a7 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678
 EBUILD libtermcap-compat-2.0.8-r3.ebuild 1111 BLAKE2B d1d6910d8f6d654fabc3e7e62b3dad2eff4a67ed8bf749ec2077cb187ad197ac0049dbd689ba0e8419fda85864945e1193cd111e9af4c1d664c9585d310888c5 SHA512 e2723f1142016937517c86fd4f9b1db4ac576227bfa89432473c55459e56d18ca286d32de92affa865004bdf5427333fb1f63659864b79a6132a4cfc94fe46ef
-EBUILD libtermcap-compat-2.0.8-r4.ebuild 1200 BLAKE2B 7d7cdfa1f7f14c63042e01d6200e129f3e6e0a3c9961a5fd8225938ae17d5b2bfe5ce8c84a301bd1010f3ad59760adc894dc0aebe91e73559c41a8328e3323cf SHA512 ee86770f5a49c2f0697900c0763c460cae87d97ec464a1aea45cb0345d06650e09c11a798aa4e996ae4f46fe6e7725fa772818368ea3363467d4dd4ae5cee938
+EBUILD libtermcap-compat-2.0.8-r4.ebuild 1194 BLAKE2B 4ef220b31acc8f7dfe43b54234e4bb8f64271db3f0ac58345c6ede7379e1f67c4c411f74f30a42c15a062f2b13b4b622899912bb2b3abb00defa80aaa4c3f882 SHA512 acffab477dee337358f85b01df75ad24d8e8e2c9584f71e593ab233d930220d977a687eeb461fcce93fe278e0a0d75af2ea2ab177829f401d3ec8f54617b6e37
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
index 422d2e748b9c..bdbf937f6121 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # we only want this for binary-only packages, so we will only be installing
@@ -19,7 +19,7 @@ SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
 
 LICENSE="GPL-2 LGPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 82306ce310e4..ca8ce1871c54 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,9 +5,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-libunwind-10.0.0.ebuild 3360 BLAKE2B dd4b9b43af7ce1a8689940a89bf4a89ce13bcc59c005cf8117aaf9579c9a06dd38806f7cf78951e7e237a32f102c8354cc6de8a9744335997cb96f9a5f060186 SHA512 7bc34e1f314a45aec7154447a51d682d2cc37157bef41d35f7ca56b2362d2b1fb6ec12755e12cd7307562433d8875456ce0eff62794962a05e7e65449b59c225
-EBUILD llvm-libunwind-10.0.1.9999.ebuild 3337 BLAKE2B 3ed18438eb02755762d4533396ea50a1e2df5ea428cd22b92f6dda90813a48fc1fafb3538e0cc10ada3b8b52fefa8dd18d61043c8f616ea88b32e26bc6e737ad SHA512 db1bfa10cbd3e0dc847262c7662c54c32d98b6467ef29ce7f50b506fb48a05bfa72b04dd3129291a7f66059ebc8b571acff895142bbd7e6bbf08cbcaf209b8c5
-EBUILD llvm-libunwind-10.0.1_rc1.ebuild 3337 BLAKE2B 3ed18438eb02755762d4533396ea50a1e2df5ea428cd22b92f6dda90813a48fc1fafb3538e0cc10ada3b8b52fefa8dd18d61043c8f616ea88b32e26bc6e737ad SHA512 db1bfa10cbd3e0dc847262c7662c54c32d98b6467ef29ce7f50b506fb48a05bfa72b04dd3129291a7f66059ebc8b571acff895142bbd7e6bbf08cbcaf209b8c5
-EBUILD llvm-libunwind-11.0.0.9999.ebuild 3339 BLAKE2B e92386cf288170ed1ef4a748bf0d940c3ca2a68f0726a6a1f540478a715fdd575b738f7f4944e9b15bba9eed1abecbba86e860e68d656237eb6d15818325c997 SHA512 12dde32052b466123d1846246439d97b5cdb4af26247f217363cc75862191fc97e15825a719aeb001d5d52c39ecda9a6b5d52e1fd5dada9777eb6c1f61ac92b9
+EBUILD llvm-libunwind-10.0.1.9999.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
+EBUILD llvm-libunwind-10.0.1_rc1.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
+EBUILD llvm-libunwind-11.0.0.9999.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
 EBUILD llvm-libunwind-8.0.1.ebuild 3815 BLAKE2B 52a00f299c179b3b826702e6b76468922745be47e97542ad2e620879c14434f7ab334089a529ed9c27584c17f8e805bad783710c288c2e5d4258487c2b502186 SHA512 b956f3a085591de5a1519c7b5830c625a085ab2f178ca5b5e7d55b6f4cb23e0b64eeb108d3d45fd18f8420da5898ec2099e6f6d68fc575e5f9bbc846b98865e2
 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.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
index d622d1cdee5c..6d15a7f4a17c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
@@ -37,6 +38,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -63,7 +71,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -81,8 +89,8 @@ build_libcxxabi() {
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 build_libcxx() {
@@ -103,8 +111,8 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 multilib_src_test() {
@@ -115,11 +123,11 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-unwind
+	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/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
index d622d1cdee5c..6d15a7f4a17c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
@@ -37,6 +38,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -63,7 +71,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -81,8 +89,8 @@ build_libcxxabi() {
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 build_libcxx() {
@@ -103,8 +111,8 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 multilib_src_test() {
@@ -115,11 +123,11 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-unwind
+	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/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
index 4f813dc7e2cd..6d15a7f4a17c 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
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
@@ -37,6 +38,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -63,7 +71,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 build_libcxxabi() {
@@ -81,8 +89,8 @@ build_libcxxabi() {
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 build_libcxx() {
@@ -103,8 +111,8 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake_src_configure
+	cmake_src_compile
 }
 
 multilib_src_test() {
@@ -115,11 +123,11 @@ multilib_src_test() {
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-unwind
+	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/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 6860338999e2..a62939fe3203 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -2,6 +2,8 @@ AUX openipmi-2.0.26-readline.patch 291 BLAKE2B 82885b89bda01db81472e6dd72883450d
 AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659945bd7d85758342438f261fedce67bace7795a74ff6010f68d04d8ae33936b6c60780986c9e0d66e93061577132f SHA512 2deae71fd039126cb3dd0a348658ddbf568345c782c2467a4712d36006217f86eaf86950c821d36a400aea4cf18409684e8abd3b1e504928f5bc6d4cf943c4bb
 DIST OpenIPMI-2.0.27.tar.gz 3125193 BLAKE2B 86639a86803e49393aefbaf5b1d1fee8e2bf399b2772bdee7d07a00d5e6657efe5cdf962cacb0397f9de5deb0b18edc05783c3388f4fc19e1ee2de4c01be0663 SHA512 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3
 DIST OpenIPMI-2.0.28.tar.gz 3118911 BLAKE2B 0f4192dc536ec1767ee72cf9f0d2c3b021e5f8e88b4029846a27c3b6561a3c63d44f4bad7ced234a171504804d2d9cdd90d0c6a6dc178f9f76ea52f6df20b9d0 SHA512 faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da
+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
 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
new file mode 100644
index 000000000000..99e493a94c4c
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.29.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Library interface to IPMI"
+HOMEPAGE="https://sourceforge.net/projects/openipmi/"
+MY_PN="OpenIPMI"
+MY_P="${MY_PN}-${PV/_/-}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="crypt snmp perl python static-libs tcl"
+S="${WORKDIR}/${MY_P}"
+RESTRICT='test'
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/gdbm:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	crypt? ( dev-libs/openssl:0= )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.21"
+BDEPEND="virtual/pkgconfig"
+
+# Gui is broken!
+#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Bug #298250: parallel install fix.
+	sed -r -i \
+		-e '/^install-data-local:/s,$, install-exec-am,g' \
+		cmdlang/Makefile.{am,in} || die
+
+	# We touch the .in and .am above because if we use the below, the Perl stuff
+	# is very fragile, and often fails to link.
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# these binaries are for root!
+		--bindir="${EPREFIX}"/usr/sbin
+		--with-glib
+		--with-glibver=2.0
+		--with-swig
+		--without-tkinter
+		$(use_with snmp ucdsnmp yes)
+		$(use_with crypt openssl yes)
+		$(use_with perl perl yes)
+		$(use_with tcl tcl yes)
+		$(use_with python python yes)
+	)
+
+	# GUI is broken
+	#use tk && use python && use !tcl && \
+	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
+	#if use python && use tcl; then
+	#	myconf+=( $(use_with tk tkinter) )
+	#else
+	#	myconf+=( --without-tkinter )
+	#fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
+	newdoc cmdlang/README README.cmdlang
+
+	use python && python_optimize
+
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index a138cf9a501f..5cb0ce70c54e 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,9 +1,10 @@
+AUX fix-test-calls.patch 1969 BLAKE2B 13344bc09298e1ee68db1cf4b3d4c26ef430f6e6941b965edbca4b90bf8ecf762024f60b3541750fd1ae000f6bfd3f5e9792f0f0578beaccd405941f8b868397 SHA512 8051b3d8170ed4930274aa37c49d886b913a7cd043e247806a64c7929ea4c36b723e77d881c65e082f7424491cc29f0a726ddbbf401e15b6d7583f6f39342583
 AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
 DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
 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-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
-EBUILD pam-1.3.1-r2.ebuild 3342 BLAKE2B a9c03e5ae1005b63f416b3778de5e6a4cfc02fde311aa3ff1bc41b459fd39d464afe43561934885abe1f19c1e98075bfc4071843d9ccb89026b376a52985a5be SHA512 1c7d78bc680eb1025b41b8e724b2e59eaceccccef6cbb57a6887a268a21e49a813f75e16f7d3f7a2b3f20b402453a0e9a42b99e8f7ee252c6af88601dc6bbb53
-EBUILD pam-1.3.1_p20200128-r1.ebuild 3551 BLAKE2B aa6581a5d90745c4a195e2516c73cc9ef25b768bbb7cc3ff4dcb2e7a86276916a44276aa002fdc7f96524a63484d3feb5370bcaeb5823c399e5e26dffff94200 SHA512 5ee4e9449e15fd5d113299cee9bd19210e837f4a72e6c4b01c7bcf97d85ac3415813d2ded97711b11df1b437e7740dabc91d3cb5a0df74b586de95eb3716a89b
-EBUILD pam-1.4.0.ebuild 3604 BLAKE2B fd67cc30dfa80bfd479d8de6725e512a9b91ba1fdea30239048850d46acfa2d63ddbcfa7012e23f1ac0b833588b441001d5f614223427c01ce277c80a0443c09 SHA512 4c2192a36db1e575b88623ec52eca8953dedc07483ce756715d22d1168018511bd548c26d31af3473c495aa87f020160cc65d182cae6dd4fcb21a227b06d8a39
+EBUILD pam-1.3.1-r2.ebuild 3322 BLAKE2B 5e020cfb239bb8e415d3ea28ecfc4450d85ca8fa5d564b2fa5a044c6258d4b5c7da692f8d9b3b203667bbdd3eea0305b679c073fe540369a426fc4f14b1616b6 SHA512 4a2caac1f4dacd20d28b646b998d7afbc1fed807db944b09c3e3bd15fb758d3f0bf7faf5a6e937bb00740b0cd10b8f891e2eb12a41b3dfb2fbbce45c8f3414ec
+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
 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
new file mode 100644
index 000000000000..32d4c2d94997
--- /dev/null
+++ b/sys-libs/pam/files/fix-test-calls.patch
@@ -0,0 +1,48 @@
+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-r2.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild
index 26873bc6edcf..560c09a3fe16 100644
--- a/sys-libs/pam/pam-1.3.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r2.ebuild
@@ -21,7 +21,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
 	sys-devel/flex
 	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
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 97a36d6399c7..0cb0dcb2aced 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
@@ -23,7 +23,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
 	sys-devel/flex
 	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
diff --git a/sys-libs/pam/pam-1.4.0.ebuild b/sys-libs/pam/pam-1.4.0-r2.ebuild
index 3583a5ca60aa..95952e5cfb40 100644
--- a/sys-libs/pam/pam-1.4.0.ebuild
+++ b/sys-libs/pam/pam-1.4.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
+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"
@@ -20,7 +20,8 @@ BDEPEND="
 	dev-libs/libxslt
 	sys-devel/flex
 	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig
+"
 
 DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
@@ -32,13 +33,14 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PDEPEND="sys-auth/pambase"
+PDEPEND=">=sys-auth/pambase-20200616"
 
 S="${WORKDIR}/linux-${P}"
 
 src_prepare() {
 	default
 	touch ChangeLog || die
+	eapply "${FILESDIR}"/fix-test-calls.patch
 	eautoreconf
 }
 
@@ -53,6 +55,7 @@ multilib_src_configure() {
 	export ac_cv_header_xcrypt_h=no
 
 	local myconf=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		--with-db-uniquename=-$(db_findver sys-libs/db)
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
 		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
@@ -65,17 +68,17 @@ multilib_src_configure() {
 		--disable-tally2
 		--disable-doc
 		--disable-regenerate-docu
+		--disable-Werror
 		$(use_enable audit)
 		$(use_enable berkdb db)
 		$(use_enable debug)
-		$(use_enable debug Werror)
 		$(use_enable nis)
 		$(use_enable pie)
 		$(use_enable selinux)
 		$(use_enable static-libs static)
 		--enable-isadir='.' #464016
 		)
-	ECONF_SOURCE="${S}" econf ${myconf[@]}
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_compile() {
@@ -92,16 +95,17 @@ multilib_src_install() {
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
+	# tmpfiles.eclass is impossible to use because
+	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
+
 	dodir /usr/lib/tmpfiles.d
-	cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}-:${SLOT}.conf <<EOF
-d /var/run/faillock 0755 root root -
-EOF
-
-	if use selinux; then
-		cat - >> "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-	fi
+
+	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
+		d /run/faillock 0755 root root
+	_EOF_
+	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
+		d /run/sepermit 0755 root root
+	_EOF_
 
 	for i in "${WORKDIR}"/${P}-doc/*; do
 		doman ${i}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 46212146448e..785fc5581d28 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,3 +1,3 @@
 DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
-EBUILD tevent-0.10.2.ebuild 1632 BLAKE2B 69bd1cee72926c77b55ce2d6f324cbd92ea7c1c93aae4b83d541458a9743f85939fcdd6429e6adda5a6d66eae051a09eabc4a9bc36ed56d161591514a24a158d SHA512 97b895b74b4440072bedf6f6ba1a785022441459f388a5746a8251f3674116b812722c17c9e3bb0fecdb33d822e594f84d306554763554e99e875d6d97d37470
+EBUILD tevent-0.10.2.ebuild 1605 BLAKE2B 401623d3836fbea1cffb8d8fe9d68e1fafdcabacee166885dfbc19fe482a1081c0d4920a62d4ffdfda9095c82473a11f4dbf8175aa7c5a66091e11162c32ed63 SHA512 6c01a01dba4bf300abb8c4d96e0b9d4a1693a50a1f3e3ac84305126418afbdc8f56bf652da5cc36c21c8863beafc018ba7b7c49c9d8d4e173af63089b91edf5b
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.10.2.ebuild b/sys-libs/tevent/tevent-0.10.2.ebuild
index a5b491901fc3..0d5e3cf69422 100644
--- a/sys-libs/tevent/tevent-0.10.2.ebuild
+++ b/sys-libs/tevent/tevent-0.10.2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	elibc_glibc? (
 		net-libs/libtirpc[${MULTILIB_USEDEP}]
 		|| (
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /sys-libs
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)