gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-libs
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
219 files changed, 1021 insertions, 4517 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bfa366d0302c..e9d7e4a9e4fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index a672e06a5bc5..ffd027284775 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
 EBUILD atk-2.34.1.ebuild 1136 BLAKE2B 258da793056c38e69971be60bee19954c9852094b6dc54d0f936df83d40f7eebe62d3e82b0621a34ed1a5e1509d74b27b088ddf4db5665aca7a67065d1be7df6 SHA512 2484f173bfcc79ce6364e47e05b3c631f11e64212bae571b7f533f749f7efbc934d47aef4be6c7287d75002a28d5d9ce5dbd1d472011c1d9c7337cd9e3a64f59
-EBUILD atk-2.36.0.ebuild 1144 BLAKE2B 2dc0e84a03bca7e2672797d1d68f68b7b2493d21ee37e090222396b7dd2df8e7c58632cf40b670aca5b801d28598e62d5e9c33c28279bde326cabe1485c97b2a SHA512 bd042bf5cb08c697e284108bde08f8f7513c0a0d530097ee7c10091ab686dfebc7552c26641fbda543da4a4628d674523b9e61257c1235a033cb5b09a5743f0b
+EBUILD atk-2.36.0.ebuild 1140 BLAKE2B 09eb3647f070ea873fd684d5c04b1e5d81054b1d1f9f5f7c6e8a6f4cf396ff450fa77d8635c9fe0c563097e6b08adff771a7f2078dd9813206b0ed998a69473d SHA512 f89cd84e5b867741019a14eee4148226bcd9f4562ba3f41c94629647019f8077f11023209925090df7c02b55ac0e2da9df304622fca238f47853a32af28f3328
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index fb26bc563698..1d612f6d193d 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index 46111475f9dd..d2d26f4396da 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,7 +1,9 @@
 DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
 DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
 DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
+DIST capnproto-0.8.0.tar.gz 2121249 BLAKE2B 6d4ef9adb026a8ea8bc558bed1f8ce910e9c3b050ad0ac7ebd4be323cc1709a6b08956d4d2f39daee5c6485438f64695a028ea198aaae8a6c366316f10b1a64f SHA512 a3b87d47f4c160c3c72304539c3d2a6836488a50d1014c9f0eb95c112dc1e0f85b3158d26c248eff464205388ea61733c45ba10dc5441e5dd04064ba2c7970e6
 EBUILD capnproto-0.6.0.ebuild 815 BLAKE2B c568f71f4e6be421b7cc1c2c0cf5746c53f1ec0974efe46533441840ba0972b2431e42a65d3d78e49bc6dd3c7e19fa81fbda7b992855eb35460e0659134fa947 SHA512 65b75863b45e512e9dd073e55b3dd4ca8d1b8d2285df8d9d7f7f7cdafec970497ae00b78e2f72a359679db821a766e0dda4056c6fcf6184f8e1107887877da10
 EBUILD capnproto-0.6.1.ebuild 815 BLAKE2B e05f98460b1d6f3cfdf5cc046c555756e579f41ba887b42942230c7e185c0269f43bd9dc0ce10ee34b5c46c1d7999f78b5805523efb61560fea2c8837dccf68c SHA512 1b53b7a5505fdffb6ace4b7075f1abf8cfa3f67c0bf8fa532bfddcbcab7420208cfeb637e36e163a641114a68663f8cde39cc43bd9348af95e9b6cd058031c8f
 EBUILD capnproto-0.7.0.ebuild 894 BLAKE2B 64ad5fe9cf2e65bfefe4e3060ea938e1b7e3d446a9757c4d8fb32622765c7e1ea9ec2b291491de7ba8180c4ce944291cf6b77ef32e1c9f641a67d6f593b9f30f SHA512 1fbddd46b4ad600802041181414d73100b5c75965254993a2bdb840718b9e6f0c1ababae50744e185f42597bf43766941cf5c9ae40eda7d61e45eb52c4550679
