gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /dev-libs
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
146 files changed, 1577 insertions, 1148 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 44cdaa651fd4..c0d995d1d840 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index e1fdfaec7e54..0561537ad479 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -4,5 +4,5 @@ DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc34
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
 EBUILD appstream-glib-0.7.16.ebuild 1690 BLAKE2B 14c53fb11352fdde910a5a41e28d232f970c33e8482a65865ba17fb690bf41507af0755264c5ed7fbf088f0b70768bb96727f6fec8e2e660fc9e41346eae1c1f SHA512 6a115a6ee1aae8ce819ac2fe7fadf26a666562abc25ed9ce54a2bde0b8eeb873e268daf6928c710fb9f93fe3103264d28deac805cf486700aaaff48afbefe0e0
 EBUILD appstream-glib-0.7.17.ebuild 1628 BLAKE2B 16e2d0be5ce07f59ec468572c2461e7479522c0d24e3cda5133e3b46b27efdd617337b06e7a1aee50d300f450b6d7f125d0f8aac19e4d17dae4416027fb690c0 SHA512 9f150460886683029006a6b59838d3dbd39277ef6c27ea78c704f3538b7986dffb4c65d62fa613fb86a8265231e9cdf01e2a614efb047040ce4f2704e02f2e91
-EBUILD appstream-glib-0.7.18.ebuild 1647 BLAKE2B 2029bf15fcdc8db54bc29031ade8d4a0cf7a68eaa5a5de01c819247576db7fa993a7800c28c160c0b9ad09bbdbc98c27a80f7ec3b152f271a104e0c4497c57f2 SHA512 49bef47c927f2e00c9ece55b761a4b904c2f6844633345640b514d6bc5fc0801aab22b25b414418e0ae14feecc8d97c0967708404fe9cf5d5593cb1320cc3d36
+EBUILD appstream-glib-0.7.18.ebuild 1646 BLAKE2B de65ed14fcbf2d2fff0949fc1d7b282bcddaf62a648f9bd06b40ba31d2994c2005bea22da033b8483b7251f9d6f97429dab64dc8759511e2628a0495d307facd SHA512 d8aaa98d3e82f9930990a821a008c8182c5a4fb320b5d64f04f6d5b39941cf1b6cda26c661812429ae9ec598a7a5a79aa19e83790e9f060084104259dbede48e
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
index ce43e426a912..969f483b6458 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 2d930caba0bb..3f80539234bc 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,5 +8,5 @@ AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 EBUILD boost-1.74.0-r2.ebuild 11248 BLAKE2B d8d0e8792d13c8885d484201ee0255dbb0512f91a8c576f554e6ec60907ccabff2cf1c9941b45ef85701d3203525ac56dd9e74122920df9067e08119c75d5a74 SHA512 e9975bac036cede871bb60dece316fc4c48e6516084a4b4982b33a3a342f7c7c0deeeae6c5dbccaaaae8309b65f2425272475d93a666aa799938249174ffb8f0
-EBUILD boost-1.75.0.ebuild 11100 BLAKE2B 95d3e30860c81855ee702516fd09384adf771aa313f937fe4266843fd1881a7dc37fc4ad83e57ef7588a17ae5afd4d654a5441c43f8114eb2a697a71ab505e56 SHA512 8ed1eef22c42c6f0f1db6b79a2ee6169fa37843cfa05ffd20b715c01f932e972c53f7f959331510ba377ddf3d4479cdc0351209088187eb820d32eff8bf8e1a4
+EBUILD boost-1.75.0.ebuild 11093 BLAKE2B d7d781f3860d7f06ca17bb6bed8c2e0c7bc3848b761ac12e79804332c03969ab792a01507cd4c10463a3fb9a229c4876540c13088e35ae203d5ba9e0fd371786 SHA512 13bf620f665992ac6afd29fd4b5d592308649dae67176293651239dfb1c25292b4c2e88654e4c09fedd237462df6830c4c25a203ae827011effea6273bbba095
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
index 2ff1dcece6d0..1c866c8fba8f 100644
--- a/dev-libs/boost/boost-1.75.0.ebuild
+++ b/dev-libs/boost/boost-1.75.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index c4966cb165a4..ec436df5585c 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -2,6 +2,8 @@ AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540
 AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
+DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c79739550b1ec7a6da3e7183af5748c2dfa5127be3810d73960af2f3b09b4b2bf4e624a43bfc4357ecde12b SHA512 090472545c74bbf0579b56b09e8b5dcd777b38f29f7199a2e68f45d4a8c687acc82f105ba8b2a38f9aa65e5997a3d846aaf2341ab74d58b4bbfd1f5f03823b93
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
-EBUILD crypto++-8.4.0.ebuild 1196 BLAKE2B 40ef68935a522fb3ad24f636f88aa1e174ca55c7c87d939d9623db6a86d54e34ff6f016fcb133bfad8429503901a9add537ddd4b35551c096339947a0b02e714 SHA512 7dc7c6e3f14c2bf032cff6ec2a7129934263c917b21094d683c55addebafe46ef8a4daa51e699d5d75ccfe6a7db46ff478dc5380c302bddb9ecbd5909ac618e8
+EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
+EBUILD crypto++-8.5.0.ebuild 1236 BLAKE2B cc4fc8d3a8572bf3b4fafe95068010dd630d78889140755f1d80026c3c8e093353da39e64b3e5c161a2fa1ee6407274578546a3073cc148b124a2c268d0b64ce SHA512 1159926b46feaa144c9481007e8045ebd8ac0f8b9f1a1b7aa6c26f24792cf05c65cb69a5f0ea94322a2ba597e58c4a14ff777f4bcc80a9624596bffbd19d4209
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild
index ed056d9020c1..276755fe4309 100644
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Boost-1.0"
 SLOT="0/8.4" # subslot is so version (was broken in 8.3.0, check on bumps!)
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
new file mode 100644
index 000000000000..0257ab4cfffa
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-8.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="https://cryptopp.com"
+SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+S="${WORKDIR}"
+
+LICENSE="Boost-1.0"
+# Bumped to 8.5 in 8.5.0 out of caution
+# subslot is so version (was broken in 8.3.0, check on bumps!)
+SLOT="0/8.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="+asm static-libs"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
+)
+
+config_uncomment() {
+	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
+}
+
+src_prepare() {
+	default
+
+	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
+
+	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
+}
+
+src_configure() {
+	export CXX="$(tc-getCXX)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	tc-export AR RANLIB
+	default
+}
+
+src_compile() {
+	emake -f GNUmakefile all shared libcryptopp.pc
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 57f4dbef46dc..12e8d7493278 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -16,5 +16,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 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-r4.ebuild 8210 BLAKE2B 1a404fd0b0e1b4591ef8368fa564f6253299d660edd0d6ad437b395e1bf7fb4d4be91042d56ccb5a1b794a75d5b9efc2cbff4b9026ac36f9fff8acda03a66089 SHA512 3d6aa3c26a094c93823bfbf6520b7f0fb54c53e1e5fa5bb4292bb5a338b8f105daf76c68abd02998f192321a94410fc2d7b350e3afea9e1011c1b530696a01cb
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8210 BLAKE2B 1b57ab87d62970c0b61c604dc9f9e5e5b553b99e5b0b67c9358054071ed1bdd07102a7cf008ea79e385e9ab81a47494999399084d5e85688a47f416ef106dd64 SHA512 0bae289f1218824a00596bf188a60452fca5de311ae3ddec2097e04c583741a6f58b5e6851dfec151cbf5a9b44450f5ce301892e9574afa6de5f79c3bcd7924e
 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 9eaef70f35bd..500aa56870b3 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
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs
+inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
 
 SASLAUTHD_CONF_VER="2.1.26"
 
@@ -227,7 +227,7 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
 	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
 	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
 
 	# The get_modname bit is important: do not remove the .la files on
 	# platforms where the lib isn't called .so for cyrus searches the .la to
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 51c83d5a8f1f..293472403d40 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,5 @@
+AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
 EBUILD efl-1.25.1-r10.ebuild 8191 BLAKE2B 9a217e079ef634df822d42bc9106986c395978bee7a3deff60f7a5f5564f9c7e6c31b07a46ae70142a01a3cb16e840d0fdfe3ac6f5be01a02dd31fa52f76ecc5 SHA512 9c8efce650ab2c9ff5e2c12663a5929c4d4863b6630c9bda7ff9733519f45aad69d865a8007e5d53821eb92f12153420dfd3cdde723c351a14cc0bbb9aeba3d7
+EBUILD efl-1.25.1-r11.ebuild 8249 BLAKE2B ba546c94a4460a4544b3634ed2fa01a36595e10d92468e9e5fc672b103cc5996861b2408c331f0c29c759683cdecddbba19ada44cea1e5c4347d9a8b990d54bb SHA512 6cb05681c695432881d5e82f1be291f59a2267013df33b02acbe5617357ea50a2ef5616bd6e2946b1ca542e5884306d4fefcbe80e84413ef027f63d239689bad
 MISC metadata.xml 1888 BLAKE2B 4c689687387fb09a2387587bc32e5cb4f09b94264fb1b594d8dc0c1c214eaeb6cf5f39110ea3dde72acdcf328da25bfcd2756dc85c8b060ad64aa321b8dc8a23 SHA512 40289f8c6e10786c8c9d5069b775c7db5695910a33593e706d3ed0f623bdb8b6149161a25ad55deedd479fbc214dac174d6b99151e5167272fa464f5115eece1
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
new file mode 100644
index 000000000000..30a74e5dfdd2
--- /dev/null
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="${S}/doc"
+
+LUA_REQ_USE="deprecated(+)"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit docs lua-single meson python-any-r1 xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+	xim xpm xpresent zeroconf"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	?? ( gles2-only opengl )
+	?? ( fbcon tslib )
+	ssl
+	drm? ( gles2-only )
+	examples? ( eet svg )
+	gles2-only? ( || ( wayland X ) )
+	ibus? ( glib )
+	pulseaudio? ( sound )
+	wayland? ( gles2-only !opengl )
+	xim? ( X )
+	xpresent? ( X )"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	avif? ( media-libs/libavif )
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2-only? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/efl-1.25.1-libavif-fix.patch )
+
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Remove automagic unwind configure option, #743154
+	if ! use unwind; then
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
+			die "Failed to remove libunwind dep"
+	fi
+
+	# Fixup Doxyfile
+	pushd "${DOCS_DIR}" || die
+	cp Doxyfile.in Doxyfile || die
+	sed -i \
+		-e "s/@PACKAGE_VERSION@/${PV}/g" \
+		-e "s/@top_builddir@/../g" \
+		-e "s/@top_srcdir@/../g" \
+		-e "s/@srcdir@/./g" \
+		Doxyfile || die
+	popd || die
+
+	# Fix python shebangs for python-exec[-native-symlinks], #764086
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D mono-beta=false
+		-D dotnet=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D dotnet-stylecop-severity=Warning
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D install-eo-files=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use lua_single_target_luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2-only; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	local disabledEvasLoaders=""
+	! use avif && disabledEvasLoaders="avif,"
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local bindingsList="cxx,"
+	use lua_single_target_luajit && bindingsList+="lua,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use lua_single_target_luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	# Not all arm CPU's have neon instruction set, #722552
+	if use arm && ! use cpu_flags_arm_neon; then
+		emesonargs+=( -D native-arch-optimization=false )
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	docs_compile
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples/
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch b/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
new file mode 100644
index 000000000000..ab11790f1b79
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
@@ -0,0 +1,71 @@
+From 00f5eed1d2390d204c83a2cb78a37531f6bbe49c Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Fri, 18 Dec 2020 11:16:38 +0000
+Subject: evas - avif - fix for 0.8.2 libavif that broke api
+
+also require 0.8.2 ... as well - no point trying to support older
+versions forever and this is still experimental.
+
+fixes T8844
+@fix
+---
+ src/modules/evas/image_loaders/avif/evas_image_load_avif.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+(limited to 'src/modules/evas/image_loaders/avif/evas_image_load_avif.c')
+
+diff --git a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
+index 34b6da9bd3..f7cfe0ef03 100644
+--- a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
++++ b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
+@@ -43,7 +43,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+                                         int *error)
+ {
+    Evas_Image_Animated *animated;
+-   avifROData raw;
+    avifDecoder *decoder;
+    avifResult res;
+    Eina_Bool ret;
+@@ -55,9 +54,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+    prop->h = 0;
+    prop->alpha = EINA_FALSE;
+ 
+-   raw.size = length;
+-   raw.data = (const uint8_t *)map;
+-
+    decoder = avifDecoderCreate();
+    if (!decoder)
+      {
+@@ -65,7 +61,8 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+         return ret;
+      }
+ 
+-   res = avifDecoderParse(decoder, &raw);
++   avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
++   res = avifDecoderParse(decoder);
+    if (res != AVIF_RESULT_OK)
+      {
+         ERR("avif file format invalid");
+@@ -141,7 +138,6 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
+    decoder = loader->decoder;
+    if (!decoder)
+      {
+-        avifROData raw;
+         decoder = avifDecoderCreate();
+         if (!decoder)
+           {
+@@ -149,10 +145,8 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
+              return EINA_FALSE;
+           }
+ 
+-        raw.size = length;
+-        raw.data = (const uint8_t *)map;
+-
+-        res = avifDecoderParse(decoder, &raw);
++        avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
++        res = avifDecoderParse(decoder);
+         if (res != AVIF_RESULT_OK)
+           {
+              *error = EVAS_LOAD_ERROR_GENERIC;
+-- 
+cgit v1.2.1
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 168b1118dd95..423ed3dd64b7 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,10 +1,4 @@
 AUX geoipupdate-r6.sh 1085 BLAKE2B f093f49881fa86bb81ac8b7c2705568a186e51c669a3da85114e0985ea7b2cc3de7ab5b6f8ef2e73ccd46af89149eade9b9b116506c6d9891e70dd8613a3c7a2 SHA512 97cdeadaf42510b88e00b3187e51089f62838c87d11500f572ed19232aedde1cb51a4183a84d7421773d8248072c2ef7197a28b0fe9a06cc10624b0f5d00a21e
-DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05ffdc8d17f164bc2a91db25e2be45319a942fef05f084c6d6463521d481286888cbe7b43c7394e46ea0b47b5ca SHA512 5cd527da9d9a921bcc3020e636b410310e6462832804ac2d594b9cb4ceaacac0c31eb64f97e23e77d468da7b63a704084e140c8b69b838e362a188309756a2bf
-DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
-DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1261 BLAKE2B 6a766b7dcfc177a88f2a35c419f3eb0b49c48db5359d3383f05126bf0b63673f64626ecd8bf76155d5e8bb5739711767320318286af4a940ffe07fcab0409f86 SHA512 662603f6fe45fe8d6330ee8e323d66e6673a7f6f9aa7580def3c7b8f725c0bbc4f9e2d7c6742099590f9dd5d08f5e0bc6417a4c7b0383b0ff6dae7a646c829e6
-EBUILD geoip-1.6.11.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
-EBUILD geoip-1.6.12.ebuild 1263 BLAKE2B 76ac0091a65899acb462c2fb4d91a0dd2d2fc4d1f32626de961747235ef269e56faf9be5d70b9634db3154aaea9a0d60a2c1d6d7f81c50041681f2579a8d1de9 SHA512 7292b05bb0c767200e2939d946fa5933e5652f2ed48c6dbe6afb044bb98919732de5ef7b969cebb6324c76ce640b79c4258d03ac2239836fd5c603cd5869899a
-EBUILD geoip-1.6.9-r1.ebuild 1262 BLAKE2B 3c943ad84847dd2d49e9448c67858329a5e4a00ace289f7184d8ea9ae7086451482f92f31147940e7bbb386e55a23a1b12397653fe9e52b921007277a8eb6bd3 SHA512 fac580a443ee56aa9ac35d27e6a257da0d0bcab2fd46e6d76e22ce66d46b887c4ad7ab64513ea8f0f5490328ed52230439d18399d1b3c7283adf92def939a921
+EBUILD geoip-1.6.12.ebuild 1261 BLAKE2B 694ad4c8f091ab1aa112c7a2afa148a75680c029b46a0bd75525416406ff0cab9f10195e79868663193e93023fde445f6a82b12abf91545ee8c012362d2d42cb SHA512 9651aa6ea38fdf8842a38913309ae923411f547bfbd35a5410e9105638c0f803bab3c756242911833792ce408cb29b2c30035ef89e3d8901ba70a531c3a6de9e
 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
deleted file mode 100644
index 2f5ee8e5606d..000000000000
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="GeoIP Legacy C API"
-HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
-LICENSE="LGPL-2.1 GPL-2 MaxMind2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="
-	net-misc/wget
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS.md README*
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	dosbin geoipupdate.sh
-}
-
-pkg_postinst() {
-	ewarn "WARNING: Databases are no longer installed by this ebuild."
-	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
-	elog "with geo-located IP address databases."
-}
diff --git a/dev-libs/geoip/geoip-1.6.11.ebuild b/dev-libs/geoip/geoip-1.6.11.ebuild
deleted file mode 100644
index 3c6fe0eb74cc..000000000000
--- a/dev-libs/geoip/geoip-1.6.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="GeoIP Legacy C API"
-HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
-LICENSE="LGPL-2.1 GPL-2 MaxMind2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="
-	net-misc/wget
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS.md README*
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	dosbin geoipupdate.sh
-}
-
-pkg_postinst() {
-	ewarn "WARNING: Databases are no longer installed by this ebuild."
-	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
-	elog "with geo-located IP address databases."
-}
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index 0f47ddd8a68a..8d3acd5e9c69 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -1,40 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="GeoIP Legacy C API"
 HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-api-c-${PV}"
 
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
-DEPEND="
-	net-misc/wget
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
+DEPEND="net-misc/wget"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die
+	sed -e "s|@PREFIX@|${EPREFIX}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die
 }
 
 src_install() {
@@ -42,7 +35,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS.md README*
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	keepdir /usr/share/GeoIP
 
@@ -52,6 +45,6 @@ src_install() {
 pkg_postinst() {
 	ewarn "WARNING: Databases are no longer installed by this ebuild."
 	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
+	elog "net-misc/geoipupdate) to populate ${EROOT}/usr/share/GeoIP/"
 	elog "with geo-located IP address databases."
 }
diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
deleted file mode 100644
index b951be9e1a64..000000000000
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="GeoIP Legacy C API"
-HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
-LICENSE="LGPL-2.1 GPL-2 MaxMind2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="
-	net-misc/wget
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS.md README*
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	dosbin geoipupdate.sh
-}
-
-pkg_postinst() {
-	ewarn "WARNING: Databases are no longer installed by this ebuild."
-	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
-	elog "with geo-located IP address databases."
-}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index be5205ed0e76..ccd23fe57183 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,5 +3,5 @@ DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8
 DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.66.1.ebuild 1114 BLAKE2B b2324eeaa60bb5a885e782fd5cf7b84534565d7470b153b30e972a5c624b1a83fd71d4eaafd72d01807a2035fb667d6c205c24f0db591c56df6cc043d1542f76 SHA512 9aaa7806c10fb4e27d23bf0c21575054d309dd2ccafdc88023e1543b083b61a53f4a1dd56395e0e53a90be552c51b0da64fdba21ec36a522844b78d4eff764db
-EBUILD gjs-1.66.2.ebuild 1114 BLAKE2B 7b7e0a42125079bb76eb4c4639f051fad029d8034658dddc9a121edb62f85e028eab309c41c24d0cf117d55b87b0e9ec0acc6cac9e199e591b5cf9b1fc1b6c8e SHA512 8c90187141b1f7ca137ede8aed2400852de6abaf375779b60a94e3dc7a36954cdfe2af7f8cf82d01aec52ef086965fe7bb4a2c358180f6ea08ee608dc52a4ecb
+EBUILD gjs-1.66.2.ebuild 1113 BLAKE2B 4e1047bb670c2a98558699f476a8c99d784978ae531c42713b20a37aa67616df6ae4c51c140095f3cf387094e476504a8cc99cf4ca32ea1be4635abae0c45c99 SHA512 f4268bb5ab845fcabad639291c1a92f27f90900a57dc7a035d70ac642ef3f21d13e1c2b1d166ad424f36abdf3cb1ae70ca9de507df459894d1bc9c18b4fc9c58
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild
index cd936bdbf15a..fbf9d3dec01a 100644
--- a/dev-libs/gjs/gjs-1.66.2.ebuild
+++ b/dev-libs/gjs/gjs-1.66.2.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="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 7ebd47e822b7..c522324a89a2 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f3
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 EBUILD gobject-introspection-common-1.62.0.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
 EBUILD gobject-introspection-common-1.64.1.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
-EBUILD gobject-introspection-common-1.66.1.ebuild 936 BLAKE2B af10d956a35e545df5668677594a4f138f89d5fea027dc7b17ac5a54c9f7bd1f764b13445635809914adb1f6dd7ff1749fe40ee43d2550bb1240dba33858d1ce SHA512 d4a952192a343d32ea4c33ade3aebcf58efa6ebbe05c4234f4db2c1a0a12f1468f5815bacc01e0098f104b05ed61104f1a779c7db0580534b2451af7a23bce12
+EBUILD gobject-introspection-common-1.66.1.ebuild 935 BLAKE2B 8a93a551942d909390987ffdf3dc2a3f7ffc349d7a5799c69b8561332c106f2f3bd6d6e04bc91fe15ba890e03e2d821d6b41cf62056c3f82a22038aee7a4a40b SHA512 f9c783eb557134b3b5bf88dbb48484d81a0993ba25c0def9b29a7150e0adfa85c99fb609600c70a5c3cb3e56f32898545089ae6ac7766b9872b6d1472e1ed2f2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
index ff6157de2f64..39009c802847 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 0c9d9a38fbb3..88967593d428 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f3
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1859 BLAKE2B 795ef4666619c07a748877530d15eabfdd36b7f879c443302aa8e7a4df838ef4c5b542d05d7501ef327ae9d29122dc386c915b4349f3aa7148251c575a5436a8 SHA512 8907970414f5b476118aa1767723af2a89dbad574b367e3b1ab72ce6b6a7fb53b8514cf82edea6fa6626a529da2f0965cc8492a776f5bec7f9623ee816e62f0b
 EBUILD gobject-introspection-1.64.1-r1.ebuild 1991 BLAKE2B 08b7dba997ae74f49652ed88a627a9ee4a78b87bcae3c51f0965ee7b19955fd7e5f7be57658549ef058d41482b3168733b9ba38282d33397667406b323d8a65b SHA512 7d840f3d50e3bc413b0802d8d0fe2914b885b5bfb3f85f92e1cbff73a56d6d72c1ccfa511cd8f8c3e3d610e80b1ff931876a8b2444081cb867a6ee18ff4d908c
-EBUILD gobject-introspection-1.66.1.ebuild 2002 BLAKE2B 7b07d4469f899141ab22f76b3ac2edc479bed6c0634b4da5b1486c54a51bc5d5caea1b85cfe5611155dae13e9ed42c673782accff1f14becbf967c38293df532 SHA512 05d809a40a9cac45ce04e0b9079fafa562ba38d1c6cae12ba144b7ddb0bab18e5f8c2d7954e541e6fda50b254b6330cfa33c409c55b6edbee4aad71bc8422c3e
+EBUILD gobject-introspection-1.66.1.ebuild 2001 BLAKE2B 7cf0365b14a1aa8a7d0be775f52c98a246bfd16364679d4a3dc2158e1f040b2211416e124afcd2a674ffa3d064dbc78b93bccf37ede6899be7bb8f7aeae81d2a SHA512 436d5e09e79a9ac721623b99730fb7e3e94b6c2c9b68e8e433bc6d8ed9021cd90a3f2574bf211f3e9100d3acac684abe73f4b62b00c07fc8d49364092a257a7f
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
index 23eb08dfbd85..ce38bcb6a0ee 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 9a697ae14e26..c0d67c20aa8f 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,4 +1,4 @@
 DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
-EBUILD gost-engine-1.1.0.3_p20181031-r1.ebuild 976 BLAKE2B f633f6a8452c103e15e3f059e71b554a1deebb0b0da4f42d696420abc1ea2d780c80d979176d7d95f40a50952c15cf4ce11c96836ed37bfbbb51b0dd6b24dbfa SHA512 47294737be21c61a99222c02c38c7294c38eb3cbc57093565564d027c7d8eeb57659a37d17e17893a72b05c51b9803ef460e861c534947366983c6a60a42dc6c
-EBUILD gost-engine-9999.ebuild 907 BLAKE2B ac8fca4012b1fae656adc421d5261b31f5c989f7f6c0fb7edbd8e8852324a9c9dc0417b792e0a1d811eb4284d117a1fce486d26c5c0efbc8953f2c019081ee2e SHA512 6255a12cd39fac787e4113aa4f3b2a64672230e44d044b64788067bb70e877a92deb2cca8c20793e4123895c41a37948a4fcfaa026334a896d5f2a69a15f1fbe
+EBUILD gost-engine-1.1.0.3_p20181031-r2.ebuild 964 BLAKE2B a32ed49aaa867cd99d0bdc4225c46f9758929fa8ddb272e06ff86a37fe45974102d8eabad35b71b5b6e1dd71efa7d6d27c231682b2c2e77e1b48565f7fbc72d6 SHA512 58f8c3db060fe5ce68a438ee79fd998c2daa62aa93c1d32125cb3f0d824d95afe1e3c38dd7875146cb0aacfcc113e0dd278873a89d60a2ce1c1dd79480c8f697
+EBUILD gost-engine-9999.ebuild 895 BLAKE2B d51d424428ac6262094f8c543e1c3a51e98215aa9a4960d06f0e3431c82d90dd35cffcb853215dea36209aa70269e01b14fda10ac268430a22baec2457e883a2 SHA512 213acb55ea3fd6b253e1ca24683be82b17db3b8b639dc07f8f450f4941377380cdd6f68c51a86100c624beeb5424af8934e72a4bb3b274c26b09d2b27b00d8f2
 MISC metadata.xml 341 BLAKE2B fe6664fbcd10736141fcac977eb33d5f7b398af02b107c366fc06769150cc709bc7530896ee8a424bebf6dcaf6e12c37a8c1be65f7e53036d90d9159ad63d1ec SHA512 4d9d7229aec6f3ce7e6ea3a560d9ea126c64ada9dca18534d184073b0da130e2858e5ffa2eb9b34c61ce40ca44be42a043bd8b68f0446c7c41364d3a8d59ecf1
diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r2.ebuild
index fec5175b2bcf..449f37079b65 100644
--- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
+++ b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
 HOMEPAGE="https://github.com/gost-engine/engine"
@@ -34,6 +34,6 @@ else
 fi
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
 }
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index 945c78a4f22b..fd08e96d4a63 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
 HOMEPAGE="https://github.com/gost-engine/engine"
@@ -34,6 +34,6 @@ else
 fi
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
 }
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 5a854457d194..7d1dee64c5e4 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -2,4 +2,4 @@ DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f
 DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
 EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
 EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
-MISC metadata.xml 748 BLAKE2B 7f6eeeac0667efbdc6bf98c22207688342ec8725865e85a1990ff67d60e5c28e8a9ff88f628ce1b8476362b24a8220ffc585f3107dbfa53241280e2f14b8c511 SHA512 5cf1e483842eea74f495b72e3887c0fc8a64abe163c951b15b130a660de3cd4bdb41a5dc981a6d24b5ce77fd5ae3d567bf6c6c6c51c0275bb12f9a7991f5fb61
+MISC metadata.xml 744 BLAKE2B 9580feba11a5596321376921c6a6f6fcc88a9d691fe405425bd03253ef0bd1bd2d53e1f693383cfdc806b1930c2ffdb0d86601b3ba832044137e3b2df5e0cbf9 SHA512 21d02b987991d6e6816f6042813b5ff175e8edb32ee022bc7fadc27fecd79c58ccfad0fdca7f5ac7002dc6f2f95f3e2c1e055fe906dda8dbd8c09ba4cf058f2f
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index eb3302b9001c..b0702aac282b 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
+        <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
     <maintainer type="project">
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index db0f0febaf38..fb3621db7d4c 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,5 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
 DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
 EBUILD json-glib-1.4.4.ebuild 1514 BLAKE2B c6c90de778fd04db9f8d1656bc195a66643dec302b44eb46c845d87f226ea37ac5641df57d0d9076ec1ed69039458ee00c609f7fdcfdba0dbb0122aa39998ce0 SHA512 a65556de5ead0c2563fe9106a2d94ab83a428a8973d1b5931f79858fc2a73d47d1bd7244a4d77347a3e14ff4809674be35a7d02bd3c7b7689e8e16878447c5e4
-EBUILD json-glib-1.6.0.ebuild 1548 BLAKE2B b5ca65ee8dab6eaa56bd24a3008141f1651a1e5812b8c1e8f3da92a72fd9fe65e6110273a44ea4ae494e6ee554dcdcc790370adef6525b763828b33c0d79db64 SHA512 59e695778dd3f2002512ef40f73836984397639410f03b6ad989d197943f05e7f28dab87c1462a67d777cd1385cf9626267003aa62afb5c2fc90ab898cc5c94e
+EBUILD json-glib-1.6.0.ebuild 1547 BLAKE2B 72c9a1fb4378b6c5932c4dc2e24933e44d6902a440dcf205bc85c277c52caf51537f8e2896e7a50224680e474762df48c342b2c2006fd3e7879222cf4965a86a SHA512 91f47205aeb81251f0c89ef920f32718cebb9279e64f00a02bacfc21ae19fed73fc5ea13e0f1af4fbe5ff69855c629381bbabaf3cf8f5235ae36eb9fdc6ad0f2
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
index 35c0e160931a..2dd59591b36e 100644
--- a/dev-libs/json-glib/json-glib-1.6.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index ba1da002b05f..dd204168c657 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 817 BLAKE2B 500039225abe33bc54414b89a56766fb76faf23aa8c29ab9ba8caea99a41b794fe98ea2f5b9432a82a9e0fc360e74f2e69fc3770860ee7a8251ab852cfda9ee4 SHA512 5df86cd1082364f1fae52d92800d5c5e1449cf72bcd7384c2c14e11cd8b571fde0b5561360f86213675f0cc1f53d3376ee21cf2a427cf2907d237f10e369946b
+EBUILD keybinder-0.3.1-r201.ebuild 816 BLAKE2B c596dfc37bd7857c0079da3da6ccfa1bf0eeae992a442cb7c57dd2e50034d94da1b3639d698c2cb52053a505d48388aa5f03b1a509ea8eb753f2ee2d20decd29 SHA512 b14989000cd7072fc675cc9b87fd7dbf8ea4f00092962b3540d5b8ac5347d9577447e2d51c5b1dca75bc6439fdcea390d20ab08cc1450a2c0223e661d986bc14
 EBUILD keybinder-0.3.2-r300.ebuild 1077 BLAKE2B 9cab94a818634862846cace83ccfbe75194a84a574c2e85e22c61d5a7a394cb71304c208f663487c95ee074280f311babfbe74ebe4109240154fb2fcf0d220af SHA512 a23945953fa2f08d916e132f0e52129dabd294f21be6003544b6c9bd4a42272b70d9f793b7ebdc033df0ff02a4e0bb1ac4b2415e0eca5754d2c8cc9fa2b12f17
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 94ce6fd1890b..4b3a64bd613e 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
 IUSE="+introspection"
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 7953139bd0a3..633e79abf262 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d
-EBUILD libclc-0.2.0_pre20201001.ebuild 1470 BLAKE2B 60185cb19de9033fa87135883bc1bf4e0dbeb940f0cca455231b438c56e2c86dbefc307825e0a67216f65c7ad96281f7739a5762cec6171821931bccd24b1f5d SHA512 86f226fe9c8c3bf7089866960d69fce8791be4d747a2fc8a82949371f3a85dc3530a29963bf5a8aa98a00921f932124ca397b2cb0aa0b3f3a27fd02953d049b9
+EBUILD libclc-0.2.0_pre20201001.ebuild 1450 BLAKE2B 4037c436548563561cef4f84374e7ebc1449126c3583c942607e6c7f2f8bd1df537b942854c6f6001a241f2bd4450974a31798aa3a4fb9a0d35eaf09ea8efad7 SHA512 77b6b9395c66d582e09a5e1b9fb1913c387d6dbc056f33cf55334d14cd7bc42e45c422994e26a4a909c676ce550096323d6aa6ae24bf041cc74d7a2aa840705c
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
index cb5d00dbecce..ffc6fbd8be7b 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,6 @@ BDEPEND="
 		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
-		sys-devel/clang:9
 	)
 	${PYTHON_DEPS}"
 
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 98b3b065eabb..35c70c3b6ba0 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,5 @@
 DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f
 DIST libdazzle-3.38.0.tar.xz 447304 BLAKE2B 77add33e1947dc33a086501928377cc9547563a9a8095f38283a5bc4b1916bafe1ac3073abe4111ba4907857de0726d2325458663acda4df122e6237f703281f SHA512 76dee75fab5a508c274f45cf5f51bac4edc80786942ccc64e49ffe1721607d88f9067b0a7751f44a48bfe38ee87b6986d449e8c5e6b704c6ec32de84d21f7e69
 EBUILD libdazzle-3.36.0.ebuild 1695 BLAKE2B 42df0fb02ff8f2c40b0de1a786f32c79c847a5c1488eb8fb09ba5d106c439ebca3fbdac90e1359c436745d154fe7b2ab2f294469ba17029e63cd9eee73c6355b SHA512 d6a3bd2d6ed1b0b8f1544957c9ca3764c9456052c4549614749bb75501e28633333a1e8c2a7fbbc8ebf48d4c0cc3546b25f67b599df01c19dde76bab45044afd
-EBUILD libdazzle-3.38.0.ebuild 1697 BLAKE2B c7b766b4d16df7cef291b6ec5273f8ec9bf309d10de5b5880ef2c6d61dbcf9f0bc677e37ff8b9559d1ddf088fe523a9df58434f378b7bad24d4af28f485db2e5 SHA512 4689e16152cf2494b9c9a41d6b360489e00c545f8bc4e2cc0974263bd1e24627969927b3e5494946ae8f5da07bc9ccdc2464127627e984839ca9532980ed2f0b
+EBUILD libdazzle-3.38.0.ebuild 1696 BLAKE2B 5ecd3023a2a81c7e664bd5392427ae8c517fb932a45941ff41685fe3760306b86218745c311e16981b4469be07706c52e582d814bf9505611863da4fa782087d SHA512 691016a10690e94dba29fcd2e5bf82aa13831d52d0f657bbd1534b6a5d7fd7b358620775f10c7e311a7aef7f5c790f2d42498abd8680f23f65ea1a3f22fba6c4
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
index bb1360473dc1..eca00810e1a9 100644
--- a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
new file mode 100644
index 000000000000..d5b17e86e950
--- /dev/null
+++ b/dev-libs/libdispatch/Manifest
@@ -0,0 +1,3 @@
+DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
+EBUILD libdispatch-5.3.3.ebuild 914 BLAKE2B 9f350cfa7bcbc278a728c4efa057a5b17bc5145b4bb43441b7a2bd73b6ded456c74a174e14558f5cea38616fd9707db792276a5f1630a500f9c306045662c5de SHA512 d0da595a9f026824aa577d35b043b5ec40441fded2efddd122eed541352bffb357641d52cd1bcb28f2f14745c42f3857004887e1acea4f21e023f97cfdb54507
+MISC metadata.xml 349 BLAKE2B 5174115141a1abee14ac46ea3e8bbf9dfdeb263fe431411ccd17c36fbf25b31607df53fe3c9535404aaf5a5b4ffd1f11606387d1b0cd7ab83e18549588a0e563 SHA512 afda3310a1fb23f69619fc40e24c2007b5b40f0c3976b0b20b5c85e87d48830d56ecfc1a0b8ca1800fba00eb00cbff22f7b63e6b99aa12d601081fb8451c42b4
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
new file mode 100644
index 000000000000..d469c43530f2
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_configure () {
+	if ! tc-is-clang ; then
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libdispatch/metadata.xml b/dev-libs/libdispatch/metadata.xml
new file mode 100644
index 000000000000..7629980c0ab6
--- /dev/null
+++ b/dev-libs/libdispatch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apple/swift-corelibs-libdispatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 71060dd49f4f..80479634da07 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,3 +1,4 @@
+AUX libebml-1.4.2-header-fixes-for-gcc11.patch 599 BLAKE2B 850d5eca5b6126a791bbd3791ebf5b34f93b822e3f9d263a38ed1839a3f36073d4693fe82f02265b809c9a7ec1c41d1bbd721dc9517e5930410e8b25f845dc58 SHA512 c41024d454ae83318e899671aec45b27ff0e68e18b4fde1e838ffc9a4baff6e70e0dcbf0966f70241dbef3b05e04283451f9c0ebb01e5b0a0d060cb62a83d3b6
 DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
-EBUILD libebml-1.4.2.ebuild 590 BLAKE2B 7620d314df2222094c2356142fb93a2944c1b21595d09e5b382bd0ac24922369db1b8161634de11a7a53ddeb4f94bc3ccda7c15252b7e876221be8ceb5cefe57 SHA512 6d26aaadfe821c31d9a9daf07b83815156cf31f4dcc6a38a2a1b6690c3e34475683c78b92137872244114f4a8b21697ffb68c9b05068d4877a3accfd58581c90
+EBUILD libebml-1.4.2.ebuild 559 BLAKE2B d9cbc919903e561c521ed2876045a00187e4e1438188e94ba9a22c7b8959f635c14cc68eecbedf0c1fd280a1b733928850488f19ebb408e7383aeb916400ce7b SHA512 367c220047b0f059c9ebdc62378f92786bdf0638f48bb9fd57b5fd200eb1fc2a238c51c94e24c0d84034989364aa9b0516900f5e16820edeed79031280fbbe09
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/files/libebml-1.4.2-header-fixes-for-gcc11.patch b/dev-libs/libebml/files/libebml-1.4.2-header-fixes-for-gcc11.patch
new file mode 100644
index 000000000000..c16e1395d605
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-1.4.2-header-fixes-for-gcc11.patch
@@ -0,0 +1,26 @@
+From f0bfd53647961e799a43d918c46cf3b6bff89806 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo@bunkus.online>
+Date: Sat, 27 Feb 2021 20:36:52 +0100
+Subject: [PATCH] include appropriate header files for std::numeric_limits
+
+Fixes #80.
+--- a/src/EbmlString.cpp
++++ b/src/EbmlString.cpp
+@@ -34,6 +34,7 @@
+   \author Steve Lhomme     <robux4 @ users.sf.net>
+ */
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlString.h"
+ 
+--- a/src/EbmlUnicodeString.cpp
++++ b/src/EbmlUnicodeString.cpp
+@@ -36,6 +36,7 @@
+ */
+ 
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlUnicodeString.h"
+ 
diff --git a/dev-libs/libebml/libebml-1.4.2.ebuild b/dev-libs/libebml/libebml-1.4.2.ebuild
index be4140b75697..4fb676d19f7b 100644
--- a/dev-libs/libebml/libebml-1.4.2.ebuild
+++ b/dev-libs/libebml/libebml-1.4.2.ebuild
@@ -13,10 +13,6 @@ LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=YES
-	)
-
-	cmake_src_configure
-}
+PATCHES=(
+	"${FILESDIR}/${P}-header-fixes-for-gcc11.patch"
+)
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 4d59a8fabcc2..10db1c3cc79a 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 EBUILD libevdev-1.10.0.ebuild 1252 BLAKE2B 445b3ae22bb70fb6d4f4e9f36dcd1baec01d28b0b4c9c8f3efe26deb452767f6db4eaa1c2049acc0fe31b4a5c9228f7e2ee43cc6acc5a38f8053dd1255c35407 SHA512 2bbffed6d3693907dd99588b83a76db4c9b19c7c0eeb90976a4e4dc58d527097f540ba75a77c3f31e9e3cb0d144eb5cd2fab6e7db0b5e7225bb85a6cfc3d7894
-EBUILD libevdev-1.11.0.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
+EBUILD libevdev-1.11.0.ebuild 1256 BLAKE2B 1e1727a33126d2d9fd859a54036cd8ddb2fed58b0f7ed885dfe89020f015d8ac84a6ebb70cb7cbd13749379e749bd11a2cc25d04d281c192a3f8d29fd8b1f4a2 SHA512 3af8253236cb5dc1fafbac26da71a6cad72b1b871577d7bf9faac907ccadf824dd9c25a0b5f1213ea04d3861fe75d9df0239c034fd7d69588c77b07e75a4a953
 EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index 11acafcb2294..4f2cccf073d6 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 10ee363ffede..f243f5965453 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,5 +1,7 @@
 DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a
 DIST libfilezilla-0.26.0.tar.bz2 564361 BLAKE2B 962f513846cf74a419a281c751266360196225c06577e7f5fe6b67f23ef3a4759f7372cac8fe11918e49a0ed20e08995c4bd971a02e692979dc09726be51fea9 SHA512 96ccc61e66dae744c092389a570f591e4f4e62ebf4fc39ed5a60206ea96b47b1aeb3d8f2fb7e22b4920560af4ec212540cc177d23ddbeea879dcd80143b86af6