+EBUILD capnproto-0.8.0.ebuild 953 BLAKE2B a5d737000df9ff65d42d59d83e48a2e3fde0dc0a80102b4b2b85deceded323bbb0e5190e47af968ee6cb4734a5fc355b1d016a28af86164e1d0f22c548ba2fe8 SHA512 7398cc3f4a5cd936e72e070b2e40e56213993012e7f37ca70efd50f09d7452005993065ec40538eb6939a2881d891f0ee101b3abbe5f4496f4c557ab72a0ee63
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.8.0.ebuild b/dev-libs/capnproto/capnproto-0.8.0.ebuild
new file mode 100644
index 000000000000..2905a51fc563
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="RPC/Serialization system with capabilities support"
+HOMEPAGE="https://capnproto.org"
+SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/080"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/${P}/c++
+
+src_prepare() {
+	sed -e 's/ldconfig/true/' -i Makefile.am || die
+	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index bc1b1a7c48b1..7ac1a9ae9ed6 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.2-r2.ebuild 1374 BLAKE2B 0a2125c08c00d3724dc4460329be6f298a43380c034ba603c05b2dd362e6d692a193034eb16ca35a61bad5be14b43bef1bb226ffd16bbe872bef5ad0b30f4ca3 SHA512 e3378d5580eb5b0a91a44e959f464e0444db06478a86e518afbff10eae8ad6c4b2dfc09efbce3bc238b179bc094adc81257bbdd8c4ded198c3d45e3e045142fb
+EBUILD capstone-4.0.2-r2.ebuild 1472 BLAKE2B a233c75fd89ca49998a33115cadafb8316b4c84ade32c65ae9b1e96a5ca35dec2fe7de18d4cf932d68f4b35ae7bf932d6728375f40dea2370e7e6ca3492c7798 SHA512 15a9bc5ff2dea34565a4166bab754f06fce83dc04dda60a2d04828570dee55ee8006797f3c7e532f7192a4395731088bc82aa9cb6e5e03dc108aacf35e0c8db4
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 99f181cb326c..09477aff2a6e 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils distutils-r1 toolchain-funcs
+inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+#TODO: needs upstream fixes
+#distutils_enable_tests setup.py
+
 S=${WORKDIR}/${P/_rc/-rc}
 
 PATCHES=(
@@ -32,15 +35,20 @@ PATCHES=(
 )
 
 wrap_python() {
+	local phase=$1
+	shift
+
 	if use python; then
 		pushd bindings/python >/dev/null || die
-		distutils-r1_${1} "$@"
+		echo distutils-r1_${phase} "$@"
+		pwd
+		distutils-r1_${phase} "$@"
 		popd >/dev/null
 	fi
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	wrap_python ${FUNCNAME}
 }
@@ -50,25 +58,25 @@ src_configure() {
 		-DCAPSTONE_BUILD_TESTS="$(usex test)"
 		-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	wrap_python ${FUNCNAME}
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	wrap_python ${FUNCNAME}
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 
 	wrap_python ${FUNCNAME}
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest
index 36b772d9202d..68c597144650 100644
--- a/dev-libs/clipper/Manifest
+++ b/dev-libs/clipper/Manifest
@@ -1,3 +1,3 @@
 DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd
-EBUILD clipper-6.4.2.ebuild 616 BLAKE2B 54d2d148f1ccbcabfd151fa4d9084a22a577fe4ff5cdc69d6746273aefda22570d5ba919afbb2fc327b3bc668f84b7b5919d2c831eae680cae07d5416fd0c76f SHA512 14538e2a89f67704f82d2e849ddcd918aa14dc16a702cf9272826b40615a2adba636fe61e3a2aea76e64966b87167527e82f3ff4312e0f49417f9dc63dff2e57
+EBUILD clipper-6.4.2.ebuild 621 BLAKE2B 7b93470d7ab61f5dec552a066d3feddc5d8ee90ba0ff162502b70c2216a04b7e98fbd35ba727fdcdf0ec05536ec094d73518a79dcbf7f6c29dbfa730bfe5c196 SHA512 c1abeb8e96b69ca0d0858750b3ccfc9a56c50fe1fff2dac306824f328784e4cacec54e4573963097919dfbe2bbda4ff5909d166bffb7a62323cdd03e185545a3
 MISC metadata.xml 631 BLAKE2B 2f873cd0220e6fcb0404b0ceeefafa2acf4418bc23a29e2eb249341a4c3b4698d77efdd30deede7a4427fc228213d67c034e43237c60e91679a7c05be5b664a9 SHA512 06e5eb63edca0e93a95de200775f51919583dea253fa4eb59eca5bc0c4a5a96c2eab59b746f43002c71ae992ceafa99ef84fe1f02267bdac40853f2f0c4e1081
diff --git a/dev-libs/clipper/clipper-6.4.2.ebuild b/dev-libs/clipper/clipper-6.4.2.ebuild
index fd2344e7318f..bf08e2705120 100644
--- a/dev-libs/clipper/clipper-6.4.2.ebuild
+++ b/dev-libs/clipper/clipper-6.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/polyclipping/${MY_P}.zip -> ${P}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 77169ef4ac53..a97ffb1a3d21 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.27-r3.ebuild 8182 BLAKE2B 70af8a045087a3b745c0bad450c7a0ed0b43a906791845988306dc6068d0d3fc7646c6d7d9882a2e5aecea28f861d552d4e4ad9c2631eba8e0fdecb2b33a0a63 SHA512 5822cdc9cd037593cade59aec6c47590e25d012aed191377a82d03842412d433ba1d933f47345533d15d9e2c72cd4853dcd6a3a13ad07a2fa88bdc57f4c86a85
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8201 BLAKE2B bd72b81301fc1868ced9ee108a44f16ce968ff4c74f6054ab82a0db41d937659bc98464d8be27799bdeccf7295f6d7c3b93270faa1e5ffeed577657639c0d139 SHA512 69953cd0a1294679a33bf41dec6312d2699bafe48d88c21072ff94249b08324c4c66ef39e328cc68a1740fa15a5e10d1537c64cd9be676f173a4fd3805568510
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8200 BLAKE2B bd73820606a6b60d219e6effe243e3cceff02602a7bdbec3b96bc666ad3b5df62c8d37bbfb8db004bb36ee4b7a4829d5e91818afe1940cad2ddaf349bcde6815 SHA512 8df2f31035e3484c3a13569b4f7efa126226bb061c03a658341256ebb73ae2752f737e9f92228c5d59caf27d85f0e90bc9b05e83c091bf44988325544aad9ee7
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 5e02c971cab0..edb126b67681 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 971c8f29778f..c3b9486a0770 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -3,5 +3,5 @@ AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c58
 DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
 DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
 EBUILD folks-0.13.1.ebuild 2127 BLAKE2B fbd9a7223cb54a3b7131dd65644d4b3232ff6f5746c0dcb9cab470e82180844b45b0b3a8c34f5949863dd7e728b2a1a3f8a75ba23e9f1c66fe480beb900bafd5 SHA512 78ec67564db62ff9c97326a0cb971b7240eb3bc9e1c28e07b10d60acb5a030a595abd093fef877fd68915a780b5a6f4ec9fe45c25eca793122e95f72cdc06ca9
-EBUILD folks-0.14.0.ebuild 2580 BLAKE2B 96d5ef5528f8727adcd8c3416366c89f2ce063ee3dd9b0d486b3daf43a6806700b648b0ba5fbc3341c7bb04f7c1841658f1419c2053dea15d88dcf9da5d4190b SHA512 b3efc52bf62490d9561398274ebdfd760338ce9d3bcc2775baf65154d05986ca478f3592ed4c342b244dc1be6e6e18aa64bb4bd6e28f7db6e52c58f37be30e76
+EBUILD folks-0.14.0.ebuild 2578 BLAKE2B fd63633e12ed937f579a562c94c455d78dcb4898fb5e6cc68e7f091e296b28827c93c8f26f8e392f67f09b6cbf5d8c64ec624cfd4e884bbcc6ac61b0009921b3 SHA512 ee502d9c4e68ffdc09e0c9dca1ed7561c269487610ac88f25a37bf7cb160879e7c5b889bfbb5e006b59e8ac288966c52d93adb0496833f05ac03c213f68af865
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.14.0.ebuild b/dev-libs/folks/folks-0.14.0.ebuild
index 3da8c1c10c3f..c59515538edc 100644
--- a/dev-libs/folks/folks-0.14.0.ebuild
+++ b/dev-libs/folks/folks-0.14.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test tracker utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 56b480cedf01..42ade8127cd2 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,5 +1,5 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
 DIST gdl-3.34.0.tar.xz 531368 BLAKE2B 5e32c330ab2fda0b9f06de0fd9d7e3f3118b0af36a73f4f0280f069b49002a4d00e5cbfd373d65b0ea7a15bb5b577f8babbdf7ee71ed7db773d2ad65008a452e SHA512 8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0
 EBUILD gdl-3.28.0.ebuild 729 BLAKE2B 1b46485f8ac883f64d5c35b46992a7eb3e8a82ecae841eee29f29a9752f794f8d2975b3cdfe4d551a0ec8a1687961db0116ade3936d30804ceaf3e458aa167e5 SHA512 09a66a3105ecd29787f0378e6bea909aa9312e6c211eabbf11d21775d5ef7e504a60d87912f95d5e6f326c1df8c9d4a9ea4ee17c5b8a3cb25ac69f71f52c0260
-EBUILD gdl-3.34.0.ebuild 733 BLAKE2B d89b48abf949e96dae3c31b6378a0220fea61146ce2f0ad26f964afd5e975fc68648fc2d2a26cb5a85b2d4260dbad48c31bcdc1a9ff27536bde34656792fb2cb SHA512 2bb44b67d54e77fae565e2c7fb13ffebd3a2859e653a07ce6d5dcbbd35af192cad544882e45289c115e39667714ae5b562b09596f005e467b88b95c03b427738
+EBUILD gdl-3.34.0.ebuild 731 BLAKE2B d1dac1a6ea3bcf061b9e39115c405190f0b87eebf34bc1adf84577efc8d62edbf5ce9dcf33cc72978acc712fe596159a7e214c62622db27d2010636df8984d75 SHA512 d8cf39270d3a37b1e363022e65787bb92a4a6e90486dbfb6144bfda667f47442ffa498d26db92af004c4caef3450dbb55ef538a0ed68dd89810eede352affe4a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.34.0.ebuild b/dev-libs/gdl/gdl-3.34.0.ebuild
index 827c89eccd02..1cab54f3f74e 100644
--- a/dev-libs/gdl/gdl-3.34.0.ebuild
+++ b/dev-libs/gdl/gdl-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index 8990f12e9bb9..c08cbe7e320f 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1,4 +1,4 @@
 AUX fno-common.patch 1170 BLAKE2B 828fb26be2a3055d0dfb7fb5b0237c0a0b6f22143ed0a55e786b3cae6e39a5eca189856ce0a53d5a672194e2a418e76934ade60549aa7cc6d46ee436bc7583cc SHA512 c01d85b974b58accff169bdb34292d79d84b9035374a92933a503622f66cd2b08f407122c16b8c358d418626449df33083ae554a7e7a334ed6f32d500a7d7084
 DIST gf2x-1.3.0.tar.gz 727717 BLAKE2B 65f6596a09087708e4ae940b067cb375476c1e7b25a28bf12e9318c752cb326516edeb9363d0f98a9b4173f5bcefd204aa62e1cb87b3f27ad9c30b661edc7451 SHA512 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e
-EBUILD gf2x-1.3.0.ebuild 1530 BLAKE2B b674c37ab4bbd9a93228047cdb79626ac277b8a1eebda7ce86c827b57598af6ab5ad767cb018bd5f76db57dfab775335a113771c2027d203278cfa57c75160a9 SHA512 d6319583c3f49d3d2dd17add1b86d89325e63a4bb9fda22bbd0272d35192309c5c643584b5e33cfc883362236820d73014adbe6e1360f1f12b378d8b3cc85924
+EBUILD gf2x-1.3.0.ebuild 1537 BLAKE2B 547d75cc83b2013547f860aee5ac9f84dc5f80a47678b0a32ef0a41dba52331501a6faea3a21e5601137a2fb4f74c977bb3d1a81293e69ca91968f53229ef649 SHA512 bb8ef59e2b186bc642041fe2b77db5ac36adb8a84822acf16d8e9b6a0be34a3a65c1d6b8b4643b19a8c787a648b4497e2aaae1f9a6c82d786a9f7503c96617b8
 MISC metadata.xml 754 BLAKE2B 53d2cdd4bf257213b6f431fd7692593d9577f0c146c2b40546846ef868a781f8ef40d82fc3c833edf7e0cb9c9805c67e1740af2ba205a2e50f767d3e7160303b SHA512 48a3afc2bef2fee5bce10f9d0f4580269bc0089855f2329cf74c3726ebf20ab05867e628dad5e05c57982433cee2a17782b30b16080a76ebc979373105e18803
diff --git a/dev-libs/gf2x/gf2x-1.3.0.ebuild b/dev-libs/gf2x/gf2x-1.3.0.ebuild
index 3c44e414e864..0ff8c7a7a428 100644
--- a/dev-libs/gf2x/gf2x-1.3.0.ebuild
+++ b/dev-libs/gf2x/gf2x-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # soname major version, defined in configure.ac
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="fft static-libs custom-tune"
 IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 07514ad1ea61..ab33f8b87464 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,5 +3,5 @@ DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
 EBUILD gjs-1.58.8.ebuild 1608 BLAKE2B 157415b6171cacd2d7c08c9426227f551ce60441fbec98873149b2d80b082cacf068757fb7dd62e47fa2a2aa098f200b5330ad700e1b716e5e310ef2d92c145c SHA512 9de69d57a9795771dae2c4d828f23ae2a269d80dbe153c0830978b083b39cd4188bf5b37097529dc986b62534c996a1d9ca392cf692f62edcdfd676ccb9c5ddc
-EBUILD gjs-1.64.4.ebuild 1128 BLAKE2B aae76852c57af70d535d1ebb586d400731f3bffe83ac4fd141872ed73b6c7057131f45d82ffd56f5b98fa3ef1b98c716a1e1763537793d71aa391c68e2af9008 SHA512 9df6933dc65c49a6e74a0106f44b006bcc6c324c0311fd4b9f723c1192dd4831f9a01d12da5f2a737e61712128f58d755f039bf278af8869f9f651ac03f480ff
+EBUILD gjs-1.64.4.ebuild 1124 BLAKE2B 8a31589c2645c762e70f19fc6987d8b1cc07b8fa6531c3f4bd15ffdf339ddd54c4f2d9a03746a34ab4c559f05d486467857f26842c9fcc6bfa5db4997eca7e97 SHA512 1a4648b0fdc426c8cf4a43110c470667e287f9d6fe446b546c70495d4ecb4511395fc1e7e37f14edf05f53580eafc6d30742b78142d065e3c4967c16c2ed3f51
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.64.4.ebuild b/dev-libs/gjs/gjs-1.64.4.ebuild
index 32d72857d4c1..48a880b97706 100644
--- a/dev-libs/gjs/gjs-1.64.4.ebuild
+++ b/dev-libs/gjs/gjs-1.64.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 9cc5f9b8f8f7..f35635282cda 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,6 +3,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
-EBUILD glib-2.64.4.ebuild 10345 BLAKE2B 9942555a844dc1aa6bc0d5b5eefb7b338f6ee24e98bd654058809acb7bcd392977e7e3d2bdc8bb4f391b35575c6f90c334fef8189216a41ae05ccd00c2e35179 SHA512 696e24dca1fe1209ff0d8783900d5d0ca6fa8ebfd164062fb30271eee0fc95f76407828b3f64b9e4d475858ac1dbff72eafeb203c3be3ba99f6795bd088a3911
-EBUILD glib-2.64.5.ebuild 10348 BLAKE2B 65eb5f35c3a0cd59c1f5d4dfa4e6ec012a17948446e6a2ffd9c533b08ffb491971132db1e5a614163d5f4f96480d2f2aaee4630e80c38502bc978b6cf94b3665 SHA512 8dd59110fa24b8b2fe30ca678230d709e1bc508f7e043f5c987c81209a3851623ce4112888110457f41c18ade7640257333631076c1cffb37af8e419a09ea0ed
+EBUILD glib-2.64.4.ebuild 10343 BLAKE2B 84d82001f55a173d36d263675f0168a0d8f9cfae88c53358b722ebf9c7a07fe12a10ecde623e3e26423216a08ca74a94037727ac64c8287a3de80334dc8ce4a4 SHA512 a5f70fe09a276c7a1e4ebb6e924995b0e216879ab42fd57dc185716c3985547c1e46aeea2e2798548a33d227afc9c4cfc961fb2e0fca17b156022bc168b341b5
+EBUILD glib-2.64.5.ebuild 10344 BLAKE2B 41f17b87deb363b16093aa5ee004bd828b1d9d998206db4c30ddb0295a63e321ceef2e6864ff7f842d455b82ec4d4df04154e3492721e75d926aa8bab370677c SHA512 e2c4656c0e1cfc824c1662a7727e00fbab5f874757d32eb2704c60c7a151ea22cc0f8289d1e4dab02e7db1b24b4d89181e10c25c3c67ca2216745839c71687c4
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.64.4.ebuild b/dev-libs/glib/glib-2.64.4.ebuild
index 93a5921ec33f..837596c8f777 100644
--- a/dev-libs/glib/glib-2.64.4.ebuild
+++ b/dev-libs/glib/glib-2.64.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-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"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 00e2eea8a942..20eae495eb41 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-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"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index ef9e02ed6b9c..5d36854ef19e 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
-EBUILD gobject-introspection-common-1.64.1.ebuild 938 BLAKE2B 028043f8f24e9aefd06d12d6cbed25f76aec1611dbacf91363cf2f9dd00433563ad71caa7066642887d00cda2b31258eb112036d0c16e021b53c930a27b21f95 SHA512 f2bbf6d18b92581716fe776020037fde2258279846fe093f8df23959b3195581c8e176c073f811efcdcb701b088bbff2143f6b91a5afe4f946892c0544577a9b
+EBUILD gobject-introspection-common-1.64.1.ebuild 935 BLAKE2B f6c0d69b0b4b1af9d862532fa5beb0b279f17c2c3a70f2963c0f7843cc67b06cc7a958130d406e1dd641093679b0e4f425049b719f6c0eb803781d97908af765 SHA512 966ffbd4aa5b3e14559e9aaad20b282caa1e0c67217f90da46184da9339fbe8422219ef9a0dab0c7535a75cd68a20b9af6bef7992d80ce838cb4df610f9e67c5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index efe5cc899814..7597915c3011 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 11fe9450767b..1ce1691b7250 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
-EBUILD gobject-introspection-1.64.1-r1.ebuild 2011 BLAKE2B 8eeffd951899248927077dfe5119bfed3355ac5d593078b8ae027263d542d522c881c0abdcf031a050f574a3644068fd8428b102943b701f5c42176ab7cd2c80 SHA512 93b745e1ae2c987d91433fa1e38186e672e0b652cb339fc2b418a4fc528139eed583671cb558c1cc65114f4336ea841bbfc2eff7b300924126565394f5512d32
+EBUILD gobject-introspection-1.64.1-r1.ebuild 2008 BLAKE2B 49bae69209a1ff169f2cde345bbe482c3651ada4e498adfc670d13b65d41cdf328f43407b5909c25b2eb466882b7836e3a91116a7b2cbb35f12b80ea7a51cbc8 SHA512 7af841ef83491e790e50f7d0748fcdc5fbf5826d5556739ef31de1b4d8446fd86ef94bc41daaeab09bfb27e492d6a5e72c2775a9b1667d06e2cbc65b97be808b
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index ff498a735a4e..b8c5e60f37d1 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 70ebef0e4acc..edbeeb0c2806 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,8 +1,8 @@
-AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3cc1230d2d341fcbcffcdfb7aba16051edbf1cabdb64189c49f80845fc33593e2eeea1eb1bd50e131215e2be96b89777 SHA512 7cfdd1d5e2c604125ec33a4e0332b32b77452445b59244d4c13e4c1b635ebeafd5cb6dd345c22101951acd71aab7621c4a2f36b9596d449a74b469d9f812610a
-AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9
-AUX iniparser-4.0-out-of-bounds-read.patch 768 BLAKE2B d1de412aa113ed5e0c7f4f91bc6a18293fa1855b8982bcb1641d3e224c3528c2c0e35398555d12b0db9f08db7c318ce39668b0f6f091db34b063910e0ed31367 SHA512 c7b28f1cf3c853a00c56fbf686adc6ae11d7b6b5d838d6624d92ef6366400ce27a54332e2d17561275db08866bb050d3a4096b8e32ec109477537c839f0808d7
+AUX iniparser-3.0-autotools.patch 833 BLAKE2B 6d1328b0b5c7afcf769a55d5fa03741449364343a174f466afbb6eeac3a1fd8df799f4f1f866c982c15eb9f5c32dd04b8e914e621b788c770f77a3546c66ef95 SHA512 7da9af6dd9d72148fcdc2a0cf11b1308e33ccf208448af6e7aa3cb3e1f2f34696b8098458a3903b498445dc5627e15e7ccb20347de13f7ddb8e5e999890acd21
+AUX iniparser-3.0b-cpp.patch 1032 BLAKE2B bc558d7c0263b2fef25a0cca617a717378a203f3acc95ec276c66122d5f1db99bbd510f35b07107ffc4f59fc6c853d961211be66c5999a7b8a991b00e21b2d33 SHA512 62a2514898a710293c7dabea089aa21597c47eec030eca1d0f3d8a3f7043f7811f374ef56b3b60527568b012af593e86c66f3e7c52f9ff64a000975978e88379
+AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c67ead108150375d850d6afe6f57815e9c4b434415596c514632e0575ea1cdf0cb464d6ca12e47780db5cd237bcf38849771ee41a SHA512 f1f01120fbf740cce5749f8ee9ba2014794523bc045999f45ad28a2bd4842d1e822b65fab2feb0751cba074de956c753949fb8b188454daf129c1ba8f0b6a1d4
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r2.ebuild 1174 BLAKE2B 34cf773316a4448856fccf1f3fab4dfbc14ba847b64dfb71e1da7350b476a1f6a6eec9c082e9d9a953aff544090aaefb623c17e3070a07924db2aec13303af36 SHA512 c472f665c77a614ed87bbd319ddc29c2305e4180388bf34c2355c20d3d2eb3e83e1f29f3ace908f5d0afc65434b26f9dea3e90e029a3fdb0dc70fb0a8ae1819c
-EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d
+EBUILD iniparser-3.1-r2.ebuild 1282 BLAKE2B b437ffcd1d48a77053cb1c75dd387769df7c0ab03e7b63185f3a455e56c0cad54f0ecb098fc8fe3c703d32e150d15b7e58d9d6e0920554381a8f568df265d89d SHA512 8e6de570ff690a11bd91fa35473a674ef61a92686e50a18ab3d9e9934d88f010b06cef725f15a82257ddca87368b83307b68a5b27b864b3ad194fb605965060d
+EBUILD iniparser-4.1.ebuild 1552 BLAKE2B 4587d192bfce6a57bea9beac7fcb4f08cdccbb7d97f9e4fe52367fd3b1f1e46e2b51d8c31527251d0f0151e70b0dbd83068e1ed32dc8ffa0d893731b4a1e29ac SHA512 dd2ebecfb0eef87f2e44fcb874dcac8e3b500738399035af24d8fa94cd1117f6c617ff9aa2fa8c2c979b5a65b9aab58092e5d4cef8cf039a7916ba7d05350a50
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch b/dev-libs/iniparser/files/iniparser-3.0-autotools.patch
index 89c7f63d29af..361c96a7d4fb 100644
--- a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch
+++ b/dev-libs/iniparser/files/iniparser-3.0-autotools.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ Makefile.am
++++ b/Makefile.am
 @@ -0,0 +1,8 @@
 +ACLOCAL_AMFLAGS = -I config
 +
@@ -10,7 +10,7 @@
 +
 +include_HEADERS = src/dictionary.h  src/iniparser.h
 --- /dev/null
-+++ configure.ac
++++ b/configure.ac
 @@ -0,0 +1,24 @@
 +AC_PREREQ([2.65])
 +AC_INIT([iniparser], [3.0], [ndevilla@free.fr])
diff --git a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch
index cb331b813093..b7cd17d2d226 100644
--- a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch
+++ b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch
@@ -1,9 +1,8 @@
-diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c
---- iniparser3.0b/src/dictionary.c	2007-11-24 05:39:18.000000000 +0800
-+++ iniparser3.0b-patched/src/dictionary.c	2009-04-01 21:38:09.000000000 +0800
-@@ -38,6 +38,9 @@
+--- a/src/dictionary.c
++++ b/src/dictionary.c
+@@ -32,6 +32,9 @@
  /*---------------------------------------------------------------------------
-   							Private functions
+                             Private functions
   ---------------------------------------------------------------------------*/
 +#ifdef __cplusplus
 +extern "C" {
@@ -11,9 +10,9 @@ diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c
  
  /* Doubles the allocated size associated to a pointer */
  /* 'size' is the current allocated size. */
-@@ -401,5 +404,10 @@
- 	dictionary_del(d);
- 	return 0 ;
+@@ -394,5 +397,10 @@
+     dictionary_del(d);
+     return 0 ;
  }
 +
 +#ifdef __cplusplus
@@ -22,12 +21,11 @@ diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c
 +
  #endif
  /* vim: set ts=4 et sw=4 tw=75 */
-diff -ur iniparser3.0b/src/iniparser.h iniparser3.0b-patched/src/iniparser.h
---- iniparser3.0b/src/iniparser.h	2007-11-24 05:38:19.000000000 +0800
-+++ iniparser3.0b-patched/src/iniparser.h	2009-04-01 21:38:02.000000000 +0800
-@@ -41,6 +41,10 @@
- #define iniparser_getstr(d, k)  iniparser_getstring(d, k, NULL)
- #define iniparser_setstr        iniparser_setstring
+--- a/src/iniparser.h
++++ b/src/iniparser.h
+@@ -49,6 +49,10 @@
+ int iniparser_getnsec(dictionary * d);
+ 
  
 +#ifdef __cplusplus
 +extern "C" {
@@ -35,8 +33,8 @@ diff -ur iniparser3.0b/src/iniparser.h iniparser3.0b-patched/src/iniparser.h
 +
  /*-------------------------------------------------------------------------*/
  /**
-   @brief    Get number of sections in a dictionary
-@@ -277,4 +281,8 @@
+   @brief    Get name for section n in a dictionary.
+@@ -304,4 +308,8 @@
  /*--------------------------------------------------------------------------*/
  void iniparser_freedict(dictionary * d);
  
diff --git a/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
index 962566cd5b7f..f6488810ac12 100644
--- a/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
+++ b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
@@ -1,17 +1,6 @@
-From 4f870752abbb756911d7b11405d49e9769d082bd Mon Sep 17 00:00:00 2001
-From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
-Date: Fri, 8 Apr 2016 22:13:36 +0200
-Subject: [PATCH] Fix #68 when reading file with only \0 char
-
----
- src/iniparser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/iniparser.c b/src/iniparser.c
-index be37fec..fb1b549 100644
 --- a/src/iniparser.c
 +++ b/src/iniparser.c
-@@ -678,7 +678,7 @@ dictionary * iniparser_load(const char * ininame)
+@@ -663,7 +663,7 @@
      while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) {
          lineno++ ;
          len = (int)strlen(line)-1;
@@ -19,4 +8,4 @@ index be37fec..fb1b549 100644
 +        if (len<=0)
              continue;
          /* Safety check against buffer overflows */
-         if (line[len]!='\n' && !feof(in)) {
+         if (line[len]!='\n') {
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index 357f9b4f3b5f..5c50f4305ea2 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -1,47 +1,55 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="A free stand-alone ini file parsing library"
 HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-		sys-devel/libtool"
-RDEPEND=""
-
+IUSE="doc examples"
 # the tests are rather examples than tests, no point in running them
 RESTRICT="test"
 
-S="${WORKDIR}/${PN}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-DOCS=( AUTHORS README )
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0b-cpp.patch"
-	"${FILESDIR}/${PN}-3.0-autotools.patch"
-	"${FILESDIR}/${PN}-4.0-out-of-bounds-read.patch"
+	"${FILESDIR}"/${PN}-3.0b-cpp.patch
+	"${FILESDIR}"/${PN}-3.0-autotools.patch
+	"${FILESDIR}"/${PN}-4.0-out-of-bounds-read.patch
 )
 
-src_install() {
-	autotools-multilib_src_install
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static
+}
 
+multilib_src_install_all() {
 	if use doc; then
 		emake -C doc
-		dohtml -r html/*
+		HTML_DOCS=( html/. )
 	fi
 
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{c,ini,py}
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc test/*.{c,ini,py}
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 02c8405c8e5b..44a31f60eaa5 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A free stand-alone ini file parsing library"
 HOMEPAGE="https://github.com/ndevilla/iniparser"
@@ -11,27 +11,24 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples static-libs"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-DOCS=( AUTHORS README.md )
+BDEPEND="doc? ( app-doc/doxygen )"
 
 _newlib_so_with_symlinks() {
 	local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}"
-	local libdir="$(get_libdir)"
 
 	newlib.so ${source} ${base}.so.${current}.${revision}.${age}
+	local i
 	for i in ".${current}" '' ; do
-		dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i}
+		dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i}
 	done
 }
 
 src_prepare() {
-	rm -R html || die
-	eapply_user
+	default
+	rm -r html || die
 }
 
 src_configure() {
@@ -54,7 +51,6 @@ src_test() {
 }
 
 src_install() {
-	use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a
 	_newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0
 
 	insinto /usr/include/${PN}${SLOT}
@@ -62,14 +58,13 @@ src_install() {
 
 	if use doc; then
 		emake -C doc
-		HTML_DOCS=html/
+		HTML_DOCS=( html/. )
 	fi
 
-	if use examples ; then
-		local examplesdir="/usr/share/doc/${PF}/examples"
-		insinto "${examplesdir}"
-		doins example/*
-		docompress -x "${examplesdir}"
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	einstalldocs
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index d73f262fd467..24a80afc8d6d 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
-EBUILD jansson-2.13.1.ebuild 891 BLAKE2B afd3ae0f565b15b21caf145772d0e18d88233e48bff6e5f108f7a1c9ad48af06c7dc962557bb930b1121976ae19ae3bbfb1c4cfdf8a16c95fffb65815832bb9c SHA512 0119aad5dad85732f2385466f74b4bfb8527cec51e706adea00938e5f63e64acad1317a34d24daf3f736d9be28763b142ea3dfa5f1d1ab0616943cece82303e7
+EBUILD jansson-2.13.1.ebuild 898 BLAKE2B 6fcf7ab07434b15e1c319084e58a2008e01edbf2e7ae9583c9591a5620404b31359e2e4c4a55032e0ed854b3688babe829d4912245a183aa3a28118580b4f979 SHA512 963d872a5a70c41a06c07bb5ba6542dfdd41ba806638a82ad546ae3dc5d2f905f5edbc3c6a468ba4b9b2dde65f97aeb37951e7ea99461fb8b54b62746dba4678
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index 8b9c7d1b6c5e..d2941ff336ab 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc static-libs"
 
 # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 6b4c3ce6ae29..1495d1a57fe7 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -18,5 +18,5 @@ EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3
 EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
 EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
 EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
-EBUILD jemalloc-5.2.1.ebuild 1837 BLAKE2B b4b4bc6ce86702f0e781e16c64b98951721840a1c267287668bf3f75d35bdaa260794ceeb0f3555ab25fdbbd509099a7929d1122173c5c335a706710fc967bbd SHA512 a5f3703e05a694b770e1cccf221128f9ef19de1979c56807d07d5888c4f9bbb3ea0213ad3b3417b91a7842faffc1a681ec3484a929da4b54a14368e909fdc1ba
+EBUILD jemalloc-5.2.1.ebuild 1844 BLAKE2B 24a281ca1f56030555daa9ff4a6579ae47ee028fc620b52b77c027e94cb043d73a64c62c7493a28ce2a3cc42f02b497135a3bb30745d94048fec2b163ccc9ec3 SHA512 859ad5e39b236d091b3761264bb1b3966f9ea81ffa107d809a8c13817e89aef5a3141be309d47807fa2344aed9cc0e6e60686342d52bacc5bdb19ac1d705f60c
 MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index a33b2a2d84c8..de9d97d0f769 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 2f7b1fe5e721..0202d62d90fa 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,13 +1,9 @@
 AUX json-c-0.14-cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
 AUX json-c-0.14-object-limitation.patch 8789 BLAKE2B 39e307143dd439cf5eafebc86851c98cb09ab45ad33f4e30b7d1f88a4d22feebbe9a472d8b856de15d9a5f66f5b3b1a507958a5594967ac1e44b130ef62f91de SHA512 6a3ad442ae56082f6c76dc53aa9d9d5eb77743a33f1ed28fc49df6e445932f5809d094feca8d1f4cf90f6fe6516e902de99c481bab0527e2fa382ab008dbdd7c
 AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764c3786b8a35ad6b4e5736561901fd7c24f46f0f48b7dfb1b21395fa0fbda24e2bbbfd81d50f9c8de52908022c766df744 SHA512 3a3c31890ef7c1d6cca4f2bcd1b76602165471ab03d55c85da8c821e82e1985fa33ebbc35fa63350158fba5ba517f45f0a895f0624da97bb6f7caab0e4eec7b6
-DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
-DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
-EBUILD json-c-0.12.ebuild 916 BLAKE2B 835228c2ad857ff7a698d12400958b8aaa7da2828d92617b36db62e01433a3efbd3704134089b63f3a440489ae03bfcf873c303b35ccca516099d47f7633fb0c SHA512 02b0f07045736394ef18ca98901496c73153043e8825da2039c89607d5d2ca399e70ae371297f0b88ec05caad06a95ba83e589ebc89eea5345ecb12a05b4b3de
-EBUILD json-c-0.13.1-r1.ebuild 979 BLAKE2B 7df2aca92e501c35826dc6c30e190cbafc2719203bba58bcf525b8d6bb15e3602d4b69c5544032c34e90fd6e9a285cedeab5094e383aa2b0d434660ee8b72b35 SHA512 b7ed1dd4ac4ba08082c244bfe414abc1462491ab03d3ee1756641936323f8c19d6ee45a4681e48f3facd6584c8678e5c200d920950a4533b0b8c345273885056
-EBUILD json-c-0.14-r3.ebuild 1239 BLAKE2B 457644ffbce97ecfdfab9a0c5a65ba96c6c8a29c439001af513f4c6a93d4f309a09da08c92597a680a3786b5e25d4fd69d7e1ca8d8935a09dcfec30a4b117fc8 SHA512 84039f735a86db328a40443bf7b06a2b1427e61cd3ea9d25b5bbc9da44d61c74256d698aea4a2a6c7c31787ff1b379b8c5ded801293c54bcfe963a5ea7e3187e
-EBUILD json-c-0.15.ebuild 1087 BLAKE2B ab379406d0c4b66ef69440c5871ebe7e26bda599ff605d17f62f774b32e035ab160d012cfe296e7ed40bf95cf3b20fb5918bafc2f1ae537534bf26b935ab2437 SHA512 bc5a606bf685f358fb72471318f70855748597fb48869fd0b944623370c8f1a085593a8022823bd5a2b7233ed8a641bb7343700e59f85bca0defd043b9771a53
+EBUILD json-c-0.14-r3.ebuild 1246 BLAKE2B c06d68d6aaa52c0281841ab0de9d58923da4b1dc5c1c6ecbaa633cfce307ced0da8e2d0e2800cc20eb2fd9dfdb93e5d6ffcc5acb474d6a7c3f7e394bada5ecde SHA512 14e8374030a30f813395ce4454ce4a1e218c3c7da33ef9f5970e2b6718dbd034a2d4bcbd058989fb559a7f1f2418bfca091f50b5e5422bb9ee286f18fc910d50
+EBUILD json-c-0.15.ebuild 1094 BLAKE2B 6aa62cc278790420cc309ebcd8d720181fcba194383279553fd93c0ab0389a43408cc4b89ef6021f4969e2afc864295775f836d97d8953b8bec7956e3d43c0f8 SHA512 5157736e32aa487e16161306a12350ba850c1ca6c7aeab6b9e770767e47f90c9456c424a4609528ca4f980f3aadf3c5b1bad6072b7a7f37eab28bfa7378c1bd4
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
 MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
deleted file mode 100644
index 18e4b3cc8a55..000000000000
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-multilib
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs"
-
-RDEPEND=""
-
-# tests break otherwise
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	sed -i -e "s:-Werror::" Makefile.am.inc || die
-	autotools-multilib_src_prepare
-}
-
-src_test() {
-	export USE_VALGRIND=0 VERBOSE=1
-	autotools-multilib_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}"/doc/html )
-	autotools-multilib_src_install
-
-	# add symlink for projects not using pkgconfig
-	dosym ../json-c /usr/include/json-c/json
-}
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
deleted file mode 100644
index 74ff2bc61f49..000000000000
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs"
-
-src_prepare() {
-	default
-	sed -i -e "s:-Werror::" configure.ac || die
-	eautoreconf
-
-	# tests break otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	export USE_VALGRIND=0 VERBOSE=1
-	default
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	# add symlink for projects not using pkgconfig
-	dosym ../json-c /usr/include/json-c/json
-
-	prune_libtool_files
-}
diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild
index 0eae66557750..483ad5f16310 100644
--- a/dev-libs/json-c/json-c-0.14-r3.ebuild
+++ b/dev-libs/json-c/json-c-0.14-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 PATCHES=(
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
index 06f7928f8f96..ab5e203329b9 100644
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ b/dev-libs/json-c/json-c-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 1261a25cde6a..b27e3ac512bd 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,3 @@
-DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
-EBUILD jsoncpp-1.9.1.ebuild 1341 BLAKE2B 5109241c4f6941dc6764593d2f3b9c60dd6e1edba2d98dc980a7645a837fa4821e4cc0ab58b24fbd74532353e411dfad5aa086cece7c7bed7b6f19b4a19a3671 SHA512 c7ee5a71342c57a8c3b44f038812651c1acb6897c308df0946c81b33fc1af684b1ed5dd97e95a9d1532c2c647250b9f91293ec5a0b9e5c4aef3086045472a261
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
deleted file mode 100644
index 49dd145bbeaa..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cp "${BUILD_DIR}"/version . || die
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake_build jsoncpp_check
-}
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index b7cd554fb77e..8bf2081a2b1e 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,5 @@
 DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
 DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
 EBUILD jsonrpc-glib-3.32.0.ebuild 950 BLAKE2B 1a5f899fcd1aa09f924ced35d237fecc2e83178e2df4149cd6973bbe9f5a26e63f56c388bf8e4dfb98f20f3d22a1c14708e3fb628bc46156bb2fad6273f957e6 SHA512 d18ea1e621e48980411ff2aa284acd7f0913b7ba4ca89f4b46fa030331c73a292e7edbacbb5a401e7be7d4d0b6ce34ee6cc9c932cc40dbcaaa919f4f760aa8d1
-EBUILD jsonrpc-glib-3.34.0.ebuild 973 BLAKE2B e4651c021fcb0124577f161deccaf84f12e0fef68c38ae23f0dcccc2f066c152fe0db51ac4dc6cae56144270328d70135d8d61732a7045169592a8d06621af41 SHA512 386ace5ae44be904a324da390b91c5c9300000afa32561d4c6e7f8ff42a8458c1ae1f466508df1d1e45f32e1ce0425db3211b1121e10de8b298748ab2d63e296
+EBUILD jsonrpc-glib-3.34.0.ebuild 971 BLAKE2B 4f0ba2deafc37cf4051ba58ee20c19c669c1f46b78c893b2c859a55bceef4e0fb2a28118d208c5bedbbc5260eb6d5ee9884c7163132fd0212642bacb1b4fab7c SHA512 93372b1f84231ef06344b177c5696b9da31863e46bfb24814d7d99eccce5f069ae23fdb9b2f3b1227bea3d3064a8957b5cf31c299ae30b4eeb4acb8c2eecea74
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
index 2a4c35ea0539..217ec10520e3 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 175f2e6a1963..555f14bdc8c8 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -11,6 +11,6 @@ DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B a1f396b417bb1b8c2579e3ca589d9e6df24818b13084d09fd480a8f64ab19eef5aa2a543f7e467786ef4177ebce3bf60b8f893b21ddcdc529e0026f14a1f6c74 SHA512 569e5ec134506b4e20f4eeb586dd88e3f2bdefcb737300fb4c6f103876207d1bd60fdb76f2e3b1b4d4ca4984a96efb1ee924d16547e1faf36dbeca28507c12b0
 EBUILD libaio-0.3.111.ebuild 2232 BLAKE2B 81065497e191a4e62b17d61df604b073522dbe9ced1ebd162081fca73765fcec638cc2d40ddf70daa11480c75ea51ef3197fc4905791721db96a7cb5721c4a82 SHA512 0f374c61ef9f6567739b5d948749184ef8e60ab5c9bf005f20339ed5199a954a64816998fcc060bd7b953fc17db02bca4654f8d426c2c088f07437e1fcb4797d
-EBUILD libaio-0.3.112.ebuild 2129 BLAKE2B 56dc8f7ac296ea12520b676537cd018dca5c46a251776f9f402182e79c0e090ebd4bfbf6ccb1f1bc3aca9c7551b4ae337e6cf9601193f01a63068f6bcc58b8f1 SHA512 bc57b38b63795f6b1be71cbccc2cc72597b9684ed6b855919affd9a0da088d310ab07bbd8d11bddc475ba5cdb719f835e743f4afad6ccc24db99f4a2faa21f92
+EBUILD libaio-0.3.112.ebuild 2127 BLAKE2B da2e80cfdf58e007c49f960f6064480732b8688b681ca75398761d7bfd8a6a39f60dbd83ace23c7993c9a0466e03a608d9f00b3cb58fc091bfacb8d263db87bd SHA512 c8f0e55038e4dcfc920d1fc04993349c7b7ba7b107d0410cdf4d1a1afafed1e2f4d4db3eabd86c4cffa719ce83f72cf1a212a49525730070816ccbf320f4c48e
 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 3cd164570b4f..7d8801416182 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	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"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index e4c0febe392b..c2ac3df21866 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -3,9 +3,11 @@ DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c
 DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
 DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
 DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
+DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
 EBUILD libarcus-3.4.1.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
 EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
 EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a
 EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a
 EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da
+EBUILD libarcus-4.7.0.ebuild 1289 BLAKE2B 1e84873d98a85133a6432e9b46fb89591a0a59c2c36dab0f151836af095943d6268e39d50051d681af2eb55cc83fe1baea152ee8c317147ccabb279b4f897f84 SHA512 f41d1a13f6f308b11578dcba651f291231ef42a6a349d34f1c9f4ce48305f1a30a2870458f170cc276fb333954ee7a58ee366e1e4a39327caee6fb595277a187
 MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
diff --git a/dev-libs/libarcus/libarcus-4.7.0.ebuild b/dev-libs/libarcus/libarcus-4.7.0.ebuild
new file mode 100644
index 000000000000..a3f66acd8767
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.7.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index c9bfb56a41f9..3464798cd596 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -2,5 +2,5 @@ DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 EBUILD libassuan-2.5.1-r1.ebuild 1258 BLAKE2B efa52147c6b3c42086196503ff9d516bb9a9fbede7d648ed36fa98a4a056dc6382428838abcb50e7fad34db24a0ad68a002d33e9b447cf34c61032b987be8f90 SHA512 d24e6d34d0c198bc52d6370c54f764ffa1c4ea20cc49badeebfa879639ac8d4c4d0ad354b2eb1a229e501986390983d02d80d9a6babfd03ecace44d24600c116
 EBUILD libassuan-2.5.1.ebuild 1060 BLAKE2B 00418cde3ff85a1d9d35a248dbada254770b7537198ca794d77186d748114c70efb25ff07bb0e501328800543406d8881f3e1b188f3f086a14ca384b62cfb784 SHA512 13faafbcaffa9da2e873816478b2d5f0411596c34503667a27ba9c8aa5c5b024453d0d070f57054fef72023a7d818cbfbaa51daece2f436187b8e8fe5bdf88ee
-EBUILD libassuan-2.5.3.ebuild 1259 BLAKE2B 18faff4502bd0ef6816af8f23e2ea1d94eaa4e01f12785d1431809188e127ce67680a51ce4053ab8bee165bf2e9fc67797b1c928b05d299748a40c53d2c31cc5 SHA512 109489bf49454c859c3597aea3f77db594fb267ec26a2b0ff040b73698a67e2e84f51816ec85cf868fd7ca623a0fc2e019cd30446e1a200843a1e6d294c47f04
+EBUILD libassuan-2.5.3.ebuild 1258 BLAKE2B 76494ac9a7bf2561a31f4c15352a8e240d3f0044918fedcf3479d451bb1b1d1d7ffd8689d8f40efa234f8dcf9b4840830698b1e2dd024e1b2b94e42563c40928 SHA512 a76496460ffd556e810693a904be16a56bde374775f7e25eee9e264151087c4827301d505c9319dd7f5fde49c62a15e469618e68f728097de1045e2084598011
 MISC metadata.xml 977 BLAKE2B 25e7724178eab058abfa95fff731f32d04a025cc0882718eb5d02c40dcc7f0ef81185167ed0fa72fe050e9637fbcc456208eff1783f719cc2d153854a472781a SHA512 bbcc73e33204de48ae1001d34e4f07b8df9e1828e515da748bbc7d09e68763b7567cdb939a9298d9939e8b2693570fc898a931d080947fa8cfa2517c2610bc74
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 9a8af061f40e..68a274079307 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index a7939118d7ea..4405b6a935b9 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -3,9 +3,11 @@ DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade3
 DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
 DIST libcharon-4.3.0.tar.gz 145484 BLAKE2B cbb0edca76921c32b69809dfa8e07c07baedba90ff3c8f2ad5128cc1efa60e34f0f96c1936567825f7e876d298ef1ed4c10d0058f5b3697f87c412891654fabb SHA512 77ed18fbd11c008659a02419250647c9c977a57772d648f4af353c637224ba586006665e60e7fa2394b9f8cf53359a6211b936b5920ccc379754a743dbf2416f
 DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B 43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3 SHA512 43f7606529a933067bcb82a16e95d76f713a7847535887968c2933131d3197ec6127376e10c7d5f1debd218fc902962329fe22d4f9229b434a804daff94122cc
+DIST libcharon-4.7.0.tar.gz 151221 BLAKE2B af9fe83e07303e1ff296b878c9745a329531a9957ad16a9b39b36e53f3f2275f850806b6d1a51638013c7148f3ee68b92489a67629a6026056a8c4ed3f2338b1 SHA512 690ce086bf8bba3eee2ce087d02ce00c23a7ac4079b0a2961c05cf75d461b0d5dee0c1f86ed769b50f1cd9ef83d8570a54f4fac628e0c19a5a593138292bc64c
 EBUILD libcharon-3.4.1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
 EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
 EBUILD libcharon-4.2.0.ebuild 563 BLAKE2B 05d8210539c2251b38bc8314a70aceca0a5355b81c98e444c918d678b719efecceaacdf4e587b4c7da8a855fec1c288084958e155580148db58396d945abb90b SHA512 3fd4727350ed0160d2024e04f29dee04468f93490a81c9c6639bc018f3da8b68743107680222dfd0ecbd8324a7935c148061bf928fcd90a53d07a5760aee9bbd
 EBUILD libcharon-4.3.0.ebuild 783 BLAKE2B 116426e6f5089367803504a211916b3a72f97164ef43526e44e12ce51cc15d3876ecc519d643dc3ac5d37140dbcf7b57e6d8bc1d5d8214848ade6c6d35745c65 SHA512 0d3cdb427aa4f7e375baca1818fc5160cbccd45bfcb1dc03df7f873bef33ffc6584b5627fed840a059a432bf9048b2dad18b6763ec774d5f73e08ddec5f82fc5
 EBUILD libcharon-4.6.1.ebuild 879 BLAKE2B 16669d87920270c86b67935c836b5f6929218aeaaa8904301c7ccd439954b6a6efb26b0e06c8dc82531ceee401def4581da1b85ac6e08eb668aa2c1b984ef1a9 SHA512 4675e202878348756d337c789f08d610ebd44cfa74e29b2fc76eb424e81358a5fedce52995b304a365fd118ab61e1754583257b3de8ca875206dad0a3f2fb135
-MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
+EBUILD libcharon-4.7.0.ebuild 1773 BLAKE2B 4e4a5ee42866a68e96afae8329266ac7d6f70e627e22d971ebb73ac646accbeee79182e6c39cea761d2cbb84a97b7497a8f70e76213e1c189cb2c09882fa9309 SHA512 611e66601a587e243a57bd6ef286701e5b0ce484c306eff0f19ec5050c7ccdc7b11c2291899caeb2f820e047b635f0476727ba45e6923409732427fc736db681
+MISC metadata.xml 1098 BLAKE2B 6167df47c3514dfd94d9e8d9046167ec1af4b02a224428671f3a3a70471f4fa81805ceb18c9ef85fa687e74c8229c2ee0d1601c9203c329b89644ad300611b30 SHA512 a41c8b8bf3904242479f66cae5875fe9991e8ad1b7cd706393570218c223985c15cce9701b4c4191a6b5b2d15d72a45e3743bfe4c6d985ee6861483ffa24b358
diff --git a/dev-libs/libcharon/libcharon-4.7.0.ebuild b/dev-libs/libcharon/libcharon-4.7.0.ebuild
new file mode 100644
index 000000000000..5ebb18cff1f3
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.7.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+client +dbus test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="
+	${PYTHON_DEPS}
+	dbus? (
+		acct-group/ultimaker
+		acct-user/ultimaker
+		sys-apps/dbus
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# use current python version, not the latest installed
+	# fix python install location
+	sed -i \
+		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
+		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
+		CMakeLists.txt || die
+
+	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CLIENT=$(usex client ON OFF)
+		-DINSTALL_SERVICE=$(usex dbus ON OFF)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	python_optimize "${D}/usr/$(get_libdir)"
+}
+
+pkg_postinst() {
+	if use dbus ; then
+		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
+		elog "    systemctl enable charon"
+	fi
+}
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index 56f0a7df8630..8ac90e1ed2c0 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -24,6 +24,12 @@
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
+	<longdescription>
+		Library to read and write several 3D-printing related file formats including G-Code and Ultimaker File Package (UFP).
+	</longdescription>
+	<use>
+		<flag name="client">Install the charon client library</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Ultimaker/libCharon</remote-id>
 	</upstream>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index d86bd5ca0e90..9def5e8b6675 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,5 @@
 DIST libdazzle-3.34.1.tar.xz 440496 BLAKE2B 88321e82f1961ffffc46c2e484b39a80e201498c1f5aaf3beabe59f9d24c21b446485aeb1e70821868d207d222e9a4c9c06353f3add28a1c12ba84f90f79e640 SHA512 bb55c21c8d15406e4f09514c36e3e633d13c0cdb6b30b40a7da7e1cb5e307f371c905dbd8ee5e56d04e225df4c1c8eb9cd273df76814a4cec6ea1328b998d95e
 DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f
 EBUILD libdazzle-3.34.1.ebuild 1667 BLAKE2B 649f65fb8b4f68889b27894d94aa858e0eb6fdd9f8b8e13c50acc0f377931952611b139a13e617bffeabb6695288c34d2a2c15ed17de36eae82063e93de27f93 SHA512 ac46eb71815d8a15dbb19c759dd02227aa70109af192aaf4d5f4959501780a966d82592fb4f745607790eeb47169cd2cc5b924889f896c1bfaa8b45570aa60c8
-EBUILD libdazzle-3.36.0.ebuild 1697 BLAKE2B c7b766b4d16df7cef291b6ec5273f8ec9bf309d10de5b5880ef2c6d61dbcf9f0bc677e37ff8b9559d1ddf088fe523a9df58434f378b7bad24d4af28f485db2e5 SHA512 4689e16152cf2494b9c9a41d6b360489e00c545f8bc4e2cc0974263bd1e24627969927b3e5494946ae8f5da07bc9ccdc2464127627e984839ca9532980ed2f0b
+EBUILD libdazzle-3.36.0.ebuild 1695 BLAKE2B 42df0fb02ff8f2c40b0de1a786f32c79c847a5c1488eb8fb09ba5d106c439ebca3fbdac90e1359c436745d154fe7b2ab2f294469ba17029e63cd9eee73c6355b SHA512 d6a3bd2d6ed1b0b8f1544957c9ca3764c9456052c4549614749bb75501e28633333a1e8c2a7fbbc8ebf48d4c0cc3546b25f67b599df01c19dde76bab45044afd
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild
index bb1360473dc1..d07666e1c344 100644
--- a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 855550d5ee99..d1b190378c7f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-3.3-r1.ebuild 2609 BLAKE2B 36fbde1f703bc2e49882a24f91f5d039972f0825bc2ea864c5a110ff033b897051fa9d675f2fd61624d8f523d3532f0028b2f5b6144d2779ba9f992a2a706a35 SHA512 966a1a6d4b98de9a0eb7b54fb2e54eb7fb7caf9f574806740304cdf002fae5694a0e519c96bc77e6feda9eb90bc9489e51f29acfa6afb771cb35ab41652d2c8b
-EBUILD libffi-3.3-r2.ebuild 2702 BLAKE2B e83880bae34bc6dfe8fae53807df7a4dd2f12fedfb15f79ec7650b8f7c132956811131e6a3369e0e37ce1626a1d4876a817720cbd09289a00bb0db31820626ba SHA512 6c5e125e77c0f37848266d7c2e628a085caca15cec1e67d0db235359d59aed004f35b0999011d6b22d70854de0768505a47abd618025c477a28721004c00f668
+EBUILD libffi-3.3-r2.ebuild 2701 BLAKE2B 01f2eeb093ccee463a1b6c0b98d6f5e8232186314955f04a480e670a02bb289d5278086a6c7816bf7199d4741bf473216a52c08f2bbc9fbb5b4381b057a489f6 SHA512 124d97344c82a235dc5d1807856a5cb8e9dd387f12ce56b422a0f68a4c6ec031b862e06a1057a9287f2af3c63d2ee5079f95f341511aeff523960d66265a5756
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 4cec983bd172..88b106e035a1 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0c750a6da84e..855295d404b1 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -3,9 +3,11 @@ DIST libfilezilla-0.21.0.tar.bz2 552491 BLAKE2B fb2729c1c2616b4dbdc292651fd5afe8
 DIST libfilezilla-0.22.0.tar.bz2 557320 BLAKE2B 864f286844a3693ae1aa9f0176dbcf32a6a483174aa4b29e23ebccd309f88e97cb84368b3b5d22f07f94d396885b992e2e2e4b2f64bfec490bbcb898c88e0dc5 SHA512 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e
 DIST libfilezilla-0.23.0.tar.bz2 560028 BLAKE2B f5ef9001babc1cdf5f36ecaa88aacdbab99d2f65fb6554296c54ed63c6131cc03f16b92635b7c71375b94394d02b0596500c6c796c4efa6fc2c74f561c640d1b SHA512 a69040b7767e4568ba155adce67a5755b2947a73626bad89c89c88c773cb99147349ec5c3b8cc746715c9270b54ac6bc70fd57c77fe125b2dc6753669dfe93d7
 DIST libfilezilla-0.24.0.tar.bz2 560451 BLAKE2B 2806820e3aca63e1a018b01b990e7580c53d32d6e0e519a316a172a516c4b24aa38e5e1847fb40db7d21c22b68caffdafd3701273ac96561305661b9b8a86716 SHA512 f5fd2ca426235e03e26209b975e2eda4763ef1bef16a1b424ce4a248245163038d4e56089d523d77b8370f52a2947873d8439f4fc9478ba57fcef453c2f54861
+DIST libfilezilla-0.24.1.tar.bz2 560439 BLAKE2B f4848149839fa121ed856726769a9517932ab0b34dd19696d66bd15ad8208fa0bb3e7dbf9cb31baeabea02ec6e0b7d0c8e48fbca3956c26251dcbbb4332c727c SHA512 f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c
 EBUILD libfilezilla-0.20.2.ebuild 1084 BLAKE2B 86e8f9e37f842925b7d681ed00924c72d8555553dec8a84fce045e92320c25bcc299ace08e52879bdd67d2f57eccd95ba6db5937e92b214d29414654095bbb16 SHA512 1c79733f899c6703df637720591b5b84b17fcee1acc224b224fe25c440d77dde0fbd54d272b715436d2fa69560de76406a2856500e979864ca5caaf42620d4e2
 EBUILD libfilezilla-0.21.0.ebuild 1087 BLAKE2B 60d3c3e36532022c5d100508ba220a5a128b461324201cf1a1cae0b5599fa90399dcfd85eac8f57c2851610067ce237fa31bef608204a27e3b484e735fc084d4 SHA512 e16ea6e70a9f805bdc5556df9801242f2a37724f2532b008bea7f30361d39b2531118a8d615e0691e64540d1fe79869b126e438d15284e00b35d0e52c2111598
 EBUILD libfilezilla-0.22.0.ebuild 1087 BLAKE2B bb93cb261fb3d9e2e7779fa26c0a954f27b9c5ad2de4b462b3d97af617369a51b2627fab61144f115e5e517340ff6286ea9f72ec0e90ed96be9527a1e4f16261 SHA512 a996968500007e666db75fd884490950a3aa45e6f9fe3e447ba6a1357ee9f6b72b81ca24048ff5769d10cbe757dc93968afdbd12d57d1cf341f5607be2f80244
 EBUILD libfilezilla-0.23.0.ebuild 1087 BLAKE2B 78ae435cdbe136082a59fc3674647105b294fe40d9cd0e3f06415973693a532620501c9230020dac061305180ddc54295503a5dcdc67962b55cdbbe41673f4b2 SHA512 f409e8d2ee4b4ae85dcda7ff515444d8fc8602f2aab9bde827dfad5a7af331b119ff6c3629d1e3dce14cdaed06c01516c28ef745df0ae88ac90f64b954db56b5
 EBUILD libfilezilla-0.24.0.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7
+EBUILD libfilezilla-0.24.1.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild
new file mode 100644
index 000000000000..06fb1f38b744
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/9" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 9e89eb9ca838..c5c1c5dc1e2a 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,6 +1,6 @@
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
 EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
-EBUILD libfmt-7.0.3.ebuild 780 BLAKE2B 3bcc14f9290cdb163611bf2e53d6d96e978585524b15f4dce7af430cf56337bf0c204069071c422551aecf0b0ca76626e90838caffe3aa02ddbc24e49610bffa SHA512 95917a9ab5ca32dc955a8483bed7d1bee84aaad68c1e990f7a4e4927aa1928df477e6e9696046607563019ffdad856845760996ad549173adf0d0eb72fa8f2bb
+EBUILD libfmt-7.0.3.ebuild 779 BLAKE2B 0c96c292591a3f7b3b4fa4c5d078a5f66feebb69a1fa94b51f791706856b919b367a1420348312b7cb436d51b5fad7a29eec95eea8c8d4438ec0e8c5c5150a97 SHA512 f7666d7a1ad80489ebee0dbb8d6190414a885675acd3649e2b46001fba67df222ef7a2eb63c769809d841d381019ec30666194741f1bfb54f40ed7151a1606be
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-7.0.3.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild
index 28a20d754457..e962f1d0f13b 100644
--- a/dev-libs/libfmt/libfmt-7.0.3.ebuild
+++ b/dev-libs/libfmt/libfmt-7.0.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 0af8b9c4382b..4867fa17caf6 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -10,5 +10,5 @@ DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD libgamin-0.1.10-r5.ebuild 4022 BLAKE2B 36678416d616fbe2ce5b435bc6005705437aa247f3590b02ccc2b115cb1d8a2a8ce0b658942fb2f3e19aa0640ff1f488e5fdf131b668ee5bfa254b12c6fa0ddc SHA512 98499bc04eeaf8d7e184f9a1714e6174fdc9604e5873faccad3f031daff803c853e1504cbf1f05151ed0be24324e15cce5e5162bd7ba1767e5cfaa8b2b76360c
-EBUILD libgamin-0.1.10-r6.ebuild 2982 BLAKE2B 20eac44aaa85e06289ec620b7d92ffed62086e8e0432242cc44826ab488e374368479079f37657532f8762c104a77de2cdd25c7881493a6df6866547798439d3 SHA512 5104a2886cfd30eb79af6bc271c287afe03cebed09e7fea023cce2fcaf9cca6ec7868f1831db85c631b3c56e3b8a7d7ff2d670402aabfe76b5b7a28472a70070
+EBUILD libgamin-0.1.10-r6.ebuild 2980 BLAKE2B 2225f0f08faf8cd83f1e4b9e9f9725996108d04efdbbd032084af62ded8084bfd1ef20fe81217d91411d422cf9fb4dabcb4383a4bfc169ebb0b6cf36b12c3825 SHA512 089814b7ac12b9ec6bc85ecd3422785a312d64ada7787e36739b7f275cb2c33abf1d65b40a9f0aa49e0f9f4080b8e05cfd92319ad2c201d31842438affe7c5c7
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 6e6090b368c0..bbdc72ec8d7e 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index f8b73797da21..64e15474e870 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,5 +3,5 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
-EBUILD libgcrypt-1.8.6.ebuild 2282 BLAKE2B 6666c6525d99407c00f33a663963d9ea3d143a9997fb96b2b7ef43f7cf1c14e636f8cce13cc42f988af289b255fcfadad95713431a8ada797a9a166dab19cfe7 SHA512 7173d56961fb30557b5641e4b4107eaa0e1c10375ce65aaa7c9ff3e8fb1ad805948205f86632c0ec314a44d57e0afbda2ba42f8cf0a8c2c67dac7cdf4f94df3c
+EBUILD libgcrypt-1.8.6.ebuild 2281 BLAKE2B a16ba640e2ab55e6fe8c08b8c58880a6b7d0b0bb22690ed782d753cd83b00b7ddf7b1c8a2ab901ab5d1661a4582f3227e5855ccd3afc3e5d9ea0ef5b06c9c1c6 SHA512 969699ee806f6c8bb7454710794cc7c404349275c43d69e246eae53c064539955870547323aac4d31a626f7c4a14139a49faa9219862d3500a7712901be48e5a
 MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index 96660a05c6ab..326a5f8cd0f6 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 01e3d5fe3271..dbc1802cb5cb 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.4.4.tar.xz 336708 BLAKE2B ecd21376ce8d83a0a8c0f65992ba4d39d54b3b97d90df8adab0d5c5714d0c9841711a21dc611c94a8141313ff991c3a8787f7e27492c149a7f76e25d8a2fa8d6 SHA512 2b2c77210103610cb91554f870d634bc8d06f0886eef5166bf9909c1975a87d960005640d48e3e917f74c7553e3ae07d473ba06c6c5d6582313c50a390ec6168
 DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
 EBUILD libgnome-games-support-1.4.4.ebuild 539 BLAKE2B c8ada946bb8232de5d729d8600ccdf585febfcfccfd06ed559dccd7de49c57d947433427a179de41778e37b14845baf4fbc2752c52060794037e8ac9a525b670 SHA512 bfa18199d67b31f345cb5d27aadafb5c9fa722b95d5de426bc4cc1f4f049bced42769e62ce66a47a2d89e64ccc39d8069dba69ddfcf8de975b0ed6c26b3a0cfa
-EBUILD libgnome-games-support-1.6.1.ebuild 668 BLAKE2B 8639e5dc58a6de38cf5196dd587fd17b764fff05b6e9249221135412bb182a2b345b4925482ddc1d8c84d2d11f7c916d8d45bc9e860865fd1974705451531a43 SHA512 44b99893d924955b7da4e1ea499f701549f7ae4300dfd0a198c86c34ee2c05cecb8717e930d5484de564df63d763daabed4dae4d696a8883aed3fd1d618e8659
+EBUILD libgnome-games-support-1.6.1.ebuild 666 BLAKE2B 0bbf6c886e20d56785ced43dfb3ca8fd4fa5fe205c3a22c56aad82a179bb57e966e1dd6bc6c057e640ca29b7256ef91fbdb3c0da9cd53e7f2c2ed2615379cb27 SHA512 abb35787d23eb98d9cb36e4673af42b3f5208cda2476462a4775afbe510bc56bffe8ea26553ee7ab36779c06b8f007435a44e487bb5c09f469f5f9ac913b9a28
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
index f47d5cd46c86..f901fd53715d 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index f069275900b4..28cde4200e28 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,5 +1,5 @@
 AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba2096aa1b16804dd141f87d8c7b8ac3350fc8354bc53423e3ca9a677a8de0c2f8710023561f4e230ce74793fc66ea899829f5 SHA512 83f1640729653bc9cee49f667f79e472727d4ba7c3d6fad3ebccc6fe412fe0a43b868582bbe2de8bcca611661cca8ba135330c1c919ea7622135ed7488b524be
 AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
 DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
-EBUILD libgnt-2.14.0.ebuild 785 BLAKE2B c908717480640776270c41b126a3df9bb4cd6fae4263f8bf5f2851e067b08565f78170db40e4457087e5b33186d1fb48c19b584abf8e0c9bd4b5128c8bb92dba SHA512 1e2f074653fbb0babe25fcdf81514dc94655b00861792a010e7ff35f11055c9fff858a0c54f2851086d8aa5a00a46dadfa458c2df51ad76392d787b2f4a0dd2c
+EBUILD libgnt-2.14.0.ebuild 784 BLAKE2B da9563b9951e5b9520b2e9dae2a00a42d720eaa2530d763cd35f18e56eb71415735ba72b5429f69690df99da7452373ccd22e7c6129352bb5d7227b3af663426 SHA512 d77f55cf9e8b36a8e2052a9851fe3452ef8ce545f151ff436e1111354da44a17383ba1c04a0986b759f483875959d186bbc6956b614658b3ec147b50a5a881c8
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild
index 0e1c9facea81..9373a7086c94 100644
--- a/dev-libs/libgnt/libgnt-2.14.0.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 8d6ebd9a1413..f60512a4c9ef 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -8,6 +8,6 @@ DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 EBUILD libgpg-error-1.36.ebuild 1682 BLAKE2B 060fea2878a9ff65e895978743bdf00435e4c275bbf2769777d52d60108358bcf02b8387671f9ac46bf8d9b2b542dd0a383950734baea3568d69fa10fc05a1e7 SHA512 77a635e5f705bdbacf5bcbb9a9bdeb26aed6ec2f7f06a213a2f1bcf84c5c15cb6072511988c95d1f7832e23aaedd42059a3481c1f55fc1e1e0b66f18343b3d9a
 EBUILD libgpg-error-1.37.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
-EBUILD libgpg-error-1.38.ebuild 2128 BLAKE2B 9c3fcef9f21a608eb68b7680d87aa1c86e2adbebddb9f47ed724068b99cc93ffc8e0ff014544b3e25a9d4f1266b071a4e798ba239a56ca9f1a07837564efa61f SHA512 ff96d0fb95195891165272a4f549e5d12c0ef96421d6e2236a9d0b6189d2fa92690c3fd093b3ce4c891d186a0ddae3e1dc95d6b2e9bca2bebf59e2296ad78e14
+EBUILD libgpg-error-1.38.ebuild 2127 BLAKE2B dfef95bf60763c8a3aff8dfff0679bf0a2681ea0ff121bfbecde04d74ce4cde9e8b7ac4aba40adaac0077298a0bc87ec561c7cdd9d2adc8a478410f6a87a5756 SHA512 b2ba41ec7f54e6c7401412b8e42c76f992a09b8ecb0a030cadc2b3bd07de596fb82a88466733d3cd60c7b675b8077873cb425b0876da674b6a617639726309d3
 EBUILD libgpg-error-1.39.ebuild 1698 BLAKE2B 8350db5f7f474cdc2720f9dcca24526f46b84adeacf00d5efbc4d8ebf7aca1ef9a9d5949920c3705a19d4e34b39f73aaaabdfa84854982345b12168d3c7e6192 SHA512 9ee2c9b4bf5cb08c08238d3a6e2cd54431efe85dfabfc8b78dbbb1c504900eb29e9a0db15e098660ff4382dcb39d80a6fee1e5e94ff6acc5b8eb906ac0b8e853
 MISC metadata.xml 525 BLAKE2B b2be127796014b926129f269602f39c5b0fa9ae4022b1d7492c201725c27e614e0dd6a0f8bacd1e6703309130f7e758c0bb7abef9d532c01182eb7b4fdc0a13f SHA512 48841f068de32aefcdafd5b831a90811c8006862a8aea7b9cd48e77dc3f9e1dfda00d952de9f5784a58f730ae2707eda2ca4bfc1509985988042017419a7b8b5
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index d1b8761f0266..4638e200d82e 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 0bda87b0123e..f1b06f9357d9 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -3,5 +3,5 @@ DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a
 DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
 EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89
 EBUILD libgusb-0.3.4.ebuild 1698 BLAKE2B 02d9da0f09ea400a6516e26b10246bfae5646f64ba75c17bb60ca019dc51b63738519c4249bdb82bb373a4743190fa4bc9ee623c4ff17ea66e519c940c118daa SHA512 83005576562412286f7e50f41af90176500450ec0c8f8c8d1b2a4f092d3cf229556c8d852d96e11151e34a9437eb83ca045fab1ca7463a7aa0ee39bf599dfd24
-EBUILD libgusb-0.3.5.ebuild 1701 BLAKE2B 726c75a45d210071e8c88edeb0f1600fbf4b765f25f34053e4454ef0c8a5d56347e5558c6cd4afb55af90162cc331be9b635605736438ade16f56ae8d76100ec SHA512 9755677a7daac0db38658389ee5843a988f5b891ab40770770f4a2f1998b72739953599dd3ea912d6ea11e7fc41035c816d7934ed1002ea3fe6b1d84bb35745b
+EBUILD libgusb-0.3.5.ebuild 1698 BLAKE2B 02d9da0f09ea400a6516e26b10246bfae5646f64ba75c17bb60ca019dc51b63738519c4249bdb82bb373a4743190fa4bc9ee623c4ff17ea66e519c940c118daa SHA512 83005576562412286f7e50f41af90176500450ec0c8f8c8d1b2a4f092d3cf229556c8d852d96e11151e34a9437eb83ca045fab1ca7463a7aa0ee39bf599dfd24
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild
index 5ec7e1e7ab8e..7b23026baa05 100644
--- a/dev-libs/libgusb/libgusb-0.3.5.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 2151c10facde..b237f7bf54f9 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,7 +1,9 @@
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
 AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081eb82c6726cde11af9d18fb193794339f639953653f937442bb78a9561cde9a0860d0d4841ec50943d218f87ea4507bf05a7b45337 SHA512 529fe41ded3a199795d39490804f6ab8bfb108e0c9b8ca4cafd7b4a27d695d0a32aaa0954b0a89650d160cba3b7ddb2efad4170f2fbdad806e611aaf918b83cb
+AUX 3.36.1-autoskip-network-test.patch 1062 BLAKE2B ae819a4e2f3db2a20c516a15b6f8ceeb33c4149a8010c8821aac925b0e81ffb43b5d02de09affdec2b1abc70bf432b2804c9e55d1b261360be17fa95f20d0e74 SHA512 de6f0f0727c0fb21aa7eea652084b7d7b2c526044e69a8a4b6ccaf813d4bc2162726c87224d25cc9a5773aeba76c57b4a2e1bacf9476dc4ea789aacd06d789bc
+AUX 3.36.1-tests-locale.patch 1825 BLAKE2B df10a2db35720cfcb8b8c67f73573067cdd420a11276fee75f399e47e4b68e3d054d94587e68f7cffcf8de3267351bbdcd61879d5470532f8430a52c33b28ee4 SHA512 0918cd2b8fc9265e974e8315671698aa0e8f3442a30d4f545ef35cf64347a85e93500fc414c17afb6fa89f8eec8d9c1e19b90d2327fca6b6ca426b95719dcf33
 DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
 DIST libgweather-3.36.1.tar.xz 2702144 BLAKE2B bd867461b64ef81607695ae1a3796d2b096129a9a60721c5fcb20d8c35859c0b76a985e9393c23b311f7c0fdec3e691618eab83a826b483c427287906d575251 SHA512 6c7090b0b6dfac61e73a398d34329cd706080a007694ceb3d47700b4f444982f8ca989dd6dfaefe85b79ffd5af9c423be4bf1bd8491ac0ba6bd15c150d97b26d
 EBUILD libgweather-3.34.0.ebuild 1716 BLAKE2B 9d3eba6e7f1e3b200dceda12ebf7525403b9805c7e6eec14429f9490b5f9414fa5145e1b600b6af943a2fda342a4bf8ce705e94ed4b5a88540a552b9dadb338a SHA512 a47c9c7a28fbc6533398ac6e47350f54ce9dbc50f6bab4e9d87fb97ec427dba7f000101cc0aa75a434288d1bec66e77117b4d0de1e70bb163f9b268222593680
-EBUILD libgweather-3.36.1.ebuild 1663 BLAKE2B 80bd819b24f5fb636604867c9921211d7b5a08eb9eb00d3ddc3974ff18c8717ba865f26d764ce05c4e24b3585c485de9319dcf312ee35c7bb9858e8565b4428b SHA512 1ae58ec977f644e581d41d15482fb2aefdb433af33de3ae8c7f3dfed7ffe267130ca152f869afd73d561f193466ab2971a7443218aa74771f77b98fd1aadd3a7
+EBUILD libgweather-3.36.1.ebuild 1864 BLAKE2B 5a2ec73581ed8dd92f933357af78da1a986fc1a957661023ea1a18cc6618034211d8d94287bd5621bef6ffd9d66ce3cebc7a1c127d9b1fb2af2c6dc3a5cc3e13 SHA512 235f133a6209d6cd446aa2d75fb992c41c4ebe633eec76df62973e2ea379456ebc460c54696bfa3fda1eaa0d51d08fefa9460d4a2cb87c7e6048fdd8d843da5f
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch b/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch
new file mode 100644
index 000000000000..d6b3d2f61313
--- /dev/null
+++ b/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch
@@ -0,0 +1,30 @@
+From f2bacee194ce58aabf5a08752556177bda6ab570 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 30 Aug 2020 10:35:13 +0300
+Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
+ resolved
+
+---
+ libgweather/test_libgweather.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index 8a21911..ef401f8 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -419,6 +419,12 @@ test_metar_weather_stations (void)
+     msg = soup_message_new ("GET", METAR_SOURCES);
+     session = soup_session_new ();
+     soup_session_send_message (session, msg);
++    if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
++        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
++        g_object_unref (session);
++        g_object_unref (msg);
++        return;
++    }
+     g_assert (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code));
+     g_object_unref (session);
+     g_assert_nonnull (msg->response_body);
+-- 
+2.20.1
+
diff --git a/dev-libs/libgweather/files/3.36.1-tests-locale.patch b/dev-libs/libgweather/files/3.36.1-tests-locale.patch
new file mode 100644
index 000000000000..fb35d2f00b7a
--- /dev/null
+++ b/dev-libs/libgweather/files/3.36.1-tests-locale.patch
@@ -0,0 +1,52 @@
+From 8b20cd91a96eae39bafe82ccf444dbc00759ad43 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Mon, 9 Mar 2020 12:21:57 +0000
+Subject: [PATCH] Do not run local-dependent tests with missing locales
+
+Not everyone has all the locales installed all the time, so let's check
+if a locale is available before using it.
+---
+ libgweather/test_libgweather.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index 8a219115..77ee459b 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -643,6 +643,7 @@ static void
+ test_location_names (void)
+ {
+     GWeatherLocation *world, *brussels;
++    char *old_locale;
+ 
+     world = gweather_location_get_world ();
+     g_assert (world);
+@@ -653,7 +654,16 @@ test_location_names (void)
+     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "brussels");
+     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
+ 
++    old_locale = g_strdup (setlocale (LC_ALL, NULL));
+     setlocale (LC_ALL, "fr_FR.UTF-8");
++    if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
++      {
++        g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
++        setlocale (LC_ALL, old_locale);
++        g_free (old_locale);
++        return;
++      }
++
+     _gweather_location_reset_world ();
+ 
+     world = gweather_location_get_world ();
+@@ -665,7 +675,7 @@ test_location_names (void)
+     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "bruxelles");
+     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
+ 
+-    setlocale (LC_ALL, "");
++    setlocale (LC_ALL, old_locale);
+     _gweather_location_reset_world ();
+ }
+ 
+-- 
+GitLab
+
diff --git a/dev-libs/libgweather/libgweather-3.36.1.ebuild b/dev-libs/libgweather/libgweather-3.36.1.ebuild
index f3d82c03f4cb..c89adaa7e6a7 100644
--- a/dev-libs/libgweather/libgweather-3.36.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.36.1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
@@ -40,6 +40,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+	"${FILESDIR}"/3.36.1-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
+	"${FILESDIR}"/3.36.1-autoskip-network-test.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 0afe931d19d0..2538a0a885ea 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -4,8 +4,8 @@ DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff
 DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
 EBUILD libintl-0.19.7.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
-EBUILD libintl-0.19.8.1.ebuild 2097 BLAKE2B e19a88ee249a2d6f9f9a02a2711b04e7d4eb18c4e466b1303350fd75396cdd82dfbb202c38fa3a9730cc20c77896d03d309681850e88244f65674c96ed05cfe8 SHA512 384fb3a380f4dadd57313b512827494ab2faf408d284f1184fe75f645d3f9f03614e98197df45466bbec03ce1c5e3a5bf0d4c7c3434e7dfb9a8fbe8a98363ea0
-EBUILD libintl-0.20.1.ebuild 2108 BLAKE2B a98ff4f17bd5509b9b5b50b2adfb7e6238ce3e9a3a6d3f3e6e87797b18620316194bfd38db3e2591b2b5343ee0efbca323df78dd38712202a8e72684697efafd SHA512 364817bd96753382c5308e157d1cfcc3897a17d0d0b55fde1d28163f331f5c1dbdae4ecb2355a80614f6ba0e40276824149569320db9197b7fe71c5a225250b9
+EBUILD libintl-0.19.8.1.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
+EBUILD libintl-0.20.1.ebuild 2107 BLAKE2B f7999e94d7a092fac43823798096e030e46738c1ce0eb76999661012c48a93d63b95b879b1f6733afcc6ea8013719ed8103084c72156ea720894e4ea126e4ce4 SHA512 074d8cd9fdaa7b0ecf6be75091be3857f8b040d567f03b448fb6828a8b30051abb0f437b1662899451c72cc6b4f2817dd76547a29ef2e279dcbcefff7cb7e2fb
 EBUILD libintl-0.20.2.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626
-EBUILD libintl-0.21.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626
+EBUILD libintl-0.21.ebuild 2101 BLAKE2B 2373ccf7895b045e7d50d66bb90ff0c05830833b261682e969f15b8232460cf44d3a935895dfcf6b45d6adf6347123c0e93638d901ec14e75c5236a562194d68 SHA512 c21418ed404924b32f65f845472caa83c6c17feb2d478d3382db05ff89479c9a088995533468a26690a15f6ebb0ec3abbb956676ff1fbbd662f63b6e305eaa38
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 7e3ab8673925..d3833d165dc0 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
index 72fd36833be6..83b7e5e77b3f 100644
--- a/dev-libs/libintl/libintl-0.20.1.ebuild
+++ b/dev-libs/libintl/libintl-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 381e47de63d1..53bf9aae5f0c 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index c4dda6b9c7b6..23b05557b36c 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,9 +1,5 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
-DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd
-DIST libmateweather-1.22.1.tar.xz 3437496 BLAKE2B 74d9d0b18ad33fd15c7b3411fd5811a43d56e7a99e78c1d6ac846d71285701414f0b6c5f54c9d445af6a2e6c1405fc4d0547e023aa4114f7419f507d8739fc29 SHA512 c7f5214c14fa3bf6bbb55442ea450c0f3c0a2849e29f72821c22db88baf3763c72dd6d2a27795c23d8ecc69d190a55313f6cfd18dc2a41c233a7e1e5653a0868
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
-EBUILD libmateweather-1.22.0-r1.ebuild 876 BLAKE2B a9e43a17d4617ed0f9875102286cbe629386d1257650676711dec025d983f549cb0b451d04899bf62a063a7607d51c79718f4b533efb4e1bd4bacb384701634c SHA512 92ee410a60d8576034b53d0f530944a2606c33bfb61c2cc94f4831058f66e220f4106b117727f2baa0648645435cae95aef4e25588b46e24cb15712fbe376dc4
-EBUILD libmateweather-1.22.1.ebuild 878 BLAKE2B f77d35198b224eb4b8c26036f21f8b8bc9796b20f1d14c6b1fa5fc17f62b3cfdc443c0fe3e0ae13ce69ba6cadb2b2c422f33c70e6426bb1b2406443cf30033b8 SHA512 14f7b8ad59da3fa34b2715affcca77ea046bcd86570a44cbd4091f10e5c873a00c88aa0fbcf9a310859eea86c244601f0a66426cde371384e0e7ad2bfc42b297
 EBUILD libmateweather-1.24.0-r1.ebuild 1119 BLAKE2B 58647265c3768c597987806bc3576603398564afb9f6a48c2d9ee991f7a3eaea56182e6a51b4d1cb1c1df6f9383e902670dd1b8c7ff3d8195530943ea7170869 SHA512 7d92ba209a08f429334b3448130ffe7e1105b7b039f6ff8ec5cb9615dbdb8bc4f038e443b43431f82bf9fe87d89ba96e2cabbba1c4cc70888e73c8b6c2229827
 EBUILD libmateweather-1.24.0.ebuild 854 BLAKE2B f51dcaa5f5303761f47efd4025f04f5fdc03091811d70ba84fe9d73c49b3b1e35cbbd65925b4250364e901524f687db8e01df9700ef749cfad1624623ec986e2 SHA512 750a6ea93069def2dd8bd2e1cf6c198cf484cd6a2873c3caf67f6ebedef32c60c62b699114e066b653850f7f86a05a939e30d057d19e5d7c1be80bf287d9c9cb
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
deleted file mode 100644
index 0ddc5e5e490e..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.22.1.ebuild b/dev-libs/libmateweather/libmateweather-1.22.1.ebuild
deleted file mode 100644
index f35dfb99ff58..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.22.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 28cc7bdb1bd9..6ef57879945c 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,8 +1,8 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
 DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
-EBUILD libmaxminddb-1.3.2.ebuild 585 BLAKE2B 0781072137ac3a9af9dec68ab64aa5ceb28ad3b1044f1a5bebe08055f2cf65ca3321d3f4409e397ebe3fd57b4d5f395ef23fc4d0cff1917bdc5f82a631307606 SHA512 129705297149f3955fdb8509c0587fa0aa81c43be7b3e4282949671fbaf58763f3abd702e1eac6b4a550d5352b98f8e7e7dcbe55d4263b7900fdda5b2aecfb7e
-EBUILD libmaxminddb-1.4.2.ebuild 591 BLAKE2B 8d648d824fc80c5169a8a4d3ed636d6fd5728bb8f6e8d28e170d707ffa1636906947c0c693d32c09e82ebb76c2b6517d7082348154cde2810b98acf6becf344f SHA512 cf5de4880c80be800f22a1010f87ee6c1f93a6175b3181217c0272f469726a74322afdab9aff3aac1ba0349d5ff97b3f7404d24da92619efb04655ef1f5d619b
-EBUILD libmaxminddb-1.4.3.ebuild 593 BLAKE2B fb5c4074e1c077f62f5c8707cb8b2b82b6eb45663cfa6d75b4f35a473ccefaf861bec3103ca9d994ec3285cd759f7c4085763eeb8dfd9380cfd30d8460644c0e SHA512 2cf468e0007df84f612b4dfcd512ccd147cca0cea7a25c8bb5eef44ae5515d92054e31778958c40e36e6dae2ae0b23a06a2d1929c05084d755065a0b7a439fec
-EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba
+EBUILD libmaxminddb-1.3.2.ebuild 626 BLAKE2B 6b032b35fffe60fdca3f2860077f23231106bf6d57a490ed5fa49a4825fcd78e994af5febce06d087b3fa9f1a92c090061c2bbe147a278b77b88084ce1fc72cb SHA512 0208be02580f946de2576230c00d9efd468270dd73545fc5522609abd653d65165204e3d0389bb4074843182ba7b49767e63b25932819e43cb7d5f470a2a80f6
+EBUILD libmaxminddb-1.4.2.ebuild 632 BLAKE2B 4449256e3b4eb997828b90c599d9180eb7a152bd5491b127700b9c79fc9d5e8ab703829c45dd4df6deff5172266e34ae3a7ceadbdd1ca1bb2aaaf239a2aa1442 SHA512 51646143eaa81370f61190e6b793056211eda73110ba36e3912f7a03b6bee91e40cdd7d5c4be0ef890bd27bce998bba59a2d691c3acdf4e6c5bb102342006029
+EBUILD libmaxminddb-1.4.3.ebuild 634 BLAKE2B c7ad32d48226eaa1ccae35516699e20c4a3f87955923ca222d6b9f5be65492d44eb7be3cb6c70153236b1a557415db6eb110bc5f9b6dc0bb347de2a16db907c9 SHA512 e44cf48578161fd5234f424da8a0e3bc276ac9e4f1bdc7cdc2dd7f983922a93219ee808e4f55eaca95cfd3bef14950ce1fb8e59f3d4387b3c32458e0587d83aa
+EBUILD libmaxminddb-99999.ebuild 599 BLAKE2B 2f281f45f33c357d7691fff9ee23543188caaf053f26eb2042480bf686bd3fe3198f666b898aa588ce9fb8e0ed90c5dd9e83264e1167fa9b8833bd6acc59b012 SHA512 498788586fa32e19ca8757386f65d0b6299fd5301e5fdecbe6aa9b71ab5f1b0c12faf325b2bba13875cb9a65222bbff7031daa272dd12c70c5893ce10f82a842
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 2beb460e554d..f093d97c8040 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
@@ -16,6 +17,7 @@ DOCS=( Changes.md )
 
 src_configure() {
 	econf $(use_enable static-libs static)
+	tc-export AR CC
 }
 
 src_install() {
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
index e43296f2809d..92c3e272b6dd 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
@@ -16,6 +17,7 @@ DOCS=( Changes.md )
 
 src_configure() {
 	econf $(use_enable static-libs static)
+	tc-export AR CC
 }
 
 src_install() {
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
index 386556e699be..3e02e09d373c 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
@@ -16,6 +17,7 @@ DOCS=( Changes.md )
 
 src_configure() {
 	econf $(use_enable static-libs static)
+	tc-export AR CC
 }
 
 src_install() {
diff --git a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
index 0162cffa49fd..307904ee7c42 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
@@ -22,6 +22,7 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_enable static-libs static)
+	tc-export AR CC
 }
 
 src_install() {
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 83149792bd1b..af46af6f69bb 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,7 @@
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.10.1_alpha.ebuild 1629 BLAKE2B 4096b24255453f75318667ae26f4898a832b9715712f55fd0cd73e76027ea5206f0ef541e80b6f110cb155c39b225e201a46938444bf1d34e21a6f024f6da14c SHA512 74e0ca7f051d7f622383e42e1331b66ca7b3379382f84534a875e0d741340ee047e9c8e23271a0d88b30717bdef71d10cc378a379eafc422467182252f3c0ae6
+EBUILD libmspack-0.10.1_alpha.ebuild 1628 BLAKE2B 7eed7ee09b23eda38cb2f69905a4748bfadefa66cdaf70e6907711b091b6ee8b4c4c4c3c9052c9586d3da3ea8f8124517f6b0b55a11e36f1d49296cbb3122824 SHA512 0c763034caa4f61c4e253bd80a6fc5b24728c8bf4d3eb52943ece7efc9cfaea5971292280f1e7b46a2dad42e5aa792686b9626ba12ac515a0c3982b85652bd26
 EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B 38c7a31937f88a905232b0c4eb28a115ee9bf464ea4cb7dbd5302d1720d3fd44674953e75eca05d94ff15727647d63d11cd7649889cbd0ef27f1a24e7e60e449 SHA512 6ea352513bddea74aa92dbe9f95972413d82e9add64755743be29a9b6695b41ed2cad0c523c164c1949b52924a46763424207aab1d45c6bdddb97fa67c426e52
 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index d59f609305d9..c6e935f2e544 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 5895a8d35d41..db22fe581934 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,4 +1,4 @@
 AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
-EBUILD libofx-0.9.15.ebuild 1030 BLAKE2B 9fd2e976af0d9572e4981838e43e1611fea898dcc7f2c730703ff0d3234906fe907080ac6fa9f9594f1a1c88f706cfc7958126767271ca96f718ca0d25271321 SHA512 0854a4dac4a275fd70f47b336ec29b5c7cede9905d679d928129fe88ee64bdad834bf7f701ffd97b97e4c97378dc551157d6eaf861a74e54ff5f9f9e6bcc0274
+EBUILD libofx-0.9.15.ebuild 1037 BLAKE2B e8dfb36676b66ea17433f2a5320c74946f42def29eb972668dc388b58f4b25bcd410e57efcbf61b7a860a35d652ece28f955ec41a38f5dc41538b1623f03189f SHA512 9c18d1650b0c2ff2cc822dae6de12d64d2315cf489669df5c8cce8547eacc61ab700a1d530fa81dc3e900dcef90fb3277deba661873b7e4170d2c8fa082870e9
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
index 2342fd3e1537..81c4ebbb55b0 100644
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ b/dev-libs/libofx/libofx-0.9.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index da1d5b1f7bd2..ce8c957e8abd 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -4,5 +4,5 @@ DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa16
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
 EBUILD libpcre-8.42.ebuild 2569 BLAKE2B f0dfd202675e5f247d830162967a57692b10a85370e77303bab3f7e0f4a18912a4ae35a0fc017447d2b264d093ebd72477a62b50a9084a251f595c1ee2be5e37 SHA512 a843f1750600b74cc6760dbe9de5acd43161cba91aa17b11ebb99df9f6a6e5f6d025e4987b4f982b1b6200bc226e5746f87332196bedde01e58d8fb7144d95a1
 EBUILD libpcre-8.43.ebuild 2587 BLAKE2B 8b46e88fb2df8c2baca19db226d61d7dfb50ff13a5184e8f077e7c92de1840f6f559907fb1de0e08d52e4e00c9fc10ae405577fd5ce9314465cf174d3106c5ce SHA512 c8862ad1f85b3d0a4e5a36050987554efcc0c5011c22e0fe19ed9de98bcaf928968a82bd55bbea2d5a177ed133074e377f8e6099e888a4a39167003b2ff1c69e
-EBUILD libpcre-8.44.ebuild 2609 BLAKE2B cab6c1e535c80c2b3a0488b8e1d391f9a50509d4fc807fd63226d4f62106da80733c5b864e4a1bc1afe53a09e350d51e991c5085328c179b13a3250e9d47b405 SHA512 a3417378bd13d8eff34dc7c0456d42e43a0273a9ee8d25235ce5a397232a708842f8b8f0dffed632c79616f0cc713504b936a40965914f14bae4e5f358d31466
+EBUILD libpcre-8.44.ebuild 2607 BLAKE2B ccb9b0e11c01b4fb12ccbb72c24c5f31cd0392b14495f7c443e64d40b67315d1a1373b7e27dda56513e251b11083f3bcbd561974708bc20100f8b6c2bb6db3c1 SHA512 3ad999642d83ac2133ba4744fc7caa8a12e5e7efc15211b7674c31e9cb8d00857182faba5ac68382a976faefb9e2ed16b7ebc1688aa154b7d506167710d3608b
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index eaf2be21f9ab..013ed8025dd6 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a41cbcf34ef4..1b1c73fdfcbd 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -2,5 +2,5 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 EBUILD libpcre2-10.34.ebuild 2533 BLAKE2B d37125e2860a9477770133820eee44d04d686771c72ace1a0089dec3d06b06ebcc6d2ad71a43f67a4b64c71d6836c7a5134a6ef2a33ab121d8bd4f938f10d9e1 SHA512 f6c09ed783695ad41e6564d1606a3444b6c2fbfd9ba643ab5287a93779fef6b0ce4407ce872ff54bca866897f58114048e938b4ffdd7b31af0fac49ed252105b
-EBUILD libpcre2-10.35.ebuild 2543 BLAKE2B 4dd02f8169a282ff209bb06d5273e30927d0bed7a54f2ffc78fb5c1d6569bf6c713fc0015021c20d166921ed4f70f15ab0a45e73839a1c7a762444071ea1cb14 SHA512 31e94993d36f320a8e50321131b097b06e43e88df7bbe26807056c0f4d0bc3592ebd1a5f183cf01e48dd6b58c5bf46c75e7e8bfc81b0f077299f59ade4407810
+EBUILD libpcre2-10.35.ebuild 2542 BLAKE2B fc94d449ecad26264eda49a4ed045885949d130b684b55695532f122ba5077f5fd9d6fc28c50b14fd70f71f3cf98c422f02d0612bc6270af1fafb79151126d7c SHA512 5eb8fe0bde342ada4234c785deb2490ae32641047b1169896224117df6d073936d2db6fda66b6d71ae4a5d4526422ba635ed80ff768496e343b16da5a0bb4c38
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
index af20214e780c..d5cbf94bdb0f 100644
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 844e83571021..337514e70da6 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,7 +1,6 @@
-DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
-DIST librelp-1.5.0.tar.gz 521793 BLAKE2B f3fa42ab1df5bc7fea340bf87f241666535f61a5726df55f47f6f324347a1dbbede2a66d252fe654d21e79ee44684aa51e83cace32491778d6cc42698f578195 SHA512 b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36
+AUX librelp-1.7.0-missing-files.patch 10718 BLAKE2B 83c4621bbb5e896464d0ec3f8c2ccb1bb5d59371582cf2d360a314cf5bdb8094326aa17b913178206fc8a3dd29f98d7b0c20764fc07e96f5c1204cde51d1243d SHA512 9a8a88a2704b9c16cd5a9bb8c1ab19e6fe541bd5a10f7016e55733baba343a46f1c372f2865f23970d4806395f0f071ab5ec940b7fd207d836179da6818b0a28
 DIST librelp-1.6.0.tar.gz 522827 BLAKE2B 04e608a3afe4e6e0109cc9bf753de34e9486595e33bc57387b9428bcf50f8d56177e8f849870611778636be5a58714e4640048758c83a041a354f70442d55cf0 SHA512 1bf96b700fa5ab648ed671b341ae7101fc1db4107f178abd507647afe4f12d59a94c821cc0e06998ac7b344ed41a5e3821843c722c82bf5284c6556995391228
-EBUILD librelp-1.4.0.ebuild 1399 BLAKE2B 330788604ea143718e59ab3c88d5248cd93c914c70a8c91d6d5cfbf3cea0a286355cefec2f6b8aa9604b932283b618f7e5615a58ca50dc14089e94eff09311b7 SHA512 9b2a4086e5a56bd13b7741f285753fa834e2f2b8cc7c376e539e5b8507e8d61dce8264ea0e1ebfbdf1ed26dd34b44b490f125d13bf97a106384f81a51ff83847
-EBUILD librelp-1.5.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
+DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
 EBUILD librelp-1.6.0.ebuild 1411 BLAKE2B 5922b8be561df56c0b687cb6ffc62a43fb907034174341ac6f0fbf60edaf802d4a540ea96472444ef6cbcf7750d2cd40a89be76735a1b5e7eaa5f625ef138909 SHA512 a353bd623a5eeb17a25ff4e45296526c03e92ba8879afeb9548d9431a27c40b04b61814b8fad61d25809a08a8517a388d75602516da75cd9057e10b44eb09334
+EBUILD librelp-1.7.0.ebuild 1468 BLAKE2B 5ca89a754028fd81f9e0edea6f9499814ac2e72d5575b7fa95357dc6af1920537cbbe6587ebbf50a2eb6f15c6f2c46d16afa8b43e5c207ca3fb5b88945acb226 SHA512 245346686a1c09ebf0f891a354354a8d4be5673969bc2800b15a09dfd92b9396cddf4f86336e48f013fe7d274877e7b4f399ddfc4f6903d613dc40bf436591f9
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch b/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
new file mode 100644
index 000000000000..327ca720c72b
--- /dev/null
+++ b/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
@@ -0,0 +1,180 @@
+https://github.com/rsyslog/librelp/issues/206
+
+--- /dev/null
++++ b/tests/tls-certs/certchain.pem
+@@ -0,0 +1,60 @@
++-----BEGIN CERTIFICATE-----
++MIIFVzCCA7+gAwIBAgIIWxfNMhQmuncwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
++BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
++b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
++MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
++MDE1NVoYDzIxMTgwNTEzMTIwMjAxWjCBmDEXMBUGA1UEAxMOcnN5c2xvZy1jbGll
++bnQxFTATBgNVBAsTDEFkaXNjb24gR21iSDEVMBMGA1UEChMMQWRpc2NvbiBHbWJI
++MRgwFgYDVQQHEw9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQG
++EwJERTEbMBkGCgmSJomT8ixkARkWC3JzeXNsb2cuY29tMIIBojANBgkqhkiG9w0B
++AQEFAAOCAY8AMIIBigKCAYEA8nNWVoZwi7fYKSYxm+lidTbMQEHh9pLXV8P1N2FD
++wqhNc6Z71VqQw6gIDyzxBjZf3ldyPb6xAcxikvk2XCxVGqDaP7E1rfnCDSqxcgLG
++r1/TlRH3fFMFPqzMgs0GbDoKi7WuhcNMH1yIRk4uPVSUY3IclcE9sNvMpNVY77c9
++tYeLyoLgG8A2ljlSjbHXDmR8E1C+WcOvjFKQunpv29zIOvfp3Wuw0g3C6E26RyvY
++OnNNq6bmDHXdyIkxYNPwxyfBDGq/WhnrFqQTyEqulVLVVIpK+3fIdtmH/4OpOwxz
++KM0q2k9CzL+AI1JqlFoePeIKYQYAOssUBwB0VBDbhyo8f7txBs6OB1phPcmbkAo2
++bJfL01UT315omqlGWjvvDRjDEeRAfXnWu/UVLIs1MNn09l2+fKwgZyOZIQEk5gGg
++b+xO7pZp5W1IuLxB1DMatQjYK1L1MG8KUebovTyumAj8kOaCJaqa+EWcPvsH2wJb
++zp7JZV7xAMnNQGLHHccY9Iv9AgMBAAGjga0wgaowDAYDVR0TAQH/BAIwADAnBgNV
++HSUEIDAeBggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMRMCAGA1UdEQQZMBeC
++FXRlc3RiZW5jaC5yc3lzbG9nLmNvbTAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQW
++BBTFQ9rF9eWMeqNtrDMOGb1fZ54EYTAfBgNVHSMEGDAWgBQMETadsJwFRGSslyZA
++wChTI52OmjANBgkqhkiG9w0BAQsFAAOCAYEAG9hahjpm74U85pP7/zngEJ5P5nnM
++3aC8u4lDM7kodtnxJWoisbv/EBr6SihpDtfWA6+bAJGGu+4UBUaMyUg8w/FjylHc
++INtljbalRuu7YguL2uLdlDNCxQa1XkWugYMObR6r6OvTPUwK0QakTsZuibRbWBDz
++lWKOoM7ZSxZi9DaeChe3yNSGxJSC9xHZbYYBOP5RjChXTZTKtYZemF2wx6EtWRtc
++vXK3TbnJtDy7SPm60EoFnLXUyywmo5mCUSlx85HinS1DzYo7I1yksWQgdW4XgWId
++9RgwPtP0iZSjrZ1TwKqcvo5jvn96LNCoob+JyhpL+9mFvPc6C3vLOxyG7JZOb7Dn
++IpJf52KeBnLRUoIpp+x1XYptoy1ti7r8YqPYn5EHmPxCDVoujskRSX7ncP3SV1qY
++eEgr94Tw/l8GyiaGyixVl2pAMbzYJtgrzQ9UvZurhSPjApGlm87X5KHHXN/CJTY5
++8t59+qvjESRJk74JNpm1L6X/N7HpAsqcsYjP
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIIE9jCCA16gAwIBAgIIWxfM+RyuD1EwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
++BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
++b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
++MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
++MDA1OFoYDzIxMTgwNTEzMTIwMTA1WjCBizETMBEGA1UEAxMKcnN5c2xvZyBjYTEQ
++MA4GA1UECxMHQWRpc2NvbjEVMBMGA1UEChMMQWRpc2NvbiBHbWJIMRgwFgYDVQQH
++Ew9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQGEwJERTEXMBUG
++CgmSJomT8ixkARkWB3JzeXNsb2cwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
++AoIBgQDHA1CeNI30en7OKGJ/pWyNSH9rnw8z6egDxdTjtOIichA2/LVPaGZYecI0
++GH/UtkRgM69kFuo6dRaWvr0yp+XPfGlAcFcPg6cYKEoYyb18HsTReyuAcdBcYQYg
++2ZdmAqtqeHAqcb7wSEB8XuXLdD2Flsco3GaT3zFNv7t7QFDW1b2tT/92w+QGtI1T
++r5LCMVbISRGSQzhCv29l3UtWt4SKA9W8yhg5zMJkMExaUJVtViRFlAFzKrUVKFqZ
++8sszy2yXIcTLskJJc5if8o5cpWCrbcXSb5TsHA+4FHOB6ou0z7/s3LwYjof056Zy
++ixj0LM4sTYIEttDuLERRvYTIhtLhlA2BWfAfuW9bGuog0C9xGpt99vniHJlKmMms
++qz5hEDLYziUEfj5qzSxKMcA2VCeO1DgajSedh13VN/sWUyk5aKA71i40Cnp4oK/u
++zeYW7vWl/ttCEFc6x8pzeMdoBjv1Jd9hC0Z2UgttC/KnMTKX3y6NR1PVFjDQ3MIA
++7Bhxj50CAwEAAaNaMFgwDwYDVR0TAQH/BAUwAwEB/zAVBgNVHREEDjAMggpyc3lz
++bG9nIGNhMA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYEFAwRNp2wnAVEZKyXJkDA
++KFMjnY6aMA0GCSqGSIb3DQEBCwUAA4IBgQCOv2kyg8vZ3jncZuZ4i2k0QbXztZoO
++jMDNqFX2935lK6WrVZ6u1InZzsaqrXXOJions3EvmmAqrdTBW6dyw6V2/lic1gGz
++MhlafAPe0DyQCaXp9iFCH91Hzo94YhuPbne1qdga9jrVTiQIHdIKqVtbiUv7i7mN
++43GssOm4a1guf+Qs5rkuHG4YwiJZhjzhmixfXCerHXykJkpSvBUb6EeKA+p5/w+I
++Wjm9sAkJgqcvrNvOwwBZInU1I56zmM0ZwWucSydf0hgOImpgO5F6KGVQRoZsO9IA
++Iju2RQ1y9qVTNp8evVjIMuqXh5ZtU9ti/buZrjr5Zb601jFLZCMrpDVUcVyHUfOB
++rb3nkUFDcFcrKlfovwp/fvlISKM0bp6pFas5X0FXg3sVVI+iIokmHsmqRUHhjdLX
++t27+/TYpyEkjF1cH3acd7MOcw33KxE/4+qUHT2QU9COPkGu7oPS24qDYnmGPLkev
++ZSmpz4jLTmbCBSRcoOB0Q4K36WnegzVtvd8=
++-----END CERTIFICATE-----
+--- /dev/null
++++ b/tests/tls-certs/ossl-client-certchain.pem
+@@ -0,0 +1,54 @@
++-----BEGIN CERTIFICATE-----
++MIIEoTCCAwmgAwIBAgIIXBeg0SlsiUswDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
++AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
++CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTI1MFoYDzIxMTgxMTIzMTMxMjUzWjBY
++MRcwFQYDVQQDEw5yc3lzbG9nIGNsaWVudDERMA8GA1UECxMIU29tZVVuaXQxEDAO
++BgNVBAoTB1NvbWVPcmcxCzAJBgNVBAgTAkNBMQswCQYDVQQGEwJVUzCCAaIwDQYJ
++KoZIhvcNAQEBBQADggGPADCCAYoCggGBAJ2R2tguPZ2uhcPFp/akZvjIkZG4cCDc
++7egjylP3uFJD86fr+9+KOyywE/pi06FTpFFxH2jZ/bw5SvvJat/ziISwgLzA9RtC
++EfZMGtgsYgtdUGQwmtPbwdV/OVPkvegeBJ3JEuDkVykpAbnx5bx0pudLYeZnXGxO
++7u4iDBsUbegMb+7uw7jd3xXtepZbzIXl41DEziu/tjfmIPxuRX4JvYR6rwcn9Jkj
++Qd822CkxoJaEL/1FLtS0+frcjyPA4AatrQpy2vQ7ocvWpjvsRsSV8nGlrQgf5wYY
++DtuAUZa6JPZkAmvT8HYBNDpyAunL0KpiUQyPg77AR5nSknLtU6VJBdTJofRN3hKd
++GsgXhPOifGdHgkuGHnOG4iYmEJSjmZsImXidPTNdhcJGZZSrcLQ7wSaLEbZmJ4gi
++hAO1CEUyjIEjvmLcb6CqXp8D96f1A3A8eAnQhESMGa9295P8r8b929lMyyB5RHHL
++5lVhqXqvC6Om7empEa/6o12sl+fvK7aoNwIDAQABo4GAMH4wDAYDVR0TAQH/BAIw
++ADAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAweg
++ADAdBgNVHQ4EFgQUlBeunSFXuHvBrhB7CKkhvKEUAIswHwYDVR0jBBgwFoAUsJ9n
++MyyIiIkfRGJ0nSX/wAYTXdYwDQYJKoZIhvcNAQELBQADggGBAEk9KaiQ6NzNHf7M
++kvPosgCu9Tm1jgRg4qjdMHxtzDxFQZWOtMuDxqqrNEC9FEF5zpEB8Z4VtubIeVK7
++6i6BdSMbI5zlnlxffPD1Gz8AKXe9BNb6UlLvlEC+58D4CJmrxDuKZXaBzy3xh2TP
++Al/s5XkPBuXKc7l0qQdDkt67LfDCrwpGfseOFXNUHDREBOulwX4LJzilVqLMsp03
++qMHK0f4kOxc0oJrH+2+jCgpu1QPoFOLl/6shbRw3qls/f/coWnnS5kd2NOPUf0pe
++j5lBt5ThhnLQIGwJucLa6cHVx+R4BWtTz4/v8hCwWr1cUbNEkxTyBErl0l8KkpCQ
++d0NCuZe2u2AJYEKdNilSiBr33ERZ70peE/ATfk6hv9ysWepeGYJiuybWXMrDtLbw
++X9wzwtdetIvvMxXiNAT5RpsZtFrdBD9ZwCHhJ+xjEycRDQKdnL/H4WbpAfvB9zcJ
++WCJ50FBFjNoHSYrwmhQULOYa8AjVxxrX/27g2mN3P3sDLG6bzw==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
++AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
++CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
++MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
++U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
++AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
++1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
++qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
++YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
++flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
+++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
++4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
++lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
++eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
++b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
++YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
++9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
++UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
++wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
++S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
++OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
++wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
++dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
++QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
++thWJZzNJeHyZSpah
++-----END CERTIFICATE-----
+--- /dev/null
++++ b/tests/tls-certs/ossl-server-certchain.pem
+@@ -0,0 +1,54 @@
++-----BEGIN CERTIFICATE-----
++MIIEmjCCAwKgAwIBAgIIXBegQDWsgowwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
++AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
++CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTAyNloYDzIxMTgxMTIzMTMxMDI4WjBR
++MQ8wDQYDVQQLEwZTb21lT1UxEDAOBgNVBAoTB1NvbWVPcmcxEjAQBgNVBAcTCVNv
++bWV3aGVyZTELMAkGA1UECBMCQ0ExCzAJBgNVBAYTAlVTMIIBojANBgkqhkiG9w0B
++AQEFAAOCAY8AMIIBigKCAYEAvYhZDSdPcxBgjF+sgQZ10YPuIXIzoiq4G943OGFX
++EdMc0kdaVQcCKkR4raPMR0wKs57akpiN5CrU1HvkwYZbTNB/BpyhUuZnx2qjTRyO
++pB71k62z7HP3KAI/GYfEMX5DNPS0X3B7chkAT4Sk1Xdn3WjW3BVt3GK4XdWmG2M0
++cmsYaFvijFJDi6Fs8fy/5sG2x+WBwct1Kt8HnjfR+nh00YhgiqOdX1jOrDN29XHk
++n4GIEm/BRQRQ0/PoOa6VWGVVxu+8sfmM7IJ8kC5/QII3PFZCplqPnxFYd3C0Wa6v
++au+tYisJ9B5CB/fn9ars7H6nFMc1D38G/sVkspdJrFuFbQLElkH7ydxBZBv3O+fl
++Iomav/+JL1PiNHFtXxoGsTOPHHFKbqauxLuTbv9B5D1tO/MaxOBTt9MVMx8rDpVB
++y0spKhfWcxJ/0Hge7G9XrFGpN4joBPHPMghM8QjS9/EL8r98m8PNQk6OIG9TNeQC
++gzglQIV3K+rhFwTeeyetxDozAgMBAAGjgYAwfjAMBgNVHRMBAf8EAjAAMB0GA1Ud
++JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1Ud
++DgQWBBQ3rDq/2kYOFskMD0lHFG+g2Ej/2zAfBgNVHSMEGDAWgBSwn2czLIiIiR9E
++YnSdJf/ABhNd1jANBgkqhkiG9w0BAQsFAAOCAYEARbJDuWZiqwA/CU9Eh99POTOk
++fnWdog8tLaOPLFS5mCiLNDmTXX14syAAjhbRrJ+43j1HWXbgovzDqzFtQzbztCMB
++qpxQy3d3R9nUKv6NpNT/IO84OcYuiMtRGr/AaVqc2PZlFirBqlQkxFUxiDc2pIhy
++h2orOJrPu3jSQdWI1PDT6oWKCwHdU+obqh+NmRWwjetpmeJ5r/kgAlZJ1krlNPJU
++V3U/J9WTdOYMhLcn4RcNOTAyrmxOoTEIOcqkXzJOypbkMcZic+OHCaDohUsfdOkB
++Xxz+6nP4xqnOcyHBLNTjVVrnr+wyqsWA18HoyLiCluf946S6mVoXcxwvWHzz7VVm
++qHVppLVD/iOJxtl4bm8YEYjO4C1IPxWOCszG4N71Reyo/+p1UJ8Ww6IAgJj0jX2l
++L7pqCwZKXhd8+LT05dZr7YJV/EjmGV/pL6IU3RAk6s2BqgtTkvy5nnmSPjBFuxG/
++gUBfaglsXC6w6R1aMVr9m3E1ht4vOPu9Qx7E21oG
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
++AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
++CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
++MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
++U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
++AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
++1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
++qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
++YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
++flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
+++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
++4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
++lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
++eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
++b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
++YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
++9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
++UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
++wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
++S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
++OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
++wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
++dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
++QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
++thWJZzNJeHyZSpah
++-----END CERTIFICATE-----
+ 
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
deleted file mode 100644
index 529fe6d6459c..000000000000
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.5.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
index edacd29ee8ed..75ccacffeaa3 100644
--- a/dev-libs/librelp/librelp-1.5.0.ebuild
+++ b/dev-libs/librelp/librelp-1.7.0.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}"/${P}-missing-files.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index e4b707df197c..0b0607beb8c8 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -5,9 +5,11 @@ DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb03546
 DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
 DIST libressl-3.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895
 DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
+DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5a8210b2b127b7d49ef0e96e1a20a45f60e6231dcbe379f57f19c1ca8a4dde6205b1cc52ee44d17a4a21da34c98a SHA512 0204177ad0291f3fce4c77ab21cce17785d0239f2ae4be8fbdce5575cc98775186caa0e1851b211c05be07e3cc603111eeaac4379c8977e7b140fedee2551f93
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.3.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.1.4.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.2.1.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.2.1.ebuild b/dev-libs/libressl/libressl-3.2.1.ebuild
new file mode 100644
index 000000000000..ab31f2041689
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 00fc61628655..65a1265ad6fd 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,14 +1,17 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
 AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459
 AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441
+AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
 DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
 DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2
+DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d
 EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
 EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
 EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6
 EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78
 EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c
+EBUILD libsavitar-4.7.0.ebuild 1746 BLAKE2B fcc6adea25485c30ecf0a9ef24a7c61a409761ab513a41137d965682ddf9a09928614df78396e467b5119150dccb4379d6ddcff7337f62da1e57bf7f9d8fb200 SHA512 edd4574147cb9663f7185e9408e4fb7981d9c57af053ec5277232c92ed41b89e55ca58fbd30a501ea773562d028d0d7121ea8c7128c1e6502cc89428d5cff119
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch
new file mode 100644
index 000000000000..cd9406da9286
--- /dev/null
+++ b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@
+     find_package(Threads QUIET)
+ endif()
+
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
new file mode 100644
index 000000000000..485ab1b9b939
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit cmake python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+python static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-cpp/tbb
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+BUILD_DIR="${S}/build"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove bundled pugixml
+	rm -r "${S}"/pugixml || die
+
+	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+
+	if use test; then
+		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+	fi
+
+	# find SIP for current python version, not the latest installed
+	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index ac5a89acf3c0..2db725d4be3e 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -5,5 +5,5 @@ DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db
 EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1387 BLAKE2B 8cd207c8547e7ca9098072bb793e27e340a9898c47ef90c62bfca5201831a7404f3fa3691d53360c1316cdb378a018e95439cfffc3540a3d91f24514ec47e100 SHA512 8ce20517b338647743f06ecfbf2ffe4f681955e1f9fa4bb5650dd69d6645f495c7035d125f1a0c9d5b8af9e46fc66a8f652f3ab7ccd4b719d8ce5133ff5c30ce
 EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1551 BLAKE2B 389dcae1dfa6f1f1fe5dddb1948deda3f6d73d7d2144bf2ebbab1589d9e872ad7c0579e54868c60c436bcaf24496e8e5efd49f357f22a06027ce7c127665e5ba SHA512 93270a2b843211feeb8821e6f7c7d009b4ed563b3c8fc6076c75ec841017968570bb031e99f3b8564e6681a872111cb6cb5e277b525b7c60839018d5b1f40197
 EBUILD libsecp256k1-0.1_pre20170928.ebuild 1589 BLAKE2B 05817723585615dcc740d329e994459fb79a8e7f0da83d9cfbc8323f16a08617bfcfa2dbe9ec224f4f2acd01f30d0d5cc3f0c3e88c5de0546754626fd8fd03e1 SHA512 2b9b370c3cf5439e00043b7b559e7a11941511acd2c66ab93fe68b5f875546306b90c2280eec69888898973277fef53ff8361840e099e7662a1f508e3cee3ffb
-EBUILD libsecp256k1-0.1_pre20190401.ebuild 1579 BLAKE2B 607834c06408149b959de8295407e0e1290089473ba8a1f31ea17fcda67851043ec154a4f6ae45b92630a1a4e1cbeffafb7e44c3ef8189258e0c54ab94a4c9e0 SHA512 56164064f31669e81eb29f7a6fb8f5d3c6a9c04b84fe11594d70c9e26051b8e1db4605a85b1e384b4937672dceac5ff7c8252bf57ac9e66bf9893d1a30a58c7d
+EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
 MISC metadata.xml 945 BLAKE2B 7a69755c3d1c70ed97958a6597821b2d35175bdb8a396bccef731a9da250a4b8b4a14fb9f28df076b265db72f96cf5d75c3892449bc7bc3f320c69d5d8e79c19 SHA512 f90780064a7b48ef4d9ad70fb20f61ee2ff62508c396bd79f157d2790becacd833d035cc9bd7719aec29acd0b4a30b37426106196f1e229f86bb6eb5c2abb8df
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
index 330a5cdd9972..2de7d3048000 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index cc3c76114718..5e0ff5071c62 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.3-r1.ebuild 1204 BLAKE2B a3ce05a95c08dcf5149a7bf982df847f014f9d935bc820991aca39b557d6ef981b0cfe2b8922ad699fe57fc5bad96a729044b6332a9317ab126597902501d441 SHA512 2530d9732f9f1f7a13458a10bcf28c5afa62fbc86e275480db0294ec527d9b710b4bacd068f2b92dd38f1c6623049db745434650ba44653df9955e1964bdcea4
+EBUILD libspnav-0.2.3-r1.ebuild 1211 BLAKE2B e3aeced8b07e7e9ebda1b5c0707fb29c4ffd975da33792684d14b16e1449fc9936505ca87acaf51019a22d31477838665b0987a54805ec6eb0d0957ee239b73b SHA512 5d5386e1230e804a3caf90884ba5cacf290595fccf645cb875f84ec2662ab44789a14f6a682d622044a3d31fb3cfc022e1d5ed2afd63e99b2f698acd8b085558
 EBUILD libspnav-0.2.3.ebuild 894 BLAKE2B 7069d849b8e936289ee7c66805c8122038e331503311a607b20dacb34db97529a11b38c7530af70def1073baad08e6505b97fc88823bce3b09367600613709c7 SHA512 e535b119a9a967f262d78e22ba82d438a78a97e8cc56f1cf37c73b6056b48c3bd4a0264bc5c38a3258950358b85ba1e60e8a692b8516c7fc1d0a3eeb52857cae
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
index 49946c481da4..0061ce48ad0a 100644
--- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="static-libs X"
 
 CDEPEND="X? ( x11-libs/libX11 )"
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index ea744d3ad8d8..e5c0284c0300 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -3,5 +3,5 @@ AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49
 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
 EBUILD libspt-1.1-r2.ebuild 848 BLAKE2B 6b0e10ca243709ac309bd7797c1413fa2a29d7a4677300540e45dd563f83385ef54cb1ab529caf237ab87afc68bf8f1841ba4c36c22d909f42f8f2746dc4d341 SHA512 4587ee745bd24b4efaa852b5070ea4fb79c9b4440dbb7d8233c95e212ea05211c8d2624493775a5c0de5d303447e6e18d6ca15ae6419763e059193d437bff6c9
-EBUILD libspt-1.1-r4.ebuild 867 BLAKE2B c326b190c3da12fd213c28a7452ec783cb99ba5ceba6c3d56a313352fb5fd7485918d2a70a3117e754ee8718b6604546319a2e5dccea27f8918cc34c5a7b0e04 SHA512 53bec70e7a3814c7ba90d74b1b11a43563d5142c4fbbbf091e76986a2bf5704abdb9ccb6f417776427099145df5ca65a09b5e25ac7b7e7afa293f64737ea8347
+EBUILD libspt-1.1-r4.ebuild 866 BLAKE2B 9cc05778431eaca782a70660f31b5b1283671eb42c77fcea4fcf9f10521b8e56b9b23098a0a2e09c4227942dac65260a63c9b44f6431d122f85c7200c37ceefe SHA512 2e71fbb8a15defc13c3af392da784c848961427d70f29db5b48936dba136a096a99b3e345852c0f3f6af2fde69cd6b96ab597cf4a079ed259fcdf074123075ad
 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index 038dc8d2ac53..9d9b7f4ce4d4 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="suid"
 RESTRICT="test"
 
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index 0a185e2216c3..72ac5f535205 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -1,6 +1,4 @@
-DIST libudfread-1.0.0.tar.gz 31420 BLAKE2B bf68560d283fb88af54ee1a939166e68df94d60f1e8d3fc0d0e6e1d0faa0b9ef35825ff8a2dbbcdbfb0412dbe6e1639a34b844c10cf7424a659f974a53b59b2c SHA512 8b48d809197f3e9e4271755acffe74849aa3a01c6b23eab3acad6c2bb0c9045491f43657953300e5f84b27e99715ea2a2c4926f1120b3f5129042703c2804606
 DIST libudfread-1.1.0.tar.gz 33506 BLAKE2B e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e SHA512 340a03fe90d26a8a5c78e1e4f558a0b448a14332a661494f44af7de3e6c98cd219125e19f69d2a611ecb4870648a5d5b55d794e665eb8ec4192c0b499a0701ed
-EBUILD libudfread-1.0.0-r1.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837
-EBUILD libudfread-1.1.0.ebuild 806 BLAKE2B 96b131caa9da63f3bf55e36dc4057c17d744ce92e2d631e5670cc52a1504a74bdf0b81f435d8e3aa6864e850eacf8ec5bd27d205ae581ecb81e580a4db24dbb4 SHA512 0c8172358d8a8040fca4af9ccd372cf1aa901c8d76ff676b4b7c01b5a75b57ac791f2dca4735bc4e1643c69762476cce27dcf8072a1e72d6f8f16dc524619f44
+EBUILD libudfread-1.1.0.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 EBUILD libudfread-9999.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.0.0-r1.ebuild b/dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
deleted file mode 100644
index 6dd66e41c5cd..000000000000
--- a/dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Library for reading UDF from raw devices and image files"
-HOMEPAGE="https://code.videolan.org/videolan/libudfread/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${D}" -name '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/libudfread/libudfread-1.1.0.ebuild b/dev-libs/libudfread/libudfread-1.1.0.ebuild
index 6297184ebd35..f4fb055b98c6 100644
--- a/dev-libs/libudfread/libudfread-1.1.0.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 8c8d602ed772..a81d9c7308de 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,7 +10,7 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r1.ebuild 6817 BLAKE2B fb3c82c45702da0b683fe167d07bc241196c69835b0daee4cb9f94f9f611197bde3ed1f2dfba1f6bbba581e698d2e1cb148c3a02499797f88123748f7a08933b SHA512 427c7ef39e8f6f20f3525f5a1c726a4c866ff1ad3e5229ad03d3e52ce30b1f416fd2c88604a012f0b18ea73eabbda316472d5c56fd0dec74ab75ad43c85c7046
+EBUILD libxml2-2.9.10-r1.ebuild 6816 BLAKE2B 00759ab3637075af76694d3a4233f33f69d506643f2d278c0eabc74d42002203676445d58ccba1f44c336ee401243aee2ffc1c5f70fd0ae6c22265a8086afdcf SHA512 3ad9ebe99fcca3af44036746d2a40d749fbeb9b35635542916a4a85e6b4038ea5fe9f4f956df1d9b46fff4cf1a3bab9af9906d0902e5acf3c9bd05593a2c72cf
 EBUILD libxml2-2.9.10.ebuild 6816 BLAKE2B 7d1574df705961e96f314c4e64a05fff9930c01164ef006e28466ea57327558db7ab1bf698798a0182d0bd3c45e15314ad78515c1651b3dd53d14209162be6e5 SHA512 517edfdc130d70de52b825c37d3ca36ecc0a4b04ceca5e7bde251d823dcf53b43ce08fced4bf06a940395fcdefe2f9ff93d6c67ad813c9ad9a6228232df316cb
 EBUILD libxml2-2.9.9-r3.ebuild 6943 BLAKE2B cfc351f4626fb77dec2032e57385fe0800d8ea79c5a776efb31549b7d7a1af9822762ae463bf08982988d740e693eeb4139c117e4a8dcb0b71bdb7dd1d8c3574 SHA512 be36f698c42bffd8d153806bef4e2820e5f8f0245abe4c5547986fab64067d3282227dccf16d7d1e475572abb952b1f57f16a4a311e18071a31a1bf4d7fbd7b4
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
index 07a922640fd6..bf5c24e4ac2a 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 36e3a960c7e7..096b76ff52e8 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -5,6 +5,6 @@ DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 EBUILD libxslt-1.1.33-r1.ebuild 3476 BLAKE2B 8c01bf27c646b31949d5c7ae74ad40df43ddc227f885757a331901c5d055f5d3d9fa09593556dca3a8f49a73f48981e8988d2756252feb7255a23dbe905e83f0 SHA512 4656d28fdd1b1ef9f6145a7bafe01e44a6c77480bd966958e48ddd4911ae43663a56e7365f5e48639a28f4e58e966616ff5bc7bc81fe2e0a3c5e02d646ac44db
-EBUILD libxslt-1.1.34-r1.ebuild 1574 BLAKE2B 6c4e3d5ff4cee55ba520d58a4c58e24e142fab2051a2984ed86b23e14152a65aaec71ed913bf6becd47fca9d21ea4239a487e00e14c8a9836e9f5c823ab76e57 SHA512 eab27d5651620074ab52c414ecc9728525bdeeedcb6ef36921a83f71578335b27888dd3bb03154a73e19ef62e45d346b6d34fc172e88dbca101b2a7fff231e2d
-EBUILD libxslt-1.1.34.ebuild 3299 BLAKE2B 73cef3a1e3928be709e0020f0c5b95a6e36d78f25117f72b22ccdd34c38a4595da5644d2e6689a85f007abf2a5913cf2f9d066b67f5a509e9807cdcf5b1c6ced SHA512 e4aabbbb2b3eb2aed96e84370ca9e1a4379a592fd92fed338ac3409f8d6ce2502347a11f7697235656489eaebc2ddc105d04ce02a47d727c2e902170a6c1906d
+EBUILD libxslt-1.1.34-r1.ebuild 1570 BLAKE2B 6402a3f19caa0d545447eb54417225d4b9bd51d8d56a58ced09e8f4b2b00176fcb7005750ad13814d3b4e1dccbd9d3bc180bda42344efa5594cfc366b056072f SHA512 7d7c3091a9809814d3e1c0635d9966753aa75648316b6bf4558c5bbd4ceb36f9d0949bdf1c886ff82c3dd9cc948e1e92733da689fb9a433398473ff36ef4ec6d
+EBUILD libxslt-1.1.34.ebuild 3298 BLAKE2B fdc2468381664fde5436de91ab7bbf68ae349e5fcd96f5dead396a147759d27e3b77279921ef18a414b210df9ea0bcd38fc1dd5fe077f0ac2ae1b9b1fad69598 SHA512 be322afa5f6e0ade4d11e3996be808bca0313d9752c304031d43891ee388427115d298b739e09b0d4dbe1586b826ffb1529fc3cee6d2ce927a02ef93712c19a8
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 8bc2516fb94d..a444fb79effa 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
diff --git a/dev-libs/libxslt/libxslt-1.1.34.ebuild b/dev-libs/libxslt/libxslt-1.1.34.ebuild
index 230ccacc3bfc..310ccc749f6d 100644
--- a/dev-libs/libxslt/libxslt-1.1.34.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 862aae9a5503..58485ca32f69 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,3 +1,5 @@
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
+DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
 EBUILD libzia-4.21.ebuild 838 BLAKE2B ff1f384a87ddb0b798b03c8f04b83f86168b4e45755f12d979825d4ffcc234784cfcd52773ca37eefc6cd04885946d25bab069b542faf6ccbeca3dfbc3c512f9 SHA512 edc8c49c7186755c8dd25cc0d2958c27c26d9f607804fccdb3a85debb8bba4edc3f124ba044712273411909781a06072f301db8e121d2df08a5389df3d5ed6d5
+EBUILD libzia-4.22.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.22.ebuild b/dev-libs/libzia/libzia-4.22.ebuild
new file mode 100644
index 000000000000..4977fe81e7dc
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.22.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 72a1893fea36..6b114d5f8de7 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -2,5 +2,5 @@ AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b7212
 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
 EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71
-EBUILD libzip-1.7.3.ebuild 2416 BLAKE2B d23bf31c4cf1d48359ead5eba5f833a275fbb44ab147064358cb6f02863781dd8e934496bdd13f8634aeff5e6238026937a526f90468e92dba949ab58271cdfb SHA512 4caf6478051589a1f7ec50b592a75f51a82b264719c1f1b0dfb0051e6dcdf6be1f4913bb67ffa9ece28411e9235eb79e488421524fbedc88449d7584500987a3
+EBUILD libzip-1.7.3.ebuild 2413 BLAKE2B 5822b165ac56f503e6fee73215efc8121a73581254c2d68e9d50e191766df79ce2171ad4cd5f606f1ea76d98b36974eb9ebfac6645e643da6b6dfe8d56ef60c6 SHA512 3359eac6e2432bebb5ca51f5bf868f14043a401b8458d45d9cb9e16a05b564829f47a07fea728abfda1f067c293a9d229ed62b92071fbd1e09bad1fcf23b97d9
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild
index 2953f97bb222..fe0d69415676 100644
--- a/dev-libs/libzip/libzip-1.7.3.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index c5cc6470c06e..5b07456741e2 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1019 BLAKE2B eb9fa5931ab416efd6575737650c291b69c0db0d5acdc144a49fb45e6012649ade17b1de01b82fd44afe8bfee008dd67eaab74f6e7c14364844ca418854ab6ad SHA512 e8e3d4c353e2aad050a81de834730610fdbc9bbe4b49997f9d2ec284824967ae897be60c11b191d0d97fa8f065541fbabd5ee14c26583d4cd02834b1316eac47
+EBUILD lzo-2.10.ebuild 1026 BLAKE2B 96489628f775340ecd3dd4e6ad820b085a3ba95d79d2b89b0fbe6585857887d4634bc4ca307e3d5d60f6656e42f294b1cc708d12b8375f2f0e0d38db0fdc3aa1 SHA512 3fa27c365516b462bf81da48603020d46e3fff30d58ae48e906a7789f6b36ef5b555fd2816ccc6862337adfbea99fbf87eb303054eb6d6b4abfcc4ad4908832d
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index c6a3abdfa53f..7f72ec374ac1 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 8af4c6b726e7..872cafdbf56f 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,4 +1,3 @@
-AUX 0.8.1-api-version.diff 421 BLAKE2B 77cd7452029021c098f3d9a40a94e0af63a30c986148101f9b86d0dc416873f6081d8530001e9c478cf3c1b6d933fefee227987b9ac7e2305c82c16903259a24 SHA512 0ee058b1f16feef966cbddc9502507f8890d9a9ce5a6eca70bd0b831909d286caf7c09cfdded4ac97a28efda2215b11df8e9f747ace727b4b972c79841a7400e
 AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
 AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46576e21c773a87e71ef8618130f8055b03080147e68a5c9a9b805149eb328510ccea172b790df8a512b45241173c5f1a5052ce7db6 SHA512 ce81feab28a06d003c731d4b14a611f705c0f45123282b7a1836d7eb0befdca4a1a041896b3d4b9bb49027c3fafa72feebfff2a26657df56f21862d0125c13c6
 AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d385bdbebd1b90bfc7bc49bed4a4d6cbcb02768fd98b9bf110e9b463893131d44538f1d2ff2b4cba3ce2242832d1149cbd7498 SHA512 fd4b083695e7db3e407e2068fbc76ec063040f200f2087fdad6b21b15bb0da4a8eb74123908a3798af2b81811e8813c047d44117aebdc0d5393069c1ac653ed6
@@ -10,8 +9,6 @@ AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6c
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
 AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
 AUX mongo-c-driver-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
-DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
-DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
 DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2 SHA512 10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
 DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
@@ -28,8 +25,6 @@ DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
-EBUILD mongo-c-driver-0.7.1-r1.ebuild 1264 BLAKE2B 060b69f97e33bf26e3613baa6571e7abb902bb03d67590c1a8a0fb1f86923600942a25fdf64a41b5a556b4ae0547f25347f3baf52f82756e874362229f60f11c SHA512 fbc20dcc7a431c324fe45b14129891cd7285c00653c4d32fed95285bd9187cdcaceef448bdbf963ed3734089d59ba8b9703e46f26da4a8735f2a70207aa3aa37
-EBUILD mongo-c-driver-0.8.1-r1.ebuild 1202 BLAKE2B 63233c8853c72cf6722cece455408b9b43212bc78201043c516d21e6eb913f52b7d0180239643e35dd6739a73b0d60e6be646c7b228cbe2266974b61c4e0c100 SHA512 ac1dd21bcccb06eae6666ec4675a9c2abc8fb97f2eb708b7502e961b67d32167526bdc09cbc4d25e93f93ef5aa436ad0c80b1651233523993c2f517ebebbb8a3
 EBUILD mongo-c-driver-0.98.2.ebuild 1840 BLAKE2B 2fb16cd97763ff2af007e76670f3d424dafc90c56171be4afca356811a2df7f9c2d6bc21f99d7195f4f09344b6910ea8003807ca9be006a6ce443ba662c9344c SHA512 9c3a12d619c20f018aebd9585504621bfb18067390c5cdfe1a61f3ea449377905718c5bcbd98c2fdbae4c0a8266d79b5482ca3eb8884a47512eac36d591b95c0
 EBUILD mongo-c-driver-1.1.10.ebuild 1951 BLAKE2B f2b3a15a6aa9a0887ae6ab52d7ee1e79d7b3fa06bb1b3684657719dc69f10894070d002ce0f06abad742ee753daaa4dd85e586785e29bf84e7bf9a2a4f2ec46b SHA512 7226237c58d4b94fa052ac455e7b67aaebac2bc14d285f74829fab289eb4d3a0dc4f3b7e5fdbc6ee28b6eeea59dbe0bc0cd3511c959844f0915cd2b1390875f3
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1948 BLAKE2B 65296d043f84794efa8d8c69c174211097c73f14fbc945f81d6068663c2b23cd2a0b4eea33b5832a32d0bd1adf05e051c481625f767ddf708dc2b2851a5999f8 SHA512 9c8b583be17df5d3a32ab71483c69f2974e6c3634285c1ea6ddf46ab305ffe8852bff95b26361efeca0b0051632b69b267c40041dc13dc8f90a0f766ceba486a
diff --git a/dev-libs/mongo-c-driver/files/0.8.1-api-version.diff b/dev-libs/mongo-c-driver/files/0.8.1-api-version.diff
deleted file mode 100644
index 2bd52253a17b..000000000000
--- a/dev-libs/mongo-c-driver/files/0.8.1-api-version.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr mongo-c-driver-0.8.1.ORIG/src/mongo.h mongo-c-driver-0.8.1/src/mongo.h
---- mongo-c-driver-0.8.1.ORIG/src/mongo.h	2014-03-27 17:00:42.880465606 +0000
-+++ mongo-c-driver-0.8.1/src/mongo.h	2014-03-27 17:01:05.131465940 +0000
-@@ -33,8 +33,8 @@
- #endif
- 
- #define MONGO_MAJOR 0
--#define MONGO_MINOR 7
--#define MONGO_PATCH 0
-+#define MONGO_MINOR 8
-+#define MONGO_PATCH 1
- 
- #define MONGO_OK 0
- #define MONGO_ERROR -1
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
deleted file mode 100644
index f342b65bf469..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic multilib python-any-r1 toolchain-funcs
-
-DESCRIPTION="C Driver for MongoDB"
-HOMEPAGE="http://www.mongodb.org/ https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~s390 x86"
-IUSE="doc static-libs"
-
-# tests fails to build
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	if use doc; then
-		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
-
-src_prepare() {
-	# bug #510722
-	sed -e 's/-O3//g' \
-		-e 's/-ggdb//g' \
-		-e "s/CC:=.*/CC:=$(tc-getCC)/g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	append-cflags -D_POSIX_C_SOURCE=200112L
-	emake
-	use doc && make -C docs/source/sphinx html
-}
-
-src_install() {
-	emake install \
-		INSTALL_LIBRARY_PATH="${D}/usr/$(get_libdir)" \
-		INSTALL_INCLUDE_PATH="${D}/usr/include"
-
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
-
-	use doc && dohtml -r docs/source/sphinx/build/html/*
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
deleted file mode 100644
index 0220abebd224..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit base flag-o-matic multilib python-any-r1 toolchain-funcs
-
-DESCRIPTION="C Driver for MongoDB"
-HOMEPAGE="http://www.mongodb.org/ https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~s390 x86"
-IUSE="doc static-libs"
-
-# tests fails to build
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
-"
-PATCHES=( "${FILESDIR}/${PV}-api-version.diff" )
-
-python_check_deps() {
-	if use doc; then
-		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
-
-src_compile() {
-	append-cflags -D_POSIX_C_SOURCE=200112L
-	tc-export CC
-	emake
-	use doc && make -C docs/source/sphinx html
-}
-
-src_install() {
-	emake install \
-		INSTALL_LIBRARY_PATH="${D}/usr/$(get_libdir)" \
-		INSTALL_INCLUDE_PATH="${D}/usr/include"
-
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
-
-	use doc && dohtml -r docs/source/sphinx/build/html/*
-}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 1c171764397c..adf8e5504d8b 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,5 +1,5 @@
 DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 EBUILD mpfr-4.0.2.ebuild 1644 BLAKE2B 0e93bbe9c14f289fad63c5055eaee18299d4daa1297581f2bf8241e75ef711814de09a6ce6154bb1979b6e452c674d6a5a59289deb8b134752c4bf9fdc35c7d9 SHA512 7ef27262e6172f59c952e61f5b2433225066778a3b7a7d3114542dc8356de625e4a59361c0606d302250c28c23ea565990b70eb139a9d0633475d9d8071de328
-EBUILD mpfr-4.1.0.ebuild 1062 BLAKE2B 7f987a8cfddc96a4f8308a23044f22ea587c48139fa85a8cac2646098f5f302a7de14f5e23398702b18ed93aa170dbc365eb2bc62d91ff7976ec6437557956e9 SHA512 3a57ccd9abd0527be30986c5114ed9fba34ae19c0387508541d3a7daee8ee65706003b3cc623f8f8a4fa9ed3136f433ca9fba00068d99dc36ec39b378910b797
+EBUILD mpfr-4.1.0.ebuild 1061 BLAKE2B 4a0c9209eea6b29eafacafaed858d004af966b52d04f1bd99cdd74e06de6546793010c71da5e2ae1210959b7e00edc5534a0cb834439e3c2d7e218998d8641f3 SHA512 f61f6bbc7b0234408d82cf79d3cfae660e2192dc9dccf828aeea633f1196e5f4569510474b3e4352134f23bc9c2054c7d5a3b5289411076a7d8cdfb338f80824
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
index 8ae3c247d9c2..bb16255e02e4 100644
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 788a74e53b45..ff726e880557 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,5 +1,7 @@
 DIST ncnn-20200226.tar.gz 10363010 BLAKE2B 3f5e22ecffc7d36d7babb8c316eb95785f60b2938672cc2fc4a56ae8e4cc79fef8d498032117998a1813b4a5491b4b99f6941ac41be3fe8d6c6e3276ae46396e SHA512 e91694692e2c48ba4b404b26b382939be62c61e8452a09b8c1cdad351adcda1ea8bd19ded671f6c4c6cf979ccc49c181dd47e501a351fe89ecdf17a5395b3fab
 DIST ncnn-20200413.tar.gz 10520160 BLAKE2B 10fc59f3a09d1a6b21a6c73b87dabd450279d2c30923b15266461360c6a63b7cc58f91e33c6563752161de3ca067098ed4f2d22963410fe3f72a8affbd39172e SHA512 3f3610f94cbfa6072347857675865b3b21e4cb330a3b889214e7e8cf6e7a558451979ee4ba727c28fc5919a38b27d3b0288dfbd1bfa06d92d3677b4035b019fd
+DIST ncnn-20200727.tar.gz 10989866 BLAKE2B 27ec105d4ea24b1bcccfb64074f47332515112b7fed7b6f833c6d3fd846542f14248254d076e3d1e63eb16cedb51d16dd156890ca805f4160d7e6ceb3de1b46a SHA512 122653ee4fcf6e45665154ff6014eb3291d48174ec153b27ccb9013bd705a81e664e4c4ad94df5cb3ea661891115929562db45c7c714747fb6f7673b09a16b68
 EBUILD ncnn-20200226.ebuild 692 BLAKE2B 3fb887404a2de19dd311439714ece71fd51d84484762f57fadd2a06059a569ae55b39b0cb924e3016312ce3474a03ba1917efe9b100a7d242f7bf9ea68168c35 SHA512 db08ff07cf73c967e31a9a64a361a0e40ac858a3ebb074309e0f0d120392040a5fb5874c6612f9163d2056fce9883d40aadedacbbff2a55ed17f6521b58c0a09
 EBUILD ncnn-20200413.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
+EBUILD ncnn-20200727.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
 MISC metadata.xml 329 BLAKE2B a70f4b06a9dffcd4c7182c52354bda1faa068fdcb5785a1e8ffa40115cf963c89a40a321688618e95ac79e5c5eec1f87772cce5fe2fdf924b57b2c8d914b6660 SHA512 3ba55224bd0842ba5354ce52680471a7e5a364acb96d530bae821c99d3ca4a9e74db67c7f854eb89a7760996e4e4d4f050fb9933077213af0bd5c9a138869f96
diff --git a/dev-libs/ncnn/ncnn-20200727.ebuild b/dev-libs/ncnn/ncnn-20200727.ebuild
new file mode 100644
index 000000000000..efda01091014
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20200727.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A high-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn"
+
+SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-util/glslang
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+RESTRICT=test # Tests tries to use real GPU.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
+		-DNCNN_BUILD_EXAMPLES=OFF
+		-DNCNN_BUILD_TOOLS=OFF
+		-DNCNN_VULKAN=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 3290c841e8fa..b9efc5f7b756 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -5,6 +5,6 @@ DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10
 EBUILD npth-1.3.ebuild 670 BLAKE2B 5987fb8075ac5efd02a1980ff28666e38326ca43064628cd8af7ee04bad1bd0e90768ddbadfce11f812618d2e8ee0fdbec375d978a89ef80e9d8cbb1bdb24e33 SHA512 25e0f26a55c970b4d2974668cc8452468e95775f17d6456310be19aefae343539f8cb2ac7d619481d2179ad9acfe3a2859c39ac28a084c1701dbe10ff928d3bd
 EBUILD npth-1.4.ebuild 683 BLAKE2B 046f4e47d204fc077757524f5892a6cce5b7c2cc6663b87ca87500d21b1669b3c86cb463aaab5888c69ff98856a7fd060b5e7242193757b5617b385bbad1b8de SHA512 37c5dd04b5c51de81c8ff8c50f9ac1ce260b77ec45869c18cb98251dc2f7b1862a9f0d7ddbe6b386d3d825a1f309e66ea9824839ed8011710af071be6d350d2f
 EBUILD npth-1.5.ebuild 740 BLAKE2B b7f39e56382f5ec10b21a1e65d89a7d8d9ee74e456b11ed54d8744cd40b2ee023c7dbc4aca842d3079364ff0112c636260733c50d16a714c8c538ce15f4cde00 SHA512 602fc9d468a8b382f22c703855ccb36053e1964c98af0d437ce47e2ab8bb82569f56b0077a0a9e08226c1f486fc10a4af91b5e405a1f88792037676ca6431462
-EBUILD npth-1.6-r1.ebuild 757 BLAKE2B b1c01ae0d1fc4abc3eca53ce2dd434582341fe84ac3073976c2654cf540d3a74de388d4d2f5d9c384f74e4c2be4a58844c1d27d817dbc550fadbe26aadfbc804 SHA512 2c2657d60decf03db7a592c128967b44a9b92eca9d89f7b9be3dd8384a172b64cae1f16d522031470730bb81adf4363e86098d650270deda44431272be7655b2
+EBUILD npth-1.6-r1.ebuild 756 BLAKE2B ade7bfb1e503ba0486dad4fbf56df0541143916d2efd7f7c0fd1e13ec3ada37c7429762b1a7a4f3c9eaf9969909f5cd08362368b8ab17a209e442edc03016a83 SHA512 c05936b811c9181409258a7366e969e60da5e9282bb05c59a75c2d03393a896d34d5ad867d750227f9a157df2167d2ecbe3ab05dedf752b614cbbcc4a169a43b
 EBUILD npth-1.6.ebuild 752 BLAKE2B 41971a4ca71f49bd3386c90c1423ccdc1a9d28208868adfe0a4dffc8dcc48f140150e3591036ae427b91a3e5801203df0cb963398de46579c012d79d707b0d33 SHA512 45030582cbeeb0611d97a7934205e4cc421c341c38c02df4fb13d18ae2b3d67231705ee793ad079aad40704311ee77f012bcd5bf9ac29e0f61b71f335756e762
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 8a95ed7685ef..b4b46cb59b2d 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 14f654861682..7ebb5042f228 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -5,12 +5,10 @@ AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
-DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
 DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7c71400e691dc3e882ec6d63cbf13996eb1ae1a03a294def419e1669e38fe42990c66efedce03f121087e6c SHA512 d6632cde3570ee386ee1459257eba99f91dd62fa905fd82679222c83d63c185b76d8dca0422d4349de2dfce603472ae52bc0dcced0f142acb733374c74155d3c
 DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
 DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
-EBUILD nspr-4.25.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
-EBUILD nspr-4.26.ebuild 3931 BLAKE2B 6952a7e9909aad55717ed0113e89c9b71f39b38f421160d4c90bcea04b1a3870e01dc37c376b1879241b4bff02630c90cda5027e62b50c6229f5c4c4a9593750 SHA512 a1486044ebfb544a6349e09bb9245d1faec6d97cdfdeb379a39ce1581e6ce51219bcc0a23aec56ab68d7f17362e186229aa5c64b7874401ddf487939031a5653
+EBUILD nspr-4.26.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
 EBUILD nspr-4.27.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150
 EBUILD nspr-4.28.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
deleted file mode 100644
index 22a70f0cfde8..000000000000
--- a/dev-libs/nspr/nspr-4.25.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
index a73504395616..22a70f0cfde8 100644
--- a/dev-libs/nspr/nspr-4.26.ebuild
+++ b/dev-libs/nspr/nspr-4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c6742fe4f7d6..eafa17662a63 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,19 +1,10 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
-AUX nss-3.47-gentoo-fixups.patch 5260 BLAKE2B 994233aad2a0016676e6aea2bf4331a131561aa2b67bf6bab369b86e3a31e2fe651b0cd3fe77c6b8127fd276a5a2b8fccf3db90e0ecf63cd6d3a43e4dc26849a SHA512 c917ee0a2e4c889613f0d931b2553a6338c60a4ef898ea30bcdb888f94a30994849a3d33cd0b9eb7c5d1baebd2c7d991f2dfef44b50a0b59bf2f6b332ee3ef84
 AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
-DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
-DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
-DIST nss-3.54.tar.gz 81190188 BLAKE2B bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2 SHA512 9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b
 DIST nss-3.55.tar.gz 81759883 BLAKE2B 5b663d2b1861eb74cf070f2711b4db1afbfbc40b08e1f117e6b4a62e9f997de06889de3afc654cf6547c371ab2a1183904a1a014d1dc4b3e94f734107c81e1cf SHA512 acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.51.ebuild 8973 BLAKE2B 38182caddafaa28743e15d70796912f523cdcb34ec6bf3fde4d8f5d147eab19cf3927aaf919a0f9f95ed71b3c4e45c8ae03bd60a9b75596d3428a5a661841e4e SHA512 631181fb368571224d9673fb2dfd70e01fe296c6ff27f5c4ffdb717e7ed2ac8b78ad7a17b29a93426f9e4815370b4c57391568c7ea7b2a141c36de3f3e2fb84f
-EBUILD nss-3.52.1-r1.ebuild 9139 BLAKE2B 512de8c0a96884adba78a42af3d6017096ec17b54ddab2ba7ffe934a65e6c09bb2f874e0c1e630b4fef514716e003771e3024192dff5054f0693a0934bec6132 SHA512 a308d2a036b9edb7d3b14a687384fa292d2b4fc3fdb9f86cde27f5419d56c1c50061eeee2bcb0a4170692a429600f491e31218053aa085d865edffd7ef224837
-EBUILD nss-3.53.1.ebuild 8980 BLAKE2B cbe93301acc7fa612b3557911e9b2607e643667e11fefefc8b6bd50f2f8e50766378f001a67231788febf0a429677a13b007cb04e390cbe309cbc9d26316df9d SHA512 99e517111617fef4186bc0fb691cc092567f4f3385ecb30e866835da5e2b7418d45aaa8fa51c728fc88b4c411a1e0b6ca7b34f93d8192f4c70f32873024266d6
-EBUILD nss-3.54-r1.ebuild 8980 BLAKE2B a044e5016d4ce38953e4cfead12f7232d93176bd99598624400f861271c7c882158283e0c30f77cfc6e2afc3656deec5882ba37f87f7f49bac05bc2d6ce00bb8 SHA512 617f5470be6279ddbce1a3f998fda3e19971ce8b6f53140d751b56c96427bb3573c64d2d6e4daa5a84dfb6cc70df3d25ecc7bc35bb389869950a64dde99ab9e7
-EBUILD nss-3.55.ebuild 8993 BLAKE2B 48fb1e98f11dcea199cc055a08a1d634230a6e91ea0ec63cf36f1a2978d5bddf092c856d66df4faade767262eab99fef53df2a7523b25227e9d97b818f7e09f3 SHA512 08114bb14b0a7ac3ae7cdb295d2f8c5730e652fcd6b1c3f5567412633ff8557c2a617252af73bf6f5c5351fc1e5b542542a3152c1aec81a201da7a1152c79eda
-EBUILD nss-3.56.ebuild 9001 BLAKE2B 929685fc2b5c2ec8b60bbb11b13912f245093c4ecdd8afdd9d4e7e6fbc5c8b8ef8d1fbe4aed224b9baabe191e660c8e87170ac057d1b7be322e2ef0ecefaa6f8 SHA512 dd5638594ea50cb389b6c3336781c5c92c1d9ae5f083cd4188efcc8756908ba7616abb6b4730ac3fbabfd87e3dee2afe2a15b3be2ecdcb5bfb4360eac21be546
+EBUILD nss-3.55.ebuild 8992 BLAKE2B 45d0ef7e3ecac0a19c75b5193cf3f21aad28fce9ee03d30785cd133c0357e3b71e62800154ce22df775e168a0eb5f99601db55f90bc3271d2ea5a8faee2a580f SHA512 8bbcd696bfd436eb76d4eee53db228c2d8c1351217ae9e171fd1e9a38e7c4903ff303c6931be733f3e2153e474f65668567bf720d6840f7325145b179d99b14f
+EBUILD nss-3.56.ebuild 9201 BLAKE2B 58df2697f19dc6b8a7f1a06aee9ca18efe5351094df731dfa73c5162f0192afe87d1ea886afd4ca914cd3aaa6483e9a6fda8131bfcea82b06b638556b9f8cba9 SHA512 127051249485f79b87eff7d93a495a64baf6135e0fe3ffc30278df6dbfe5cc8b70832b079da27d0ad7b826ebd360a9d4029dc3773f1a1f29ed87d5283cf49c92
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
deleted file mode 100644
index 29b3a2a72328..000000000000
--- a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
+++ /dev/null
@@ -1,242 +0,0 @@
---- a/config/Makefile
-+++ b/config/Makefile
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH      = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+	# Create the nss.pc file
-+	mkdir -p $(DIST)/lib/pkgconfig
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/lib64," \
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss.pc.in > nss.pc
-+	chmod 0644 nss.pc
-+	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
-+
-+	# Create the nss-config script
-+	mkdir -p $(DIST)/bin
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss-config.in > nss-config
-+	chmod 0755 nss-config
-+	ln -sf ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
---- a/config/nss-config.in
-+++ b/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+	cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+	[--prefix[=DIR]]
-+	[--exec-prefix[=DIR]]
-+	[--includedir[=DIR]]
-+	[--libdir[=DIR]]
-+	[--version]
-+	[--libs]
-+	[--cflags]
-+Dynamic Libraries:
-+	nss
-+	ssl
-+	smime
-+	nssutil
-+EOF
-+	exit $1
-+}
-+
-+if test $# -eq 0; then
-+	usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+  case "$1" in
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  case $1 in
-+    --prefix=*)
-+      prefix=$optarg
-+      ;;
-+    --prefix)
-+      echo_prefix=yes
-+      ;;
-+    --exec-prefix=*)
-+      exec_prefix=$optarg
-+      ;;
-+    --exec-prefix)
-+      echo_exec_prefix=yes
-+      ;;
-+    --includedir=*)
-+      includedir=$optarg
-+      ;;
-+    --includedir)
-+      echo_includedir=yes
-+      ;;
-+    --libdir=*)
-+      libdir=$optarg
-+      ;;
-+    --libdir)
-+      echo_libdir=yes
-+      ;;
-+    --version)
-+      echo ${major_version}.${minor_version}.${patch_version}
-+      ;;
-+    --cflags)
-+      echo_cflags=yes
-+      ;;
-+    --libs)
-+      echo_libs=yes
-+      ;;
-+    ssl)
-+      lib_ssl=yes
-+      ;;
-+    smime)
-+      lib_smime=yes
-+      ;;
-+    nss)
-+      lib_nss=yes
-+      ;;
-+    nssutil)
-+      lib_nssutil=yes
-+      ;;
-+    *)
-+      usage 1 1>&2
-+      ;;
-+  esac
-+  shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+    includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+    libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+    echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+    echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+    echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+    echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+    echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+      libdirs=""
-+      if test -n "$lib_ssl"; then
-+	libdirs="$libdirs -lssl${major_version}"
-+      fi
-+      if test -n "$lib_smime"; then
-+	libdirs="$libdirs -lsmime${major_version}"
-+      fi
-+      if test -n "$lib_nss"; then
-+	libdirs="$libdirs -lnss${major_version}"
-+      fi
-+      if test -n "$lib_nssutil"; then
-+       libdirs="$libdirs -lnssutil${major_version}"
-+      fi
-+      echo $libdirs
-+fi
-+
---- a/config/nss.pc.in
-+++ b/config/nss.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
---- a/Makefile
-+++ b/Makefile
-@@ -47,7 +47,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
- 
- nss_clean_all: clobber_nspr clobber
- 
-@@ -133,16 +133,6 @@
- 	--prefix='$(NSS_GYP_PREFIX)'
- endif
- 
--build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
--
--install_nspr: build_nspr
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- 	$(MAKE) -C $(CORE_DEPTH)/doc
- 
---- a/manifest.mn
-+++ b/manifest.mn
-@@ -10,4 +10,4 @@
- 
- RELEASE = nss
- 
--DIRS = coreconf lib cmd cpputil gtests
-+DIRS = coreconf lib cmd cpputil config
diff --git a/dev-libs/nss/nss-3.51.ebuild b/dev-libs/nss/nss-3.51.ebuild
deleted file mode 100644
index 25170cb99d38..000000000000
--- a/dev-libs/nss/nss-3.51.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.25"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild
deleted file mode 100644
index ac5506ab5973..000000000000
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.25"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export ASFLAGS=""
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild
deleted file mode 100644
index d94d193dbe96..000000000000
--- a/dev-libs/nss/nss-3.53.1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.25"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.54-r1.ebuild b/dev-libs/nss/nss-3.54-r1.ebuild
deleted file mode 100644
index 5d96e159be45..000000000000
--- a/dev-libs/nss/nss-3.54-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.26"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.55.ebuild b/dev-libs/nss/nss-3.55.ebuild
index a3fb150caaa9..827349d454c0 100644
--- a/dev-libs/nss/nss-3.55.ebuild
+++ b/dev-libs/nss/nss-3.55.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
diff --git a/dev-libs/nss/nss-3.56.ebuild b/dev-libs/nss/nss-3.56.ebuild
index 1be5f0e7ebe1..c5e3dea3064d 100644
--- a/dev-libs/nss/nss-3.56.ebuild
+++ b/dev-libs/nss/nss-3.56.ebuild
@@ -161,6 +161,14 @@ multilib_src_compile() {
 	export USE_SYSTEM_ZLIB=1
 	export ZLIB_LIBS=-lz
 	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
 
 	local d
 
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index c1c082978405..66c9ff99955a 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,3 +1,3 @@
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
-EBUILD ntl-11.4.3.ebuild 1622 BLAKE2B fb57d2648841652dbc333a1be4ee8d4690a8c7342525b0a3ac639fcb2c6532cf3984482be1ded238ba95bc00acdfe834c5d8d1ba8adb892e4a60b9ad59faa46e SHA512 c1fe99867f3872aac98844a04923122cdd217d0c3c9e348c56b288cba60ae8fb74505abd02ffcab8976188b00d0b68b55901b855956845ff9636b3a9810a799e
+EBUILD ntl-11.4.3.ebuild 1629 BLAKE2B 04c521ed638fd32220065c99f3204a76885d6323ee699066f08b89c517780d26d4ef4ddcef19d8812a7d8d0767b28a891804cb6c7a7aab7c2e610a165e5089c9 SHA512 8b0f55efaad20fdca6530f8ea88f71df2fa5fddb0fcb76a4e2312d35fc9489e55afe0d104263c0c30a72daa5751017341812586d70dcabebeffaafc8fc871cd1
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/ntl-11.4.3.ebuild b/dev-libs/ntl/ntl-11.4.3.ebuild
index b19d42f860c2..b30b4e2fe4ee 100644
--- a/dev-libs/ntl/ntl-11.4.3.ebuild
+++ b/dev-libs/ntl/ntl-11.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/43"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index e4d5daf9c5a1..f22237befa4e 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -3,5 +3,5 @@ AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34b
 DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
 EBUILD quazip-0.8.1.ebuild 1106 BLAKE2B 7ae5b0f37f840aede6f0d3310d176d5bf45d82ef1821602b3a010cecf21c77e483318a959ba9901f45e2b326c5e4481615d6115a95ceaec0a8067c0492193ac2 SHA512 d9ce0a05b55da4c1317cc380c2d19bb8107ed02cd4aab26149f07c518ed07f8a98e51de7ebb272d789b2e4432cf185f9fb19fab009e06d8208bb508645933560
-EBUILD quazip-0.9.1.ebuild 834 BLAKE2B 4c4489f2259dee61a6c45894e2f2c7be54dc0850824a1cf4d9aacff84d2dc1c7c90056105ba4fb10b1e8e040240dd0c78aa0bd40454162784ec2fe18d05d4c46 SHA512 5051d9411c278c3bdbe20c1bcf51aa6776a841048f9e3533801fe15acd7ea88f884d554d6a7a4056a7a4b746bcb3af1dcf908663871cc1861437d662e026dec8
+EBUILD quazip-0.9.1.ebuild 833 BLAKE2B 2e7158bbb69dc3d08833ccfa6bbf5ce36e99fa4a9f1d6b3125e67ed9265738e9db235d91c35fb63ac05a0897b4e362d0d918eb7c42e57fcc9b9784d7fb1f8faa SHA512 859a988ad5fbd513ee8d5caa44eab0e7cd7f3ddd25837608fac7dce95b765e028401a54da3ae5347bf8053fee9eface64c4f249d4c2e4f181abf14a179e353f9
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild
index 2a480a28d814..f1c3a647940b 100644
--- a/dev-libs/quazip/quazip-0.9.1.ebuild
+++ b/dev-libs/quazip/quazip-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 9d09b7ab096d..2a0aed65a2b6 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -5,6 +5,6 @@ AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.14.1-r2.ebuild 1323 BLAKE2B 0cc330b0b39002f67957957eb57da192b7d4703d073f7f4f47b35c5d872f165c0a0bfff43922d984d32efd32a00c19481347271a116668c5b0863a6a1b46f8f8 SHA512 9d4b1c658bb9e5a967674107a405038a1c52d4721008b21ceeb989233ddd83ff23b4b457cb4293a9dfc7c1d639cd364cbda21ce72164fb777ca27a6d9eaa57f9
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2950 BLAKE2B 87cb0edbe71c77e1453af89c76552024a9605482b3acb7a2509ca0de019e0b1263f63f5ba8548742d6e5f47817a016ca0a3c4348b643d2fbcbbb8b383d52a2dd SHA512 5130a69d049ef57799d1ad732e96d0d7ce8829a2a6cbff1dd8cb9d0b5ce9281f1481cbfb74a00515064ce92446d0538a401d23d63c257829d4be3f27cb50cf63
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2949 BLAKE2B 3d8b6b2e5451f438beed93e2d758d13632e6178e3e5da14faf962087dea621710e73478cf143b13365991df80ea6c55e7e10f324d28200621f0fe0caa27650ef SHA512 a7cc2e80485e59a71c3bf6bf4e7313820dd463ea08d17035b2a7a8545a292e8f75afb9655c79e1f593afe51da62c71469fbd78b9c19abc2b03a0a4b11242bb1c
 EBUILD redland-bindings-1.0.17.1.ebuild 2633 BLAKE2B b190723972f27a4eaa1aa5a9895622d2964aae7f5098db9b3e06e75955312831aa897163640cf195e1759d19688fea0b43bdc8259548b68d2f7073ee8f3d3dd3 SHA512 363f514f23eaebb5333bf48bfe136bf28db77bd37176d98b1978e2a8a3cdfcbf707e08acd0023deb2e5d463b35d4b7fd16eed3ffe4716cbdf4a5f5246e247853
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
index 885cf10e208c..8bf9a0152644 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="lua perl python php ruby test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 0e3251178d53..87e15acbbb76 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,10 +1,5 @@
-AUX rocclr-3.5.0-cmake-install-destination.patch 1743 BLAKE2B cacc53fe9ca31a90e294fc75d611d3dec70a196cbd8456f3c7d21639cd8d1a30e2bbfc336756936995b7bc1e23b4ce486410aff10e3f39a1d6da627d74a4ac81 SHA512 2675850ee6f1cf3b8ea66a9f54cfb35573f2d6ff1fe56b69630fe1323bdf916357eefb5927692bba58ec7007be24f2d1b2734ee13a81afe72c36fa59c4de5f28
-AUX rocclr-3.5.0-find-opencl.patch 1538 BLAKE2B cde3a6af047a3d2aef58e54930398787927d45683f210cd558a5afe55fc22d0ef426080c2b099dfad9baa6bf9a9269b42bc28bfb7f51b069acf3fbc45c1bc3d7 SHA512 0b264d77d30519d174a3724fe3d55f4875e1d6ff2747595ffc9d585eec2c91e69da93e75865d7899054026c7db4350dc8264429e642c77471af1379936ccc65d
 AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2
-DIST rocclr-3.5.0.tar.gz 874139 BLAKE2B 027403d51c86aa492c0951f8d75bd90493fc0fbe99987e9f443a9fa0b86fc69335a4a6625b5af67231b99c9e0b0adbd914e11369fb2a2b1acb3b5254e475b09f SHA512 732c439f900896c0e065b64054a789edbc0258a0e53723077e578b99bd59925517b201c31a428389cc0dbd100051df8344378aee4a0c2c294110ad9bcf1a3098
 DIST rocclr-3.7.0.tar.gz 881814 BLAKE2B 5d7c70d52d8c06e421bdf2a02dba35ed70509c9154fbe3b8c3193969b37970d5f52d1a67eff46abe95b8af1932f2c6931b18380d046f633a3870fe95c4bfc651 SHA512 8684cc9b4f9f63ef65bcc286b74c51e3f7d334f0245b5a1fca6d3dfa0bb552fccb6b82419b538aebe1d316aa2c41a28a9a21df459b734aa44923d66d725834e1
-DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014
 DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
-EBUILD rocclr-3.5.0-r1.ebuild 1301 BLAKE2B 1d67bf666b69871767060f7742a575b6326e8007c1783c23597a30a8396c17e8323e09a31bfc5d12eb2837e5abf5a7711a0f359adb83d64b0d01a9c30eba0e40 SHA512 9cb182fada78acbe442e65c2f3674087a332f87972524246d0916c267b3bef465fc8adda0ce1b045f57d8c1942fe15304cb7d94257799801c6576ad17e9e45a6
 EBUILD rocclr-3.7.0-r1.ebuild 1125 BLAKE2B 5835e53e68b6cb6300ad505a23963989291740ebb872175c873a66f8d37f618dad954cefb0b29efcd82571b4017dbf92fd808b5b533a5b91844a9797d19ca15b SHA512 27e2425539f6dd0822c747f57ebbb158ca77994ee6b7ba351b771d2ee255a4ef49f9f7d9b3839a9919d1eec9d4271edef6db9260aad15e127b6ed336bed9f286
 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d
diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
deleted file mode 100644
index 4f915284f627..000000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/CMakeLists.txt	2020-06-07 13:12:46.497062447 +0200
-+++ b/CMakeLists.txt	2020-06-07 13:13:44.401062226 +0200
-@@ -202,40 +202,40 @@
- #endif()
- endif()
- 
--install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT applications)
-+install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib64 LIBRARY DESTINATION lib64 COMPONENT applications)
- file(GLOB headerfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
- install (
-     FILES ${headerfiles}
--    DESTINATION include)
-+    DESTINATION include/rocclr)
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/platform"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thread"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/os"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/device"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
deleted file mode 100644
index fc9bacee5020..000000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= <t.kessler@posteo.de>
-Date: Sun, 19 Jul 2020 11:58:24 +0200
-Subject: [PATCH] Fix search for OpenCL include dirs
-
----
- CMakeLists.txt | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 122277ee..02ca4644 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG
- )
- message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
- 
--# FIXME: Use find_package(OpenCL)
--find_library( OpenCL REQUIRED CONFIG
--   PATHS
--      /opt/rocm
-+find_path(OPENCL_INCLUDE_DIR
-+   NAMES OpenCL/cl.h CL/cl.h
-+   PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
-+   PATHS ${OPENCL_DIR}
-+   DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
- )
- 
--if( NOT OPENCL_DIR )
--   find_path(OPENCL_INCLUDE_DIR
--      NAMES OpenCL/cl.h CL/cl.h
--      PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
--      PATHS /opt/rocm
--      DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
--   )
--
--   if( NOT OPENCL_INCLUDE_DIR )
--      unset(OPENCL_INCLUDE_DIR CACHE)
--      set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
--   endif()
--      message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
-+if( NOT OPENCL_INCLUDE_DIR )
-+   unset(OPENCL_INCLUDE_DIR CACHE)
-+   set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
- endif()
-+message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
- 
- 
- 
diff --git a/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild
deleted file mode 100644
index 2601b431de18..000000000000
--- a/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.5.0-cmake-install-destination.patch"
-	"${FILESDIR}/rocclr-3.5.0-find-opencl.patch"
-)
-
-S="${WORKDIR}/ROCclr-roc-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	# This should be fixed in the CMakeLists.txt to get this installed automatically
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr/$(get_libdir):" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake"
-	insinto /usr/$(get_libdir)/cmake/rocclr
-	doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake"
-
-	cmake_src_install
-}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 9413c99b2b52..c9c8b73e0579 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,15 +1,4 @@
-AUX rocm-comgr-2.6.0-find-clang.patch 982 BLAKE2B 7284604ac25dbbd292050d35952db0b42fada73465f86bba34a40941c28c38709b6cc5006ba40357dcccece60662d12abde68d3cacc46b138325851f975a63e2 SHA512 74d4042c1c4ddaab22b0708a317db0d3c4e7045dfd36b03b94a10fd8f7c40a3442c5016e20067e59ca2266e1563fd33fc378053ce917c2a161cfc4b71425b33d
-AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e17091fa6060518b11bf2dfce700fedc780189f9db4da57aa4290183e743a08bfe4502be9079895690085a89788b1ba56bf4e9f8aa3062 SHA512 211b274280734b7f2478ecb094a36f303f7849cfede46709714a5171d07f2521959c216564623d119a14064d762fa752de4b745cee340480210eea4b757c7e3f
-AUX rocm-comgr-2.8.0-dependencies.patch 2120 BLAKE2B 4c5b50d122b2f92ea35419111e9eece967c09e4b1014639c8f81b5df8a674ff0758ecc8a8b7b1984a6d27b4581704d9b8f494089abc477b221effb2d3652308a SHA512 791d36e56e50c2734529d3bfe286219c6ab8b5769f65c7e993a8c7ab961e52f90239871b31fe63ffbcdc5f2e0c06bf60e33943cf68d797ecdebd37d237849777
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
-DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940 SHA512 ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc
-DIST rocm-comgr-3.1.0.tar.gz 88654 BLAKE2B 2b74fcde11a9fdd815526cb6fae81c1844aed5d73e961c437c9d3585b8cbd538983a9b06a5130eb75e5ac272d0a833f459053436f48116eb430c742de532ce65 SHA512 be148e92c84aacfc11724b0bfb54fab0e8cec2474eb943b1df4841517d47a3995b179afafcaa0730ddb9fadf891ca4797ce6613afac1f6f018dcc5b030a32e98
-DIST rocm-comgr-3.3.0.tar.gz 88792 BLAKE2B e84d63c0462bd64a7f10a6092d736811e834c6541aea2ee6363b60e7ab5652dc3efee16ae353dbc7ddeca343f7ce2d41b381cdd722dc98d7c9e9f2c43d4ff25f SHA512 681656f87639c1a1893e073738c253d5a0a63c23d8555e59950828c0a3d7ed997b0a70d827aae6e0af6a465a433acd0e82dd921bd12b9df31628f53ea83754a9
-DIST rocm-comgr-3.5.0.tar.gz 89330 BLAKE2B 463b5a7fed9588a87308ef7b8ad52a25000baf53556022b68c666dfd41d9d89877bb392aaf58de947b35bfae74b13ca06ae6f3770ef689c612e31318ebb9d981 SHA512 8f4b702976f31e2221ed0a545ffe028fecb268b3939b8e13b8f321786dc63398e5715ecb1910c0ca671454702dcc3671d518cc458c5a02e8cc63a90d029ca569
 DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
-EBUILD rocm-comgr-3.0.0.ebuild 1033 BLAKE2B 91db829efe411ed98bc3dce4818e5579ee182b1823e731fbb2ecfc6db2eddbfec300bf30d9fab292d36cadd6aa90307f94bbbc55dae6116246d945f3cf7e2d6a SHA512 0edd588bb23e8c66892c5e437ce1d866f0b895d05c1c9182ae37586359b33353527eb2d2417ff2bc87d351822c0ab0daec81f44ab62c61a3f1e47845cfa1c557
-EBUILD rocm-comgr-3.1.0.ebuild 1033 BLAKE2B 56a3fcceff12f501e9e5129d1b50c3b736da78e5553b5cb99daa66e7dc7256c730c6755208b1dfd95938d4ba67298f8f2796d0a82b4d3305fee0311baf51fe8b SHA512 d0d0ff389dbf7ac8f7f88fc1cb3d0ad8ef918c97b44b3660c55ebe340a4b630239ecb1e318ca249b1bffaea19276212c532b1aa06c0b0cd6bc9b0ca8b81ecade
-EBUILD rocm-comgr-3.3.0.ebuild 1035 BLAKE2B 88fd6f76f9d5906f9ffea88bfd36aa43e02b85972bbb53b9b4e52d5ad42f179f5dda1d65d9c0a09fcb3979ed60c21a349a98d171f2963371835e6a6a7d939ad2 SHA512 8bad55ba2a67ed3a32f8ae2f036953cc9341caf482074609ea14b985d54c7565431e86127788f2a30dca734a2e6e68cd53f74437a8f528065ccf9e02a3fcaf04
-EBUILD rocm-comgr-3.5.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
 EBUILD rocm-comgr-3.7.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
 MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
deleted file mode 100644
index dda005ab7a21..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/16
-
-From 09eb70afa22e2d6066a5f29888158c6005170ca6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:13:30 -0400
-Subject: [PATCH] Find Clang avoiding the system (non-ROC) LLVM
-
-Use NO_DEFAULT_PATH to avoid finding the system (non-ROC) LLVM.
-Use /opt/rocm/llvm as an additional hint to be consistent with the build systems of other ROC projects (such as ROCm-OpenCL-Driver)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..8642c98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ endif()
- 
- project(code_object_manager)
- 
--find_package(Clang REQUIRED CONFIG)
-+find_package(Clang REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
- add_definitions(${LLVM_DEFINITIONS})
- include_directories(${LLVM_INCLUDE_DIRS})
- link_directories(${LLVM_LIBRARY_DIRS})
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
deleted file mode 100644
index 5b44feaf1b3d..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/17
-
-From 4588c1a5aad3edae9d3e121685d8d1f5fddd54ba Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:45:01 -0400
-Subject: [PATCH] Find lld includes in LLVM_INCLUDE_DIRS
-
-Allows building against an LLVM build tree
----
- CMakeLists.txt | 20 ++------------------
- 1 file changed, 2 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..db28533 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,24 +19,8 @@ include_directories(${LLVM_INCLUDE_DIRS})
- link_directories(${LLVM_LIBRARY_DIRS})
- include_directories(${CLANG_INCLUDE_DIRS})
- 
--# FIXME: There is no way to directly determine the include paths for LLD when
--# working with an LLVM build tree, but we want to avoid having to install LLVM
--# to build Comgr. This should eventually be fixed in usptream LLD so this can
--# be removed.
--if(DEFINED LLVM_BUILD_MAIN_SRC_DIR)
--  set(INTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/tools/lld/include")
--  set(EXTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/../lld/include")
--  if (EXISTS "${INTERNAL_LLD_INCLUDE_DIRS}"
--      AND IS_DIRECTORY "${INTERNAL_LLD_INCLUDE_DIRS}")
--    set(LLD_INCLUDE_DIRS "${INTERNAL_LLD_INCLUDE_DIRS}")
--  elseif (EXISTS "${EXTERNAL_LLD_INCLUDE_DIRS}"
--      AND IS_DIRECTORY "${EXTERNAL_LLD_INCLUDE_DIRS}")
--    set(LLD_INCLUDE_DIRS "${EXTERNAL_LLD_INCLUDE_DIRS}")
--  else()
--    message(FATAL_ERROR "You are attempting to compile using an LLVM build tree, but the LLD include directory could not be located. The paths '${INTERNAL_LLD_INCLUDE_DIRS}' and '${EXTERNAL_LLD_INCLUDE_DIRS}' were tried.")
--  endif()
--  include_directories(${LLD_INCLUDE_DIRS})
--endif()
-+set(LLD_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}/lld")
-+include_directories(${LLD_INCLUDE_DIRS})
- 
- find_package(AMDDeviceLibs CONFIG)
- 
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
deleted file mode 100644
index 3a0af258c054..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
-From 5f872ae4a059ac6a09669e301b8a60b11a25eb42 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 11:51:17 -0400
-Subject: [PATCH 1/2] Link additional required LLVM libraries
-
-Without these additional required dependencies, linking fails with errors such as:
-`undefined reference to `llvm::errs()'`
----
- CMakeLists.txt | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..95e5799 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,11 @@ add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
- include_directories(./yaml-cpp/include)
- 
- set(CLANG_LIBS
--  clangFrontendTool)
-+  clangFrontendTool
-+  clangFrontend
-+  clangBasic
-+  clangDriver
-+  clangSerialization)
- 
- set(LLD_LIBS
-   lldELF
-@@ -193,8 +197,19 @@ set(LLD_LIBS
- 
- llvm_map_components_to_libnames(LLVM_LIBS
-   ${LLVM_TARGETS_TO_BUILD}
-+  Option
-   DebugInfoDWARF
--  Symbolize)
-+  Symbolize
-+  Support
-+  Object
-+  BitWriter
-+  MC
-+  MCParser
-+  MCDisassembler
-+  Core
-+  IRReader
-+  CodeGen
-+  Linker)
- 
- target_link_libraries(amd_comgr
-   PUBLIC
-
-From ffc4d18a7ae1fbd5c8807eec4ca8aed043524811 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 30 Sep 2019 10:52:12 -0400
-Subject: [PATCH 2/2] Link more required LLVM libraries
-
-Without these additional required dependencies, linking fails with errors such as:
-```
-in function `amd_comgr_index_list_metadata':
-<artificial>:(.text+0x4d4c): undefined reference to `llvm::msgpack::ArrayDocNode::operator[](unsigned long)'
-```
-and
-```
-undefined reference to `llvm::msgpack::Document::fromYAML(llvm::StringRef)'
-```
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95e5799..b6123a6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -209,7 +209,8 @@ llvm_map_components_to_libnames(LLVM_LIBS
-   Core
-   IRReader
-   CodeGen
--  Linker)
-+  Linker
-+  BinaryFormat)
- 
- target_link_libraries(amd_comgr
-   PUBLIC
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
deleted file mode 100644
index 4eeaffa1c91a..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild
deleted file mode 100644
index 96891e698554..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild
deleted file mode 100644
index 0c08627ebd88..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild
deleted file mode 100644
index 097011983ea2..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 1677ee4691f9..cac8b58f4b7a 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,14 +1,4 @@
-DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B 8fb866611e82126b5909b75282081371ddeea58a34d732586e43dcf23d512fb8f2ad259f2c9227e35730af0d0d2b235895aa5396a7d19c2987754162d2ed6f49 SHA512 257f8990d93bf8cb0438fa15d7ca91a7f38082c90f0bb96b0691196ec78f16e790142ecef0089bc765edf80c1f0b644210e991a7e6f7e8dfab33cedad6465fa3
-DIST rocm-device-libs-3.1.0.tar.gz 227951 BLAKE2B 06918195f4b7073089dbe3475fb12402f1ff9a514430b143f9135f63ea0f75b0ed125af69bb60995d80974661fb3f3fb8276d72dc935ce48f059bac0e9c23f85 SHA512 4238698011bb2501f15ab081e12f1c9959a92890093c8607188526e69d2a35483edf39fd55c3eba33dbc93fc1865771fde9affc7e1e0aa3bd26f1878af106e47
-DIST rocm-device-libs-3.3.0.tar.gz 227986 BLAKE2B 4d62002e06b4f69641d6733120dc6222aa9bf4a4f6af2709218f42e8d92cb1943fdc967ef6a88f62e19d46828472b91fa9b17a35dab1cda90ef2a0278398d6b7 SHA512 920d7bd6ccd423bab98c97fadb183d4d667a967e6843c41b4c5c6c0c14ceabf57ba10e7c8787cb86b0b8ddf14efa96b7422e6f4a12079e37c5da7053e8bf0a99
-DIST rocm-device-libs-3.5.0.tar.gz 228247 BLAKE2B 05b8e850e5ad4ae80bac92b6392dbc6d7bf78a63f5718e7ce5ed94fb85df356c2d1640a862ebd4587000df6c728c694535e5345a6a702e769c506fd8ebe5c606 SHA512 d8af9e93b0223ea18d96b80c3d9e0c97ef69448e3af823a802cf485ac8ed88c54dd0ac98cf5d6d2c9f66c3b197cd6991822310c7cde53b8c437083c0d6f984ac
-DIST rocm-device-libs-3.5.1.tar.gz 228311 BLAKE2B fcf6eb566a375015b521e3885c16868f6133a9ffbfb5f7ff766482a1f901811c86c5c8baaf8ece9bab4ad4655e907da6ab37ed8b25fba6637803e403267f9587 SHA512 182c901b837d57331f6d05280f17e2ee62339887dc61b6ddca66a8a7f58eecb9366a0abb3d483a86c227d5ed5cc2c7ca1c98a20b7db8214b27d1ceae0e68d2e0
 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
-EBUILD rocm-device-libs-3.0.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
-EBUILD rocm-device-libs-3.1.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
-EBUILD rocm-device-libs-3.3.0.ebuild 814 BLAKE2B a86efd3afe14bbb6356226b215951c419cf764e7202b991b291e3e1cad4e7e68bfd100ab9e441866c9ae056876e094e7c9ee5a0b241e533401044426fed27dd7 SHA512 1c8f592d37e1865c5f55b1fe93aa4f1c25e9a0000baf1181a450b27b99c0748eb320756be50fb42e4c21aa18e7acc6bdfc897fd7fb296d13b2a0a0e37a551b30
-EBUILD rocm-device-libs-3.5.0.ebuild 820 BLAKE2B cdc41b86105554d1c1cab13cb4a832f90415ebb4f89a2631388db20030a6623b3db2472334113339dff8a4aeec26cd1b50dc8d33507bd14d907c49efd780973a SHA512 1e6499561fe0d0b6caccc77ac0d4d097366c59930ece799996d1cfcc53119ca285a9ea3a496d8f39fc03b8fe5f14135280f5f2c3272ab093c57d4f88efddbd36
-EBUILD rocm-device-libs-3.5.1.ebuild 829 BLAKE2B 34d2a6a8227d2a869ab6eca5d1bb53b19c95f2156d8ab55e7dcbf801a56d7fdd8858455038d19d86b5705a0de4c994749d6e8fddb1d62c6ea728b4683aa673bb SHA512 96dfc6a00940edf0ecf4a52b0eef9b76b83f883684716dac66fa349d9b6a7c8523862927d7db8000275c26920c0a3b7d2a3c4c58eed7f69d170207cb5d39c5da
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
deleted file mode 100644
index 48a848e0b31a..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.1.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.1.0.ebuild
deleted file mode 100644
index 48a848e0b31a..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.3.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.3.0.ebuild
deleted file mode 100644
index 18ffd5a51cae..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-rocm-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
deleted file mode 100644
index fa623787da83..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild
deleted file mode 100644
index 6d4a832b910c..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-$(ver_cut 1-2)
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index eb862759787e..70293740ac24 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,23 +1,7 @@
-AUX rocm-opencl-runtime-2.8.0-amdocl64icd.patch 582 BLAKE2B 28e97a03f6696503b1ddc3d1720d3aa9f4e807b2e5fd01771e81f3bda61350cc580e961a90ed07499a8625ea6178e34e15f117115719a6bf04046c758eb95f46 SHA512 938abe8eadcef1d703c797f1716c5588dbe0267d5bb1e3eeb0e46b5fc52f6976751348f402332d07f3c56007e64dac672112170fc33c13cb4314a2a299735142
-AUX rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch 2778 BLAKE2B 5fe2c74631db679788767a4488d2157660e0c1c1e4291165e1d0c52c29c8d976ff5b2f691ff128ec49778d0cc2855bcfc73c3dfc0ed831d3fac114445e272408 SHA512 8c34c570957b5f25f9347b50baf47342f84f6a398e77f7b9d007d2861947b70dace27ae016c23a7959a6d936fdbe24980acc1a253a7bcaff95eea11283c89901
-AUX rocm-opencl-runtime-2.8.0-change-opencl.patch 3886 BLAKE2B e9833c8486757214876aba32f52722189497e5a1975cd6f7a4d64388a9cd52bfcf114625906b671cf73de052e42101ab3be7a43562c2983fe9e2ccfece3b83c8 SHA512 ae49608277493259d1348c8bce912b4d489a9edb16b0e6460336f4468530460362b2e95ac85c57543edfb8ed57b93e01f73a9b3e9012a8a333eba9eb52d80d8f
-AUX rocm-opencl-runtime-2.8.0-update-README.patch 1263 BLAKE2B f6fb48bc8ea55480c157d0963b859b47acd914adc77a1ba2780b058f50dbe820100355ec2f73badc6e0618c0b2fb39285b6589587efcf2ded1b9cce62354ec7c SHA512 4351eb77a2d5f7cdf8e014965428624b35a2314edb63f65a34f5939fab9975733b3cfa4f70a8bee2e1c3368c6ed6bbbd568a941ed370b5a9a07cc347795577df
-AUX rocm-opencl-runtime-3.0.0-change-install-location.patch 5316 BLAKE2B 3c8770657f5b944f7943454c78a89ecd473e4ec9a78652f74ceee65b0388f33cbecde57954a4d3ede84b36cb5f0850407b19fb7e342c38f6a790fb17796da079 SHA512 35a603e71139d2375d5769406de447eaa87439617e42bfc2ddb3736a32e0841fab216622c2bb45560e77489584c87e60d0fddef8fa912c841fb704ba8c635256
-AUX rocm-opencl-runtime-3.5.0-amdocl64icd.patch 469 BLAKE2B a52e51631a1ed03df156f2fe360539cdc144f11945e947014f1d3dac3ab17f56512f6e37ae99c8bcfa1d43558b977988ab9281a92e31a41ca11fda498c1be302 SHA512 d90c2cdad51b841026ff1d0d4a1466b49280b6513667b16f666a9261cd7dd7d0a72e27f99383f7bffacbf661b6d1be8f9531d2a12dfe19ad5c85d661f35205af
-AUX rocm-opencl-runtime-3.5.0-change-install-location.patch 2513 BLAKE2B e8e1e79b5bf962d490f2c72ee1e8e74cb200917e4db0744029ce227863d6733c6c16005b9116e599bc52ab79f0b130a81c9cfe1dee88db9a9af22846c616ebae SHA512 d80e7d0c74620011205a0bf5c0bad8935ee950d6774ff46fa88cddf35f259c366558a0f5d40992f7b178ad2bcecb23d6a160cd6158b102d62f345f1b099ddca4
 AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae4234422acdc1fdf0bd82a0469f63239e709c0626e3918d34e6a023b70452eed98aea1725a3638ee8f46d54d08ca885bf114ad3a7689baaa18794a6d5c983b9 SHA512 27682bb65e281744556c2a99c38ae7b3e22e3306ff10ceb98d8c3204950982b17521309dd11d36e1a07ca33b8448dae1270fa31004db9841025ff9a9e9af3d4c
 AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
 AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
-DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
-DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
-DIST rocm-opencl-runtime-3.1.0.tar.gz 969782 BLAKE2B efe3cba6122273900fec80f577c45b5a93816cfd3cadbffaa36df258ea163ecc9d47530da0aa012fd7797c431506deb96fd3642c160470e2b78af75bc9fd56f6 SHA512 1665c30349547e6404563b1b1dd4258af5ab8106a66d65d6f94e7eb3ef51b2da9bc71878330c0c7ec21842e17a97e910a36be9b06fbdeab3de84bebe3a65c9db
-DIST rocm-opencl-runtime-3.3.0.tar.gz 969871 BLAKE2B 5dae88abc5861752b45f2b7e72a4d774786d0363a6da633d2ca1386a002374243a0655e8c5bc4aaa7a7db528f3c9bd5e6e1298561d3b06ce935865b6f0106172 SHA512 10c892cebca3db031b69ef3e1521fa11e49f40b18b621983f4f0902c9f563ff178d543fd1a05f6217f817838499436adaac883f7b474b64a54ce9eeb482382e5
-DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014
 DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
-EBUILD rocm-opencl-runtime-3.0.0.ebuild 1735 BLAKE2B ea3ec1080283cf20b89858d6c2fd3332ffdb243794160422b16e61baf27d42b53c69aecc078844715629851d6f98247034996aac74f2f9ac2b66382b5a039359 SHA512 e1c6bdcdd37b6417d9acb4757f035fb682c5bdd7a6430caa91bed29e9ebfef2294a3695abb07a9d5a991feea38f924d059078ea445ee9d48df517a4299b04d20
-EBUILD rocm-opencl-runtime-3.1.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a
-EBUILD rocm-opencl-runtime-3.3.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a
-EBUILD rocm-opencl-runtime-3.5.0-r1.ebuild 1914 BLAKE2B 85002f6a55491553e26e9f711447b48aa84d35aebd94c1ca89ec47b85bd24eaa143742b52da69f40e1ff5d446b8c1178d944e07c193a1717b277159235d475b8 SHA512 5fc5a2100e72b0210efe0d7336992fe8619fa46789dcc7c34489986e9c11b1343880c83b0f0a986021264102f3cb52f4a68e84d2aecaf8fa977d556d51a23237
 EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch
deleted file mode 100644
index f399f360c9cf..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/api/opencl/amdocl/CMakeLists.txt b/api/opencl/amdocl/CMakeLists.txt
-index 8ea8517..d1223ed 100644
---- a/api/opencl/amdocl/CMakeLists.txt
-+++ b/api/opencl/amdocl/CMakeLists.txt
-@@ -82,3 +82,7 @@ if(${USE_COMGR_LIBRARY} MATCHES "yes")
- else()
-   target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES})
- endif()
-+
-+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
-+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
-+
-
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch
deleted file mode 100644
index 796277e46723..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/runtime/device/device.hpp b/runtime/device/device.hpp
-index 9eb45b2..a721463 100644
---- a/runtime/device/device.hpp
-+++ b/runtime/device/device.hpp
-@@ -21,7 +21,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) && !defined(USE_COMGR_LIBRARY)
- #include "caching/cache.hpp"
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
- #include "acl.h"
- 
-diff --git a/runtime/device/devprogram.cpp b/runtime/device/devprogram.cpp
-index 587e950..dc233f3 100644
---- a/runtime/device/devprogram.cpp
-+++ b/runtime/device/devprogram.cpp
-@@ -14,7 +14,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #include "libraries.amdgcn.inc"
- #include "opencl1.2-c.amdgcn.inc"
- #include "opencl2.0-c.amdgcn.inc"
-diff --git a/runtime/device/devprogram.hpp b/runtime/device/devprogram.hpp
-index 68de7ba..8b91ba2 100644
---- a/runtime/device/devprogram.hpp
-+++ b/runtime/device/devprogram.hpp
-@@ -11,7 +11,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #else
- #include "amd_comgr.h"
- #endif
-diff --git a/runtime/device/rocm/rocdevice.cpp b/runtime/device/rocm/rocdevice.cpp
-index 4cba9d7..7ab30ed 100644
---- a/runtime/device/rocm/rocdevice.cpp
-+++ b/runtime/device/rocm/rocdevice.cpp
-@@ -20,7 +20,7 @@
- #include "device/rocm/rocvirtual.hpp"
- #include "device/rocm/rocprogram.hpp"
- #if defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
- #include "device/rocm/rocmemory.hpp"
- #include "device/rocm/rocglinterop.hpp"
-diff --git a/runtime/device/rocm/rockernel.cpp b/runtime/device/rocm/rockernel.cpp
-index 8a28acc..7d5b62d 100644
---- a/runtime/device/rocm/rockernel.cpp
-+++ b/runtime/device/rocm/rockernel.cpp
-@@ -11,7 +11,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif
- #include "llvm/Support/AMDGPUMetadata.h"
- 
-diff --git a/runtime/device/rocm/rocprogram.cpp b/runtime/device/rocm/rocprogram.cpp
-index 0155dc2..613d00d 100644
---- a/runtime/device/rocm/rocprogram.cpp
-+++ b/runtime/device/rocm/rocprogram.cpp
-@@ -10,7 +10,7 @@
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #include <gelf.h>
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #include "libraries.amdgcn.inc"
- #endif
- #endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
-
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch
deleted file mode 100644
index cd6695e2d4f6..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
-index 2c9dfd6..863b4bf 100644
---- a/runtime/CMakeLists.txt
-+++ b/runtime/CMakeLists.txt
-@@ -23,7 +23,6 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
-   include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
- endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
- 
--include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
-@@ -79,6 +78,8 @@ add_library(oclruntime OBJECT
-   ${COMGR_CPP}
- )
- set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
-+#add_dependencies(oclruntime opencl1.2-c.amdgcn.inc_target)
-+#add_dependencies(oclruntime opencl2.0-c.amdgcn.inc_target)
- 
- set(AMDGCN_DEP_LIST)
- if(AMDGCN_TARGETS_LIB_DEPS)
-diff --git a/runtime/device/rocm/CMakeLists.txt b/runtime/device/rocm/CMakeLists.txt
-index 5870b65..39166f3 100644
---- a/runtime/device/rocm/CMakeLists.txt
-+++ b/runtime/device/rocm/CMakeLists.txt
-@@ -1,3 +1,21 @@
-+find_package(Clang REQUIRED CONFIG)
-+
-+# FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but
-+# really there is no way to reliably discover this header.
-+#
-+# We effectively back up to the Clang output directory (for the case of a build
-+# tree) or install prefix (for the case of an installed copy), and then search
-+# for a file named opencl-c.h anywhere below that. We take the first result in
-+# the case where there are multiple (e.g. if there is an installed copy nested
-+# in a build directory). This is a bit imprecise, but it covers cases like MSVC
-+# adding some additional configuration-specific subdirectories to the build
-+# tree but not to an installed copy.
-+file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h")
-+list(GET OPENCL_C_H_LIST 0 OPENCL_C_H)
-+if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}")
-+  message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.")
-+endif()
-+
- include(bc2h)
- 
- set(INC_SUFFIX "amdgcn.inc")
-@@ -82,8 +100,8 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
- 
-   # generating opencl*.inc files
-   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch
--    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
--    DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
-+    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${OPENCL_C_H}
-+    DEPENDS clang ${OPENCL_C_H}
-     COMMENT "Generating opencl1.2-c.amdgcn.pch"
-   )
-   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc
-@@ -96,8 +114,8 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
-   add_dependencies(oclrocm opencl1.2-c.amdgcn.inc_target)
- 
-   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch
--    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
--    DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
-+    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${OPENCL_C_H}
-+    DEPENDS clang ${OPENCL_C_H}
-     COMMENT "Generating opencl2.0-c.amdgcn.pch"
-   )
-   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc
-
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch
deleted file mode 100644
index 741faf20ca78..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/README.md b/README.md
-index a834965..7fea026 100644
---- a/README.md
-+++ b/README.md
-@@ -8,12 +8,6 @@ Developer preview Version 2 of the new
- 
- 
- ## GETTING REPO
--
--Repo is a git wrapper that manages a collection of git repositories. Install this tool and add it to the command search PATH:
--
--    curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
--    chmod a+x ~/bin/repo
--
- ## GETTING THE SOURCE CODE
- 
- Main OpenCL™ Compatible Components:
-@@ -26,11 +20,6 @@ Main OpenCL™ Compatible Components:
- * https://github.com/RadeonOpenCompute/lld 
- * https://github.com/KhronosGroup/OpenCL-ICD-Loader
- 
--Download the git projects with the following commands:
--
--    ~/bin/repo init -u https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git -b master -m opencl.xml
--    ~/bin/repo sync
--    
- ## INSTALL ROCm
- 
- Follow the instructions at https://rocm.github.io/install.html to install ROCm.
-@@ -45,6 +34,11 @@ Copy the amdocl64.icd file to /etc/OpenCL/vendors
- 
- To install additional dependencies:
- 
-+* ROCm-OpenCL-Runtime
-+* ROCm-OpenCL-Driver
-+* ROC versions of LLVM, Clang, and lld
-+* ROCm-Device-Libs
-+* OpenCL-ICD-Loade
- * OCaml
- * findlib
- * A Python 2 environment or active virtualenv with the Microsoft Z3 package
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.0.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.0.0-change-install-location.patch
deleted file mode 100644
index eb1901f6a1ed..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.0.0-change-install-location.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- a/CMakeLists.txt	2019-12-28 09:34:17.470030419 +0100
-+++ b/CMakeLists.txt	2019-12-28 09:32:14.939030886 +0100
-@@ -21,12 +21,26 @@
- 
- project(rocm-opencl)
- 
-+include (GNUInstallDirs)
-+
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2" CACHE PATH "")
- 
- find_package(ROCT REQUIRED)
- find_package(ROCR REQUIRED)
- 
-+find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
-+set(USE_COMGR_LIBRARY "yes")
-+find_package(amd_comgr REQUIRED CONFIG)
-+add_definitions(-DUSE_COMGR_LIBRARY)
-+FOREACH(DIR ${LLVM_INCLUDE_DIRS})
-+  include_directories("${DIR}")
-+  include_directories("${DIR}/clang")
-+  include_directories("${DIR}/lld")
-+  # TODO: move AMDGPU.h header to include folder
-+  include_directories("${DIR}/llvm/Target/AMDGPU")
-+ENDFOREACH()
-+
- # FIXME: Remove following if block after enabling COMGR by default
- if (${USE_COMGR_LIBRARY} STREQUAL "no")
-   set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
-@@ -39,29 +53,19 @@
-   # override default option value in library and driver
-   set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
- 
--  add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
--
--  find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm NO_DEFAULT_PATH)
-+  find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
- 
-   list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
-   include(AddLLVM)
- 
-   add_definitions(${LLVM_DEFINITIONS})
--  # TODO: add find_package for Clang and lld, and also use LLVM/Clang variables got from their config
--  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
--  include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
--  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
--
--  # TODO: move AMDGPU.h header to include folder
--  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
--  include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
- 
-   set(BUILD_HC_LIB OFF CACHE BOOL "")
-   set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
-   set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
-   set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
-   set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa")
--  add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
-+
-   add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
- 
-   install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
-@@ -77,22 +81,22 @@
-   endforeach()
- endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
- 
--if(${USE_COMGR_LIBRARY} MATCHES "yes")
--  set(COMGR_DYN_DLL "yes")
--  add_definitions(-DCOMGR_DYN_DLL)
--  add_definitions(-DUSE_COMGR_LIBRARY)
--  if( ${BUILD_HIP} MATCHES "yes")
--    add_subdirectory(api/hip)
--  endif()
--endif()
-+#if(${USE_COMGR_LIBRARY} MATCHES "yes")
-+#  set(COMGR_DYN_DLL "yes")
-+#  add_definitions(-DCOMGR_DYN_DLL)
-+#  add_definitions(-DUSE_COMGR_LIBRARY)
-+#  if( ${BUILD_HIP} MATCHES "yes")
-+#    add_subdirectory(api/hip)
-+#  endif()
-+#endif()
- 
- add_subdirectory(api/opencl/amdocl)
- add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
- add_subdirectory(runtime)
--add_subdirectory(tools/clinfo)
-+#add_subdirectory(tools/clinfo)
- 
- set(BUILD_SHARED_LIBS "Build shared libs" ON)
--add_subdirectory(api/opencl/khronos/icd)
-+#add_subdirectory(api/opencl/khronos/icd)
- 
- ###--- Packaging ------------------------------------------------------------###
- 
-@@ -101,31 +105,31 @@
- rocm_setup_version( VERSION "2.0.0" )
- 
- # MAIN package
--install(PROGRAMS $<TARGET_FILE:clinfo>
--        DESTINATION bin/x86_64
--        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:clinfo>
-+#        DESTINATION bin/x86_64
-+#        COMPONENT MAIN)
- install(PROGRAMS $<TARGET_FILE:amdocl64>
--        DESTINATION lib/x86_64
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_FILE:OpenCL>
--        DESTINATION lib/x86_64
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
--        DESTINATION lib/x86_64
-+        DESTINATION lib64
-         COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:OpenCL>
-+#        DESTINATION lib/x86_64
-+#        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
-+#        DESTINATION lib/x86_64
-+#        COMPONENT MAIN)
- 
- # DEV package
--install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
--        DESTINATION include
--        COMPONENT DEV
--        USE_SOURCE_PERMISSIONS
--        PATTERN cl_d3d10.h EXCLUDE
--        PATTERN cl_d3d11.h EXCLUDE
--        PATTERN cl_dx9_media_sharing.h EXCLUDE
--        PATTERN cl_egl.h EXCLUDE)
--install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
--        DESTINATION lib/x86_64
--        COMPONENT DEV)
-+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
-+#        DESTINATION include
-+#        COMPONENT DEV
-+#        USE_SOURCE_PERMISSIONS
-+#        PATTERN cl_d3d10.h EXCLUDE
-+#        PATTERN cl_d3d11.h EXCLUDE
-+#        PATTERN cl_dx9_media_sharing.h EXCLUDE
-+#        PATTERN cl_egl.h EXCLUDE)
-+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
-+#        DESTINATION lib/x86_64
-+#        COMPONENT DEV)
- 
- # Generic CPACK variables
- set(CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators")
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch
deleted file mode 100644
index dadf212d3d4c..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/amdocl/CMakeLists.txt	2020-06-07 14:38:38.827042792 +0200
-+++ b/amdocl/CMakeLists.txt	2020-06-07 14:38:27.505042835 +0200
-@@ -109,3 +109,8 @@
- find_package(Threads REQUIRED)
- 
- target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl)
-+
-+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
-+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
-+
-+
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch
deleted file mode 100644
index 5de4804c7bea..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/CMakeLists.txt	2020-06-07 13:41:57.205055768 +0200
-+++ b/CMakeLists.txt	2020-06-07 16:02:45.704023540 +0200
-@@ -10,12 +10,14 @@
- #example command:
- #cmake -DROCclr_DIR=/rocclr -DUSE_COMGR_LIBRARY=yes -DLIBROCclr_STATIC_DIR=/build ..
- 
-+include (GNUInstallDirs)
-+
- set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
- set(BUILD_SHARED_LIBS "Build shared libs" ON)
- 
- add_subdirectory(khronos/icd)
- add_subdirectory(amdocl)
--add_subdirectory(tools/clinfo)
-+#add_subdirectory(tools/clinfo)
- add_subdirectory(tools/cltrace)
- 
- # get date information based on UTC
-@@ -45,34 +47,34 @@
- ###--- Packaging ------------------------------------------------------------###
- 
- # MAIN package
--install(PROGRAMS $<TARGET_FILE:clinfo>
--        DESTINATION bin
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_FILE:cltrace>
--        DESTINATION lib
--        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:clinfo>
-+#        DESTINATION bin
-+#        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:cltrace>
-+#        DESTINATION lib64
-+#        COMPONENT MAIN)
- install(PROGRAMS $<TARGET_FILE:amdocl64>
--        DESTINATION lib
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_FILE:OpenCL>
--        DESTINATION lib
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
--        DESTINATION lib
-+        DESTINATION lib64
-         COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT MAIN)
- 
- # DEV package
--install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
--        DESTINATION include
--        COMPONENT DEV
--        USE_SOURCE_PERMISSIONS
--        PATTERN cl_d3d10.h EXCLUDE
--        PATTERN cl_d3d11.h EXCLUDE
--        PATTERN cl_dx9_media_sharing.h EXCLUDE
--        PATTERN cl_egl.h EXCLUDE)
--install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
--        DESTINATION lib
--        COMPONENT DEV)
-+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
-+#        DESTINATION include
-+#        COMPONENT DEV
-+#        USE_SOURCE_PERMISSIONS
-+#        PATTERN cl_d3d10.h EXCLUDE
-+#        PATTERN cl_d3d11.h EXCLUDE
-+#        PATTERN cl_dx9_media_sharing.h EXCLUDE
-+#        PATTERN cl_egl.h EXCLUDE)
-+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT DEV)
- 
- #############################
- # Packaging steps
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
deleted file mode 100644
index 390f4de5e07e..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
-	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
-	"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
deleted file mode 100644
index 45a3fcd5324b..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-BDEPEND=">=dev-util/rocm-cmake-3.0.0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
-	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
-	"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
deleted file mode 100644
index 45a3fcd5324b..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-BDEPEND=">=dev-util/rocm-cmake-3.0.0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
-	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
-	"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
deleted file mode 100644
index 28188cb2bb61..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.5.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib64/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 14e67f181a7d..42b4c63abdf7 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,15 +1,5 @@
-AUX rocr-runtime-3.0.0-cmake-install-paths.patch 2719 BLAKE2B 66e262fed83f839d87e3d31658ac7373bba7d6985d0dceecdc9d34a4734a5aa877007aa6f26d1ee9bbe8c3d232eb22b5dd98379d67c89e3e94a95c1d2e29c3be SHA512 d5ad7aa6d6531616448c131817cfc41044dcab0bb71baf5a49819996370ad8d9bf239132b54bbab1650634a953e05ff3aa5f6ee300f2aba14a70e74d3c44bcfe
-AUX rocr-runtime-3.5.0-cmake-install-paths.patch 2262 BLAKE2B 2ff7e223081ffecf86198c9b227a34952cbcc76fe9d4cf6f76684857381e12f70a64b9c37e83eaf8767bde03ac72240a66f38f476039421f6f2a79cfc414de7e SHA512 ceef7ee2df759a51d3228d6301f72375e06fee4d11e7d09a6bd151456b9fe37f9731459482186dfd93387cc130b5c0a6376e63344dd6378e0c1cf923a7bc0294
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
-DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
-DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a
-DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d
-DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e
 DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f
-EBUILD rocr-runtime-3.0.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc
-EBUILD rocr-runtime-3.1.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc
-EBUILD rocr-runtime-3.3.0.ebuild 959 BLAKE2B a853aeb83d557601e0db52e7e147543c57d3e18151e3324517464796c372ce8a3142df55b9bc17c660c77acf1db690e078b2652f83eba97eddbfbae48c10bd1d SHA512 ac8f6b61432c6ff3cb934d77e36b77f8b7e679273601f0843c93f994bbdac3c26fbbfce846779f4580be0ae856e8a6838956debea166ea5f436e4faa8140060f
-EBUILD rocr-runtime-3.5.0.ebuild 959 BLAKE2B 9e5fd024a20457bf65ed495a8281ce484d7ccb223c00e07ab8424614a70260e2ea7316e7a02de81e7661c8cda13244795d79c169e05f58c34685e9918e27e3ed SHA512 2265a22322478821e398d5483ea3d1275a346907176ece986865571915539d766b85021793fa43cc84a77e4af8e05052bac6c4559c441b2d2e02d3b78dc68fc3
-EBUILD rocr-runtime-3.7.0.ebuild 1490 BLAKE2B 6d6de26038d2f4d66af347f09306d2a9f1825b5d148416d4d76094354c6a59b51ea768293889430fc9e0f5b5c19bf046065574a9860b0e91fc4fb6cdeb4a8af4 SHA512 535d45c9fbd47491f96bd412a38b709e51636ec8fc2b0db5c26f332d0e70155b555e33c45c1929f1d9165a7044f9c9105a42ac7cb882af0fa50aaabb0c787361
-EBUILD rocr-runtime-9999.ebuild 894 BLAKE2B 9d1066fda6f310e917b7be2adaf1a887d4b75446d4155cce3a21a7bb38191f92d75cfaabb8720259ce3f6acfb16e924ac3eaab43015b1bf55685d9643952a8c4 SHA512 5e1567906914368531ad574890dd4f513e3bc2c7c78f414ba1d7a3bba39dcc50bde60b7091783ec8bb3122c4738a6fbd97abce794f48f2ecad28d75c0a086fd8
-MISC metadata.xml 721 BLAKE2B 6a608a5a2063e626a9a39bf775ad840442cb797d07ff933b00ca763c11b024cd07a552dd0620b46bec7f4e8b7c608e898047822bd6e4b8e8716c2159a4e4eebb SHA512 71cd9916573d9b575cc42db8c878a27922e005fb31096902c1fb59537ffc9f84f23be8d8b4f53f3855e815d86d81e9012f4128fe4bb7d71490a8aa36bc9a444b
+EBUILD rocr-runtime-3.7.0.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
+EBUILD rocr-runtime-9999.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
+MISC metadata.xml 600 BLAKE2B 6bdb934a6f2602bc39dab093a9554a71463e8818181cd9bdb15f108f8d371cc515fdd165742dfe8ac4085073cccc9bbb990a353f0d860d4590049c6965c70e3a SHA512 29543e96a8ccdb2506ba33170822f1bb7399d82c82eb60d342eed616c193902ecf49d377628db010f15aae79b529a65ea1e196ec446621bb2cd9386547c5662c
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
deleted file mode 100644
index 29429d0c4807..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51
-
-From 09a835e8de2d88e917328a78765a1db423d21920 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Sun, 29 Dec 2019 16:57:00 -0500
-Subject: [PATCH] Correctly install the library into the system
-
-Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
-Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
----
- CMakeLists.txt | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f292182..7474dd2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,6 +61,7 @@ endif() # if (ROCM_CCACHE_BUILD)
- 
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
- 
- ## Find LibElf
-@@ -176,17 +177,9 @@ endif ()
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
- 
--## Create symlinks for legacy packaging and install
--add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link )
--add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
--add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Packaging directives
- set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
deleted file mode 100644
index a98a5f450f0b..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/CMakeLists.txt	2020-06-06 18:15:44.473493765 +0200
-+++ b/CMakeLists.txt	2020-06-06 18:25:47.688491464 +0200
-@@ -66,6 +66,7 @@
- 
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
- 
- ## Find LibElf
-@@ -185,22 +186,9 @@
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
- 
--## Create symlinks for legacy packaging and install
--add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link )
--if ( ${BUILD_SHARED_LIBS} )
--    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
--    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
--endif()
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} DESTINATION hsa/lib COMPONENT binary)
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa COMPONENT binary)
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
--
--if ( ${BUILD_SHARED_LIBS} )
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} COMPONENT binary)
--endif ()
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Packaging directives
- set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index e13e7321708c..d53b83185ad3 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -15,7 +15,4 @@
     <longdescription lang="en">
         Radeon Open Compute Platform Runtime
     </longdescription>
-    <use>
-      <flag name="non-free">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag>
-    </use>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
deleted file mode 100644
index d6ba469a09fe..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
deleted file mode 100644
index d6ba469a09fe..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
deleted file mode 100644
index 27a97d1c7600..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
deleted file mode 100644
index 5d787962fa12..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
index 064969d47e2f..d69d702b2dee 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
@@ -23,11 +23,9 @@ PATCHES=(
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index 5ddab400ad03..d69d702b2dee 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -17,18 +17,29 @@ fi
 
 DESCRIPTION="Radeon Open Compute Runtime"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch"
+)
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	app-editors/vim-core"
+	# vim-core is needed for "xxd"
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib:" -i image/blit_src/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index b9133cc52a62..08125c249609 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,14 +1,4 @@
-DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d4b40e38f2bd1bd5ac2c77c189490df9bcc7864f8357c262ad62d6cbf0f62f41edd9e09f5b75ce1e66f3a589d143a3883942a12d SHA512 18756a626d57255cfdd03b38dbc56769e4e28dbe1b00cc1e3d99a39dcd943bafebedc1774c76a191cdaf83b2bce4ac464dc97cbd088894447afddcca50447e9f
-DIST roct-thunk-interface-3.1.0.tar.gz 2688973 BLAKE2B b372e12ba5795a0f1e85f7c904059fbe71e147051f287939aacb165c6ca3068e59694c891e3ebdec945e494df4134ca6e4595e7b00893479387d2326b9af5b13 SHA512 dd63d097a42c8751846a1c5649a9c35c0d5e5dc68b1e8080cb6e333f787851ebc649c36d952aefbefbf9558c914d55c612800e85620b24676d7d2d7454bb3490
-DIST roct-thunk-interface-3.3.0.tar.gz 2689906 BLAKE2B 0eee8be65b0be8136dc0091cbc5534b89d630b9ffc1af1d6bdbf98671e141f524b3789153da673ed27dc3810d73e6ea8afb2fed776aa8df83e3c613b3776f81c SHA512 6ee02e5a9ef04ff9f873f762a78dcab93e45a98793545a882839fc2c890ea13030038130b1de266422eea58681e9fffa119e54b8d2f980c3a09c92b692d5cf3e
-DIST roct-thunk-interface-3.5.0.tar.gz 2694261 BLAKE2B 57beccb18bfcea9f99704e21610d62e922feee772d912a8e3e4b0618e309a0fd0983bc62f7476511d1c94dc1f7fbb95d2a7da8205ba735833bcc0846dca13e3a SHA512 aeeb066924d0b20aadf1e2ea6f752d4de1e579fcf245b8866d2856a8d0ca12c907234d97e986512c7c6fa58460937aa5fb574485fbc7975baae4c2fcef519d6c
-DIST roct-thunk-interface-3.6.0.tar.gz 2692784 BLAKE2B 13b5834b733037828a532485a4e5a44e31eee17d42ebdcadec1a67b4d157a7a7ee3e92e8f0f03c6a5f17dba55931fd7734d7021d204ba7567d322ff023d05fcf SHA512 f4578833a17b0a4e6be504403dbdc69cdb8702f5255ac018463026f79df9df56c602abe362c39e566df22cd73ef12c1ff648ff16ce3830d0ec03283a978ca318
 DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135
-EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
-EBUILD roct-thunk-interface-3.1.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
-EBUILD roct-thunk-interface-3.3.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
-EBUILD roct-thunk-interface-3.5.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
-EBUILD roct-thunk-interface-3.6.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
 EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
deleted file mode 100644
index 9ec113c78ebe..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-src_compile() {
-	cmake_src_compile build-dev
-}
-src_install() {
-	cmake_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild
deleted file mode 100644
index 9ec113c78ebe..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-src_compile() {
-	cmake_src_compile build-dev
-}
-src_install() {
-	cmake_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.3.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.3.0.ebuild
deleted file mode 100644
index 9ec113c78ebe..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-src_compile() {
-	cmake_src_compile build-dev
-}
-src_install() {
-	cmake_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild
deleted file mode 100644
index 973e79e665c8..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-src_compile() {
-	cmake_src_compile build-dev
-}
-src_install() {
-	cmake_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild
deleted file mode 100644
index 973e79e665c8..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-src_compile() {
-	cmake_src_compile build-dev
-}
-src_install() {
-	cmake_src_install install-dev
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 4953f7791eb0..7e1bc2020f98 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -6,6 +6,6 @@ DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a9
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae
 EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
-EBUILD spdlog-1.7.0.ebuild 939 BLAKE2B 0c35c5831ee9567ea95f76e2f552fb695a8e30f141f10fb64d06f82be199257c65b24236226d90f8e0fba0447538eda2ca77b7ea09d441c697cf692854f2f3c0 SHA512 3f22ac7f314e3e3efa94ef74a91620d87da244b2cbc0edc1da8e979da912e41fcef358b4a74d8c2358332503aa80422b7357405692297669184d2bf273308c96
+EBUILD spdlog-1.7.0.ebuild 938 BLAKE2B 304d4ef847cfe054bcb526bf7ddb23a89dc9a641982b579d028fbb60ec24602ca2b42988383ddcfae6d89bd522cb89851dd86cc03d66f06f067d0eb322b2dd49 SHA512 4d499f7956c71a0f546970afc8722ff06ac17df9b4f82b98e51b409e459563a85c08fca53f39bc5e747883621d74727a048be9c3db58df331424e491986c8cf0
 EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild
index 302ff616a0aa..99714237d173 100644
--- a/dev-libs/spdlog/spdlog-1.7.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 229e9b080f68..2042260c3960 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,5 @@
 DIST template-glib-3.32.0.tar.xz 55152 BLAKE2B 53c5eda95f49d3358b1a52a8c821252efc28c823e92c03d387336aaff8540bab9f4762d9fb3f9694d0402dafb1cf09d56188bdcaca29343513b0b74d3c8d1684 SHA512 00e275c15e7daac4c3cf3cd85d8e0700e8ec504a02b68f46754a8f177c6a2cecbbc9b2b5701c85c94d0c06dfa9b51425b37decfa1f619ccb2c7351c0ce1643e7
 DIST template-glib-3.34.0.tar.xz 55348 BLAKE2B f5aa2b2032dce87a3091a7314012779f789ca6e4b1a8c7406ae92deb8283c9024ef33cf8d657741dbb175816371dd8082b7f0a2fff47b58842573248c12dfd6a SHA512 b89cc9890fd80a6858b34139ce1cd2394a43f598629e59f224f4db798a17457be9a2aa8307828af3591108ed6e9a953936a74df15ed1c8c8af2100306db5a497
 EBUILD template-glib-3.32.0.ebuild 1092 BLAKE2B 6882cec4ef4cf524b09a62bf1f5c03830d4c1bd2b736ae38523b98eec43999763357d573d93fb613ff0c17ae6fbbd8577738ae4a9a00063afa47ecfe50e1ecd3 SHA512 b9e508b5ad5d59f41f4c6176bdd7caa3e868395870a40f771f96fcecc92b0e6270d8014352e65ad96fc424ce1dec33aa6385043bd91e55264ee0514c4f03832b
-EBUILD template-glib-3.34.0.ebuild 1094 BLAKE2B 14652e2b699f844360e8db8051dc5ec35ae21abc300c1cb7bf25f6b58bc7f643df33fa9719d6a1c56ac65931a526cc586ad9bda839752410b302ecdad52839f2 SHA512 29b87583fc38a0422632cdf450e0ac12226a82e065555c46a669366c6aef19d3200209c658ccea33d1d80d4567f5ea48673de46a59691f2a2986608bedf68656
+EBUILD template-glib-3.34.0.ebuild 1092 BLAKE2B b21750f52efc3ee82dc1c04edec5f3968fc0d8daafd116cbf9f34cef039c07dd822f4e49cd91b5ce2d14b842c2ac6ab4f8767770e2624e1d4b4215b481d596de SHA512 e3432ce2aa7dd4cae15915ff88fd61fb9705f7da929339b8e027f2f87b617527bee4062ede3216c1784e09e8aee9495060ef45b3744ea7e153469501edff1450
 MISC metadata.xml 644 BLAKE2B 76c8a25f64948739ac646ea100b365426db6b9f674502d2db83a93ad7203bcf2c6a49396daf959b4f3b3b89777e5f2a02c8a5a168041f6f93168f95c46fd7987 SHA512 272335daa1c3844c85dde4fe91b5020112c0652547d644fdb04126219ea39a3c0cfc16bb3d054cc362393507844e9a63d4c24e5e0f323d2bb3fc8b43e65810a6
diff --git a/dev-libs/template-glib/template-glib-3.34.0.ebuild b/dev-libs/template-glib/template-glib-3.34.0.ebuild
index c008b025235a..d8effd26ad25 100644
--- a/dev-libs/template-glib/template-glib-3.34.0.ebuild
+++ b/dev-libs/template-glib/template-glib-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 1d60a248bdd1..ef0b4afb661d 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,5 +1,5 @@
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
 EBUILD tinyxml2-7.1.0.ebuild 606 BLAKE2B 7980b36673f2a60aad432f55140272d670894ad51c50256d14559a6f54f6224cd6df4a7bf668c64a2d26fa8a9f141cbd6dee2b4eea81390b694a34fe5163f664 SHA512 8352ffc9ce6d44da1703252801c86b03dfbe93952c601932892d25759bc28f36ce29e24abe2391d8cff778a09cd7690a1774903ec8b72ad9833b71357f460cb8
-EBUILD tinyxml2-8.0.0.ebuild 612 BLAKE2B 5c0539f1e15338342806cde79e5e7e3a94cfd58d47f16c7c2f81ccc6dfe2e49efe64e00157a72b1b533ee0814bf5a3d3cd4677f845a148cc69acb3812fca1158 SHA512 3621df8001f4c76bde1662657b3c0f078a5fbeba02ca5bbedbd7c87e86d044a73b65bc31ff67af12e5657a686725a35f16cb55ed9923b97f9d077637b707c85c
+EBUILD tinyxml2-8.0.0.ebuild 607 BLAKE2B 0b79bacd416aacf3c65dd8498b13598bfd840a34f54cb86fe49ead553c15f2259e34d327becfcda6abd2b9b8d03e5364279a364253d62c3d2a35f0920c0870bd SHA512 a72445e10903db3982677cc594d8efddce0fbca71dae23d12c27344e3d47bdc91a2834f66377524c03e9f5868a57d259487b4fd7411a756320cb06712944bafe
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
index 7dd8bbfaa182..ad8cec35ea9f 100644
--- a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 5a67a2dedac5..2d74d9bcfd24 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,7 +1,6 @@
-AUX tntnet-2.0-zlib-minizip.patch 1432 BLAKE2B 137e4deaa5c2e6bd57695e19d643657c932c268adfb22f3c593e2bfb312fa979ecc87e14195bf42690883c1fdcde773e91af33823a3abc5ccd592a1cd705bac8 SHA512 13909d58fa2ea73c074816498faaa94dadc3fb750179b8f290600eb8a1adaf6a45464d0ee412ea9d038ab5e524a13da0e44fb07424388f28f16df538845dda07
+AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
-EBUILD tntnet-2.2.1-r1.ebuild 1886 BLAKE2B 7c56c11c50147a919bcdc42fdb0e5421f68be73b1bced4c861f422405449b7a512b4dc25fa54be3906a1e230e3a2727742f9e69cfeb455a32a6748142b8b6601 SHA512 0fb812dca2d2cd37a60e21cd3ec622c7c8c5225daefe3966e3cfcc8ea051a228c0ba91a21a0345623e4012e44dba47fd6a777b6eba0deaa9fef48814f1bd16f0
-EBUILD tntnet-2.2.1-r2.ebuild 1940 BLAKE2B 0a1463aaced01a5b42165ea2acf2144023ef12aba89811feb8718d10f4e950be12055af68aa6bd103dbaa954663d994c5bf51e9d1b19903f57012337f41737d5 SHA512 dc6d2ac1921609e9e19fcfaa453fbc04867838a33fd8849e1ba5a0e9eb7b2c96dbf589434d27afe407505fd3d6ec2fb0a7c64c1da2015f92c9c9954466f05d1e
+EBUILD tntnet-2.2.1-r3.ebuild 1900 BLAKE2B 273821b9179d910302c61511a7cd80dff6aeb16091dfdd387776f2953a8c1fc0338ac534d3958e3adf45fbfd9fd2d7742b22cafcfb42f3255bc0cc958d5b530e SHA512 db7ced55aceb5ed38ba87107a5d2bb63aebf3471b68a87592e5bca48bd23301d35ad6fddd2fb095d3371beb8a89c2a55b73a341f474c0cd33cc1186e952a9e05
 EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
index 07b4836319d4..5e0465060898 100644
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -8,9 +8,9 @@
  
  AC_LANG(C++)
  ACX_PTHREAD
-@@ -25,6 +26,12 @@
- AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
- AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+@@ -40,6 +41,12 @@
+ AC_CHECK_FUNCS([fopen64], ,[AM_CFLAGS=-DUSE_FILE32API])
+ AC_SUBST(AM_CFLAGS)
  
 +PKG_CHECK_MODULES([MINIZIP], [minizip],
 +  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
@@ -23,7 +23,7 @@
    [epoll_option=$withval],
 --- a/framework/common/Makefile.am
 +++ b/framework/common/Makefile.am
-@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+@@ -23,7 +23,6 @@
  	httpparser.cpp \
  	httprequest.cpp \
  	httpreply.cpp \
@@ -31,7 +31,7 @@
  	job.cpp \
  	langlib.cpp \
  	listener.cpp \
-@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+@@ -40,16 +39,13 @@
  	stringlessignorecase.cpp \
  	tntconfig.cpp \
  	tntnet.cpp \
@@ -49,7 +49,7 @@
  
  nobase_include_HEADERS = \
  	tnt/applicationunlocker.h \
-@@ -145,3 +141,13 @@ noinst_HEADERS += \
+@@ -144,3 +140,13 @@
  	tnt/stressjob.h
  endif
  
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
deleted file mode 100644
index 617f01ca9a91..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Modular, multithreaded web application server extensible with C++"
-HOMEPAGE="http://www.tntnet.org/"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc gnutls libressl server ssl examples"
-
-RDEPEND=">=dev-libs/cxxtools-2.2.1
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			>=net-libs/gnutls-1.2.0
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/zip"
-
-src_prepare() {
-	# Both fixed in the next release
-	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	# bug 423697
-	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Prefer gnutls above SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
-	econf \
-		$(use_with server) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
-
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/*
-	fi
-
-	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
-	fi
-}
-
-# @stable ~26may2020
-\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 2a1e7bb6230c..6012e52da3e1 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Modular, multithreaded web application server extensible with C++"
 HOMEPAGE="http://www.tntnet.org/"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="gnutls libressl server ssl examples"
 
-RDEPEND=">=dev-libs/cxxtools-2.2.1
+RDEPEND="
+	>=dev-libs/cxxtools-2.2.1
 	sys-libs/zlib[minizip]
 	ssl? (
 		gnutls? (
-			>=net-libs/gnutls-1.2.0
+			net-libs/gnutls:0=
 			dev-libs/libgcrypt:0
 		)
 		!gnutls? (
@@ -27,18 +28,19 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
 		)
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	app-arch/zip"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
 
 src_prepare() {
 	# Both fixed in the next release
-	eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+	default
 	rm framework/common/{ioapi,unzip}.[ch] || die
 
 	# bug 426262
-	if has_version ">sys-devel/autoconf-2.13"; then
-		mv configure.in configure.ac
-	fi
+	mv configure.{in,ac} || die
 
 	# bug 423697
 	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
@@ -46,49 +48,46 @@ src_prepare() {
 	eautoreconf
 
 	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-
-	default
 }
 
 src_configure() {
-	local myconf=""
+	# default enabled, will not compile without sdk
+	local myconf=( --with-sdk )
 
-	# Prefer gnutls above SSL
+	# Prefer gnutls over SSL
 	if use gnutls; then
 		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
+		myconf+=( --with-ssl=gnutls )
 	elif use ssl; then
 		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
+		myconf+=( --with-ssl=openssl )
 	else
-		myconf="${myconf} --with-ssl=no"
+		myconf+=( --with-ssl=no )
 	fi
 
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
 	econf \
+		--disable-static \
 		$(use_with server) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
+	default
+	dodoc doc/tntnet.pdf
 
 	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
+		emake -C sdk/demos maintainer-clean
+		rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
 
 		docinto examples
-		dodoc -r sdk/demos/*
+		dodoc -r sdk/demos/.
 	fi
 
 	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
+		rm -f "${ED}"/etc/init.d/tntnet || die
+		newinitd "${FILESDIR}"/tntnet.initd tntnet
 	fi
+
+	# bug 737184
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 2d07732d5c24..5e993385dee7 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -4,5 +4,5 @@ DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc1
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
 EBUILD uriparser-0.9.1.ebuild 940 BLAKE2B 0c3b4d638419248d19cea2a00f20391019d62761a04feaba8aa644afa7578d555de3ca7f849ed5e8c1732714f8610c0647e824a02772e197f53f3b39092823cd SHA512 277cd3aa28ace11ee9963ef809c364e8faa5680a438d8fea5d13b9288d9b65fd4a879e6bf96cd91be71d91ae789f81101f21bae7eaee4e2a26424770db285398
 EBUILD uriparser-0.9.3.ebuild 1210 BLAKE2B e5de6e838c817756985b67c567328f90bf3bd9a79151db76bd57d4ab09bff0bf620437040c3eeb1b91946e0b34f9b230a22535b4b6bf029ad52c1803aaa884bb SHA512 7b1f78fdd8d432972f5e1b52ffdcc2629b437bf7d826d940f065ba91d8c2a0b65b567af4ae0995a2022e003dfce5ff2e6a976f12a79b4d0d10b8dfb847c01196
-EBUILD uriparser-0.9.4.ebuild 1170 BLAKE2B 2fb15b00f50cc31b1e162b7f4b2b1222bb77d0a55a2da0fedac110640b8b384abc491f1aff94a5ae463c8cdacae1aea8c03bc70da84422ada035508d9cfa98b5 SHA512 e39b9a667ba1189662d13897b08ba3f89c5127b1384fdf052c7a699c53768f0cf9032ae7968669de5b5c81a0eda208052cd88c315be6ab9ec803c04aa1fd08df
+EBUILD uriparser-0.9.4.ebuild 1169 BLAKE2B 4ee01cc99f47941c1c3afdbc2eaff28e5231437d999b1cf87d62fa4f9e869f1d901a76fbc2f52b6d2f3175f233263018760bb7abd29c766806f33a398d534d38 SHA512 eae0ec1a6ea11d6160be6efc24d2fad23b4ca591ccc24eb0e8f964ef053872f436fbbf88d24031063974949b30a6ef98c5e13bd901bebfbe079118d9a45f5fa0
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
index acf3d54e99d5..46b87a6f9091 100644
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index d43730d959a4..fa10951c59f7 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -10,6 +10,6 @@ EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd4
 EBUILD vala-common-0.48.6.ebuild 648 BLAKE2B bd688604d8e7bf65b8a902423acbe2e469a81e57fe78171c9f77905190eca95b02b16c52f7ca8b3062e2aca8c94b4e5454e82bc6fa04dbba8484f9d38d526e4d SHA512 00fd28246c4cdebdfb455d08030eed513d649ba2bc0adf48f3bf27f1de140e3d9d2413c45a49dca55baf399d5a9c501d2d110c95f4c3fc8e8bf81bcbd75ea22f
 EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.9.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.9.ebuild 650 BLAKE2B efc1a39ce75ddf476c1440f554a4966299df7944bc19e24146b4e77e01c5a3ed986821720b0b96cc0d83617cbf44b27acf469ec532e61050315f923f63a14d88 SHA512 38d53bbb4d0e15043ae4b659247b83aae4639f35f123129474e3eb46665f0314258d0d60b8494dea02b908427e6c11517549a0d6719836c900cb51ea800644a3
 EBUILD vala-common-0.49.91.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
index ee55cfcad100..3d45bff248ad 100644
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index c3b698cb31ea..db35e6f28cce 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,5 @@
 DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
 EBUILD xmlsec-1.2.29.ebuild 1353 BLAKE2B 64427acb8bcf6aba37d11de040607f442f94113cfef9f008af73c6d0a4a03163f859b312bab27a5e865673c348460191878621e74720569bc64c5faa5208d62f SHA512 2349f8d6fa5500a6400d51387d0996730cb7c8efea7877cb087e4cb750cd7e8ea0cd236feb6752bc8cc895f226c8ff21ee85abdd280a73f85c606ca4709cf20c
-EBUILD xmlsec-1.2.30.ebuild 1402 BLAKE2B 3a4c8aa1b82018b5a93a08b59e53f986a5bdeea1f3e9d750cfa7f4ff851d3b8b1336159e98f8182a60cf25dc42b9d859cfe693929e65285d845fed9a6a24188e SHA512 933eee97696dd2321ad66de74ae689d0252f1a254baef40e0e4bbd708fb71d67f7303c53c2b07ffaf64af9dc70cc9ab5cd9c704985e6931dd0be01148f2ca5bf
+EBUILD xmlsec-1.2.30.ebuild 1401 BLAKE2B dbc86b8f37d6e4b88572a5f75acfceec04dcb5e4103e599a4a5f525ce22944c1d14d423d24789e5fc68208313d8abd3e27137f723d5c2a9f7ccbc09c0f05b56a SHA512 2533d18037ff6c59b6e6fc8fad9fdecf43e18b05cdfc0b379415d857fc713bd9b5ce0f9a8d8a1e249c8eecb2809feace0007fa7cf87861f05e032cd153de08dc
 MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
index 7e6e08c03122..cf4329bbd9fc 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ef27d9335ecd..61133af9aecb 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -9,6 +9,5 @@ DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad859
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
 EBUILD zziplib-0.13.69-r1.ebuild 2412 BLAKE2B 60415e9912525a046630ecca9f466801a3bfe29a5f48e48c937508f9ba6cda2f55974e218d3dbf9e41196798f049851e6e4c68871a09ee7dacd05afe892012bb SHA512 e7ff6954f36159d88e74fe0789d7a38b1ac22516f189170533e2b05a8bf9455c8cb459af7794be0bf81ae3af4c58a6b0abcddce8282357c5f4daf727134bd912
-EBUILD zziplib-0.13.71-r1.ebuild 1699 BLAKE2B 6d8ed4deb0f5424896c27c3ab1e22e176ced07f4897cf3b213898dcd0132b6afb8b62c6371b14c695ab5eb0e71139e73dbbe6075e0d292907af49fcb87711e40 SHA512 8a59e3fab9150eef670fe101e10572964b5bb4a8f18b06309234a85cacd52826e0e578fd7e1b13f0cd2dbb466a17a1592498dcaad239e3eb4137b4bed974513a
-EBUILD zziplib-0.13.71-r2.ebuild 1670 BLAKE2B a6d5f2e5370b21d32310e526a06242b246d2ec1a8c177c8520d7de1afc654f70b63c07b1d7e82632fe6ff50affb9475174177ff972b2534abd4057bddae6afb3 SHA512 4825888c0c76e9518ccb331f2ae7d9012cd4c21c164ca78361163418f1d11123567b180b052b023358d0271a9a4558c4db72c9d22a5633f023844dfbd635d52e
+EBUILD zziplib-0.13.71-r2.ebuild 1662 BLAKE2B 001c1b96f530e4ab9ae1f3051d0d2c61c81f68231d4dddac9307009cd3217940c838214b968ee8c82eb6780209a92d1ffb4a9c1b330a8dc8d1a2ec1e5669506a SHA512 5836b3101e1073dd59028988934c65f086c498f95575faef5b33a9f6436f5ff3e2b7a2769c9d9ece4dc363ae3551e68af62ea9641762ece380b8ee60fdfba860
 MISC metadata.xml 448 BLAKE2B b3c0c50b50155b120d35504fd0237bbdd681f7b98c8b9bb5df38a07102a987211861ef66c692152b625274f3957f8e3d03e1b4cb1c95410b4fc64bc9f9b04cf4 SHA512 f128ee3580c81af1a61388285aadb8481adccd9f113a734c853bc4b1ae5f9924ee12dbfa2086a28eb3972348084d5c86c81747f0deb04094322af70836c1f58d
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild
deleted file mode 100644
index b69f71534dcc..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.71-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-		app-arch/zip
-	)
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
-	"${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch
-	"${FILESDIR}"/${PN}-0.13.71-find-bash.patch
-	"${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
-	"${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch
-)
-
-pkg_setup() {
-	(use test || use doc) && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	(use test || use doc) && python_fix_shebang .
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # bug reported upstream
-
-	append-cppflags -D_ZZIP_LARGEFILE
-	local mycmakeargs=(
-		-DZZIPCOMPAT=OFF
-		-DZZIPSDL="$(usex sdl ON OFF)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
-		-DBUILD_TESTS="$(usex test ON OFF)"
-		-DZZIPTEST="$(usex test ON OFF)"
-		-DZZIPDOCS="$(usex doc ON OFF)"
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index 5b35a0f72f4b..3ba3ea9854ef 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /dev-libs
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)