+DIST libfilezilla-0.27.0.tar.bz2 567792 BLAKE2B d20013746a0a90b9e95436a2b408e9d95eb6b2d32e5cbd0bb827f401a9917c2f376fce45108f332e0a8b71c55d29a78946396440b18f345d8214775a3b7f3b39 SHA512 f7545d0220bc83d66dd6b66494696a8799428d065037c98d7752d841e03fa5ea2198751cd22e22b9b1ad8023210725dd1af8afcffa6f61bcfe6aa12671200011
 EBUILD libfilezilla-0.25.0.ebuild 1197 BLAKE2B 50fb4560d6a60d5a1a490fda01184173f1b82cb6f636330f6bb2d1186e9bd3327384757e6fc586be6ea15396a7d1c8aae27b90dd62a73dc3487e811329f6c1fc SHA512 8ed8773b226a0b656695e139f9eb97e1c7b6d9b32ece10085a3440427ee49aa802cb2ba587ecce33306ba85821c3a067937cdab2a5e17232c604bb186fc2d28e
 EBUILD libfilezilla-0.26.0.ebuild 1201 BLAKE2B 605e1c7fd2059de3beeebcad1207cdc87d4003361e72fa2264c71e1570fab8a263a65e32d29c8b32a08caee46af68c20b60c56ec8f617f41ed3f66649ccfd1aa SHA512 5b195d6c324cc8467c46552ba4f60ec0b3b6a1dd5caca1810164f33fb50f49984b13a40dc42557b5c8fa9f44f731289a528bc8725f4c2583753fecd55264744a
+EBUILD libfilezilla-0.27.0.ebuild 1201 BLAKE2B 605e1c7fd2059de3beeebcad1207cdc87d4003361e72fa2264c71e1570fab8a263a65e32d29c8b32a08caee46af68c20b60c56ec8f617f41ed3f66649ccfd1aa SHA512 5b195d6c324cc8467c46552ba4f60ec0b3b6a1dd5caca1810164f33fb50f49984b13a40dc42557b5c8fa9f44f731289a528bc8725f4c2583753fecd55264744a
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild
new file mode 100644
index 000000000000..2f343c359bae
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 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/11" # 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/libgdata/Manifest b/dev-libs/libgdata/Manifest
index a3c17b0fcf33..4fc3e0e4cde4 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,5 +1,5 @@
 DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b
 DIST libgdata-0.17.13.tar.xz 849888 BLAKE2B a364f6175828dcf6d870ddf8489da3703b987587639675ed5cbe851de8761d918da9ef91531d2b992ef5188b51f00f4bc13c3ce3b36afe6d07c4e162a93b2889 SHA512 b074097bd3cc78951638f0d726a948c9ba994c64c85c0cfe713c3d87419a9a96b66688bde88732dfb529325dca2b8251bd161337532bffaf9564f7f5819b9343
 EBUILD libgdata-0.17.12.ebuild 1764 BLAKE2B cb791f3610253c6d818650a8f22da2845f54b23d7eed8d78e51a5e7705482369709d088390618dd6b2b81db6248925e0f8e38a98ca984c2853b02a5cee160b53 SHA512 afd6a51628c772a174763460eb627bfbe07bb15543c0005a6e00052e7214896d4f38ccb87f273bae4943d4c28e2e89370ebe559fe50e2170f89fb521a21e34bb
-EBUILD libgdata-0.17.13.ebuild 1743 BLAKE2B e5832c553866b10c96690bfa181279d1c71cd452ba459f244fa12f2ec400adb486cf0af155d6327d985ed4eced7ce14e2f7f6279583ddf2d288ec03aa5f8c544 SHA512 2d89751c08033cfa76d324986d303c7c4c5ccd85520d9c706f164d4c7317d4dbb0aaa748dcf48da5ea6636d6ee49483022e119beae5e9a02d4779ee14aad84f6
+EBUILD libgdata-0.17.13.ebuild 1742 BLAKE2B 923e1470eb5ef9c57c00a2bf02ee5cc126d0717e4c27867d417594f6a0e86a67b965d6ebfdcc3d523f14eedc6528de3b654fe7f956dbbedb98caacaf2b602a79 SHA512 b22a8ce0a026137b72186f509b0c3a021501e4cd3db91a1b8a2791ac2d65f2a97ededde47443fc3f13135334946d05bd61568d03e9932a8800b7ca3bba3d643a
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.13.ebuild b/dev-libs/libgdata/libgdata-0.17.13.ebuild
index e8fed43b5332..0e18668269dc 100644
--- a/dev-libs/libgdata/libgdata-0.17.13.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index d2851c64700c..6a9b766dab6d 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 EBUILD libgudev-233-r1.ebuild 1098 BLAKE2B 01e9a601ff8142d174ceed9397f231d9e49540b15b66129059ca0fd6a7843ed44cf7156bd9c885c67e1bc55c68c93ca16b28f987b7da8570bd080b820e5a8b9a SHA512 52f0b728dec487a6316b2a31652280bcc5c456ced107acf3f97f7fdcee3568f5f5555afa3d1bfdd415be3a903e1e55506f18aa2a593dbacec2106bf48e7febc2
-EBUILD libgudev-234.ebuild 1088 BLAKE2B d68554cedb46ae8b80abf12231a33ee4eb6e11084288725f11e995bba710ddc43e8b966d1f5cc60067d6bf75b723e893199f000c4c91ad7659d9448d5ae7c5a2 SHA512 4a12613ed87f07af65bced25f7474e2660f9f1b3885f44cf618541e1cc41fa87feddd39f0688433b5067f60e7b9d2dd106172c0925714ec2e73239ca828f42df
+EBUILD libgudev-234.ebuild 1087 BLAKE2B 5c8ec639c67378dc190b8990bdddb1c992761e88c1522ba2e7fe1207a60e2863ad4982b196e64a95237c32354e0bb1a2b0f47cc95550be6bee7cf6a7b641d9c4 SHA512 85e56261769b1c5dcd7cb8e3bb66391bd5b3c64af48b16b06a2dbea02a3eb5c17c2234833baa994a2be6cb29cf59707270b4b0be2a974bf1af790756c872ec7d
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
index e163aab6636e..c8561b1eab9a 100644
--- a/dev-libs/libgudev/libgudev-234.ebuild
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="introspection static-libs"
 
 DEPEND="
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 8c1791edf491..6b329cead9cd 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d7
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
 EBUILD libical-3.0.8.ebuild 2329 BLAKE2B 072647dac4c4201e08c647feda8eff2a57810055beae2074c3d05bd249d708d1b64609304955fa270991c154bfdd9a141aca47e00b49c74f2f4d8ebe149900d9 SHA512 6bd7a557255734399a525bb9b0f47c834fd711ec2f27368d5e6c6374dfdf13ac5804caa8656f74c1283bc07cc5a6e9a4291d78ce36ffc3f64393dce9c1d52d9a
-EBUILD libical-3.0.9.ebuild 2424 BLAKE2B 2ebb58db84d5ba8c6d676fa8f92fb71176f206bb2981bff4c2fd23873a1e02cc938e35f20206051f36472077118804a4d32200767e535658fc5ac373568ca3f2 SHA512 6909c5eb88a2e59dbbd9c2153363ad07448083b5fca78d1cce9380a9029b8a0bedcaa41cff053391681a75ed1409b583bcdd8241e34112fe129c1a55098e388a
+EBUILD libical-3.0.9.ebuild 2422 BLAKE2B 097a119eea70c4f138b7db60bb038bf1559ddc5b09ed11427eacd6c2591690bedf707d89caf962fd2265fc566ebeeea513f6ea15426f2df6fe43bb79bc03a8ee SHA512 556de64fddf6ef83cdcdcccd5c023ef15a7ad131de754e621af15e101596608a67080530567c60f5485dd6bd19e3136ee7211a96c9ed67662ac5edb90dbb2f18
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
index 27c9d5a47a41..c90785b00456 100644
--- a/dev-libs/libical/libical-3.0.9.ebuild
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 190fd018cf15..b6faf0ebd30a 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
 EBUILD libmanette-0.2.4.ebuild 848 BLAKE2B e51749eb7218a9b57c8b985ff9fffa57c1d9e030094a7e2871d31bc098166b7317c6399687d06b98a18bb2bb5aeada4b0dc5b9d687ff5b6b29c6a503043fd461 SHA512 bd51de492690d789d2b54dd8b6393c5eb29307aa0edba21f9708100ac87a7772fcd38613c515c78fcde9795669defc0bd534879148e13557e29dd748e8f7be45
-EBUILD libmanette-0.2.5.ebuild 853 BLAKE2B 41f584636080ac56d20dc2c9780f0cf6a00686b45d6d2dde2c309cf7e27c0764a0c431e46c0faf3d7ef538e3bd2f2fd08dd1241b2100f0ae4940f79fbee33e0e SHA512 103ac11b72f7a137ffa76e02101f15b17e5a9ae133cee53bf6ea524f43fa8aac0bb08c2c1b37b97b82968d5b324a2aa7fa1928abad6999f4e9192475c0127fa8
+EBUILD libmanette-0.2.5.ebuild 852 BLAKE2B 5e23446d52217af26ce1f93c38c6285e71507388e055bbad9e41c09426803e4c13d3129c0dfa45849f345f795534f8af5db678b40bc5807348b5ed6b0d0795ab SHA512 ae742520b9c6c87ab599ed5456a5a7778711c10470c4ea6efb883a428a8333f9f9b45bf35402989621987367b1d772ed4caaff66ca05dba4b8b2f60b32bc4a67
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.5.ebuild b/dev-libs/libmanette/libmanette-0.2.5.ebuild
index f87ae928b72e..537da110a670 100644
--- a/dev-libs/libmanette/libmanette-0.2.5.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 2bcb32e2180d..4b191d3175aa 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,3 @@
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5.ebuild 1039 BLAKE2B 9c4b3eacc753b18de54292f9b8a05e85a114fb3cc9976c90e745bd803e7f529fcb8060ef444d1c9b471ebca0c2201504285e15f1a23715c1b9ccdc7f890f4667 SHA512 2f49f4ddb60495f365f05251b586f0d5f199757f27e0f6acc765259211dbfda8096b6ac38059357e1a64a9cc8d7cd10d8eb12c745f7476e45a5c5848b730b211
+EBUILD libmpack-1.0.5.ebuild 1297 BLAKE2B 11b67ac37a11fbd04cb0905c255f05870a8f78ef299b0dc7857b0db5f7c1771611b94d1f99a26e4a09b8621077e8c682f0cd327cbae313b1fef2f19be6ea368a SHA512 2617b83fc36e16c5344eda64cc0bb0ffcfb2e07fdc93b277228dfd12694a32af890ed6d2aaf66b7dac88dcb4ac81cd6e33eb6794da26d295767844605ea7d755
 MISC metadata.xml 332 BLAKE2B 3e7c0cefba3436a86cd9372ce8688845a913eb01bb7b881aab9037ba97cf15a50bc0f908a70a3ed9a0043981132449bbfc8369d32243e5cca2362390714ba69b SHA512 4d22048dff22d80484cc344eb409e28c56eea3b7c1f8e43861be5560842aa165dd750126efdc059a50125232570fe08df5acf90d613cb7c1163ede670dd8568b
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild
index 4885407e7e55..6c07fbb2582f 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -30,6 +30,7 @@ src_prepare() {
 
 src_compile() {
 	local myemakeargs=(
+		"PREFIX=/usr"
 		"CC=$(tc-getCC)"
 		"config=release"
 		"LIBDIR=/usr/$(get_libdir)"
@@ -52,5 +53,10 @@ src_install() {
 
 	emake "${myemakeargs[@]}" install
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+        local file="libmpack.0.0.0.dylib"
+        install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+    fi
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
index 06819ec8ac8c..cf13b9cfd8cc 100644
--- a/dev-libs/libnest2d/Manifest
+++ b/dev-libs/libnest2d/Manifest
@@ -1,4 +1,6 @@
 AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508
+AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c07059f4b2b9d58715a799395943560ebd7a738f585f43907bd21115e3f297fe6df7f0b3b1801c5b04d7e2e16eb09aff642a26edb5b35339dc2440eb9 SHA512 1d367a09a9f0ac51347c3a3dc440eb772b877abf00acd92a9ce166ecc4a9b537dbdbbab254c3b742c20b48fc5bee58b79811504921ec15a19700d8bcacee0d4b
+AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855
 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
-EBUILD libnest2d-0.4.ebuild 886 BLAKE2B 4fa60f8279f4bdbe3291ac835035a7ea577378907cc69db305393bd04515dd935a08cbe6978ab97c184baf63e1355027e1d26a45003687e22c92cefc194a7729 SHA512 6a6687807a9382fb2bfbb59c3535f78615167104f19251514bd008332cb556181b6cfead8cfc91a5dd28fab09f51c8c391ffed3be640a36208267c5be91b39d5
-MISC metadata.xml 1336 BLAKE2B f0ec248a2a93ed26c928e087e0674b2ea6e8511761f5944bd4683db7e33c3db194053bd94d638b2157b32834037f1919095c549dc608c7819b2e9ad137bbb57d SHA512 f334cec00c1dac77b4d27b1fa7260c16e2f1bc5e510ff2a0fbcec72c8670f9a5768b50be533656083abbca8ff5c6367694b1b1e343ea6725f7fd8625b8a3012e
+EBUILD libnest2d-0.4-r1.ebuild 990 BLAKE2B e90a03cff6a4404503bf34f0e75427de49df2791079bc31f3861f1a5e08121495d92cf28873b053aa35cbf23895c20c222d79a9104a64ef88e561c1382d20564 SHA512 0e7c2be102f24169570fbabbb0ae28fc9caba371f60a85e65244dc8dc36f0355402e28848e413a2807cff3c6d27f2bb6fbb31b893c2fa73856be96cf8a2c803e
+MISC metadata.xml 1406 BLAKE2B 013e0c6f04e1ebe734d744f1d31924404c43523e73697f9897a9e3b2eed6cf7e8e82722e98eadb7e7416b9a58823c3879ae51190ff211dbad13a295eb209b170 SHA512 36b1316bead34cdf259a8de5834f9d95b6b1fd4a7b65fc979da51a0f725762c5ebe1b9300a7c7826a6dd2ce30affb4b42f10f59e7d590b31fcfa49c6e375ffe9
diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch b/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch
new file mode 100644
index 000000000000..456f543207a9
--- /dev/null
+++ b/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch
@@ -0,0 +1,21 @@
+From 12b64796aee24d5af41df3a10c4313dc713c3e74 Mon Sep 17 00:00:00 2001
+From: Karl Nilsson <karl.robert.nilsson@gmail.com>
+Date: Wed, 13 Jan 2021 21:51:34 -0500
+Subject: [PATCH] CMake: add SOVERSION to shared library
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 374e90f..c2f2bec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,6 +95,7 @@ if(NOT LIBNEST2D_HEADER_ONLY)
+     add_library(${LIBNAME} ${PROJECT_SOURCE_DIR}/src/libnest2d.cpp)
+     set_target_properties(${LIBNAME} PROPERTIES PREFIX "")
+     set_target_properties(${LIBNAME} PROPERTIES DEBUG_POSTFIX "d")
++    set_target_properties(${LIBNAME} PROPERTIES SOVERSION "1.0")
+     target_link_libraries(${LIBNAME} PUBLIC libnest2d_headeronly)
+     target_compile_definitions(${LIBNAME} PUBLIC LIBNEST2D_STATIC)
+     target_sources(${LIBNAME} PRIVATE ${LIBNEST2D_SRCFILES})
diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch b/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch
new file mode 100644
index 000000000000..4032618fb538
--- /dev/null
+++ b/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+
+ project(Libnest2D)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED)
+
+ # Add our own cmake module path.
diff --git a/dev-libs/libnest2d/libnest2d-0.4.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
index c9896b772210..721bfa9f47c3 100644
--- a/dev-libs/libnest2d/libnest2d-0.4.ebuild
+++ b/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/tamasmeszaros/libnest2d"
 SRC_URI="https://github.com/tamasmeszaros/libnest2d/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="examples static-libs test"
@@ -26,7 +26,11 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-cpp/catch-2.9.1 )
 	"
 
-PATCHES=( "${FILESDIR}"/${P}-add-disallowed-areas.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-add-disallowed-areas.patch
+	"${FILESDIR}"/${P}-add-soversion-to-shared-library.patch
+	"${FILESDIR}"/${P}-fix-cpp-version.patch
+	)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libnest2d/metadata.xml b/dev-libs/libnest2d/metadata.xml
index 6690b27e3325..5b40bbe2f999 100644
--- a/dev-libs/libnest2d/metadata.xml
+++ b/dev-libs/libnest2d/metadata.xml
@@ -5,6 +5,9 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
+	<slots>
+		<subslots>soname major version number</subslots>
+	</slots>
 	<longdescription>
 		Libnest2D is a library and framework for the 2D bin packaging problem. Inspired from the SVGNest Javascript
 		library the project is built from scratch in C++11. The library is written with a policy that it should be
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index d2972bc72cb3..d92f7b444774 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,8 +1,5 @@
-AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
-DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e1f41051279c15033fecd5f33d7381e9be8403f2e639c007ca6aca1d53cf651e057c9842350772c2296b92c436 SHA512 b7767088701e22a2eba072c365d379987c6e9b2403888550068d6f62f48eaee7935e5355fa6ec97ac7a79bb847c833552250c0bd3065f9274b209585a7884f1d
+AUX libofx-0.10.1-docdir.patch 1192 BLAKE2B 0fde1254701b6022970346600f1dbdec14c9024e72f6d8012c64e5e81e24af469ed5933a16d4702b68e4f0f2e7bb4afc8ae8a7a730ebb3fd6af52e4f06e0884c SHA512 953cdc7e38fe7ce563eac06087f114294abde65cd8fb93c25d3fcdad8cb6d0a49a3ab1818558eb3ca58617f868b2eff146ad8f55fa38774dd675476e19983e9f
+AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a80470c5b2fcde2c2c2ffaaeb75901e1391e79c617270af5b22942d067d43bb9522e78faeadca300e7a59c2f9f5a4e58332a SHA512 f5bb1ba87e68213e609c50f96635e7bf1de009a8e6720586fa62ad19f68776f9b8871a7782ff439f310ea31dc8010c5a4bce4b78398b980c11a6f8b6a81ebf27
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
-DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
-EBUILD libofx-0.10.0.ebuild 1140 BLAKE2B 9afd641e07b3f052c83296611ecdebcb335c20e1fa7b0dcccbb6d9129bb154caeacdbc3858b6224a454c668d4034a431ddadc2d28076bd7e50536731262a9904 SHA512 dccb49c1e6b018c086cee1bf22f1b6a791bb6208fc65987eb141e9c9e563f6a24db3c7b915c760f924ecbc2f1c56c23f10fd827f210e7d25c95cf0b411adca5d
-EBUILD libofx-0.10.1-r1.ebuild 1156 BLAKE2B 0d79282546b28500d40840514f973adbe56bd3f0b3e16318b74815a9331dfeeb1a3b74ef0763c9736cf4ff9a1a9f2d7c0c5e0907f8ace237512259d2d686323a SHA512 a0f1eb2b8878266d962a01d3650f8e5f9274b18c242f615a8fdf9a1aaf5c81e43dafd8af0dd2fe4fe8c64168273aa88911feb93191bf0acda9b87a8c9272f572
-EBUILD libofx-0.9.15.ebuild 1037 BLAKE2B e8dfb36676b66ea17433f2a5320c74946f42def29eb972668dc388b58f4b25bcd410e57efcbf61b7a860a35d652ece28f955ec41a38f5dc41538b1623f03189f SHA512 9c18d1650b0c2ff2cc822dae6de12d64d2315cf489669df5c8cce8547eacc61ab700a1d530fa81dc3e900dcef90fb3277deba661873b7e4170d2c8fa082870e9
-MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
+EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
+MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
new file mode 100644
index 000000000000..a43fdffd523f
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
@@ -0,0 +1,40 @@
+https://github.com/libofx/libofx/commit/ee296908c23a944b9b034c9b1f8b974edcb44b80
+
+From ee296908c23a944b9b034c9b1f8b974edcb44b80 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 06:09:11 +0000
+Subject: [PATCH] Makefile.am, doc/Makefile.am: don't override docdir
+
+'docdir' is already provided by autotools. By not overriding it,
+we allow the directory to be easily overriden at build time.
+
+By default, docdir is /usr/share/doc/libofx, so no change!
+
+e.g. In Gentoo, we prefer to use --docdir=/usr/share/doc/${PF}
+where ${PF} represents the upstream version combined with any
+internal distribution changes made.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,8 +6,6 @@ endif
+ DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
+ SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+ 
+-docdir = $(datadir)/doc/libofx
+-
+ doc_DATA = \
+   AUTHORS \
+   COPYING \
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 23e9d34..bd0a04d 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,5 @@
+ SUBDIRS =
+ 
+-docdir = ${prefix}/share/doc/libofx
+-
+ EXTRA_DIST = \
+ 	doxygen.cfg \
+ 	ofx_sample_files \
diff --git a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
new file mode 100644
index 000000000000..036c6864bed9
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
@@ -0,0 +1,34 @@
+https://github.com/libofx/libofx/commit/a647c1db417459bded7fb47af69dff375eae83c1
+
+From a647c1db417459bded7fb47af69dff375eae83c1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 05:57:49 +0000
+Subject: [PATCH] configure.ac: Respect --libdir for OpenSP
+
+When searching for OpenSP, we want to use
+the libdir passed in to autotools (--libdir)
+to ensure that we find the library
+for the correct ABI.
+
+It is possible that we pick up the wrong
+copy from e.g. /usr/lib/ where a 32-bit
+copy of OpenSP exists
+when we're in the middle of a 64-bit build.
+
+Use ${libdir} to ensure we respect
+any preferences/information given and
+search for OpenSP in the right place.
+
+Bug: https://bugs.gentoo.org/693458
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,7 +112,7 @@ AC_ARG_WITH(opensp-libs,
+ [  --with-opensp-libs=PATH         specify where to look for libosp
+                                   - default is /usr/lib],
+ 			OPENSPLIBPATH="$with_opensp_libs",
+-			OPENSPLIBPATH="/usr/lib")
++			OPENSPLIBPATH="${libdir}")
+ 
+ 			echo $OPENSPLIBPATH
+ for d in /usr/include/OpenSP /usr/local/include/OpenSP /usr/include/sp/generic /usr/local/include/sp/generic; do
diff --git a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch b/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
deleted file mode 100644
index 6b8cc215eadb..000000000000
--- a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am	2019-09-30 22:33:58.000000000 +0200
-+++ b/Makefile.am	2019-10-12 22:46:00.915146241 +0200
-@@ -4,18 +4,7 @@
-   MAYBE_OFXCONNECT = ofxconnect
- endif
- DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
--SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
--
--docdir = $(datadir)/doc/libofx
--
--doc_DATA = \
--  AUTHORS \
--  COPYING \
--  INSTALL \
--  NEWS \
--  README \
--  ChangeLog \
--  totest.txt
-+SUBDIRS = m4 inc dtd lib . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
- 
- EXTRA_DIST = \
-   libofx.spec.in \
diff --git a/dev-libs/libofx/libofx-0.10.0.ebuild b/dev-libs/libofx/libofx-0.10.0.ebuild
deleted file mode 100644
index 72d72da9a57b..000000000000
--- a/dev-libs/libofx/libofx-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-RDEPEND="
-	>app-text/opensp-1.5
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# Not included in the tarball
-	sed -i -e '/INSTALL/d' Makefile.am || die
-	# Use correct location for docs
-	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
-
-	eautoreconf
-	append-cxxflags -std=c++14 # bug #566456
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -type f -delete || die
-	fi
-}
diff --git a/dev-libs/libofx/libofx-0.10.1-r1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
index 0db669fdea8e..e2f99a67303d 100644
--- a/dev-libs/libofx/libofx-0.10.1-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/10"
 KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/gengetopt
 	sys-apps/help2man
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 	test? ( app-crypt/gnupg )
 "
 RDEPEND="
@@ -30,13 +31,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-opensp-libdir.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
+
 src_prepare() {
 	default
 
 	# Not included in the tarball
 	sed -i -e '/INSTALL/d' Makefile.am || die
-	# Use correct location for docs
-	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
 
 	# bug #566456
 	append-cxxflags -std=c++14
@@ -45,11 +49,17 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static
+	econf \
+		$(use_enable doc html-docs) \
+		--disable-static
 }
 
 src_compile() {
 	emake -j1
+
+	if use doc ; then
+		emake doc
+	fi
 }
 
 src_install() {
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
deleted file mode 100644
index 81c4ebbb55b0..000000000000
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-RDEPEND="
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	>app-text/opensp-1.5
-"
-
-PATCHES=( "${FILESDIR}/${P}-docdir-nothanks.patch" )
-
-# workaround needed for ofxconnect to compile
-MAKEOPTS="-j1"
-
-src_prepare() {
-	default
-	eautoreconf
-	append-cxxflags -std=c++14 # bug #566456
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-	if ! use static-libs; then
-		find "${D}" -name '*.a' -type f -delete || die
-	fi
-}
diff --git a/dev-libs/libofx/metadata.xml b/dev-libs/libofx/metadata.xml
index 78afc83cfd53..a635fdae3fd9 100644
--- a/dev-libs/libofx/metadata.xml
+++ b/dev-libs/libofx/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="github">libofx/libofx</remote-id>
 		<remote-id type="sourceforge">libofx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 2c359aceb6f7..4b4f5248c829 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -4,6 +4,6 @@ DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c16
 DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374
 EBUILD libpeas-1.26.0-r100.ebuild 1956 BLAKE2B bd378be55d13ca21fde9f6fa2f8c07f9a663d74d79557fba54c3a91a0403637de3f2cd9cc3b1f5b5e93547ef53ba372e39e3ca554e800d5be81720b9fcb26042 SHA512 c6916121ae64171904763a553584b35630c4b6ef3df12ee2343c6baf7080aff8c963822b4e50d5ae223b42b4f12ec743c21ba6eb7c5709fe75a4d40121c32688
 EBUILD libpeas-1.26.0.ebuild 1828 BLAKE2B a052f862f6df977647fae388d086f4a58e62ee8aa959a59a8f04955f5179ef88e50a438d2ad524abf64aaad1d2cac098e3f24b11a7ccad03dda117d444dfc8df SHA512 a60c7fe2b57869f6ffb09c3656843a6107c61c99d73c3e2150b5a2dedeea6b5527bc068fde600a346fc45899c7b014c27beb7c0ff7d5e512f9fcc3e80945c343
-EBUILD libpeas-1.28.0-r100.ebuild 2042 BLAKE2B c71e4360eae00c5072cc949b7d63cbaf45f90c3e43eb669546c5b7262942a593a8d3313ae88201da7e6a3986a940658283c453c9b4644d26a4936a25a6b467c4 SHA512 6b8a32da7aae7d842c04c9be046f42b9336501cf5e36267a8567582c6050a4a65d98d83b1f6b2a4f25133d880f6f9a5f1405228ce822d816980dae92fc7e3cf4
+EBUILD libpeas-1.28.0-r100.ebuild 2041 BLAKE2B 6a213c0d7428aca879da294e886f953afefbb29e46956f0e71f3d39f10858bb669665c007ee2760a6963ea7976bb0623d51e810b1829a92a0db0754bf53afeee SHA512 2796b1f8a6048f9ad98be9353a13d608dfb5376359a8ef41a62227a50452ec608e5fbd8a2674b547c619af0be53031410e7687876c610a48418a1399463dfbd9
 EBUILD libpeas-1.28.0.ebuild 1914 BLAKE2B 53b96b1de5fb90616095e8554161765267962b185cd0e2b435025a92bf3e8f1239455f5e3f4bd565f7060aa78c6fee63523d26fe0fa7f97cd496627ebf8efba6 SHA512 0308757a0f445917886290b6ef5ddc451439510b9656f8b07f48c42b65f3a06c1d11c33f77a13614bbb2b3858a4ec425012f076cc73f31edf6c7f27ab9a1f3ea
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
index 66b19a88117b..4e8105de81ec 100644
--- a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
+++ b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 5b9a1129930f..42e76c0e4c5c 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -6,6 +6,6 @@ AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc2
 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
 EBUILD libprelude-5.1.1.ebuild 2004 BLAKE2B 5d509f1c326000fcd93d19f603f1413601a350543b203c06d4c6188f3abd20210f10f40760e0eb6479160b6f845a8f2a3a480f3b659750bea9d2bb7acd0667d3 SHA512 af10845ad1ffad15ccf1b8812f9b16f417350f1900004b3de9aea2f43ae7353cd3e5eef7db022fa31bf7475e69b220f0c96df5bb45c6e715d5e3d2809c56a1fb
-EBUILD libprelude-5.2.0-r10.ebuild 2062 BLAKE2B 939d69e0133ff805adcbb157384857c24ddfadeb604db308957fda3861a8215eaa6ae5e0036a848c784dd5fa4e439d5ee3747d804f03d60e1af90b70c356c0da SHA512 c323af7bc3a54734271f84a74c36d780ed44f58921c5012d2629bf7ef3d5aacf74832fc966687dcd514864fad971f1a4ab4d5f13851522f1f193534b08fe2f17
+EBUILD libprelude-5.2.0-r10.ebuild 2090 BLAKE2B 518d8b28c5fb2056510ba3f9c23046821ae6fac9883a5c9f10ae8484c12234a2639a28233b49ec98b36d239834dddd8f895df6cb45d46b65aa5ee91a88f18261 SHA512 b024355425efcb4a2a4746324de6d3bdc1087d03aa775281c8177bdf8c2c56bdf76647df7088cc5d2ff4c56a07e1bb336109117499089034b86aecfa3464929a
 EBUILD libprelude-5.2.0.ebuild 1949 BLAKE2B cc71788080540f3fae57b93c389f9230688360a0a897c13cd58702284174e5a1338f3d12f10935d3e48d1eef17baa5ca634d5028b3863436059ce4960c2f9f58 SHA512 e661a3cb6b158241288426b50995be8be9283fda0997d31d1551f9b8eb70e303e9ff525cafd620f47cce3f198f3a8613831c9f236bd4cdc90930838124bf8d91
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
index 55be63b9ce34..f73c8917ffb8 100644
--- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 USE_RUBY="ruby25 ruby26 ruby27"
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 LUA_COMPAT=( lua5-{1..3} )
 
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index a9a06ede23ce..461dd5ebe8ce 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -5,5 +5,5 @@ DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b
 DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
 EBUILD libpreludedb-5.1.0.ebuild 1875 BLAKE2B 5fba769391866fc42ecf439deaede6dcdb2bb51c022bb56cc8c0bc10230cd7b7bd347ab078e63b2be17ffeedfac3dae2318043f2751e7568bae843f476ebf0bb SHA512 511e3fd42cf9157ef63dac60238550d0d7573c00450efe3b2acd3f90c556151ffb05f2e231b2f4a4f74e14064e0a5b05fb5202955244ce83d77ff4a67ec5e608
-EBUILD libpreludedb-5.2.0.ebuild 1874 BLAKE2B 2390e84d7450dc2e2870740b81ef37c3b08d68d8322d745bc43a5f0fc26107744c81d5ee736c1c9324179cdadc6fd826dd8a9dd49b983b9bace93a52130a5fd2 SHA512 d6963381df5114a65f3b7c3d9ab6d5557243b676c6b9da2b7593c1ee3f9bbd16a29e58f5fcffab52966a6c486e86d11585ea156a5974f5af45255a46a6c0c6c5
+EBUILD libpreludedb-5.2.0.ebuild 1902 BLAKE2B 70abf2f4c1a002049b36aa37e173d813679fe875eb3ae127c6e1d69bd2bf17a719f29c6700d9d4615fbd93939817b7a340ddf5e8b6869d26ded6b92a4073746b SHA512 ef0089648810af994210043f51c197a82323bde7d940b95de29140674755a0470308cc2f7a54b10ee7ca1975d77d0c7d13936bc0e90f03903872293f5563755c
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
index 1227cd441ea2..10cbdec64d1c 100644
--- a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit autotools distutils-r1
 
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index d78904350d82..f1f712443fa7 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 EBUILD libpwquality-1.4.2.ebuild 2022 BLAKE2B f6575f0a1b098d95c54920ed9ab83439cdcb03b3ac98ef070e2b6ea30711b5d14e4438960aca5ddbd7cb04d3185e48ff2424dd29b6e2c65eb8fe07229f814c94 SHA512 80134ec60d0241443c655d10a529e861138df9ac00d4d00511eec0967296bfd2caca7af916c10e140139f7f4b0a628d0083ad5266ba8c554d0ca873c821b4571
-EBUILD libpwquality-1.4.4.ebuild 2030 BLAKE2B c44f70cd02d0e4dd2ebb0e1b1b3a21d13fdf7938edaf4646aa998a653eaf7f4f2a52aa81a6369020d566d2a5642d5386d50e623b230cb8b85bca6a2ae12d879b SHA512 1300945c39fc03cfbb132f9d24b3d604f945f501a3a1b6f585ea6c3a7b5e0f9996a0c4196603f68e6ec340defcf49a9bd491a093f6a6bcca43990ca6d7edce89
+EBUILD libpwquality-1.4.4.ebuild 2029 BLAKE2B 7911d2ec62e62d3d8b7ecd7f80c72cf8a6b58caee5bbffedd3337c8e1b0154b6a89c6b4b9d8241008b4061b127541da998a277ba85e1fb2c7a4758aec93e1bd3 SHA512 85ebaf35cbcee6d765afbdee263b3cebb16083b3da845b1f01ed555671e19d4bf5c4cda49c02a3ea499534414e777d4cfb7b91050862de191b2297bf0b326be0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
index 69440c29a537..a5e696de2b52 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 94a33d0ab406..a069e6fb29c2 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -7,6 +7,6 @@ DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f3
 EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
 EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
 EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
-EBUILD libsigc++-2.10.6.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
+EBUILD libsigc++-2.10.6.ebuild 1383 BLAKE2B 2dbc16478c8ce5614f753fd7d9ff46d7bc0d40c8c2c46ca6694f60af39b5eeb080372716dc10f4e26983c2aa493f740bbd5efab33c38d22b1628ec9b20bd1873 SHA512 c036bf96d3cdad1a08254b48dbb6e8dfafd3f9ae97867e1fbc34c15b8c0716b031a1c64c5af6a3bd5b212014c88b2f9ca81c85a59e1144391967e73f58e143ac
 EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
index 444e6596071e..151633b2c823 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
new file mode 100644
index 000000000000..48599da8111d
--- /dev/null
+++ b/dev-libs/libthreadar/Manifest
@@ -0,0 +1,3 @@
+DIST libthreadar-1.3.0.tar.gz 440695 BLAKE2B f4f08d27f6be640e44c9a3abb564c2f1b8faf5b10ec26931a77d6de9769b456e577902c8de378d6fc420e930f20a59081e6916e2b4aeb4f083e70a1565570112 SHA512 54257ebefa0473f78510a5add0241f1282e1f135037edeecc76edd0982b6cc279592ae86e1df263327e1e090b7905ab65847ccdc2afdd366c7bac5c3097abd9e
+EBUILD libthreadar-1.3.0.ebuild 933 BLAKE2B 95747b8fd659c15230863063b8a8eff254eca0f09297afcc1b231a6d033ef560f41fde2061f0cd129d0da40bf2830fbe7a89e71e48f1b39cb63757e1257abf64 SHA512 52edd7e75eb9a84a37fce263ac390cf245670ee017b0a69104fc5cf7e8d7e81a816587454556cc074073aaf257c8dcf3c619d8b6dd812108f2312f7fa8cf724f
+MISC metadata.xml 859 BLAKE2B be25bf21b05ec44dc5ba2c6cdfd33e942485a7cdc1a0378040130a9a0b4c1c60fe4876be144cb7185bd349c67e51157c0e740012346fa7bc908a4fa53db87889 SHA512 da0e98e9da10ec81ef56d26ac77f4e358acabb6931b7b09e146240f4a77dc4cc19cde62a200d81c491895cec674f71ec13ce96cb55331178198ad59f4e297ade
diff --git a/dev-libs/libthreadar/libthreadar-1.3.0.ebuild b/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
new file mode 100644
index 000000000000..a3caae2728ef
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+	# Copy this comment from app-backup/dar as it applies here too
+	#
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+
+	local myconf=( --disable-static )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libthreadar/metadata.xml b/dev-libs/libthreadar/metadata.xml
new file mode 100644
index 000000000000..ff22d4ec0241
--- /dev/null
+++ b/dev-libs/libthreadar/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+Libthreadar is a C++ library providing an abstracted set of C++ *classes* to manipulate threads in a very simple and efficient way from your C++ code.
+It also handles exceptions thrown from a thread and propagated to another one, when the latter is calling the thread::join() method. This lets one manage exceptions as simply as it is in C++ single threaded context.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">libthreadar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 51120026417d..4dba74baa762 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
-AUX libtpms-0.7.3-Remove-WError.patch 479 BLAKE2B b0cf706227212f8cdf15b41ae516cb436ae21248454251121778c785a09ff98ac844ddabd5bbf4426020c7f5925c5cc1d3913af4dcc37f0d0c6beb136ff28a84 SHA512 b69c13d8c30fce436cecc091bc1bf201ed0ca049fd1f4a48af24b9cad7e7fdf8f7eff951c941ab0e93a94783e680ba3c7ab139e7283297d325ee016984787534
-DIST libtpms-0.7.4.tar.gz 1212986 BLAKE2B ff34a9c35167a251eb8ba222255f6be316503d67dde7fba46b6cbc32a1f4eb5ff5a2bb5f0c21963b8d879481f6f4b09646e8e0c5fcddb12cb73309c47505070f SHA512 5a396a7e8273bed1159b0c48d2bf9f02550fed06656240e336778587b7fbe53859dab8f2ba479683e02fedfde4260a9083641be161aec0cb38a605399300997a
-EBUILD libtpms-0.7.4.ebuild 742 BLAKE2B 8dbd305866a715b3191cb61db3e9e16a335f89a2d9c5f1c55e11d56cb41818d95c730598c3dd66113321b807e9bc5a1b2bcd9093f139ae1f13aaf5ca455775da SHA512 efebeca4aa086bf63dce3a493959a66326b5be2053a3914c8f914595385f046991c6d23413fa7a3f3ca7aef7849f58bbaa2d53cad258de0ad930d8b50b87d28e
+AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
+DIST libtpms-0.8.2.tar.gz 1253915 BLAKE2B 48281512f2611376f0f3a67a2646fdc406c2d28bfd560a07b23c122a1b4d68c2840c5cd23f41beae4a13eab419e722aed821cecd919ae6219da325724d55e3b3 SHA512 635f1b30265f1752602caefa1fa87f0032e4d38f1b7113137b7e25a85da10e34f89f9d928b960660e9451306807f111ed96c2a11cbb2de4fb4beb7e638f83727
+EBUILD libtpms-0.8.2.ebuild 1253 BLAKE2B df095e423e0020bd75c7507eb49802b077747ee619ff001664905f70f41540fdf93fb485c2cc4095ef77ae5253423bcb07913ce7b4332d2360fef35d29abb305 SHA512 96b9caf1d2c761f93a98926a16edd6be5ec828d4c45142bb1c9bf3de878203af9ef9e952edf405b9864c3ec2f4e041b7e8351ac9875760e7fa5758dc4009a69b
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.8.0-Remove-WError.patch
index fe17f898f5e6..05988734f59a 100644
--- a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
+++ b/dev-libs/libtpms/files/libtpms-0.8.0-Remove-WError.patch
@@ -1,13 +1,13 @@
 diff --git a/configure.ac b/configure.ac
-index 1bb45d1..147aa84 100644
+index 40d2c7f..809f8e0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -283,7 +283,7 @@ if test "x$enable_hardening" != "xno"; then
+@@ -304,7 +304,7 @@ if test "x$enable_hardening" != "xno"; then
  	AC_SUBST([HARDENING_LDFLAGS])
  fi
  
 -CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
 +CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign"
+ CFLAGS="$CFLAGS -Wmissing-prototypes"
  LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
  
- AC_CONFIG_FILES(Makefile                   \
diff --git a/dev-libs/libtpms/libtpms-0.7.4.ebuild b/dev-libs/libtpms/libtpms-0.8.2.ebuild
index e11a466ade7a..49098b44476e 100644
--- a/dev-libs/libtpms/libtpms-0.7.4.ebuild
+++ b/dev-libs/libtpms/libtpms-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= )
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.3-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.8.0-Remove-WError.patch"
 )
 
 src_prepare() {
@@ -37,3 +37,12 @@ src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+pkg_postinst() {
+	elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
+	elog "keys due to a flawed key creation algorithm. Because fixing this would render"
+	elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
+	elog "TPM state file must be deleted and a new TPM state file created. Data still"
+	elog "sealed using the old state file will be permanently inaccessible. For the"
+	elog "details see https://github.com/stefanberger/libtpms/issues/183"
+}
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index e6837bea32f7..a108be94dd75 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,5 +1,6 @@
+AUX libtsm-4.0.1-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
 DIST libtsm-3.tar.xz 293264 BLAKE2B 51044f5e7be2269e1b3f40b04aa486f30a3a496d57d3aa64f25b148edb04d8e039dafbe0df32d0557f4c3a21da52bb53be146fe57d84d4e8201289c3bd347d95 SHA512 119834fd6a84489cc7904bf01905c29004901ddf73d6dc4a1f47f6b402ad76f65cb4226eaa718a73dc06694b1524647eff6046894fd9526a8588eed97f6f68b6
 DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
 EBUILD libtsm-3.ebuild 356 BLAKE2B 1c9e1a0808e2dbc01543b0258d1331be845381860775515add11a7b9def7da590ec0e96e2b1e44abdd49c1f722b4a1a239fae6366ba688ed766344fbaa615226 SHA512 b1f5eec9d9b0fcf1eb9e090b700e41d462db9f28ec7d005b22aed699ce1f494b09664b9223d715f4a571f401002337f700d041a529bd8c0b27ca04b48c790f38
-EBUILD libtsm-4.0.1.ebuild 390 BLAKE2B 75ab14ad474fd98720ac271556c0b993eed4852fb98d075798267597ad02ab4fa45f400a0748fa171af2b0805775917ef77736cbd6e39a481d87873fa8d73835 SHA512 f23fb108308c8656229b4391be99da98ece807679d743e8815f6e00806deb9646e610b2a3bd131c0bcdbcb6d112d64b631261ea66ce36136d5c6888bc5cb2b4d
+EBUILD libtsm-4.0.1.ebuild 403 BLAKE2B 1ff0cda94f29dfaab48a2bffc79a0188375676747d49d3a8871ab84ba19b9cb059ad87130f3f83b96033d4b79b551235caab02c29a7700ec8f87e03b3a0493ab SHA512 41201a25eb3c90000c04fa18a981efbfe983eb5eaaf90544533f04642acbfa67d93264f71df563ff07612a0bec9841aa69f9fcd116df2c9a07e6089731a6f19f
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch b/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch
new file mode 100644
index 000000000000..eae34cf1aca8
--- /dev/null
+++ b/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2018-10-09 19:40:23.000000000 +0200
++++ b/CMakeLists.txt	2021-03-06 17:37:02.596380373 +0100
+@@ -24,12 +24,6 @@
+ # For feature_summary
+ include(FeatureSummary)
+ 
+-# Extra build types
+-if(NOT CMAKE_BUILD_TYPE)
+-    set(CMAKE_BUILD_TYPE "Debug")
+-endif()
+-include(cmake/BuildTypes.cmake)
+-
+ #---------------------------------------------------------------------------------------
+ # Options
+ #---------------------------------------------------------------------------------------
diff --git a/dev-libs/libtsm/libtsm-4.0.1.ebuild b/dev-libs/libtsm/libtsm-4.0.1.ebuild
index f8bc7744f35c..29e150fe9c61 100644
--- a/dev-libs/libtsm/libtsm-4.0.1.ebuild
+++ b/dev-libs/libtsm/libtsm-4.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_BUILD_TYPE=Release
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Terminal Emulator State Machine"
 HOMEPAGE="https://github.com/Aetf/libtsm"
@@ -14,3 +13,5 @@ LICENSE="LGPL-2.1 MIT"
 SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 93ba6039724f..2c6436a74a70 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1560 BLAKE2B 41e93a872d142af410d831ea2339c31179513bd9981cff006aa6d94b589e32daa5cb14a1282e97a8cf301857370a769d81b0b32849b29539854b618a32688267 SHA512 eb2ca8b4e7124c92bf63752b93cd6c5f7bc0ee0a619e06ec9ff553c8ba70a74219481e1ea7916ee835c99719c3cb97f5948862e674e8454f8036cd1e35e8f2f8
+EBUILD libunique-1.1.6-r2.ebuild 1559 BLAKE2B b53cc310817aa004f7ed60f488e10ee621b03e9c14a77af44dfad1041658d73c2ef802f84786d2348aceef4ac1b80a8085520b568ec98387406ea233b444b2fb SHA512 2137812945ddd9c67fdf5e281cfc7756c5a46f14dfe14e47465a34af8f341ab0a0d212cee4baa25430a3b9c441ae7d06733954dcd2f32c8123e81875ed1f621e
 EBUILD libunique-3.0.2-r1.ebuild 1126 BLAKE2B e537f6b3431874fd7cf723475e4b7c3a7c663ce7da237754ea927d748169108b1e8a53995851043ea5a2b56bc20ad4994215625e37d47cf72447195615a10143 SHA512 f473f2224840225500e99900541eb86008788a077f098a69bdb1e84318a8bcca11c65e2790887ea22d14b721b56a1f0a850197f75a751588a625326b9ac8c302
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index 121e79cb33cb..f68458bd2c1f 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 15cd827bfc98..2c7937748749 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -9,5 +9,5 @@ DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6
 EBUILD libutf8proc-2.2.0_p1-r1.ebuild 763 BLAKE2B 099b8bc2f67ac32c5c4df88ac68c641b1fc51185b4e13df6c38ad32a4fc9fd23c850affcb64143d93bf6caa589a8d4aa7ee1ce0b77cd899a4b9ca4335369d75a SHA512 f26ef903568f966e6e28021f38376a3588d43f7103695d5b2c1eff1602e55a14954c0a4ebfa404e3e4fc3066c4ac69ce81e6aca81ff6e180174c22675f545f41
 EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
-EBUILD libutf8proc-2.6.1.ebuild 1350 BLAKE2B d411ecb5af1fb6ef10e845b2e57e5846170f2ccdffe46632d2769a8ff65381f0873b77cc84a0b61dbd5f4cb18339328c4281f16be60ecef2f44c3e8f8858ed00 SHA512 d781e74cdca494921035c552e49531e71ab378f6846fd977fee2a71a75f3e6e01fb0355647ed79de211e9fc6d10cad0ab1d669e0d809eb32c09b65807b21986c
+EBUILD libutf8proc-2.6.1.ebuild 1421 BLAKE2B 2181d7b0fb6e532bf5699d855c4c6d7035c352c3110a8498dc64e0655e28b577c8d5c8e7b4a5cc6c501685b80ae6255b40d7c491e585032287a6d177785859ad SHA512 dff03a28363082c6b2b1441ef4bfa6bb1f86b97aabd68d40378e4ced3cfd6dab87684e4f42bf23218829b71321d286f8b4278cbd5bb2ca24ad8861ffead572dd
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
index c3a247d61225..aaaea94a9ffa 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,9 @@ src_prepare() {
 src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)"
+		CC="$(tc-getCC)" \
+		prefix="/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 2a4900eebf14..e990a5c50fea 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,8 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
+DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
+DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
 DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
+EBUILD libvoikko-4.3.1.ebuild 1246 BLAKE2B 48e3376a16b900f9313aebac627bb2c94a34841cbc9c8c86b73d4346e9b8677e277c4c1b248365644ef93f4d9075821ac5d497f908d3299ccda8bffa46187cff SHA512 6e0fb734888ca763517f376886ffc255d6b4813c66c8dd4037d97e890153a296c8fbf684aa99be98d68945f7e2d37f685e25f913f9aaa795149f03712c25a444
 EBUILD libvoikko-4.3.ebuild 1235 BLAKE2B 3887dfa49f9c0bc1d62a52e4c38dcee8b64131538f3687ca6722036de2cfaa4233507a3a36f375660ac7693fd8760f3c354584002412b90987ad1eca3a3e1de4 SHA512 112c5a28dad525cda883157251dfe3bead401c834ac49c7ef7ced715d585432f8896bfc544654d01e17ea55fa7de34d00ad13ab994e2778e5fc6f4f9da58ea95
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
new file mode 100644
index 000000000000..51d52df53811
--- /dev/null
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-r1 verify-sig
+
+DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+expvfst +hfst verify-sig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	hfst? ( >=dev-util/hfstospell-0.5.0 )"
+RDEPEND="${DEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
+
+PATCHES=( "${FILESDIR}"/libvoikko-4.3-disable-wall-werror.patch )
+
+src_configure() {
+	local myconf=(
+		--prefix=/usr
+		--with-dictionary-path=/usr/share/voikko
+		$(use_enable expvfst)
+	)
+
+	if ! use hfst ; then
+		myconf+=( --disable-hfst )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	python_setup
+	default
+
+	python_foreach_impl python_domodule python/libvoikko.py
+
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 577848fa4c58..7ac395e52bc7 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,5 +1,6 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
 AUX libxml2-2.9.10-remove-TRUE.patch 942 BLAKE2B bd5272551189d21162366318b211965aca2da947e5bbadaa8a487821369c3f552005de243c4b110392908277144317bd64c86d8641b972cbdb338d7eaf93dd08 SHA512 6abc43b95baa5540c78435654f391858c8e72667afdf00c993907510204441aee4367d1d8a038961e65e9d4d25ac8d0c4f5b7a2ee8d8357737dce5b643898502
+AUX libxml2-2.9.10-xmllint-utf8.patch 1082 BLAKE2B 166f408a9c8bd01a000362845beb77b3bff1736f4d13296330d074a9e3fedb242381cdd63363500632dc8b21ff3c8a9800f6e9ee9c476b36355d7307979d2bb3 SHA512 99f6b54898f12c42579c868fe963f8ad164d81c0f3f4f20800a2b809423b46f11d792794354d3ac77e3b545f15f1cc2a5163a940288e40a6ac0292f7a7467b72
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
 AUX libxml2-2.9.8-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba02468c01b9b87fe21dc6e2488d56f599573bc442f78386f64477a89c3332cd25f9b5ef3b4fedc47b51915c727a1b8eba06e7776d SHA512 a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7
@@ -9,4 +10,5 @@ DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01
 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-r4.ebuild 6409 BLAKE2B 82a43ea7f6ffcf9e648c711db4beec9c6b82ab825fe0f676484fff6529bc00ed948758130919877ac01d12f16ba074f1036e940167e125069183726097ad4d50 SHA512 fea86142743f481018290de2282a06d1a7abe6a838ff745b563a01563db4c0272ae837e562c98ffaed6ba2ecac98f3569016ace7639d6b07194232c900ba0390
+EBUILD libxml2-2.9.10-r5.ebuild 6660 BLAKE2B dfe1ec621c431e4e1bdb28c833c0e701ebefce8b40f51465ce674d0279bd84b82abe38a83d268311aa6c6aec76ecb6bb8942be71b70661ca8db95781b120b0e2 SHA512 d55888cbbc77eac044e358689905845f533e3986a7f9fb46ed0025ee8c006ae389a44065122ecbc45a6a7edab2301d98e40b2cf8ad0ada262e53c0d8bb40bff0
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch
new file mode 100644
index 000000000000..179f3a8c3847
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/749849
+
+From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Fri, 7 Aug 2020 21:54:27 +0200
+Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
+
+Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
+array access.
+
+Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
+the report.
+
+Fixes #178.
+---
+ xmllint.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/xmllint.c b/xmllint.c
+index f6a8e463..c647486f 100644
+--- a/xmllint.c
++++ b/xmllint.c
+@@ -528,6 +528,12 @@ static void
+ xmlHTMLEncodeSend(void) {
+     char *result;
+ 
++    /*
++     * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might
++     * end with a truncated UTF-8 sequence. This is a hack to at least avoid
++     * an out-of-bounds read.
++     */
++    memset(&buffer[sizeof(buffer)-4], 0, 4);
+     result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
+     if (result) {
+ 	xmlGenericError(xmlGenericErrorContext, "%s", result);
+-- 
+GitLab
+
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
new file mode 100644
index 000000000000..374ad6c9ad91
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools libtool flag-o-matic python-r1 prefix multilib-minimal
+
+# Note: Please bump in sync with dev-libs/libxslt
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+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 ~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 )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	unpack ${P}-r1-patchset.tar.xz
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
+	eapply "${WORKDIR}"/patches
+
+	# Patches needed for prefix support
+	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eapply "${FILESDIR}"/${P}-remove-TRUE.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# bug #749849
+	eapply "${FILESDIR}"/${PN}-2.9.10-xmllint-utf8.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	# elibtoolize
+	# If we don't eautoreconf, we need this instead
+	# epunt_cxx
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 2f01690456ad..07668a1a999c 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,3 +1,3 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.34-r1.ebuild 1573 BLAKE2B 0d27be776fbeaad5abf68c7da1afc2f1754b9045f0c4e809e0ba1f2c8f465fba8501675eb47858c636611056040a37a708865d27934e714fb55a574807ac7b25 SHA512 72d4e0d42893bcd59775754f2f413d7598e55ebf440a25e3875a8004d9b344c6acc967a7d13bae3344b9f64f8688c369d9bb82b1ac1c4add065f2ea8d3c69552
+EBUILD libxslt-1.1.34-r1.ebuild 1699 BLAKE2B 1ed4960b46018ff32e2b62975f77ae30b44129d7699c8dfaf601afd8ab49be3d041c0f3a6ed0c60518444e56d162761919feee8e323678a1a9473f6947772101 SHA512 1c42ff76e742ed948ce2c080e72f650f341261bb2aa1d82ac5fd4b3853310eb93291b8992a3bfa610d52f3c3f38634c0f98a01d4f1953c5cfa3818e3ddd743eb
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 114b12b1abf4..350eede2cb08 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit libtool multilib-minimal toolchain-funcs
 
+# Note: Please bump this in sync with dev-libs/libxml2.
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt"
 SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
@@ -18,7 +19,7 @@ IUSE="crypt debug examples static-libs elibc_Darwin"
 BDEPEND=">=virtual/pkgconfig-1"
 RDEPEND="
 	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 
@@ -40,6 +41,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Python bindings were dropped as they were Python 2 only at the time
 	ECONF_SOURCE="${S}" econf \
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
 		--with-html-subdir=html \
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 0fde4e55b3ff..cf9c579dbe6a 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -3,5 +3,7 @@ AUX log4cxx-0.10.0-gcc44.patch 357 BLAKE2B b70ff78b141b6952bc8a5f1eca9e251a7dd7b
 AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4af43874c2640a0e7b0e0ed6b85424aa2e8d4d54d13d7eea1361c5b2d2d57f33cdc2260d6e3f5d6afd6b3d240fecc3565aab9f29f SHA512 8fb9017206bca39fa4481707cdb13b68195cc2fce66383a601bc8c7cc20869ca356f2616459b5f10615d5a40f0759c24058f22d7e08c02fee1ce367c34b2d707
 AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
 DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
+DIST apache-log4cxx-0.11.0.tar.gz 1145075 BLAKE2B 786f3374923a5d47172bdaba7edb1725bedc766cb310b7b1237cfcc2fdd84cf2e390b47d55284ad0ce65631798e545523723090f4c0f7ab262f6cbe41a03e327 SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd
 EBUILD log4cxx-0.10.0-r1.ebuild 1529 BLAKE2B e992a65f67e822180f2a47c1571fc62e3c4118ddd379c36436dd877852170f3a7f4a77d03d31621fd8b3cd82806b7356c4426f4ddd953229430aae38ad52b22e SHA512 8d392b861093fffc81624fe7331a5cff8ad9771a0220aeb1a3884509272e15e45c85bb39e88a89b2b3e7b01bdfdc999483394459e8442c53457797782d866a52
+EBUILD log4cxx-0.11.0.ebuild 1267 BLAKE2B 9d89e8a6e742da46c4f50f4d9bdaa1e9c187ed82b6ade046efe3beceaf3ff1c30af9f418f709e4320e87be8975f9bc884bfdf813bbdceac9680eed7b7018506c SHA512 2fedd3994d6fabbcd341a6dba7ca4741eb08f90260cea648a516f23e9bd319f450a7c5141a013da1b437512a927e8d5ef08942ab36bcc05b3b1239668bfe64c7
 MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/log4cxx-0.11.0.ebuild b/dev-libs/log4cxx/log4cxx-0.11.0.ebuild
new file mode 100644
index 000000000000..4345b2b1b986
--- /dev/null
+++ b/dev-libs/log4cxx/log4cxx-0.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=apache-${P}
+
+DESCRIPTION="Library of C++ classes for logging to files, syslog and other destinations"
+HOMEPAGE="https://logging.apache.org/log4cxx/"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
+IUSE="iodbc unicode odbc smtp"
+REQUIRED_USE="iodbc? ( !odbc )"
+# test suite fails
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	odbc? (
+		iodbc? ( >=dev-db/libiodbc-3.52.4 )
+		!iodbc? ( dev-db/unixODBC )
+	)
+	smtp? ( net-libs/libesmtp )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-doxygen \
+		--disable-html-docs \
+		--with-apr-util="${ESYSROOT}"/usr \
+		$(use_with smtp SMTP libesmtp) \
+		$(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \
+		--with-charset=$(usex unicode utf-8 auto)
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc src/examples/cpp/*.cpp
+	docompress -x /usr/share/doc/${PF}/examples
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index 6d8195a7bb22..f33ae5fd7afa 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,3 +1,5 @@
 DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
-EBUILD nsync-1.20.1.ebuild 600 BLAKE2B cac757b2f36d018dd2a8e7f5c1d5273fb7dc3d30412dab74ffe3d606a036fe223577edb67cb3e08ec837bcca18ececd89cf62ba87557b34e9f625ccf8021e8c7 SHA512 f4b204b322b4d45a915608c17c00221ca122b48e360dbb8703d74ff3f5a5b1b524d00fac58b90d93b775caa80d0d6ba563dce4ca393486183711967d1e4f4f96
+DIST nsync-1.24.0.tar.gz 155132 BLAKE2B 9a914b408faf8fff96a57fd3868c34aa96b4243ef2acd30dbdbe1fc90a1818d58ffc96bc6d016f5539c0e266fc1fb633952edba0a51b115904c9d6b06a35f7f8 SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f
+EBUILD nsync-1.20.1.ebuild 586 BLAKE2B 9a0099263c78063713e26a23d31c9b33d9e9bf46011f49a9e672b9b17de7f9404a9ea0a5d135032a6b4fad05fd01282753a773214a3e25512e15ebe774026577 SHA512 32bb674b7cea9bdbce54b615aeddfb95383f06831eff4f4ae32cb76218bec43a633ecf2dc2925a17867cec9bac66698656f09454b444e76f3c03ab2be7793026
+EBUILD nsync-1.24.0.ebuild 588 BLAKE2B fa49fcfc23ee8c9239bb01ae5d17f73aa92fe7f2359f7ce7950d0469332938674ee133598913663f4b7de93baf0980d3090da8bdb02e5bc2dd811c3f913c6b39 SHA512 32870c2134775d0389b813d4ab6fea89b9493f81711bb97da865165b10a3b0fea7669ac349193124207ab4162c30362a052364f9b92988cb9173db640c4d4933
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-libs/nsync/nsync-1.20.1.ebuild b/dev-libs/nsync/nsync-1.20.1.ebuild
index c30d1d46e540..f71c5b73ae19 100644
--- a/dev-libs/nsync/nsync-1.20.1.ebuild
+++ b/dev-libs/nsync/nsync-1.20.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A C library that exports various synchronization primitives, such as mutexes"
+DESCRIPTION="C library that exports various synchronization primitives, such as mutexes"
 HOMEPAGE="https://github.com/google/nsync"
 SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -13,15 +14,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
 DOCS=( README )
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DNSYNC_ENABLE_TESTS=$(usex test)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/nsync/nsync-1.24.0.ebuild b/dev-libs/nsync/nsync-1.24.0.ebuild
new file mode 100644
index 000000000000..ef961974705e
--- /dev/null
+++ b/dev-libs/nsync/nsync-1.24.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="C library that exports various synchronization primitives, such as mutexes"
+HOMEPAGE="https://github.com/google/nsync"
+SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( README )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DNSYNC_ENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 5b03ef22a87c..f70b02cb6f7f 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,3 +1,5 @@
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
+DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
 EBUILD ntl-11.4.3.ebuild 1618 BLAKE2B 9752c09cb92a1389910f53a49c1cc882f35f0627e622745a133b1697948d87197ecfdd322347feeebee1d280db45ec7e3d842b13ed368da1f559f860a500d5d5 SHA512 d32d3fc780fed344c5a9c01548de12d1326c9a7842dab8831dccdf39447db7a94ccd88df59484d79210fc1b647f8abfc0106238a4a5c6aa336b0ca8e558e1fe5
+EBUILD ntl-11.4.4.ebuild 1651 BLAKE2B b8f435cbca2e1f42d80a9dccfc47efdf9ff0712e8782c77bae4694fbe56c8c1e577e549c7a492add309dd79b0d438b4d36327dc01e0899897542b5d817677f07 SHA512 d753b41b5fe2986d1a822b2c131e7f65d5f04898c85cbf34a5abdbefedfcaa6cc99369665cd5ba932618a6f9bde96723723a342ea2b3d73362210df9b8eec635
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/ntl-11.4.4.ebuild b/dev-libs/ntl/ntl-11.4.4.ebuild
new file mode 100644
index 000000000000..0a9584119e17
--- /dev/null
+++ b/dev-libs/ntl/ntl-11.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="High-performance and portable C++ number theory library"
+HOMEPAGE="https://www.shoup.net/ntl/ https://github.com/libntl/ntl"
+SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/43"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
+
+BDEPEND="dev-lang/perl"
+DEPEND="dev-libs/gmp:0=
+	dev-libs/gf2x
+	threads? ( >=dev-libs/gf2x-1.2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+REQUIRED_USE="bindist? ( !cpu_flags_x86_avx2 )"
+
+DOCS=( "${WORKDIR}/${P}"/README )
+
+src_configure() {
+	# Currently the build system can build a static library or both
+	# static and shared libraries, but not only shared libraries. The
+	# name NTL_GMP_LIP is *not* a typo.
+	perl DoConfig \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		SHARED=on \
+		NTL_GMP_LIP=on \
+		NTL_GF2X_LIB=on \
+		NTL_THREADS=$(usex threads on off) \
+		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
+		NATIVE=$(usex bindist off on) \
+		|| die "DoConfig failed"
+
+	if use doc; then
+		DOCS+=( "${WORKDIR}/${P}"/doc/*.txt )
+		HTML_DOCS=( "${WORKDIR}/${P}"/doc/*.html "${WORKDIR}/${P}"/doc/*.gif )
+	fi
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)"/libntl.{la,a} || die
+	fi
+
+	rm -r "${ED}"/usr/share/doc/NTL || die
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index eacb0e39312e..a68a9ec33d85 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -4,7 +4,9 @@ AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
 DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c
 DIST pigpio-78.tar.gz 2900959 BLAKE2B 71a7ed89b247292718229955bf69bec1b7798040fb69b3d9d19a1143cd4fc6565b61deb6ed3bc40eb643a7987f88809125b4368b80aab2fe03bfbaa5fd665274 SHA512 893eefc4a5ab054d56df2c439539ab32a292050aa1fe4b062ba535921f1b12aeac9d509756d08986cd18ed512f52517fa64822422ea3f4dbf6e41fd364a75c3f
+DIST pigpio-79.tar.gz 2908059 BLAKE2B e33347a68635c1d8c9f65b3e1c23442b625a76c2c774326d093c281024abc7d588d4c5f7137056f49c44752752d0873fdbb24de9148a7306c61c91771d280e6b SHA512 bae24b0a28b6865bf4e0903d9e1881344ab7cf26a513f295d178402a426f90f2fdd43444cfe899c0bc25939a129ebf47ecd1ac1600683cd648902d56825a3203
 EBUILD pigpio-76.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
 EBUILD pigpio-77.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
 EBUILD pigpio-78.ebuild 1087 BLAKE2B 5899bc8b41f4a0d7d6097e4277308bb021272e85d4a96e1e7ec0fd7e4c6d62241e7ff96d822768fa65fc6c4a5afea06add108398e3832b59f43ef446194d8623 SHA512 3d3bc8f3eef22b770fc1540ff0019ee56896df6edbcc5c3867899dac31488d2651c22dcbecedcac9009e3d916fa0bb24ac0e113d3aff046e5d3b65d73772c214
+EBUILD pigpio-79.ebuild 1089 BLAKE2B f78ce8820c42d67f656b42c53d1b7943537bcdc5325e55af7e6d4e876ea5fd7950e24790d5e34dd95b1607b8781b235af489eaaae0f665c7960b74f32fc971c0 SHA512 dbb4a01345aa7fafd146ae9c0c190109a219cd256b343ad255b41c4f07ea68b1bdc30ba53a0e365e26811b79b1b864b68f3e4e01d1c4424312444abe8a37408b
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-79.ebuild b/dev-libs/pigpio/pigpio-79.ebuild
new file mode 100644
index 000000000000..4f6097e8c967
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-79.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio"
+SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
index b83015aa20ce..44aebdacd56e 100644
--- a/dev-libs/qtcompress/Manifest
+++ b/dev-libs/qtcompress/Manifest
@@ -2,5 +2,5 @@ AUX qtcompress-0_p20180513-nogui.patch 271 BLAKE2B 707ece6707c14e01119f7e31e07b6
 AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99e64b7c7aa92997a903dc011547d79efef0c457b56b955c037ee73726238c75931dd25e13561a4744c8ca6cfa423bc076c2282881f SHA512 c99e0aacdf9e485f915d911b55e1824046345364c89e6a4fbc172687bd604b4eeff20bde22975ea5c65c103efda3c9af7e907b9599b6acdfad095fec9501670b
 AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
 DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
-EBUILD qtcompress-0_p20180513.ebuild 1455 BLAKE2B e63771fbd81699b65e92e5673706947ec572524c21bf510402c52e3c79bf05629a654445ae571909ae14d058d3eac18ec665b7432aaec5020df49dc6415f7ef4 SHA512 70935bc6543f1a794f9fa29fdc7669dce62d88657757505026a37ab8183aa5279ea2221c4b1d76fc6b8c5763c4cb6c7bba0b21c6442bff2b904eca9e4cc0602b
+EBUILD qtcompress-0_p20180513.ebuild 1454 BLAKE2B d8f78847c8782f00877cdf4fb5520ca431d3dc1c777d1dba5b683fdc620251ad723121d157450fe8766ac2bcdf0676b80071fe69942fc29c5978f60b00d4efe4 SHA512 f790626ad9d35783344ac4d1de5ca8a301203ec27a9629342ddb7cd2d04a4375e7ecb40cc72f0a514129d9a787479f2c4b4eeb400c5960ad96788f7a7e1f3cdb
 MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
index 59471ae05533..3e92aab76b94 100644
--- a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/qtcompress-${MY_COMMIT}"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
 SLOT="0/5.11.0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index cd0605b7581d..46df8df35360 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,6 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-EBUILD softhsm-2.6.1.ebuild 1067 BLAKE2B c90af1b02338d1310db49aca835d41a9afdc4fd8f559637cd103555d057c1c1f395d99fa394f80499136e122df42e5cb55ca86efd4d5d61b80f7cad11afeb24c SHA512 44b14f9490af89e3e63d4ae700fe9bf0c1fb11b0c99114740db4b25830783fd37ca51e9968ce2b5ea6f1ce756541547b9ff20391768a78e54e766c60ba1ba457
+EBUILD softhsm-2.5.0.ebuild 1111 BLAKE2B 86532145dfe22ff324a041b3e653d6d30f6a557f7dfc7c00c15c6ac54a52f0622324259ada1dea891da6429c496fc789490c29d6b45266ffb6b82137d124d53f SHA512 8b67f123f85c46ae3212aee3355e6e064fc840f5d79a726930dde851085b380c00d2ad29124991992d87044bf9c42a2c85b38d74fbe69a7d55ea1d2b850e1276
+EBUILD softhsm-2.6.1.ebuild 1066 BLAKE2B a4d14df59862d7d30c9f5bbfa34ea03f86dff1b23a47e2ca637e82538819a07797526179c28e727a1ba5f133b59f5b53f1596b142fdd52611eb57158a753219f SHA512 cee0e4c0c457e56392cbb2ed4e3c9476f7e518a9281bd699eedfdd99742f9e39cd24a21ff90813d5863789a1b2d2db2f61c63c98454dcfbaf457017c604810d1
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
index c9d44cfbb66f..d9c6a91a08d5 100644
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,25 +7,27 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
+LICENSE="BSD"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bindist gost libressl migration-tool test"
+
 RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
 
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
-	!~dev-libs/softhsm-2.0.0:0"
+	!~dev-libs/softhsm-2.0.0:0
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
 
-DOCS=(
-	NEWS
-	README.md
-)
+DOCS=( NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-libressl.patch"
@@ -36,7 +38,7 @@ src_configure() {
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
+		--localstatedir="${EPREFIX}/var" \
 		$(use_enable !bindist ecc) \
 		$(use_enable gost) \
 		$(use_with migration-tool migrate)
@@ -44,7 +46,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
 }
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild
index 0d7093bbaa85..4fef59f66d56 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,32 +7,34 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
+LICENSE="BSD"
+SLOT="2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="bindist gost libressl migration-tool test"
+
 RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
 
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
-	!~dev-libs/softhsm-2.0.0:0"
+	!~dev-libs/softhsm-2.0.0:0
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
 
-DOCS=(
-	NEWS
-	README.md
-)
+DOCS=( NEWS README.md )
 
 src_configure() {
 	econf \
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
+		--localstatedir="${EPREFIX}/var" \
 		$(use_enable !bindist ecc) \
 		$(use_enable gost) \
 		$(use_with migration-tool migrate)
@@ -40,7 +42,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
 }
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 91376c8f50ff..46060a5bb8c1 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,6 +3,5 @@ AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r2.ebuild 3107 BLAKE2B 91db90e6b17651d20c232a5e50d4b004c0d5d1889dad3d01ae902b134055c7cb39387e00abd7207ffb8d849d443cd6f54dc74622823f3e7f0279f072fc96ce2f SHA512 95957e4df2f90c627a6f9d968297247b8a2cbc2d2db5df86ad662262d356a82942ba9d2d1aedc442c62bfd71fffbf0deee9c39b12bd3115dc736659a612722a3
-EBUILD stfl-0.24-r3.ebuild 3149 BLAKE2B c003ff6f209e2632a8a4c2493a2132f5eea31551c02949e51411d4ce91adc2f5215df6be0237b81f87fdd033a198577864d45f9b31ac15b13bf84509187d4670 SHA512 9ecd573b2e295898feb698a33d4abc45d5f9e3729880d6c3086191c92129e36027ce90686da4a55d04e85b67c9b52cd52e34b201ac66bd7ffd34e1216a7bdc11
+EBUILD stfl-0.24-r3.ebuild 3149 BLAKE2B e3d6fd2346e0b98f09f15e5eaadc02124b6be49183c49cd33f1c60b8f519f0a8d8f13460dc4e92ba4a06d8846288f3ee8ba0190d9043d317a0f8dea3b637b17d SHA512 85ba49b78430e97c71bd7034e2a2c16016f3cae4226069ad82e0eecf3b60a56671a252dce094623622b7a4a8d2fda875c065aed85a7d9b9b4adfade901998803
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r2.ebuild b/dev-libs/stfl/stfl-0.24-r2.ebuild
deleted file mode 100644
index eba46b9fd2be..000000000000
--- a/dev-libs/stfl/stfl-0.24-r2.ebuild
+++ /dev/null
@@ -1,124 +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} )
-GENTOO_DEPEND_ON_PERL=no
-inherit eutils multilib perl-module python-r1 toolchain-funcs
-
-DESCRIPTION="A library which implements a curses-based widget set for text terminals"
-HOMEPAGE="http://www.clifford.at/stfl/"
-SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="examples perl python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( >=dev-lang/swig-1.3.40 )
-	ruby? ( dev-lang/swig )
-"
-RESTRICT="test"  # Upstream does not provide tests #730112
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.21-python.patch"
-	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
-	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	sed -i \
-		-e 's/-Os -ggdb//' \
-		-e 's/^\(all:.*\) example/\1/' \
-		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
-		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
-		-e 's/-lncursesw/-lncursesw -pthread/' \
-		-e 's/\<ar\>/$(AR)/' \
-		-e 's/\<ranlib\>/$(RANLIB)/' \
-		Makefile || die "sed failed"
-
-	if ! use static-libs ; then
-		sed -i -e "/install .* libstfl.a/d" Makefile || die
-	fi
-
-	if use perl ; then
-		echo "FOUND_PERL5=1" >> Makefile.cfg
-	else
-		echo "FOUND_PERL5=0" >> Makefile.cfg
-	fi
-
-	if use ruby ; then
-		echo "FOUND_RUBY=1" >> Makefile.cfg
-	else
-		echo "FOUND_RUBY=0" >> Makefile.cfg
-	fi
-
-	echo "FOUND_PYTHON=0" >> Makefile.cfg
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-
-	if use python ; then
-		local BUILD_DIR="${S}/python"
-		python_copy_sources
-
-		# Based on code from python/Makefile.snippet.
-		building() {
-			pushd "${BUILD_DIR}" &>/dev/null || die
-			echo swig -python -threads stfl.i
-			swig -python -threads stfl.i || die
-			echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
-			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die
-			popd &>/dev/null || die
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_install() {
-	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
-
-	if use python ; then
-		local BUILD_DIR="${S}/python"
-
-		installation() {
-			pushd "${BUILD_DIR}" &>/dev/null || die
-			python_domodule stfl.py _stfl.so
-			popd &>/dev/null || die
-		}
-		python_foreach_impl installation
-	fi
-
-	dodoc README
-
-	local exdir="/usr/share/doc/${PF}/examples"
-	if use examples ; then
-		insinto ${exdir}
-		doins example.{c,stfl}
-		insinto ${exdir}/python
-		doins python/example.py
-		if use perl ; then
-			insinto ${exdir}/perl
-			doins perl5/example.pl
-		fi
-		if use ruby ; then
-			insinto ${exdir}/ruby
-			doins ruby/example.rb
-		fi
-	fi
-
-	perl_delete_localpod
-}
diff --git a/dev-libs/stfl/stfl-0.24-r3.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
index d2531da8b101..33ad54725097 100644
--- a/dev-libs/stfl/stfl-0.24-r3.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 GENTOO_DEPEND_ON_PERL=no
 inherit eutils multilib perl-module python-r1 toolchain-funcs
 
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 6d032d080459..88e14f0c7354 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,9 +1,7 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.18.2.tar.gz 2856990 BLAKE2B 31bb67aa1645d06b14b5dfd3b45c978da8850b42352204174fb7966b3185adf1301e9c8150ddb999f074d05ef965d1e26555a750f7f77671e03e6a2821a89cef SHA512 fe385f28ce28d96538d0779d3d69f49c6183732f48ae0e979d41d1298e7c87f259604f9f2eca2a07c424a4840fa29a38051845ead797325f748d251250ffb836
-DIST tree-sitter-0.18.3.tar.gz 2860203 BLAKE2B 77d0fe53140602759a1039fc0bb600765ee4115e30fa26290f19c296f2b3941d0d42986344f11916266b6c46ac0250f94d1a1b01a6f074da36cee34c1c942165 SHA512 b669a499f826eb51fe51cbf93fd9bee6cd17ec3d628a2b7c4359c6b8d60390ce9d348a9d7470d5faa82c937d8afb720b596ce5e7b553943345cf1f79d74a2d79
 DIST tree-sitter-0.19.0.tar.gz 2861471 BLAKE2B acb1ff34c2ce4bc3995f59569f1ffa153c76013701eb04b834ac041efe6a533397bf2d540b55c27182194a0dbe285698927f29a2be001add8235ae4357e15e2a SHA512 c5315b1b452303d0a2ef2e710cb282c303649464c0d0ca41380fef2a26f551a6b6166991f6fcf48a5a9c046871d368c062d1354fd0e1f327509c4b554ac8731e
-EBUILD tree-sitter-0.18.2.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
-EBUILD tree-sitter-0.18.3.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+DIST tree-sitter-0.19.2.tar.gz 2864890 BLAKE2B b3c8a79ed5fa5749b5b824c03a7ae451c08d28c6f2f23a17e0b4b77d7c7c834a067025e3f8da7af75ee54773c186e394fb5cfac37d370e4a9f9489eb9ad7df19 SHA512 f021b44ca78f6855d0362eca122c01d0134ce376f6123547201abc86490276134b650f33a600dc72dc12916bb14e3b5c3814c480d4e789dec7f39bbd3175bd65
 EBUILD tree-sitter-0.19.0.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+EBUILD tree-sitter-0.19.2.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
 EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
 MISC metadata.xml 692 BLAKE2B e8a04ac2d2dbe16214d82067944baef692a4e8896fcbad7feca9e54565e603b0e5308bb4f1e4bc5aaf39f41b1ca0e10fa5710159ed1012c6ed47f2007fa19a69 SHA512 a319341832c189a845f1a757b17bbefc10a7c4b00c49e80b49745061112b91ebb80f2f96a99de27ed6aa5799f25bd56ddec3eb41bfb2507b037ee8e965525053
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.3.ebuild
deleted file mode 100644
index 62e7c8355b29..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.18.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
index 62e7c8355b29..62e7c8355b29 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.18.2.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index b08b245244ff..7ede4c2016c6 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -1,8 +1,6 @@
-AUX udis86-1.7-yasm.patch 907 BLAKE2B e27f90003cc54d926b1bd39a274e7d030d6701a8833e90cc26b2f7196dbd458bf818198191227ffa97c6521be5bdca87d9c364da5add8f32ed9905252674acb9 SHA512 23bc5c973b43654083f6a70b79c3c32cfa96c2e8c85905fca9c88b11f3993d4999b2114399b289fff90a31b2c25b375a56a8e8464c6fddb6591c0f6d421bb557
 AUX udis86-1.7.2-docdir.patch 644 BLAKE2B 7929a12d9dcc43035b3ed0ec6da5dc54e7a51c19b50e4405eaac83ca351a7b9c367fa1754b1adde419ad04c19f90f8e83272b2b34e7a01974ab84a01a1f2a1f1 SHA512 4b552f30ad2c2a33ea5f3b51f01a287d0e19571368187ee5c7ab625e39a46ebdb9aaa3aa8aecb89cfc3481309a511bd37d29260377fd153bd7b427ee4adcf3da
 AUX udis86-1.7.2-python3.patch 1543 BLAKE2B c2bcd32c934e2a3ae5232ab6cf2516ae0598a3f8dfc02dcbdbcd2d217728ed5a707c8f328eb9047199f293e4b7aa66898c6e288a91c2bd5b538217c3df691424 SHA512 8075f31c778b962952e8feabafe76b984d037ee482c3cce633cf46ad15baff42d15af0061fab3dcadbae3e3b4f19bda07f7cbc3d7a9482b5b48c46fcea70023b
+AUX udis86-1.7.2-uninitialized-variable.patch 590 BLAKE2B afba36f587b9ac4e09d79aab081092dbae8640c8ad2e533019d22bb69b4fb38d36a5d43c390cb2201c3081ecc63037b099fd61e38fb307c4dcb632a67567d8ef SHA512 7c55fd11b296dfeee4bd13e1dbcc7880eec3d0653408ad2e71c71feb3b9b7546d7c814d27e53663b7e94a284aeff0563e8fb577794eaa629f24cbc63ce7d54d6
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
-DIST udis86-1.7.tar.gz 696651 BLAKE2B 5d0a97e06b6bc7b263b6f080e12f832d4bfc9a4791a495e49cd2f4ee6d37d13e593891e02fe9ee3c3fb5e7ec23bf25ae7aa1dccd1f95b5c003f6a6e45bbb7f8d SHA512 df0f802d4c0cf6b39b5b996cfd721cb7d0bdd1b0e2f2f7bcb7165514541b94d795c653e885d9f928d9a27f19464ed6fa948f4315fc1f3887079201fcbb2a241e
-EBUILD udis86-1.7-r2.ebuild 727 BLAKE2B 9435654d37e1dba515e815fcdfb6f07bea96b9743dbd22e9a11400924f89a1fbbba30203216184fed53abe71501326e11708a01bd19dc4517e1b30a545f36788 SHA512 1901dd09fae0f12e1c4a41b905460704794708803f1c68e04203f0612a63d1a8057991fdbbcf24bb0e1757f3c2814f4793ea698bf45265dad3806e05fda96e15
-EBUILD udis86-1.7.2-r1.ebuild 941 BLAKE2B 56852542a9ecfc48292f2edc6d836ee4d1370c4449122568fadf163987f4bdf6af2bca16caf4012cc8b5435d142a49969d3198b765d8f02fd95cc2d3476968ee SHA512 34e3fff101b531ec42ca16407336a0d107c1a5fc1c9cc3c3ddc9a0def2c23b7b3f1a10eb494e8db6ff4ebf54b12d71d75c6fbaf8c0aa90c7a0e538cb10366576
+EBUILD udis86-1.7.2-r1.ebuild 988 BLAKE2B 2480bdcb194c78b89e0f94028606fce72b80fb0679a53d438f8d63c6cb8ebd61f31f66c1d99112557f1a92785a1713c552ddb45c8c24675054edeeac3e2e5f1e SHA512 eb8890fe4fdaac6b1908ff2aafe95ce45b149a090bb71d9c7bbecc119924f60447de08c9e5e1710f3c9f06a0dde3e84bed65beb65b43945f98fed37da920f80d
 MISC metadata.xml 342 BLAKE2B 5f721c4727a6ee72b711b6df53a260dd420e4389f02091326483aa69995817965b8375097d3abd519b6c25e5cbceecff3de7efdc23178a2d98ee5d64522522e7 SHA512 042c3b3a181b435308c2c6cb6fb411cf5c00fb0403736a7fdd4048553c5d3ce7b2130421dd785511ec97b2c0e55f0e6e3cc603273ae5f87d19a61f9da0914a66
diff --git a/dev-libs/udis86/files/udis86-1.7-yasm.patch b/dev-libs/udis86/files/udis86-1.7-yasm.patch
deleted file mode 100644
index 3d3eecdf8283..000000000000
--- a/dev-libs/udis86/files/udis86-1.7-yasm.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,9 @@
- AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
- 
-+AC_PATH_PROG([YASM], yasm,)
-+AC_SUBST(YASM)
-+
- # If this is a gnu compiler, pass -Wall
- if test "$ac_cv_c_compiler_gnu" = "yes"; then
- 	CFLAGS="$CFLAGS -Wall"
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -10,7 +10,7 @@
- ovrrun_LDADD   = ../libudis86/libudis86.la
- ovrrun_CFLAGS  = -I$(top_srcdir)/libudis86 -I$(top_srcdir)
- 
--YASM = yasm
-+YASM = @YASM@
- 
- dist_check_DATA = test16.asm test32.asm test64.asm testjmp.asm testobscure.asm \
- 		 testjmp.ref testobscure.ref randtest.raw randtest16.ref      \
-@@ -18,7 +18,10 @@
- 
- check-local: tests
- 
--tests: test16 test32 test64 testjmp bufovrrun randraw
-+yasm_tests: test16 test32 test64 testjmp
-+no_yasm_tests: bufovrrun randraw
-+
-+tests: $(if $(YASM), yasm_tests) no_yasm_tests
- 
- test16: gen 
- 	$(YASM) -f bin -o test16.bin $(top_srcdir)/tests/test16.asm
diff --git a/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch b/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch
new file mode 100644
index 000000000000..3778e535caa5
--- /dev/null
+++ b/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch
@@ -0,0 +1,22 @@
+From cce390dd61996e569bd8a3bca78e7aa4b286d6df Mon Sep 17 00:00:00 2001
+From: Vivek Thampi <vivek.mt@gmail.com>
+Date: Sun, 22 Sep 2013 12:13:05 -0700
+Subject: [PATCH] Minor fix for an uninitialized var
+
+---
+ libudis86/decode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libudis86/decode.c b/libudis86/decode.c
+index 3dab9ad..55638bd 100644
+--- a/libudis86/decode.c
++++ b/libudis86/decode.c
+@@ -228,7 +228,7 @@ static int
+ decode_prefixes(struct ud *u)
+ {
+   int done = 0;
+-  uint8_t curr, last = 0;
++  uint8_t curr = 0, last = 0;
+   UD_RETURN_ON_ERROR(u);
+ 
+   do {
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
deleted file mode 100644
index 130c1b7981a6..000000000000
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib eutils
-
-DESCRIPTION="Disassembler library for the x86/-64 architecture sets"
-HOMEPAGE="http://udis86.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-		x86-fbsd? ( dev-lang/yasm )
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-yasm.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-shared
-		--with-pic
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
index f7f19738e446..72bba553ae98 100644
--- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-uninitialized-variable.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 76f2e4938f92..2f92f5745f7b 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -3,6 +3,6 @@ AUX unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch 999 BLAKE2B 0
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
 EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
-EBUILD unittest++-2.0.0-r2.ebuild 1254 BLAKE2B fd0b8216628692ca8576acf343dba85609e564578a254660ed0b8c8a85fed45eaea285007348471f01f8f8ec6e5e91b820c9a4eb60594abc860395136106a109 SHA512 04d44996d1562d80b15ce75e8d5a9c6478d11eb77b34176afa2d28660d8784f9c221c5c88c0babc0ed01395aff438301dade4f7eadb44ee09903248060e70dd5
+EBUILD unittest++-2.0.0-r2.ebuild 1247 BLAKE2B 1e5ddea7459949781726f1061102d238c4f236c1bb1d6ca609deca225d597482c9f42523f897101bfced06ad1ce12f47b25a44f8c7fe05b78d4f1384bddb52b0 SHA512 4ae29d6bf7b359d38b8b6d79e4d7fd37d09be18ebfd321b0cee1dc0cc34a5980f800ec5a4385f491bba32ad4a46365f5cb9e1e6723178a01132a08574f074229
 EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
index cbc9ade981cd..a74e16280bc8 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 2c39683569aa..8b72e1e99db9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,8 +1,3 @@
-AUX uriparser-0.9.3-tests.patch 724 BLAKE2B de0681eaa68e4d846853d58804646c2a528f9a2be9bf317111d4b54521fa07fb6834df375c512c8bfa2b48832591706c01beedead9f1e199df5df3526606a205 SHA512 bde6f137503540dcc8a84eba2f97b8c21244d1d0dbf132b9bea07430e615804c4ad639663497955dc97e6bb8292bf2f1ac87b349dbbfc04f6230ce82b8077c17
-DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
-DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc105cca085ea4a9d3ed9427bf7cf2eedcce4954b679a0ed1a79b7c57c98a1998b0cac27bd2b1de540aa79fdd4b160d SHA512 424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
-EBUILD uriparser-0.9.1.ebuild 929 BLAKE2B ad4f6452fabff09e9d7307ac3ab412bd10c67a69c8e96acfe79b47e57ca08ca2afde276992de3a46d4b13845f4ad087a242389e3f36903c8f79f03cf3252c34d SHA512 93bf1fc1b036ff7ed3ccfbeae76ecb764333926c5fe74cd813e5bb12ca6ae72c443aefcbc92f31f831b2a22427f0c021404ee0bae5e780b7fd21912b85df8ac5
-EBUILD uriparser-0.9.3.ebuild 1199 BLAKE2B 253164cb9593781e1c797e6808a33ee19201ba8abf41b54f95bb41b293c6959b87b69cb6fa0233e0b1348597231b4517ad3d38b605dc723c03e2fa0a6ffcc729 SHA512 ad96686a67e71aa0e31fc87f38a2574a86b3e3c28f6f344efe645896128ca8abb03366c232441e6e7062540e9187789367341750593215a5f7cd8a4e44a32bd6
-EBUILD uriparser-0.9.4.ebuild 1165 BLAKE2B 8d5f75f1e2f6b49d0c840351837bb21f5966e93bb2216b70f5f6c0c9af2f45c958ffe2e0d4c3ac0a3aabceb119b812fe2dca514b5828c63bea48c37007503f3c SHA512 f3ad2a08062cf7b59550139502d1eabac41e2dbae551f54e5bb5222b825e14f78dd081917aed991c9f4a4f9721d53468cb0923cac0e731ca2fcdc9198c137844
+EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
deleted file mode 100644
index ad6f1c1311d7..000000000000
--- a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f870e6c68696a6018702caa5c8a2feba9b0f99fa Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 28 Apr 2019 17:35:31 +0200
-Subject: [PATCH] tests: No longer crash when compiled with -DNDEBUG (fixes
- #67)
-
----
- test/MemoryManagerSuite.cpp | 2 ++
- 1 files changed, 2 insertions(+)
-
-diff --git a/test/MemoryManagerSuite.cpp b/test/MemoryManagerSuite.cpp
-index 85f498b..4cda664 100644
---- a/test/MemoryManagerSuite.cpp
-+++ b/test/MemoryManagerSuite.cpp
-@@ -19,6 +19,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#undef NDEBUG  // because we rely on assert(3) further down
-+
- #include <cassert>
- #include <cerrno>
- #include <cstring>  // memcpy
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
deleted file mode 100644
index 8af0a3c0d760..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-RESTRICT="!test? ( test )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	econf \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc)
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild
deleted file mode 100644
index 54a967442dc8..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-RESTRICT="!test? ( test )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DURIPARSER_BUILD_CHAR=ON
-		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
-		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
-		-DURIPARSER_BUILD_TOOLS=ON
-		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc && use qt5; then
-		dodoc "${BUILD_DIR}"/doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
index d814ac60e353..5eefe6b42f01 100644
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
 HOMEPAGE="https://uriparser.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
@@ -14,31 +14,35 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
 REQUIRED_USE="test? ( unicode )"
 RESTRICT="!test? ( test )"
 
+DEPEND="
+	test? ( >=dev-cpp/gtest-1.8.1 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 )
+	)
+"
+
 DOCS=( AUTHORS ChangeLog THANKS )
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DURIPARSER_BUILD_CHAR=ON
 		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
 		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
 		-DURIPARSER_BUILD_TOOLS=ON
 		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc && use qt5; then
 		dodoc "${BUILD_DIR}"/doc/*.qch
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index bc0be3f32880..99df16064912 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -4,7 +4,7 @@ DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
 DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
 EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.12.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.12.ebuild 653 BLAKE2B e9058802a80a1e5def9cade1ee0a8b91c025ca45fb6abed786b30e495c9cc3235348ccf7ec1d168f924bb6d3729c3ec4cc68054196c40d5a516fc7a8da3a8ff4 SHA512 604181259a41104e04e349b086ffaad7dd8ca3dd17e4ccf5e607f17b245a4ac2587eed6c93e5d07bf250f08445818bf67b751291e7c212c895a4591acd80a0ef
 EBUILD vala-common-0.48.6.ebuild 645 BLAKE2B 41f2dc961ad49516633d96a5f899fcc545b50c2632917ce1bb44e96eb5af458db56dce8838544092810ae55b3e4b88070b344d6905830cf5c8a472f3415366f6 SHA512 1edc9583a5e34b7592a4169c2fe3300deeba71015c1ce376d05d71a998e127ec77fa7c558b1b4fb8fdda5cd8c2556e3dd7a752d87647209a7e4cf678d4ea28e6
 EBUILD vala-common-0.48.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
 EBUILD vala-common-0.50.2.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
diff --git a/dev-libs/vala-common/vala-common-0.48.12.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
index ee55cfcad100..4ac1f54df43b 100644
--- a/dev-libs/vala-common/vala-common-0.48.12.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/vc/Manifest b/dev-libs/vc/Manifest
index eef054364a65..f8246e92632f 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -1,35 +1,3 @@
-DIST vc-1.3.0-reference-acos-dp.dat 2400000 BLAKE2B 943af6c183f9812ea1b8f8eb875f5052485647614bbe28d33d042c54648b36d42a8dd3557ea4562791b4d51fba6c4e28f7eddbd57d11d353d37989bb81b63806 SHA512 f64357c8dd5000a3e8d48af4d3dff167d0b2f6f5c90d90949fe1ee7b00668211cfef959c44775f37a2982acbba259895af6e262ef8e77d7570b6f9a2520d415b
-DIST vc-1.3.0-reference-acos-sp.dat 1200000 BLAKE2B 66042438fe17229e4ac54503df2a94c01713945c9b3c3aed76fbaa9c3969b8ad95756526fd5981b5e1dd016ce0103a7130c53c5ecc1b71514e65ba50c9d35543 SHA512 8a1077735acf06c9a70874bdf202f952855f04e8aea1b75d21b43cd098d6c26af691ecb3ff345cd26bf3ac8e46263c26ba465f8c39903908b3e72cb356802f8b
-DIST vc-1.3.0-reference-asin-dp.dat 2400000 BLAKE2B 4a992c3d35eecedf5d9c7ab31c9f5533177779cf262673584f65023f4b0bfa23c521e1ad0eaabc4e47ac1d8389c5ba55f20dd49aaf7ac21073c2448b31a47d28 SHA512 62dc115731978118e45cef0e3c11abbad6b8810a9e480ada6d479ef62413ef9eca0ece1674dcbd9fd0d4cbb50fdb86bcb860f797e17c1cab93a2f756e683d50d
-DIST vc-1.3.0-reference-asin-sp.dat 1200000 BLAKE2B 1381b377ccd4b7f2be934c2875ba9657e6ecc11582e9cb07833a4e3edca8758c30404c6c5b740cec2ef04a4cd278d25ef7f346947a7514893b1fc355fc7b1e10 SHA512 859622a5b86b2fa6077bfc931afbbff515ec779ecbd54c93e91bb1837b8f8475f7c247f89d90b7847fb3a8a96a95d5c4692ce7863c0a0f9e5d4904039189ea3f
-DIST vc-1.3.0-reference-atan-dp.dat 4800000 BLAKE2B 121ca520ecb2619a0a607cf9853bbae091bab1737916c3b2073819a1a5dd4d8b2115878452b0da08811496feae9f36f85e85db1c084ce5050989e4a96ae6a4c1 SHA512 20b2ffd707ab3f251d6d8a3ea39cb9436176154962cf60512acaf40aa3ac463cbf8e6149969ce273a9f755a1ecbcd8ac20f57444fdb73bc0ac15c43a73d82513
-DIST vc-1.3.0-reference-atan-sp.dat 2400000 BLAKE2B 584f01ccaffd41f9a4a8bca3e09a8e1cc6202fb492d925a4ea0456f366cad230540bc395f0c89b1e2a23fb558fb4c087f19791c6e6c365bdc82466dd71a49a90 SHA512 3c137570f882f057ecdf772dfd659b199d4a37d1f098450476abc0ffafb9abe324aaf6155dbd9a0d2b7f9ce3022fe91d8c81a8b6303f7bd1a1c18785ec2e96b3
-DIST vc-1.3.0-reference-ln-dp.dat 2400000 BLAKE2B d172ccdee1671c938510d40797122e56b1dfeb0367ad3ab8ecbb6902111242d7f90ce5b4b034d9476c1d0d69b155eb4367b435c27132a19bbe3864379b67ee43 SHA512 279b9221fd56507be580598c8f29bac602494ad230c975e726d49c3cea3264b6b45c385a50be12d94acd7c3b9c0527bb9b1339c380a746a639fd0ae6928fe2c3
-DIST vc-1.3.0-reference-ln-sp.dat 1196328 BLAKE2B ae8b2716874ac0f0d3afe93f5ea1ee7d3cc06c7ae09b97c7eb9eb23a4f1e79d1af885bf8c3efae7d448c720bbd2f1b968b8bb9424795ecd0fdc1f67635fcb10f SHA512 5cf13ab4997bdbe08b08bd79c719ad80844bbc451fcd1636e2c93c4a4b015c8f1909549638636b30a289c53b75822114b5aa9c5e40699b3867e23b8024a610e8
-DIST vc-1.3.0-reference-log10-dp.dat 2400000 BLAKE2B 08712b3c9a77edb9bc3628ed7006815493db644395819f6b9830be213d3d8675b1b4711acceaf7df0a55afda2756e13224fc35a3480766147eacd2ff98c9c31d SHA512 7086b73d2eeda17ef154b53fdeedf9fa21ac7016837eb9dd5e197d7a61343f1ac4b341fd04e6ef6477adc51391da7874ed7dd03a2b761d231c66611b994410df
-DIST vc-1.3.0-reference-log10-sp.dat 1200000 BLAKE2B 123b5872b7c579548665425b6d1488dc0c64ffc2a8b484396cacf042048d88ac3db60cef7d2ca1471c7bc8dcb30707704f7070bb8c3ed50921c15635233001b9 SHA512 5d027ec089f9179f4f4544c445693b64c4d4db4b8267c2360511fed52748a904a00c03ee7fbdcac234d3284b9288bd19d8722567cdf7acf21311d7f19fc53f3a
-DIST vc-1.3.0-reference-log2-dp.dat 2400000 BLAKE2B c04785c9c3c9edf2e1a2e96ffd14ff797c17ff65ce2332dad4afc3084be2e1677661d2581d7284dfdefdf12327ab939aeb615f4b498ec313effcb75f5ab2f459 SHA512 54692dbf61c2764969cda3f87ba76bcc464f9e513864625ec115b9f06b26e85db4a53775baf4d87f83ae04452d246b4b01d0d3cde733058a07f872b0d0aa8097
-DIST vc-1.3.0-reference-log2-sp.dat 1200200 BLAKE2B 01a3124c9717187485e0d6d172be29e28d292799c839307394ae8650a2d343c8a61df1ee2b1c45ca7b38aeab60dd3eea505adc255012d0f5034290f714ef287e SHA512 edcc6100a20b1ef6aaf855ccdaff05c89f6f33357749681c577bc22fdc80877f90ddc7c1c8e260b1dd0c639865c8b701d48c7612ef39de2b4fece067f88b2808
-DIST vc-1.3.0-reference-sincos-dp.dat 3600000 BLAKE2B 2f3a4d208d8b8cccc7c6f84a9f7d6a0920c98735382fcf37cc28efef5199b7e216cae9402a3c631d5a445739d8bafd782bdb80ef205146169e5d10ab9d6dfcff SHA512 92f5cbe61cc79188759cc7d03e28df1644405bf2249fc59bb84f567bca6937053c5e2c1f7b0674e745d6656da6772703305118040b9c7a272da1d8bc52d49858
-DIST vc-1.3.0-reference-sincos-sp.dat 1800000 BLAKE2B c0993d43ec2c88edcbab2ade63f1a960ed64ccfd78fb5355aa0a6940b3860669dfafee75190a67e77f53d6005f9cf7e9e82abdd270e171606ebbb143b7326907 SHA512 0760409ae093c7d897e6ac0b689fea5c1cf9cf58e3c39e2880fcacf56398e9c3ceb897f725ef54730b95847f11ca73a05fd96e108aa153ba6d22c21f7104c009
-DIST vc-1.3.0.tar.gz 530976 BLAKE2B da8e088ca5e5eca9654cc79ae8ea55d7484a7d63ba3e7f45d134877989fcee3721a686e5c07fc6e0eafd6e77fe5bffffc35de3cfd98977360b5ae9dc99b951e2 SHA512 1b1c68be9dca2212629b4d28c591366adbe719f50b8b55f04eebc8e2161acf8128264df408fe742f2f3695b2ad1bc17b88f7ec776e960921e01d61b150aafc3d
-DIST vc-1.3.3-reference-acos-dp.dat 2400000 BLAKE2B 943af6c183f9812ea1b8f8eb875f5052485647614bbe28d33d042c54648b36d42a8dd3557ea4562791b4d51fba6c4e28f7eddbd57d11d353d37989bb81b63806 SHA512 f64357c8dd5000a3e8d48af4d3dff167d0b2f6f5c90d90949fe1ee7b00668211cfef959c44775f37a2982acbba259895af6e262ef8e77d7570b6f9a2520d415b
-DIST vc-1.3.3-reference-acos-sp.dat 1200000 BLAKE2B 66042438fe17229e4ac54503df2a94c01713945c9b3c3aed76fbaa9c3969b8ad95756526fd5981b5e1dd016ce0103a7130c53c5ecc1b71514e65ba50c9d35543 SHA512 8a1077735acf06c9a70874bdf202f952855f04e8aea1b75d21b43cd098d6c26af691ecb3ff345cd26bf3ac8e46263c26ba465f8c39903908b3e72cb356802f8b
-DIST vc-1.3.3-reference-asin-dp.dat 2400000 BLAKE2B 4a992c3d35eecedf5d9c7ab31c9f5533177779cf262673584f65023f4b0bfa23c521e1ad0eaabc4e47ac1d8389c5ba55f20dd49aaf7ac21073c2448b31a47d28 SHA512 62dc115731978118e45cef0e3c11abbad6b8810a9e480ada6d479ef62413ef9eca0ece1674dcbd9fd0d4cbb50fdb86bcb860f797e17c1cab93a2f756e683d50d
-DIST vc-1.3.3-reference-asin-sp.dat 1200000 BLAKE2B 1381b377ccd4b7f2be934c2875ba9657e6ecc11582e9cb07833a4e3edca8758c30404c6c5b740cec2ef04a4cd278d25ef7f346947a7514893b1fc355fc7b1e10 SHA512 859622a5b86b2fa6077bfc931afbbff515ec779ecbd54c93e91bb1837b8f8475f7c247f89d90b7847fb3a8a96a95d5c4692ce7863c0a0f9e5d4904039189ea3f
-DIST vc-1.3.3-reference-atan-dp.dat 4800000 BLAKE2B 121ca520ecb2619a0a607cf9853bbae091bab1737916c3b2073819a1a5dd4d8b2115878452b0da08811496feae9f36f85e85db1c084ce5050989e4a96ae6a4c1 SHA512 20b2ffd707ab3f251d6d8a3ea39cb9436176154962cf60512acaf40aa3ac463cbf8e6149969ce273a9f755a1ecbcd8ac20f57444fdb73bc0ac15c43a73d82513
-DIST vc-1.3.3-reference-atan-sp.dat 2400000 BLAKE2B 584f01ccaffd41f9a4a8bca3e09a8e1cc6202fb492d925a4ea0456f366cad230540bc395f0c89b1e2a23fb558fb4c087f19791c6e6c365bdc82466dd71a49a90 SHA512 3c137570f882f057ecdf772dfd659b199d4a37d1f098450476abc0ffafb9abe324aaf6155dbd9a0d2b7f9ce3022fe91d8c81a8b6303f7bd1a1c18785ec2e96b3
-DIST vc-1.3.3-reference-ln-dp.dat 2400000 BLAKE2B d172ccdee1671c938510d40797122e56b1dfeb0367ad3ab8ecbb6902111242d7f90ce5b4b034d9476c1d0d69b155eb4367b435c27132a19bbe3864379b67ee43 SHA512 279b9221fd56507be580598c8f29bac602494ad230c975e726d49c3cea3264b6b45c385a50be12d94acd7c3b9c0527bb9b1339c380a746a639fd0ae6928fe2c3
-DIST vc-1.3.3-reference-ln-sp.dat 1196328 BLAKE2B ae8b2716874ac0f0d3afe93f5ea1ee7d3cc06c7ae09b97c7eb9eb23a4f1e79d1af885bf8c3efae7d448c720bbd2f1b968b8bb9424795ecd0fdc1f67635fcb10f SHA512 5cf13ab4997bdbe08b08bd79c719ad80844bbc451fcd1636e2c93c4a4b015c8f1909549638636b30a289c53b75822114b5aa9c5e40699b3867e23b8024a610e8
-DIST vc-1.3.3-reference-log10-dp.dat 2400000 BLAKE2B 08712b3c9a77edb9bc3628ed7006815493db644395819f6b9830be213d3d8675b1b4711acceaf7df0a55afda2756e13224fc35a3480766147eacd2ff98c9c31d SHA512 7086b73d2eeda17ef154b53fdeedf9fa21ac7016837eb9dd5e197d7a61343f1ac4b341fd04e6ef6477adc51391da7874ed7dd03a2b761d231c66611b994410df
-DIST vc-1.3.3-reference-log10-sp.dat 1200000 BLAKE2B 123b5872b7c579548665425b6d1488dc0c64ffc2a8b484396cacf042048d88ac3db60cef7d2ca1471c7bc8dcb30707704f7070bb8c3ed50921c15635233001b9 SHA512 5d027ec089f9179f4f4544c445693b64c4d4db4b8267c2360511fed52748a904a00c03ee7fbdcac234d3284b9288bd19d8722567cdf7acf21311d7f19fc53f3a
-DIST vc-1.3.3-reference-log2-dp.dat 2400000 BLAKE2B c04785c9c3c9edf2e1a2e96ffd14ff797c17ff65ce2332dad4afc3084be2e1677661d2581d7284dfdefdf12327ab939aeb615f4b498ec313effcb75f5ab2f459 SHA512 54692dbf61c2764969cda3f87ba76bcc464f9e513864625ec115b9f06b26e85db4a53775baf4d87f83ae04452d246b4b01d0d3cde733058a07f872b0d0aa8097
-DIST vc-1.3.3-reference-log2-sp.dat 1200200 BLAKE2B 01a3124c9717187485e0d6d172be29e28d292799c839307394ae8650a2d343c8a61df1ee2b1c45ca7b38aeab60dd3eea505adc255012d0f5034290f714ef287e SHA512 edcc6100a20b1ef6aaf855ccdaff05c89f6f33357749681c577bc22fdc80877f90ddc7c1c8e260b1dd0c639865c8b701d48c7612ef39de2b4fece067f88b2808
-DIST vc-1.3.3-reference-sincos-dp.dat 3600000 BLAKE2B 2f3a4d208d8b8cccc7c6f84a9f7d6a0920c98735382fcf37cc28efef5199b7e216cae9402a3c631d5a445739d8bafd782bdb80ef205146169e5d10ab9d6dfcff SHA512 92f5cbe61cc79188759cc7d03e28df1644405bf2249fc59bb84f567bca6937053c5e2c1f7b0674e745d6656da6772703305118040b9c7a272da1d8bc52d49858
-DIST vc-1.3.3-reference-sincos-sp.dat 1800000 BLAKE2B c0993d43ec2c88edcbab2ade63f1a960ed64ccfd78fb5355aa0a6940b3860669dfafee75190a67e77f53d6005f9cf7e9e82abdd270e171606ebbb143b7326907 SHA512 0760409ae093c7d897e6ac0b689fea5c1cf9cf58e3c39e2880fcacf56398e9c3ceb897f725ef54730b95847f11ca73a05fd96e108aa153ba6d22c21f7104c009
-DIST vc-1.3.3.tar.gz 781361 BLAKE2B 8e98cd983e7ef132e8d2a74f53d95e1ae7ba52b90da8878512ee4df33751ddce40dca6e70c8384048a86e495c6387d425db6cc5df0b7d15afd14f0fee94eb2b7 SHA512 dbc6f5bc723c52d3116301798b600b08bde510cff9e6777312d1970c61ad1b71fd83335ce65e9993a9f582a20b9de73984d553039452908ef229c4bde3b334f2
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
-EBUILD vc-1.3.0.ebuild 973 BLAKE2B ea21273ca341d58589ff2fdd6abf0a752e5fad72b33524945ea33e584953086f3f78d4aca5c1b8a23ca4fea32d5282027436d857e0c3e780792a1447c4a62b3c SHA512 1bab972a3c41cf09c9579727700b69c38dbd55b7f9d67939b392fd08690bd30a56fc336ee71a076d99591142d80e6dc7fe21a1996d5377bd347e54e8a94b351d
-EBUILD vc-1.3.3.ebuild 975 BLAKE2B 8b296d5c8226b3af53bbe6a2c25ec1e29b76830879308b0256f7cf5dd6e787b50ffc5b473779fa873a3d6cf31b7b97b6a9dcdc41b1ad2d9a88a098ca23a09129 SHA512 67dc977de551026c78fa2c9b8f4700f3be33fdaa0a5f72dd3ef95336dd3ee957e0aab9d5f3f3c5c18f06265b18d08cba770c0c83ea7c3a02ed7f2e7694de1529
-EBUILD vc-1.4.1.ebuild 449 BLAKE2B 64ce3305e7554566fe836699637daa446af491da29314a77fc0dd608f6151a64b5a0ce9737421e4e0db9212bff63f9c2db6446b031639902822f2070ec8048df SHA512 717937a1087745482d0a03d8695720f913b188241d29e55dd8cfae726e225301cccc73376c197767edd1a6517836f02fc12174ae1f054eabef994f7f305d0d0f
+EBUILD vc-1.4.1.ebuild 404 BLAKE2B 4470cfed655e64e12982d942d5e825f988307e5f08174d25101df7c3f1e3569c87d4ec6091fda13065179d689fdc3467205de7c1d3b4d02a865db575600b1871 SHA512 edde57729a16c831a6e4d417130cae466878641998fca59c2bdd8d97ee4fbbcdac1758b932e13344f6092655b633a0258d88c347b865a35afd90966262d8c6a1
 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a
diff --git a/dev-libs/vc/vc-1.3.0.ebuild b/dev-libs/vc/vc-1.3.0.ebuild
deleted file mode 100644
index bd941c1dd2dd..000000000000
--- a/dev-libs/vc/vc-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="SIMD Vector Class Library for C++"
-HOMEPAGE="https://github.com/VcDevel/Vc"
-
-VC_TEST_DATA=( reference-{acos,asin,atan,ln,log2,log10,sincos}-{dp,sp}.dat )
-for i in ${VC_TEST_DATA[@]}; do
-	SRC_URI+="test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/$i -> ${P}-${i} ) "
-done
-
-SRC_URI+="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	default_src_unpack
-	S="${WORKDIR}"/Vc-${PV}
-	if use test ; then
-		mkdir -p "${WORKDIR}"/${P}_build/tests || die
-		for i in ${VC_TEST_DATA[@]}; do
-			cp "${DISTDIR}"/${P}-$i "${WORKDIR}"/${P}_build/tests/${i} || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/vc/vc-1.3.3.ebuild b/dev-libs/vc/vc-1.3.3.ebuild
deleted file mode 100644
index 0f715e3f512e..000000000000
--- a/dev-libs/vc/vc-1.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="SIMD Vector Class Library for C++"
-HOMEPAGE="https://github.com/VcDevel/Vc"
-
-VC_TEST_DATA=( reference-{acos,asin,atan,ln,log2,log10,sincos}-{dp,sp}.dat )
-for i in ${VC_TEST_DATA[@]}; do
-	SRC_URI+="test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/$i -> ${P}-${i} ) "
-done
-
-SRC_URI+="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	default_src_unpack
-	S="${WORKDIR}"/Vc-${PV}
-	if use test ; then
-		mkdir -p "${WORKDIR}"/${P}_build/tests || die
-		for i in ${VC_TEST_DATA[@]}; do
-			cp "${DISTDIR}"/${P}-$i "${WORKDIR}"/${P}_build/tests/${i} || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/vc/vc-1.4.1.ebuild b/dev-libs/vc/vc-1.4.1.ebuild
index 4ad0d2618b63..6961ddd9b52f 100644
--- a/dev-libs/vc/vc-1.4.1.ebuild
+++ b/dev-libs/vc/vc-1.4.1.ebuild
@@ -1,19 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="SIMD Vector Class Library for C++"
 HOMEPAGE="https://github.com/VcDevel/Vc"
 SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Vc-${PV}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-src_unpack() {
-	default_src_unpack
-	S="${WORKDIR}"/Vc-${PV}
-}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 9001d58b2da6..a05b2a035155 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
 EBUILD wayland-1.18.0.ebuild 1746 BLAKE2B 4877a6996f909af202d7d8f80d638197a0bc305a6ec6de32a01d099fe9133f211f09123889dc779de1b63421921e45a5a7ba656e093b8d0ee8a9c14df0c10b41 SHA512 8843d5f526a0c142658fa22c0f4b771379f5ce3b48516510790914c11815219900b8697a07d18af44cb5103a86e3c756d9244e344abb5d9976ec11d93eb8fd7e
-EBUILD wayland-1.19.0.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
+EBUILD wayland-1.19.0.ebuild 1814 BLAKE2B b055c04a74423a5ae250fda6e73fcc0c7b5c75d944545ef7375a61b07a00fb514f0839c2ed5782daaffd646f15b7d3988a2e360409d7904553f016bdccfd46c7 SHA512 d8425d76c2649037467552685c1d93cbae94ec5485f2f42a2e3292b1ccb269d73455aa99d80f0b9f0c20ef4019bcdfe84d518af157bcfd0695c9918bce4be7c8
 EBUILD wayland-9999.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild
index c3d2b584f4ca..f437006d7fb6 100644
--- a/dev-libs/wayland/wayland-1.19.0.ebuild
+++ b/dev-libs/wayland/wayland-1.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson multilib-minimal
 
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 6e33d2953e93..a61aaf78aeab 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,7 +1,6 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.3-r1.ebuild 3001 BLAKE2B 738dedddf7d7083a0222773ce6bdc428e71b30530aa95e8a19de1871c1e5bcd8f393103deab8653743eb09b45027542b95834348540b027e2809e393187e6a7c SHA512 16c48fa20b2f7f24c168d3c8a79fff300c12e35b1a3eb9c05d643a59c1d7ddcd7f5c3702393410e03080b06f43676c1089eb7dbb356c872197a6b4ae0d7591ad
-EBUILD xerces-c-3.2.3-r2.ebuild 2944 BLAKE2B f2a91197c33a2847a3439a30995a9442af066887ae77af43ddc243e1ed0972a5041be70c592a1e35f9dc42c90a6266a087838cedbd5455cf16ee4fcb12d1ef0c SHA512 b69d04b067adfabde81dce0f2da175f5fd9647f3f6213a220770837a3a87109febfcc9072bc802bdce281a4ff6f88331b4416e714734305ce40b56f502e8fb41
+EBUILD xerces-c-3.2.3-r2.ebuild 2937 BLAKE2B 173f8bf9b995b6ae5aad2f828f4ebc11a4b39055b047f58d128061e79e0b0ebd221711c01191a6edc837a2abeca5d41d76b98e2fc99cfef8766dfc83697db54a SHA512 272a9564c1f44430af0b2938b37828f7efa94baf934ac6b1343858924432df808e2d6d0bf91877c03e09240e7e9034e652382a032b9a65c3fe70141b63c3d04d
 EBUILD xerces-c-9999.ebuild 2882 BLAKE2B 1d5efc807b278179b221b88e050fff78b6c275d1a3554b2aec829296060a0c9309a19dac79a48e06d3c2efe259a945352eb6a9c848c58242e63be0515be97673 SHA512 25c01f394f9043e0952f55d38fe8590d3cb7f1546cffd6c23b59c7cd5ec80a104627fd7d991c512797876ea1e4c63efe956a1b6ee2c6e51631afd4476579d1ee
 MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
deleted file mode 100644
index b6a53f71d1b0..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-
-inherit cmake-utils prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/"
-
-if [[ ${PV} == *9999 ]] ; then
-	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
-	inherit subversion
-else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-	curl? ( net-misc/curl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/xerces-c-3.2.2-fix-XERCESC-2163.patch
-)
-
-pkg_setup() {
-	export ICUROOT="${EPREFIX}/usr"
-
-	if use iconv && use icu; then
-		ewarn "This package can use iconv or icu for loading messages"
-		ewarn "and transcoding, but not both. ICU takes precedence."
-	fi
-}
-
-src_configure() {
-	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-	# But the docs aren't clear about it, so we would need some testing...
-	local netaccessor
-	if use curl; then
-		netaccessor="curl"
-	elif use elibc_Darwin; then
-		netaccessor="cfurl"
-	else
-		netaccessor="socket"
-	fi
-
-	local msgloader
-	if use icu; then
-		msgloader="icu"
-	elif use iconv; then
-		msgloader="iconv"
-	else
-		msgloader="inmemory"
-	fi
-
-	local transcoder
-	if use icu; then
-		transcoder="icu"
-	elif use elibc_Darwin; then
-		transcoder="macosunicodeconverter"
-	elif use elibc_FreeBSD; then
-		transcoder="iconv"
-	else
-		transcoder="gnuiconv"
-	fi
-	# for interix maybe: transcoder="windows"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-Dnetwork-accessor="${netaccessor}"
-		-Dmessage-loader="${msgloader}"
-		-Dtranscoder="${transcoder}"
-		-Dthreads:BOOL="$(usex threads)"
-		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		# clean out object files, executables, Makefiles
-		# and the like before installing examples
-		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# To make sure an appropriate NLS msg file is around when using
-	# the iconv msgloader ICU has the messages compiled in.
-	if use iconv && ! use icu; then
-		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
-	fi
-}
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
index 4c29af461e29..602a29ef1bbe 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 168bdab07a3b..409ee8ee074e 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,5 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 899 BLAKE2B dbdca93bb1768ef01786859f37dc7b901cfd544889585065a935ff69987f6d8cd94c32a6a65b943706d6f8de92c3c607fb784973deddb64b540d4a29b06d75f7 SHA512 ad92abd03993bc6ac875d18da789acbdc8a2f34a9e12e8424a312fcf4bae176b2de34f9625bcb70ed08e5de4916e3d6c5ca5707274628347bafa41ccae44605f
-EBUILD yajl-2.1.0-r2.ebuild 934 BLAKE2B 3bfa7cb1155560e9fca1734e1d1b47cc55b84d9c3557179d97128eba3014c9a67e92066b40bfcb6a6ec7e15c950b725523e18dea1f83ddac5f9769c9d0beaf47 SHA512 64dce8bf0574b584542c74fd5c396889539471f05c271b320b07b1c39319ab827370a19551f6f9bfc402022e93571ce479edad930774b7050b274bbc4d787295
+EBUILD yajl-2.1.0-r3.ebuild 951 BLAKE2B 87db0e670510662ea67c386e28a5e1e19c6c102044aa80cea1c4dc6f803044acb01a1be5e1cd0348bcdc8855448df8a1f5e4f311fe28d3b6a96ea17c6073ae20 SHA512 a51be6909954b36554263a0c7af42e04db4fc897ffe1168ad045ec1e4bbf72954313c3e60f7e4faa54daa67daf5d79bfa36182297742b3081574f7855f579187
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
deleted file mode 100644
index f1613406c0b4..000000000000
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib vcs-snapshot
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="https://lloyd.github.com/yajl/"
-SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	multilib_copy_sources
-}
-
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
-}
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
index 93d4f3063c1b..a4afdebe761f 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
@@ -1,38 +1,37 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-multilib vcs-snapshot
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 DESCRIPTION="Small event-driven (SAX-style) JSON parser"
 HOMEPAGE="https://lloyd.github.com/yajl/"
 SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
+S="${WORKDIR}/lloyd-yajl-66cb08c"
 
 LICENSE="ISC"
 SLOT="0/2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch # git master 5d4bf525
+	"${FILESDIR}"/${P}-pkg-config.patch # downstream
+)
 
 src_prepare() {
-	cmake-utils_src_prepare
-
+	cmake_src_prepare
 	multilib_copy_sources
 }
 
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
+multilib_src_test() {
+	cd "${S}"/test/parsing || die
+	./run_tests.sh "${BUILD_DIR}"/test/parsing/yajl_test || die
 }
 
 src_install() {
 	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
+	find "${D}" -name libyajl_s.a -delete || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /dev-libs
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)