gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-libs
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
261 files changed, 3108 insertions, 3327 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6b0ba2110162..fc1204238142 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 f2bf8e07e7f0..fedd43ce15ef 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,8 +1,6 @@
 AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20f262cbc486d57f6a1669da225386f92ac452ab0120e5095b097543430814827e74af5f9b2a7fdbdb8811f66c6b5be27d45e5 SHA512 4be4f2904ce35f29806432c04cd6c0c23783da1ebd66fb3f091c10a04749f93ceb4d49cdf6963c1f13343dd901a97446b57d39861d7251318feb03625644c59f
-DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
-EBUILD appstream-glib-0.7.15.ebuild 1639 BLAKE2B f1be59355da2351b95886e1dae32d7b552c25ce6b7f8ca09c32f015a88c8663882d98dba95f0a66551960273882669ffc80a4862e781a0259d1f906c86148057 SHA512 0ef5497cb325d16280f9b51321579f60a66794b9aec108fd3c93ec3fb7ed33c0c88a601dc3a033eb6a6d0a4a3d10e043f21a1b6f1caffd4270b7c59ea9d88b45
-EBUILD appstream-glib-0.7.16.ebuild 1702 BLAKE2B 2f3684543e76eb2c96134fe7f4e4ddbbf6dd34b968c0572e8b4aac5c31ab682301edcc56e420aa08f1dc67df350502f91a6b1a73cb22e489849fde0929c410e0 SHA512 3a7d8fd3e5e0ff48cf6d3012ee83e14c791dad7b04e08d35af79942e7dd67131106fdd7c39d219cb0a361594fc373cd51618d8e630579ee6a006b827f8c7547d
+EBUILD appstream-glib-0.7.16.ebuild 1701 BLAKE2B 7fea4d96b083a99439e2fe5e98e6f76d80ec4a9dd2233c82d12344119388364725c614dc89451e1d763162498db82226badf603c88529bddc52ea62a4cd6417f SHA512 ccfff59f9b7f034d63eda0ee1ed099b5073f6aac2a11d0d3485b38bcadf55cba34e025d72151817c4d88ebbc7cba06dc88f66ee7e924b4705dd35577bcf20d95
 EBUILD appstream-glib-0.7.17.ebuild 1647 BLAKE2B 20a250abf1dcfd2ba376b2b3bef172a655a3b9598baf154e67901a832b097170f7ea65c9d1f1d797784da05667c6f3f4e1cfd9c8ad0153f9522144629dc24369 SHA512 d4eac6ef8d2897666571e44e3c0642ca1ef09cdb5ac80eabce25363de1262efaa5914dcf7d28f328619b107fd3a01fe2b2bffb53e0208f2a78cd0c5cee0fceed
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
deleted file mode 100644
index 49ef2b9f8873..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.45.8:2
-	sys-apps/util-linux
-	app-arch/libarchive
-	>=net-libs/libsoup-2.51.92:2.4
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? ( x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2 )
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-# ${PN} superseeds appdata-tools
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index 683b5a49bc0d..b237b2c02bac 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 3ebe49efb267..115bfdcf33b0 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,6 +2,6 @@ DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 DIST atk-2.35.1.tar.xz 294224 BLAKE2B e2e4d5768d8add243bb064e3ec43bd4665bf16f0211be721788a3a3bb96a93e402671e0bf5c7e2a1747ac673fee0b5022cb1798481a5ff0b1cc61f41dc0c8279 SHA512 da81cb4a6a5f2d8d83fa8a430b181b009e5407d906bb000a2d86481e7fea9fa6fb6e9dcd6790d4efdf513e5fe8fcb32ac3ec49d4ce3c76010145b8baacf2ae1b
 EBUILD atk-2.32.0.ebuild 1163 BLAKE2B 4582b2d1881b6469ed0dfbebbbbb45d833172e4dc459499c7c327eda8cc50ebece5a799352ab12fa6b86d4acef9010bd323655d8afcd4a15acbba3f4da64db6c SHA512 b80731afccc28f9b9cdb6e5f9e19925aaedbbd5279786a947fe5c004c358f3f586dde4fe262b38b670a18a9b6155754c1595aab95c566a79c446a675b4d3fdfd
-EBUILD atk-2.34.1.ebuild 1171 BLAKE2B 09ef391df20e8888a5d549560f80f89757da1683c7d55abb34c09185c754f51dcfaae2b904bf5787f5a3ca45fa5f323706f347bc2b6b66641daf89480bce01b1 SHA512 deabb24be76f47cc4018769efa10780eded48ba75e9d7f678277dc1f361fa1714ee9ca0c74ad60c56f661b45a3f36a4db3817c259337cadb024710ea00f183df
+EBUILD atk-2.34.1.ebuild 1166 BLAKE2B 476be98e082bdf2f40393e9296e265564625f3b0551a0184afded8e1e514f61fdb441b1636bf5948a4ebc04f93449b84ad75e22066bea1e82a8e4805dd00019f SHA512 5b85c245e01efd9c30edde9c792fae72ef7f6f3baf667a052d51c5d8b6c6639a12209acae5149890795459f7de241a97bbc3736fca4a82fd057d27b45f97d734
 EBUILD atk-2.35.1.ebuild 1171 BLAKE2B 09ef391df20e8888a5d549560f80f89757da1683c7d55abb34c09185c754f51dcfaae2b904bf5787f5a3ca45fa5f323706f347bc2b6b66641daf89480bce01b1 SHA512 deabb24be76f47cc4018769efa10780eded48ba75e9d7f678277dc1f361fa1714ee9ca0c74ad60c56f661b45a3f36a4db3817c259337cadb024710ea00f183df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
index 4e54ebb066df..0947895360b8 100644
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index ebfa8cf0b8f2..b132ee47dc16 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,6 +5,6 @@ DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93b
 DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
 EBUILD botan-1.10.17-r2.ebuild 4260 BLAKE2B a638b40227d5f8e4f4776407718ab20921930d1e0aebf73322097ea5e106c77c570f4b59890a044f965930cfc3c04900e359027793ea70835e98e6df1d5a0cc3 SHA512 8735649c85d603ceba417a7d2b5d61a3067c4e8493965d54d02c10fbf48e431846dcb3138a313fe00eea1a12fec7d84d8a43e7a7160b6ba54e9e7da1c940c093
-EBUILD botan-2.11.0.ebuild 2483 BLAKE2B 1639530af7d97d152eecf5b3c8d9ae76cbb5796e831371538faa924389026586690ac943508cc45efa3e0cd6e7be8ea1071a9c617d987ddce4474e2b144cfc20 SHA512 d9c22c832246be109b5914fca1a597f28c0f9e88c3ef0fe857ca8a9a1baa4566b712cfa636e919d50b439fa18225ce4b62657c0dc98d0a68af0197b5446f3173
+EBUILD botan-2.11.0.ebuild 2458 BLAKE2B 9b222461452f52d637669263c552779697b12b8e843490e8257061148864cdc820f94dd1e3fba4445ecaad8318597a7b792a3d8f45b9525478646779dfd7457d SHA512 af7f1e9d8f65ef7b0fd6b09d1b239a43456382929e490600fb77eb28d5412ab5fac82e92c433017bf666d3e7ad3e4ba68f9a832191bae5d3d2c32e3977d941e1
 EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
 MISC metadata.xml 301 BLAKE2B d1a73485448b1088e1b111211b6a83573a3dc0f12c8870181a0446ace38120473c34f9ba19ce66c35941ec02a77015645894bdb646aa311baf4cd523c2528d7f SHA512 f2a77fdccb86cb75295e672fa686560a232f927337449527c62c6a07b396b36c95aada8673ca0316394c2b55ff5783e5f60a74aa132630514f7e430252338568
diff --git a/dev-libs/botan/botan-2.11.0.ebuild b/dev-libs/botan/botan-2.11.0.ebuild
index 4a5a14338456..2b1b5bb66292 100644
--- a/dev-libs/botan/botan-2.11.0.ebuild
+++ b/dev-libs/botan/botan-2.11.0.ebuild
@@ -2,37 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
 
-inherit multilib python-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
+MY_P="Botan-${PV}"
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
 DEPEND="python? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
 	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
 	lzma? ( app-arch/xz-utils:= )
 	sqlite? ( dev-db/sqlite:3= )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0=[bindist=] )
 		libressl? ( dev-libs/libressl:0= )
-	)"
-BDEPEND="dev-lang/python:*
-	doc? ( dev-python/sphinx )"
+	)
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+BDEPEND="
+	dev-lang/python:*
+	doc? ( dev-python/sphinx )
+"
 
 src_configure() {
 	local disable_modules=()
@@ -49,12 +52,12 @@ src_configure() {
 
 	local myos=
 	case ${CHOST} in
-		*-darwin*)	myos=darwin ;;
-		*)			myos=linux  ;;
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
 	esac
 
 	case ${CHOST} in
-		hppa*)		CHOSTARCH=parisc ;;
+		hppa*) CHOSTARCH=parisc ;;
 	esac
 
 	local pythonvers=()
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 02016f43c49f..805075db34df 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,4 @@
-DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
 DIST clhpp-2.0.11.tar.gz 172006 BLAKE2B a346e4e9a5e9090a407946cd8dcb321188a9e66ff003ec65c42ceed8a9690d6decd2c47417e149e061e8ffc975a1bfd919134639ca5ed2d91ae94cf669eac81b SHA512 f73dd41ae0e14b6e42ba993f700103f99bb78230c7c8d9248fb32977b7d1694280a8cab1cefbb8d7171dd207b41623d98eb7524667f24a6925e1ee9d47787f7e
-EBUILD clhpp-2.0.10.ebuild 942 BLAKE2B 65c993533fb5861855529ee574286411ce6f2d8af3e14b80f16507b7c6493d44f5f9e6890e9273cf00afb4ad6f598b73096e23d6147df6da9658df9ca5303892 SHA512 fece5a2d1439eaa87035614311938a60277cfade13f874126594b27a6040efeaafae7e2aa7138290baabcac97cf70d4fa4ded7c45d91db8770accf59c63c7c1d
+EBUILD clhpp-2.0.11-r1.ebuild 584 BLAKE2B 8fc65212f9d2dbcb275beae39abfd01ee689465488d0341ac00c078871c4d0418e6fe1a26936ce02c8a1fd7d58eae83725521b197313c92825969e939eb18a38 SHA512 cb1f230853086c619061118e9cdce0f0fb0c53514ad682f610c935432f860a4ce55bec4b08c8caf10a7127dd46d1d1bd557e4482965cb3900ad3dc59a8876a2b
 EBUILD clhpp-2.0.11.ebuild 640 BLAKE2B bc9019f10a86640a96e0851e7ee24800e879ea7c9947b3edf3667ea40dd537ca31cd143c0423fe400b076c4bee89a597a161bcef77b281caeabd5b02f7bd5a3c SHA512 5310f4621a883b4babcd313d3fa5715299ce854006387016b60f73381b1c8a6f2af5e4dc22d928af877dcd3b5c46d5dd65c62204a5bcf95014e9f85977c6cf67
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
+MISC metadata.xml 332 BLAKE2B f42b8bf0c7184f9cc0d2a0164d0311c2fc75e390430119c602832bd6d791913de4669ed7583a5b1f2b67db401217a3bce9d967062e7f3ba0b27801f4ca5a9056 SHA512 d18a2df576e7732073eb8ebc40aea3e67e64a1872b10cdb2bd4bc9d53c803caf1acd7296cd0d5d4ea60867e14262fef88e87e6ba128eb35a2fe797b224fac0ef
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.11-r1.ebuild
index db06bf085688..2325c35bccc7 100644
--- a/dev-libs/clhpp/clhpp-2.0.10.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.11-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit cmake
 
 DESCRIPTION="Khronos OpenCL C++ bindings"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
@@ -10,40 +11,18 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-inherit python-any-r1 cmake-utils
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/opencl"
 RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
 
-src_unpack() {
-	unpack ${A}
-	# create symlink to change name
-	ln -s OpenCL-CLHPP-${PV} ${P}
-}
-
-src_prepare() {
-	# User patches + QA
-	cmake-utils_src_prepare
-}
+S="${WORKDIR}"/OpenCL-CLHPP-${PV}
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/include"
 		-DBUILD_DOCS=OFF
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_TESTS=OFF
 	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
+	cmake_src_configure
 }
diff --git a/dev-libs/clhpp/metadata.xml b/dev-libs/clhpp/metadata.xml
index e943b72b8a48..67017a9f8a65 100644
--- a/dev-libs/clhpp/metadata.xml
+++ b/dev-libs/clhpp/metadata.xml
@@ -5,4 +5,8 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
+<maintainer type="person">
+	<email>marecki@gentoo.org</email>
+	<name>Marek Szuba</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index 5b905b7fcc09..c1c5a35b61a6 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,5 +1,7 @@
 DIST distorm-3.4.1.tar.gz 220042 BLAKE2B a845fb3b5a3c98c1b25601896785273668b48c8477dd29c5db4c4ddcf3cdfe73095e3c4c883ca0909820430989a412d9b47c87471450eba2a4d969a9a03d32c1 SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
 DIST distorm3-3.4.2.tar.gz 182134 BLAKE2B 82bff5b12503acce156be2b2b16d2d60eb39329092dabfdd51815c468a7fa1e0cfe27351fb09e3f587054ec8262f5535d1b29f1269ccde94e01e1d326ba3df85 SHA512 a723bce70f0fddf065aa53fa7ea48c5e9f354c0fbe241c70ffd1404950fcf79b5ad6c6be64d20cb80567024bdc05e6bb41f788267a069c8e7b7b9dbb7c5c01af
+DIST distorm3-3.4.4.tar.gz 134803 BLAKE2B 4c496db182c874b1f2d3e1433b53f59c51000d18c2e128d642e8088cb3150757a54d16d4f8303a2d46dfa0e83a941f9e75798d03643835938451c4b4903fd1f4 SHA512 ee39054a37436bb2137261d8fcf6da5e4849ef649bfa323c4523c195c1d9ee90708057fd1e1818f676300a410a184006d8db54ec3eef9aa8f5fcd455b25fc7a2
 EBUILD distorm64-3.4.1.ebuild 507 BLAKE2B e0d7040ef16fcf664b681e038147379ae463a51d8c4790ecffcfc0572563e8bc1b51683185a09b3c8f2058a377e24546ede7e6383f98d5b1350e63f74684fd3d SHA512 ab1f0ea5faa28c7fa35804f5e49d371e90d2e54fa95f79d32ccdbda46709bdd2425538b64bf2d0ed87778331031c6acb5a96eca22156b5bdabdf559d3c5bd1c2
 EBUILD distorm64-3.4.2.ebuild 603 BLAKE2B 3d33ce40bd15b35d216ab622f492e89c424d260c9b35fd107c6fcdba3234e3cb218c2c5b14749550516ceb893e3801ad9e8e64365b68db15e9f7aacd676a5005 SHA512 0241d758a1f3643abb0715bb3b4fb3ff7e31977d918370d5e44efb41d8f7b8b8d60a8659262208361c7f99a854c6bccc2127dc6c7cb85f29f40ff3604ea7057c
+EBUILD distorm64-3.4.4.ebuild 597 BLAKE2B be31f99966ab069f4fb32c75243c71f82ac80ddd2b89ae44ea3651ac06d4b5bb075f8015f05ad2ae2c929eb9cb135abe2a1a90346ca44a3e9b0d83beab507b3b SHA512 2e8a6654c369469cf82c63335d196ec86bb85a72d54c5db9a5ccf5d31b30cd5559183f6da95d90d045a56963707aa02ef51c619719b647d22683491a5733e7a4
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.4.4.ebuild b/dev-libs/distorm64/distorm64-3.4.4.ebuild
new file mode 100644
index 000000000000..33a2f40462cf
--- /dev/null
+++ b/dev-libs/distorm64/distorm64-3.4.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
+HOMEPAGE="http://www.ragestorm.net/distorm/"
+
+MY_PN=distorm3
+MY_P=${MY_PN}-${PV}
+
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=""
+RDEPEND=""
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_install() {
+	distutils-r1_python_install
+
+	# don't know why it does not happen by default
+	python_optimize
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 5273b82d8e91..e0569455ffda 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,11 +1,6 @@
-DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
-DIST ell-0.27.tar.xz 474412 BLAKE2B 3b7d7ccfff8a92bbe930032b6a54bdc91b6541d1e6d8e514f1e49fcd08f3f5bc47beb3722dc864a63dcbbd72f793fbc2bc590b168f1623ff6e7088fbc960acb1 SHA512 ecda285155ef5ac1b8bdeabfba2e972149a5027c85236af74366c735aec7304b2dee8ff6aa931000b4299e8bb7654e7d4a63c1738de6e6e740f5ba16467f2823
 DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
-DIST ell-0.30.tar.xz 478204 BLAKE2B 77d1b7307949feb47da28e0c777172b9f5272676dc6fe677955118a9f8dfdaad43fc400e0057ae8b370ac441c61a21bc351fe89053e40d0d94f9874a3b373726 SHA512 e58ad67b8c6aca5294eb00cc194bac672f8666a445295f289e68462981bc07e5c2bce1297423470e1ba34cc2e2d10ee57741ce370e7c013991571ad1f685c6ff
-EBUILD ell-0.26.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
-EBUILD ell-0.27.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
+DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8
 EBUILD ell-0.28.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
-EBUILD ell-0.30-r1.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
-EBUILD ell-0.30.ebuild 1244 BLAKE2B 0013206b374d0ff0c09f43e940ae943acc73dee0a59a3672829aa3b7358c7516ccedc74ff9ad7cb7f82277612e6c1f7ed6d368404ca323170fe0320bc6df3e4e SHA512 2fc3fd27eb098f39268528d763e0652e74fe2b1b27c927462c72277cc5e37fc656a867778f8a8bfb7ea34abe6070d0ec1297d0d0617ff35602229fdaaa0bb55e
+EBUILD ell-0.31.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild
deleted file mode 100644
index e4afae4a385c..000000000000
--- a/dev-libs/ell/ell-0.26.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.27.ebuild b/dev-libs/ell/ell-0.27.ebuild
deleted file mode 100644
index e4afae4a385c..000000000000
--- a/dev-libs/ell/ell-0.27.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.30.ebuild b/dev-libs/ell/ell-0.30.ebuild
deleted file mode 100644
index a16ad16548b3..000000000000
--- a/dev-libs/ell/ell-0.30.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~TIMERFD
-		~EVENTFD
-		~CRYPTO_USER_API
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_MD5
-		~CRYPTO_SHA1
-		~KEY_DH_OPERATIONS
-	"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.30-r1.ebuild b/dev-libs/ell/ell-0.31.ebuild
index 6c1b04339772..6c1b04339772 100644
--- a/dev-libs/ell/ell-0.30-r1.ebuild
+++ b/dev-libs/ell/ell-0.31.ebuild
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index dfe5ce5043e9..966df218102f 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 670 BLAKE2B 9b497d445da46239296d2df4f5125d1fdd15b7b1cb09950b4ee745df6ed18e2cf43e721e6c46bd611226d7e2e20c6a6f7f721b6d49f956579a5b9a144d375f11 SHA512 ec5dfdc1a1a4908e070a1974165ec083bf7c4e03eb1edadc35431ef2738065116eac9c333c5a1e42dbbdd9ae070daf4646c9975574938f22c65cfe104f1a4ff7
+EBUILD eventlog-0.2.12.ebuild 671 BLAKE2B 9b816ae5592d17030343f74987462cce7556b663b62cbecc80605f8b060c441de52630580c5594ed09414b38cd1ab9e9a148c2ab37c82de7fff43bba8156a2d2 SHA512 cd2a20c3e902ca5f2333882247618d3bff1e319fd603f839a7a2da283e76a1662353e039463bf6989ab2fff4a5f27b387f20cd4045acc97a8d3c3b8ae37a2b03
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 5e1cc7191461..d886e06c86ad 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 67ab3381c757..ffa27e32828e 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,5 @@
 DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
 DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
 EBUILD flatbuffers-1.11.0.ebuild 697 BLAKE2B 389c3f6f198cba2729771f48fc5e93d3ee78378e2b623a81aa53270f28b62cb4906a96407754f08b68e2b628f7458ee35bf12650f1153931cd7a5b18ac2725c3 SHA512 9040890f80c55163c711df6a38129bb0a590cc78940a2f9104e02809966e3c9a3da8b6f01192d5e3990e80e8f1b04ccdd7cf096493e0733684a59420ffc8713f
-EBUILD flatbuffers-1.12.0.ebuild 700 BLAKE2B 8d17ab5228af7ae4e07b381a197a06ce526c7e995000432f6a61c5f8c3df1e222d51db5878e68d3ee51cc4daa18b5c835ed0f07848bcebb54868058620587f37 SHA512 4da00fc25532ad57696e0c66ee1185b16bde82e60895602a6182d626653ddb2100836496662c50fbb653b3c8c1507b85434b24aed7de6849424c67edc38e8ebc
+EBUILD flatbuffers-1.12.0.ebuild 698 BLAKE2B db3f39e1236522dc831d5b850d2196956f32394e5cee5a919986bdc8706f4153c58365f94ced93357be649bd5e0d6e6d9a366e778380b2ed13295a7305bc36d5 SHA512 f3ff7651a14564edfb3b9f151a5a60f6b4d4c2ef2c928a8c4edcc97049bacc8e8b35a21617e08aeff7cc606ec15518a0a22f4a83a08bc34d5de3d6f7d28a0eda
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
index d501c19113cc..3b0fd0e17e73 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index e31eb77bf4d0..ac7d6f1e6f78 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,11 +1,4 @@
-AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5
-AUX 0.12.1-meson-0.53-compat.patch 1381 BLAKE2B f1fc6a54113dcac1f3a76970d1b3a2558fa48971e5f7e2ef8723f91aaf423fa383aefb04a833cc507057982e8305475068b58dbcdf1c1ec0711c520ede591bff SHA512 da08c17dc2ada2ef48970f30859f42b7117e765294349137651ccf46006ddd465b89dbacbfd41c6fefb4135f691d37146708250f060e9d4089d4f20c6cbb42fb
-AUX 0.12.1-meson-0.53-compat2.patch 763 BLAKE2B 280b3b9801de593136006c1129a68b05db3e8e551d4286c081906a7c254c1dbebf0afb7a35a4839792b19bdaa620a5b77904e4193bcfeff54edffc821270f21c SHA512 33fd46de823df0f0ad27402b0f69c72f41da6c6f9ecd382dc84454ac413781e884dc349c72c5ee5db0a3b24d4828a70a2af5e0f2574f80f6718a679eccc789b7
-AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
 AUX 0.13.1-meson-0.53-compat.patch 908 BLAKE2B 2fb471f9f500623565491df116099198be990c4ccf9bc308a2fd0fc2676b81c9f1ae5aa9a6168703066a35a0c3d87d480610d81333da97c1363d87265ccbf998 SHA512 2e4ee26a529d2a854027abb9d0a1414d1059f55fb0ac9ed5edde36049819bcc77f1e971b9b8a98e56db6ab18e6704591f9ea906ecd12f9bbff17816d40f3bc5d
-DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
 DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
-EBUILD folks-0.12.1-r1.ebuild 2685 BLAKE2B e022c4fc18fed55dac5983f784644e7fca72b519daca47e6cc77a806a003d57a3bb97b4b105864b4c93a7e60e9cdd9ebb41bef6a244d259f34d7117a4e784f5c SHA512 9fda39a47b741832b7155cd36c1d972d3692f18c9962b22d525551907755ed857f1af4ac76881adfc64a9b7508ba27f719619541ad22d476f9170927cf876e09
-EBUILD folks-0.12.1.ebuild 2461 BLAKE2B 07bf3f5c2228b82778628918c91539b891bb33c165f98c3661a5e68bf689536fe0e6de17ac4a80bb731e138d184d6044c926c9be406cb12700f07e8afd4eed25 SHA512 fbb30f024370c686a821811b5a63bfa7d0086da1ae6744cf1ff079a40e96bdcf557856b277395594f526c062755e5b8fb042a6e7afb2c204ceabf69dc735949f
-EBUILD folks-0.13.1.ebuild 2129 BLAKE2B abed9d09fb8f3029592349bbf1fd346cb4f709656c9f655a57ec2d7c3d50d0ada6bac6ce71cd6a21713dc4ad3ee90419754a79efa150886a539a6ac1226000d4 SHA512 6748ca3829f184bf98a64a8998d6016103881cb346188eba0719cc401396c16b40b6a45cdd86c55a555a9b0955e3ee3fbd7405424d75bac847dfffb57f78fa1c
+EBUILD folks-0.13.1.ebuild 2127 BLAKE2B fbd9a7223cb54a3b7131dd65644d4b3232ff6f5746c0dcb9cab470e82180844b45b0b3a8c34f5949863dd7e728b2a1a3f8a75ba23e9f1c66fe480beb900bafd5 SHA512 78ec67564db62ff9c97326a0cb971b7240eb3bc9e1c28e07b10d60acb5a030a595abd093fef877fd68915a780b5a6f4ec9fe45c25eca793122e95f72cdc06ca9
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch b/dev-libs/folks/files/0.12.1-conditional-tests.patch
deleted file mode 100644
index cde0847fe146..000000000000
--- a/dev-libs/folks/files/0.12.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 7 Sep 2019 22:16:43 +0300
-Subject: [PATCH] meson: Allow disabling build of tests
-
----
- meson.build       | 4 +++-
- meson_options.txt | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 91800654..37e6b5c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -219,7 +219,9 @@ subdir('tools')
- subdir('po')
- 
- # Tests
--subdir('tests')
-+if get_option('test')
-+  subdir('tests')
-+endif
- 
- if docs_enabled
-   subdir('docs')
-diff --git a/meson_options.txt b/meson_options.txt
-index 042a72e8..b4552d49 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -9,6 +9,7 @@ option('zeitgeist', type: 'boolean', value: false, description: 'build Zeitgeist
- option('import_tool', type: 'boolean', value: true, description: 'Enable building the meta-contact import tool')
- option('inspect_tool', type: 'boolean', value: true, description: 'Enable building the data inspection tool')
- # Test options
-+option('test', type: 'boolean', value: true, description: 'Build test programs')
- option('installed_tests', type: 'boolean', value: false, description: 'Install test programs')
- # Docs
- option('docs', type: 'boolean', value: false, description: 'Enable documentation generation')
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
deleted file mode 100644
index 56f9543ba40a..000000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Mon, 3 Feb 2020 08:57:52 +0100
-Subject: [PATCH] meson: Use python.dependency() correctly
-
-From https://github.com/mesonbuild/meson/issues/6470:
-
-> So, to further clarify, passing an argument to
-> py_installation.dependency() should be an error, since this method
-> will only ever return a python dependency (for embedding python
-> itself, etc.) and not dbusmock or anything else.
-
-Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
----
- meson.build | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d5115e28..f3644457 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,7 +1,7 @@
- project('folks', [ 'vala', 'c' ],
-   version: '0.13.2',
-   license: 'LGPL2.1+',
--  meson_version: '>= 0.49',
-+  meson_version: '>= 0.51',
- )
- 
- gnome = import('gnome')
-@@ -132,8 +132,11 @@ if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
-   # Needed for the BlueZ tests
-   pymod = import('python')
--  py_installation = pymod.find_installation('python3')
--  python_dbusmock = py_installation.dependency('dbusmock')
-+  py_installation = pymod.find_installation('python3',
-+    modules: [
-+      'dbusmock',
-+    ],
-+  )
- endif
- 
- if import_tool_enabled
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
deleted file mode 100644
index 40c3ca601f05..000000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 23 Feb 2020 19:28:51 +0200
-Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built
-
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 74320634..64f28d2b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -131,12 +131,14 @@ endif
- if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
-   # Needed for the BlueZ tests
-+  if get_option('test')
-   pymod = import('python')
-   py_installation = pymod.find_installation('python3',
-     modules: [
-       'dbusmock',
-     ],
-   )
-+  endif
- endif
- 
- if import_tool_enabled
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
deleted file mode 100644
index 3dbfadf7452e..000000000000
--- a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 7 Sep 2019 22:26:38 +0300
-Subject: [PATCH] tests: disable failing tracker tests
-
-All tracker tests fail for me, so disable them for now to at least
-continue testing the rest.
----
- tests/meson.build | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 6a7fa29c..2079051b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -43,7 +43,3 @@ endif
- if eds_backend_enabled
-   subdir('eds')
- endif
--
--if tracker_backend_enabled
--  subdir('tracker')
--endif
--- 
-2.20.1
-
diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild
deleted file mode 100644
index 3ac62a655ba7..000000000000
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9 )
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=
-		<gnome-extra/evolution-data-server-3.33
-	)
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus
-		bluetooth? ( dev-python/dbusmock ) )
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
-	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removes them for now
-	"${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119
-	"${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch)
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		-Dlibsocialweb_backend=false # not packaged
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
deleted file mode 100644
index 95be628d2bca..000000000000
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.44:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala]
-		<gnome-extra/evolution-data-server-3.33
-	)
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-	test? ( sys-apps/dbus
-		bluetooth? ( dev-python/dbusmock ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
-	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removed them for now
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		-Dlibsocialweb_backend=false # not packaged
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.13.1.ebuild b/dev-libs/folks/folks-0.13.1.ebuild
index 4c61554a6c76..0d40a5ff9011 100644
--- a/dev-libs/folks/folks-0.13.1.ebuild
+++ b/dev-libs/folks/folks-0.13.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy tracker utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 48a517bbc725..5c36e42a926d 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.8.tar.bz2 2077095 BLAKE2B 2b9a0887a02bf6bdd7f285aa1df012e5e8f675fc930b612f53a2cce5ef4ef275610ce9a1aec9debf4c5239164fdab4b175e36f8f07288949adf2496d01c95f67 SHA512 d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
 DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
 EBUILD fribidi-1.0.8.ebuild 1003 BLAKE2B 70a3496da4ae7c7826b940140020bdfa814600ffb67ec581a029d76d91e6eec39fc5cf86fb9e77bc19ceb1e8a3ae06dd8b7d954da32c8c15b3b216c7b07893d0 SHA512 b5b0c6d9a5e0188402b48b17a0ce1beee7ba1f5b19ceebdb8b6e881f3d1cf3c82359b7ff7da7252edc359680d74854f56a2a9a0cd16ab7d05a2bf4abacad6915
-EBUILD fribidi-1.0.9.ebuild 1011 BLAKE2B 69c5c77367e6cac1f8a017f804ea57598ef11503a33349db687e2f8c08334a95c2983f45f7f11acfe76db4e3567807479ee7de350f2e699f81e809178e65f2d5 SHA512 5bd29520ce11a5f5518216a542e8986877bd35c1bba2285e55ceb82b544217abc09040e0283d884cb5c39e7d4360916c2d13a8271e9f98cc52d810edfab76107
+EBUILD fribidi-1.0.9.ebuild 1006 BLAKE2B 94ed92e2fc509dfbf5215168f3cc52e47b2b2e0b7b7e3bc05cb83cbb4784bd4a416e5bc97a198d043100d87894124d2d6667c468932a96f80f9865c69a680942 SHA512 0c4371635be6e0a805afdedc902f07b64170e34410e0085b56745521894b64640e3572b38a9117356ad06edd9b3a3b7fc999a5e7bfa18fc74ee6c8997f96ad28
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
index d5d6d8545b99..ea8f3c59c557 100644
--- a/dev-libs/fribidi/fribidi-1.0.9.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index dd9bf43bdb67..41adfc1db795 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1,7 +1,3 @@
-DIST gf2x-1.0.tar.gz 460810 BLAKE2B 07aa3faabb2616e11c2620cbb8008dede01f0ec2b338656572d8a86c45b9fd3bc61ec5e5ed97c1f9f8b1ba740a939364f113822f7cb810e362474fc1de09eada SHA512 f4658698972e31428d8349b423762e9ef5aaeb52d8081c9831baa4eb066737ab3e9667a700d5df79e0f0df2626db39f2f994df17da14719506d44dbb9b33af40
-DIST gf2x-1.1.tar.gz 496708 BLAKE2B 18135d812c09f8ad0dad80ed7c1f58404461b79187ef8f176c9ad73e75de8b5a4a95a29463f57b86816a80ca21324dd2fd4a139531fb69eb4476f45400a497a7 SHA512 052cb2152773dc114a2a80cc64cd0679c1f57eceabcdc7cc25987b8d2599fa6d4871b5bb6ff71319727411b9b5aca11e431e43eafa474a419cf306d42d22ac2c
 DIST gf2x-1.2.tar.gz 706519 BLAKE2B 4aa45d10646b51e540be51d0fe3691083c48c666d34e67d50d8f53753c49af2bd9664483618eee5a1883106d1f58ddb28cd4eb02031f13eebe8278630de736f6 SHA512 efddad2b99fa103fa77caed4a62f4a763dbff67bc7cf4527bbbf33ca826829e4a4f94e97454ef1a6498bdc2cee8934ff43f9dabf41a4a4f256721527a1dffa30
-EBUILD gf2x-1.0-r1.ebuild 712 BLAKE2B a1eee9c3de39e86e79ccc48edae73fc9d45b171a0993ca4397d104e317a9a1e07fa63b4a7158648fe8ae9f5c5f89ee302029934133eb17bb502ba5c245a5de08 SHA512 cbc408834d81e0c6784e1f3ae6cecb61bb9ed70e250f12205e13218a9cf701440baf572977f05b836701457ee5b55068c9f9402bb577abee104b03a9d4e847e9
-EBUILD gf2x-1.1.ebuild 715 BLAKE2B c8edc6d4aac4f7ec60bcc958dad5bcff1b494ecf14649fd33cb1169f813929ac07ac32c4ce2c60d0f006a39db838196e82f7a5c18c7303a1fce209b9e0dbef55 SHA512 b9d4e006a53fa5641b7e342ce2860feb0029b10f82c0150f1b45d32c443ea5d029014f92a9dc87977c0aa0d34f2598916471cfb01f61f859bdb14fa9fb31728b
-EBUILD gf2x-1.2.ebuild 1375 BLAKE2B 172a55e7db7cb4ef22ede334f8dbc0d356b1b8ea6ff452aa3e87d5e08532cfa3f54b192c3993674a657e29230cfd07c9b2d4a353b057f9bd13307e29d5745745 SHA512 587a017d2518d8f0c293aa5dd3857d659e03724b65cdf7bb4c804daf20ce5a9a3a72c7281ea79dd521affbbbaad9b9d4b943a8cb02312f91ce1fdcf4e35646df
-MISC metadata.xml 835 BLAKE2B fce44f325ff007ee4c52f45c2e0a4f0eeb6eedf885aa4ff66b17e9081c1007755b753b89a2966237e7cd1a6f86bb20b946488707356dc2f7ffd528490e8863e7 SHA512 b939d980aa5f6ba39f4e4378cf677942b9f1d596cb87ddce2d7ffaf6d6a9f82422ebf59f5bc98907305c75bbd249ea66f3edd15cfd1195e2b9282ff637d93eaa
+EBUILD gf2x-1.2.ebuild 1374 BLAKE2B 3f0c60bec75af99a1b50f25ac15e900c55a66e8c41b312f9715b054565a27a6cbe1d2d31a947826f857e9728c95a42f3698bfd54c61c935faf97dbc736946c99 SHA512 d7fb00c2e532f11060576ccd06744c35c35650d679038c0a8e475826b16822f083f9931feebaf09e73f609c1390c48c563c06529760185a522d4ee35aba7edd6
+MISC metadata.xml 754 BLAKE2B 53d2cdd4bf257213b6f431fd7692593d9577f0c146c2b40546846ef868a781f8ef40d82fc3c833edf7e0cb9c9805c67e1740af2ba205a2e50f767d3e7160303b SHA512 48a3afc2bef2fee5bce10f9d0f4580269bc0089855f2329cf74c3726ebf20ab05867e628dad5e05c57982433cee2a17782b30b16080a76ebc979373105e18803
diff --git a/dev-libs/gf2x/gf2x-1.0-r1.ebuild b/dev-libs/gf2x/gf2x-1.0-r1.ebuild
deleted file mode 100644
index 98ee76b86153..000000000000
--- a/dev-libs/gf2x/gf2x-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-PACKAGEID=27999 # hack
-
-DESCRIPTION="C/C++ routines for fast arithmetic in GF(2)[x]"
-HOMEPAGE="http://gf2x.gforge.inria.fr/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PACKAGEID}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist static-libs"
-
-src_configure() {
-	local myeconfargs=(
-		ABI=default
-		)
-
-	if use bindist ; then
-		if use x86 ; then
-			myeconfargs+=(
-				--disable-sse2
-			)
-		fi
-		if use amd64 ; then
-			myeconfargs+=(
-				--disable-pclmul
-			)
-		fi
-	fi
-
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/gf2x/gf2x-1.1.ebuild b/dev-libs/gf2x/gf2x-1.1.ebuild
deleted file mode 100644
index 779fbdb0f804..000000000000
--- a/dev-libs/gf2x/gf2x-1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-PACKAGEID=30873 # hack
-
-DESCRIPTION="C/C++ routines for fast arithmetic in GF(2)[x]"
-HOMEPAGE="http://gf2x.gforge.inria.fr/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PACKAGEID}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist static-libs"
-
-src_configure() {
-	local myeconfargs=(
-		ABI=default
-		)
-
-	if use bindist ; then
-		if use x86 ; then
-			myeconfargs+=(
-				--disable-sse2
-			)
-		fi
-		if use amd64 ; then
-			myeconfargs+=(
-				--disable-pclmul
-			)
-		fi
-	fi
-
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/gf2x/gf2x-1.2.ebuild b/dev-libs/gf2x/gf2x-1.2.ebuild
index cf3175e7df33..f8064fb4a297 100644
--- a/dev-libs/gf2x/gf2x-1.2.ebuild
+++ b/dev-libs/gf2x/gf2x-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${PACKAGEID}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="fft static-libs custom-tune"
 IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/dev-libs/gf2x/metadata.xml b/dev-libs/gf2x/metadata.xml
index 3a09b3124827..1fea5b4ed1af 100644
--- a/dev-libs/gf2x/metadata.xml
+++ b/dev-libs/gf2x/metadata.xml
@@ -11,8 +11,12 @@
     for irreducible/primitive trinomials.
   </longdescription>
   <use>
-    <flag name="bindist">Disable automatic fine-tuning to local processor features like pclmul or sse2.</flag>
-    <flag name="custom-tune">Extra long compile time for tuning hardware specific low-level routines</flag>
-    <flag name="fft">Build an FFT API for multiplication of 2 polynomials over GF(2)</flag>
+    <flag name="custom-tune">
+      Extra long compile time for tuning hardware specific low-level
+      routines
+    </flag>
+    <flag name="fft">
+      Build an FFT API for multiplication of 2 polynomials over GF(2)
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index a6247322c814..d5a30532fb60 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -5,5 +5,5 @@ DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756
 EBUILD gjs-1.48.7.ebuild 1578 BLAKE2B 24e94013e5c8f31fb187e4b8a975da97b91f37cbbba3951c8ba82296cf0ad30c38a1a4f17ccc24b043088e48384647373b3e589d36eeb6dfad7a38c2009f33e3 SHA512 312834bf29f8f944b937582670639bdd0955525f32b5d1fe5af5ddec9b2c96e868d496f7ae4ce6cf97f67d5493e9cd6076b5f94817fd143dc2989123cd10932c
 EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
 EBUILD gjs-1.58.5.ebuild 1598 BLAKE2B cbf660c8001737e30d93b0a55e42aa94501e39013bf91e2714a77e866e1f9776276da8fe8c644829c7137f8bed29c277fce7fc173b3f9d07db7502000eec3940 SHA512 84b731d5b37d2b0060b136a5b86a665b9c786fae5d9435c5a745e274346009cdbcead494ca79033b7edc83a4cd42c57061d430e1c330bc14abde4a3bb2559af4
-EBUILD gjs-1.58.6.ebuild 1598 BLAKE2B cbf660c8001737e30d93b0a55e42aa94501e39013bf91e2714a77e866e1f9776276da8fe8c644829c7137f8bed29c277fce7fc173b3f9d07db7502000eec3940 SHA512 84b731d5b37d2b0060b136a5b86a665b9c786fae5d9435c5a745e274346009cdbcead494ca79033b7edc83a4cd42c57061d430e1c330bc14abde4a3bb2559af4
+EBUILD gjs-1.58.6.ebuild 1593 BLAKE2B a0cd6301b5881ef0d8b0e9495d66b57bffdb0a9b4521893e6b34c6aed3b2ec22fe3dd283784edee9073c92ef8755156818e0eb2aada34567660448f768d3e7c4 SHA512 84648467cd6ba87457726f70768f198c84eb8015b370853315a20569d07709c784776715b07f60dd2887fe37ef045e84cb1c3d8effe11effc416e4ce8216f5f7
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.58.6.ebuild b/dev-libs/gjs/gjs-1.58.6.ebuild
index ee4c6cf3c607..383704357bdf 100644
--- a/dev-libs/gjs/gjs-1.58.6.ebuild
+++ b/dev-libs/gjs/gjs-1.58.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58.0
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 2bfcfd8bf854..12c0dc86714b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,13 +2,9 @@ AUX 2.60.7-gdbus-fixes.patch 10740 BLAKE2B 0e42e8444c6308aebdeb240c935969015758b
 AUX CVE-2020-6750.patch 29371 BLAKE2B df3061eaa5de4115143d52fac6663c791bd5f1d1d3272d4311f49119896bee94fce9035b315dafd267164664bc9fb11798edb6f98975df2ce26f742acf00b1d6 SHA512 6f3da1db841503072d6f88b188ffa869eb07bfb918286ddbce780f114cae2da0024202a166a4b3913b51aa070cd1a98a9993f2516762e2bc2114122731a9720d
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3 SHA512 2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
-EBUILD glib-2.60.7-r1.ebuild 10214 BLAKE2B 9ebad250efa90388956a8669775a029ce90c3fa686ac427e88e2ae9411641998ae086c78e49461a99d203245e3fedfec643e23c0765f903ec065b4da6fabc095 SHA512 f9e620db4391a5b9bd57270f8283e35edad93dab9b11469f65548b6545c6e000ad3fb773b103216b905931b4ea36defdd8e8df1431afee25f554c79b0b1b502c
-EBUILD glib-2.60.7-r2.ebuild 10255 BLAKE2B 3095550fdee6a0cfe718dac2086282a8e0be93ad632c592cf6d06970accd1c3ba361d2ad64a0317fbb192ef7095d53e19fb0a4b0b99da8c3c1e133f0a856979d SHA512 a90e00e44ba89687f09ac9589881be183e93638532797b4b72fbf1d8b70d3d0f7e47624a25b9bfacf13363ebf57bf603d72ea4a18eaefb087bf02a4144923cbc
-EBUILD glib-2.60.7.ebuild 10136 BLAKE2B db0132398aa7be1cf7d9bfaf6dc429304ff74ecbc67b167cfba64235717e9a02d0d46da08a53dfdbb32397f178848dfdf578ecd6ced26717d008827a35922441 SHA512 b5b4b192ae4a890d17bfae25ad87cfd7e7623cd7211ea858fb66cc99226021df69d2a181395c53e4fcdbdce3a97c4da72ce8790b3033997b01be75b2d33a90a8
-EBUILD glib-2.62.5.ebuild 9787 BLAKE2B b014b1203657321e3ae356e4ce4a30654981c9e2c87eb86a6e64c44bd587974319a2dbf432724d9eabdf42050b8156e39616d5b143383e63192bee1bb2dc3823 SHA512 01dd1139fdd6f136f3b8f47139e84db50fbd2a80d396d291ad9d6f73e7c2a06944bb3da641dddb2f343f8f5544d3c90427400e186861d9f3f03d80f70ab4967c
-EBUILD glib-2.62.6.ebuild 9787 BLAKE2B b014b1203657321e3ae356e4ce4a30654981c9e2c87eb86a6e64c44bd587974319a2dbf432724d9eabdf42050b8156e39616d5b143383e63192bee1bb2dc3823 SHA512 01dd1139fdd6f136f3b8f47139e84db50fbd2a80d396d291ad9d6f73e7c2a06944bb3da641dddb2f343f8f5544d3c90427400e186861d9f3f03d80f70ab4967c
-EBUILD glib-2.64.1.ebuild 10101 BLAKE2B 9c9b7ad9d9f010aefaa9e869dcb425d5f016262df8751340a1917d50907930891de9d4531326ec4bc7bd4d9fd490144823e4ce05f41fce7873aa8950d40e9957 SHA512 33f147f0605a87aee6f6f373ac9630ec4a5838c7c90a20eed74efaf35f8b2a8cfc47359b7df99fdcd03b5cfb6e2264d90b9210b9fd88088cfca130e3a080bd88
+EBUILD glib-2.60.7-r2.ebuild 10254 BLAKE2B b0dfbc7218f55ef76c175843266fa68a217aa837dd90fb1b97a28cc258420da832cee5832703cc3cb31a402cd845fc41b6d1b7c6bb5119028b60107b58b0a169 SHA512 82206417d477653373ca1e023b6172e15d90e4f44cd7ef4f9fa25c45ebf267adc0f4e974bbc72d101d0c400c9b0f75670cb00a6ec07051600d35ee8b8f45db00
+EBUILD glib-2.62.6.ebuild 9782 BLAKE2B c6e9f7f24570294cdb4af9e36c7fffe018c61faa57b24adcd1cf6690da5d559320e5fbefbba427e5d928170015df6dc275b3d2b508273e5f782f1e473227e1cd SHA512 466dcd1896f0b53ffe2acec97f6a71535db21f8c167ff36a69aa546822e3c7249cff539654033c751e83c50d14cb8429edc91ff17cdf5d2ba131b0383a72db24
+EBUILD glib-2.64.1.ebuild 10101 BLAKE2B d39f731ad9d2e845246eaaa2b525814e55f822542b030830e90849610865787f110e5e94400b7efe880980a64be73a1c1bcf0606b81120077eb8061af96ceb38 SHA512 4b867fefded0d6b0dc9ae42efefc39087d0c0c54e6afa9555cb0d01ffb22e5bfb67d0cf4dd7125db7066752197807163a2c80d4645b1c59955fc3fd7359a1f6c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.60.7-r1.ebuild b/dev-libs/glib/glib-2.60.7-r1.ebuild
deleted file mode 100644
index 8d75112c2f69..000000000000
--- a/dev-libs/glib/glib-2.60.7-r1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	virtual/libelf:0=
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PV}-gdbus-fixes.patch #700538, included in 2.62.3+
-
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die
-	# Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg.
-	# Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the
-	# install_dir removal only should be kept.
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=true # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use fam)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.60.7-r2.ebuild b/dev-libs/glib/glib-2.60.7-r2.ebuild
index ed20507c6a5d..2324497e275d 100644
--- a/dev-libs/glib/glib-2.60.7-r2.ebuild
+++ b/dev-libs/glib/glib-2.60.7-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
deleted file mode 100644
index 2daa3fb14370..000000000000
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	virtual/libelf:0=
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die
-	# Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg.
-	# Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the
-	# install_dir removal only should be kept.
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=true # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use fam)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.62.5.ebuild b/dev-libs/glib/glib-2.62.5.ebuild
deleted file mode 100644
index 9ea54486720e..000000000000
--- a/dev-libs/glib/glib-2.62.5.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	virtual/libelf:0=
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=true # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use fam)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index 9ea54486720e..d620a2ffba3e 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/glib/glib-2.64.1.ebuild b/dev-libs/glib/glib-2.64.1.ebuild
index f558eaa92f04..9e610133a79b 100644
--- a/dev-libs/glib/glib-2.64.1.ebuild
+++ b/dev-libs/glib/glib-2.64.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 7c66b8e62507..705932c69566 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -7,5 +7,5 @@ EBUILD gmime-2.6.23-r1.ebuild 1499 BLAKE2B 5fa080e22105dedbbb3c948aebdc41cdc8dfa
 EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B d4aeebc85657814cb1e1b27f9c7dace2a5ae2637e92241b75ba2b1872a5dd04dff84f2a018dbbb6f3536950aa5547c0070ef78c1ee9cbf4318e24baf3deff19b SHA512 75a92232f52cf7354d69d0c7bc79b15fface1be6fa4fc9e7ff512bbe5ed0a1eaadd766a90de5a88248ed85990fe0e722ffd656aa1b3408ca74f890cb61deb411
 EBUILD gmime-3.2.5.ebuild 1578 BLAKE2B a3d05923a75a9c71646388ecad4c3b74ba9adec3231f10485aed31cd881f59e65944a365f78b9c3dd903d09b28f32710ae3f2d326a3d043e940000fbb8b6ed63 SHA512 930c882f8ecf47dd239a7f4c34125b860df464443be4abae8b7ae45c700585c3b7be3924de7b896b2509422488e9edade569dd037a790b077699139140085028
 EBUILD gmime-3.2.6.ebuild 1583 BLAKE2B 6877b53501669f0951c03f8a76ab9ea3a99ad93ed704dd2efb22a12a496b464c5630bd52757d588d250f655eb3a97570114100fec62927a4083e06868a249eaf SHA512 60a6caf3ee9c3c0e5c641e55ad3e9a8efcdbd7ad130a55b1ae213e64e860cf1c8f2363166948bea3f27400352dd1f9335ae968ec5b6b02f1e2f75ce1fb5fb97b
-EBUILD gmime-3.2.7.ebuild 1584 BLAKE2B e33e89bb903318a52ccf90cb34a3abb4c8fb612be36a7fa8674e41c1b20f53e714186de84a9fce0fe1416ab65e485a388f960167d28de5b1188f407d3f1662a5 SHA512 65b126f3a05257f9ba449b6057cb6a83c117019861b7cb95a20ad11e96b5ba251ff82863bc3b00159269e8579e6f02e371d8de4c341ac7c9de7f6a8e7a8ffc66
+EBUILD gmime-3.2.7.ebuild 1579 BLAKE2B c9f3a7adf46d172f593ee93b50c9e6cf260104c230bb46af24b962ab6f9435e080241ef62c756c5b1ca17c6a65e825706d4a7098e7b1eb770814f59c089233f3 SHA512 357d040e44f38a4b69c5a72b77c6044b7a94c722003f3533f146714e6f9fe0c2da886ef88af695dbbd30e561e644bc08e66127f0225b36cdc206a8f04e8aaebb
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 9cdd90a2aae9..813183821de6 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index f5c36a5d2f32..a15eff7212e6 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -2,6 +2,6 @@ DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd66007268762
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.0.tar.xz 1000240 BLAKE2B 09e6dec65a53a107bee387cef9cb271345ae564f3520bd9a6485cf1796deaa47243c05f45a72f3243e811a2c1962a2ae123a6b344819187cbf36eae0ed58fbaa SHA512 d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
 EBUILD gobject-introspection-common-1.60.2.ebuild 995 BLAKE2B 9dc1baa0c18a297475f7af1bcf8db071e065ba5c792f432c337029a56a3315edc4705ed8c76e07ed9dbd22a4df14cdf1ecbd375310a34cf531228cda0c78288c SHA512 ad2656b8023463ac448932896f2569e2da326c7bfcd2f4e45d2d7759e4fedae1deea86833e9e4620958d3a546620d0a88241570074c81ed9aaf1a988cd247d5b
-EBUILD gobject-introspection-common-1.62.0.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
+EBUILD gobject-introspection-common-1.62.0.ebuild 935 BLAKE2B 514362e03f1a98016172cb0a362d4abf6c0b7e4911b0a31835978dde64be7975108b5b2a2e0dbcc076426b0bc617c6fde899dfd9f1d5be4a037c299d4a9141bf SHA512 f255cfa9e9d687b96d84322a1b0d092490c16a9ac7a31b98fdcbb64ec30b417f4c2180136a96bc2d315c8685e390941013d7cb1ed9535b5d106393037d8de6b5
 EBUILD gobject-introspection-common-1.64.0.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
index 08b6851ff4fb..b46be6dda698 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 631c236de387..d6d02a2acbd6 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,6 +2,6 @@ DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd66007268762
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.0.tar.xz 1000240 BLAKE2B 09e6dec65a53a107bee387cef9cb271345ae564f3520bd9a6485cf1796deaa47243c05f45a72f3243e811a2c1962a2ae123a6b344819187cbf36eae0ed58fbaa SHA512 d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
 EBUILD gobject-introspection-1.60.2-r1.ebuild 2245 BLAKE2B cf38b83022bd32d03ed3a24d5ce3cf8baeef6638d050a151eeb0f45c95c9f47a1a9aa0dfc595f30d8cf30ee6733291eb4f78b2c8a310edbcdc1cd2b13d8180bd SHA512 ae09472bb63e9d926264c64da60b74b10051947d724e2f2e59f6f4880db2f9f9897b1a71769068bd57f5d853206f200374fb293656a5f204dfa996f3e1888843
-EBUILD gobject-introspection-1.62.0.ebuild 1881 BLAKE2B a3cbb28b5185e0ea1ca9c68ccb126f71a884c1b14b162837b710c39e5aca3753a8eaebfcf081901cd870e58360f4109c5ee722b49419466a5aef447f349d4e36 SHA512 fe4ab18b60a4f4dd0bd3e51489b874197db0f02b1dff9de66d53cc9fa94a3a9aa4666ba735e13b2dca17e24c579fdd4544f8d2b16733a6860a299161a5132dc1
+EBUILD gobject-introspection-1.62.0.ebuild 1876 BLAKE2B 3983c2a56451d0889aec5036dcdd797b028df04c2bb45fd5a2cf36877bbd9360a8ed2d5e15e053ade7b7ff64aca2fd3d3c492814fd487a14d1a9dc372a7b13cc SHA512 e8a8faf0615216c8c3e3fd6139fcbbcbc5168ccaa973e9f206768b0c362d59d7e12020f590d9f26050fee1248cc7fc39388db70078efd8eac556ca79cf881586
 EBUILD gobject-introspection-1.64.0.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
index a20b75b001c2..fc4911ec724c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index a1cd1642cc9a..236ff3c3c46e 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -4,5 +4,5 @@ DIST gom-0.3.3.tar.xz 101580 BLAKE2B 08e0abb9eaf23ba3bbbca54289ebaa695af705e65b9
 DIST gom-0.4.tar.xz 102744 BLAKE2B 8116ac388a56e85effbb37c3d5ea5036f6de2f4ad7ee8fe119bd058e1ac3e293eab612a739cdba7467202bc9e258f7cd65b1f116e146577d3a103fc03afba37f SHA512 d847928ce09c53a3f64777c313cb843052e5e001873f29d3f7acf02772cadf0e4b133fb0137aa0463b4ff95dd54810bde87062d8e396ff4fc6d142ba59c8e9c8
 EBUILD gom-0.3.2-r1.ebuild 1591 BLAKE2B 2c29de492c91663ebc682ecb8baa7d59f0aa62baf913a31d972c4a7450275ff9c2689465eec7bfe21ce91fa2b1c7b273b1832f7799d305d826109f16017316b7 SHA512 c6ea43c72be19c8162a37891b56a2f1563ae2aea5dc076125d5286b577c2a633b54a50863ec5f532190d2772afed82f15db4b0537bdbef075ed18c4bb0a959e1
 EBUILD gom-0.3.3.ebuild 1480 BLAKE2B 768f4d3721e370dc7064afdc391dfbb4ecfc9ba29b56e8ea505e210b09c29d2c106e26383dce6538aad59ab800848f65cddba3b5f9a980420642ee8cda228809 SHA512 071b7fca68016667362bcc075db1e82ba6899854772678d338eedbde654fcaf00fb67ef6ea3b72f399cca98d4a029e64181ee146300999fa2a07a23e209029e4
-EBUILD gom-0.4.ebuild 1441 BLAKE2B 6c7e140fa0f1c5bb417ae4b094907e983d12b35138d3277e8d6615b6f6d1267a082dba2f4b273dc59bbc7c02d2d3d11a0f74ff8e3c59176f8ad153f81f2a86c6 SHA512 1433b25d11d1627c08ca0f0b2f5f9874dad1e6ecdd3813ef2902a46614a07dad4614a508a6fa960aa65ba728ad18a771aea0b60bbcbb0ccde75044ca8282eea9
+EBUILD gom-0.4.ebuild 1439 BLAKE2B da279d4ecd0e936b244923018b4b3741ee08f98727f18e7f94ddb59480dced05e20829f5a9eac39bbf046c8b21b9880c4f13de0ff899c0d8e323b715b520e1da SHA512 00f17b4a97fd126597a54cb7162e6e0dec2d89714c2318e806eb592e031019b6adc5d2b51591efe3eb87c0e1ea9458fe94242d8995d326a7b4a0addddb4bbaf5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild
index 39a0e11e94df..dd55a57c9dbb 100644
--- a/dev-libs/gom/gom-0.4.ebuild
+++ b/dev-libs/gom/gom-0.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection python test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index fcb46cafe4ec..e6e3ab154839 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,3 @@
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
 EBUILD granite-5.2.5-r1.ebuild 1867 BLAKE2B 3731912ee305d02bf85b53b83f2d45a342494ec21ee668a774cf1426f51ed41e55fdc4d66e38670bb38b64c7945be7d108946a29abd6d3e168e0afff05eced7a SHA512 ff7953d1d51b4317e8043d5afbec2931cb097d36dd71b39cb516f8dff16910d90a9fdc499b5d09edb104e52158f5cbf3b4ac73d79486b84f169f992159b23647
-MISC metadata.xml 695 BLAKE2B 251666b8d527fe7308162cc3cb8f9930df967e9eb57673cff6ba7306c65d3cd7082f42cddcd40f920bb8f0ba838cc57c652690b98e86784df2cc0d3fecc0906e SHA512 e90e892b32e3439be4ad4b3aea593878f4c7c158e97fda4c657fdc6b1f56ba31b18bc516e2db40b0a766820dba0bab255fc361d5ac86147c6f422b39de51c835
+MISC metadata.xml 479 BLAKE2B 39d2fbbb6b128236ce6565ac9e765928351c4b5f953a96b293a61a3f0deb67ef8a05066b5e0ca0547d616e303c721815c405ca185318b1cf4fe59df31540c170 SHA512 394f3a02381f849c82e112c064c045d7afc2c8ac62e2788c049332447b27b094da1301eb649f562850c04ba02a4d7bddfe49569e5623da8bd714897d770b8dc1
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 9a1a6cde3148..7ba599558211 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bernardo@standard.ai</email>
-		<name>Bernardo Meurer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Granite is a companion library for GTK+ and GLib. Among other things,
 		it provides complex widgets and convenience functions designed for
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index bdcc127f5066..6b74b6703d3e 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-EBUILD gumbo-0.10.1.ebuild 886 BLAKE2B 8c887d87f2c7d1f2b50a91a0017463e360e79761b11a824ca777cab6ae313034a6387080598c72fd40876f236430efb58f488f04c9b40561cbcb3f892ed5372b SHA512 a1c285c8cb763bd8ee53b06ab8db5bea9da89541417b900a63ace0a11962860bba57882239ed9e4163c6ad0d942f97e1548ebd0b68653d81b2844e8ab58404bd
+EBUILD gumbo-0.10.1.ebuild 884 BLAKE2B bc8297f6a9405b306daef9d8fa064f009f19895050efccc7a0ee3883113254e47e5a0e3aaaf319794430ec3d60282172dc3eccd150697cd7cd352e5090df3c6a SHA512 ac61e3ff9d3fa948c5059abf0ba012a3c73011d5041c479f9880729f8fa2e69635c3444f1110b546ef051b00864f7d3a3545d51acb8daad0b761374ac080212d
 MISC metadata.xml 316 BLAKE2B f653d0ab857f07f4dc00630d5c795c86920514c04e51d0e86eb761d3f8298b8a4aa6ece91fe387fb1ec1e94b46cd8429405dbfd9303d1c591d155a0521e1547c SHA512 64d8505048d0a0eaae29a8078d340ae290f9bcd2971028e069fdca2f3dc503cec644109a9d695f7e63ce4cfdb6a1e6375e49292580aad1b4e61a46612cfc7c25
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 41b664957449..45ee50d5db5b 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 585e84409d13..f51b6dce4581 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,8 +1,4 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
-DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
-DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
-EBUILD hiredis-0.13.3.ebuild 1871 BLAKE2B c53bf4e99c2b335ad9cbaa1dc53b79a36b81762cd38b24a243cf7f5a82634ad5341773986cf5b60e2e066ddb0c3e2d4692e9381c327dadc759fa93ad870a0729 SHA512 242c465f98d85d6fb8cfc78ee19ce16f87a2435b8b9a5caceda7ea989243fe0fd60d5d55f6c6e4392712673ef5ab6e7ac8b1ccb57c7bef71be5ecd9e6bf02c74
-EBUILD hiredis-0.14.0.ebuild 1878 BLAKE2B 7ff27e77c4add05ac81f8c1c9dc67e0f03c45210827ac65831270d66f2e02b6760d40730e7d4c13cf32dffee5ba0e026a670492a1763504732aa8d71d6abdf5f SHA512 27bcf235b400677386844802bd8099c8b60418c7eb63c557c20987298286a47e9ebbf477bd64098c9ef76c6e9548d814b90e3e0576b90960735b046bf98808c8
 EBUILD hiredis-0.14.1.ebuild 1869 BLAKE2B baed0625ddf7cf07ffe0bbc4f4d1a033a196ad1896c7d175902e798cf20ae8a933efe502465af5a35ad5268f4716824a39432102c6dd85adaf631d46226c5878 SHA512 29f5812ba5bb3806974b50b83a10bbc7392b64e9a879209b3eae4bb23f0019ba2bfaf6d472ece0fe59c3a88dfb4d83810019395d2191193a10453a1e52f301a6
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
deleted file mode 100644
index 01aa7b487e7c..000000000000
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Minimalistic C client library for the Redis database"
-HOMEPAGE="https://github.com/redis/hiredis"
-SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/0.13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-db/redis )"
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" )
-	default
-
-	# use GNU ld syntax on Solaris
-	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
-}
-
-_build() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBRARY_PATH="$(get_libdir)" \
-		ARCH= \
-		DEBUG= \
-		OPTIMIZATION="${CPPFLAGS}" \
-		"$@"
-}
-
-src_compile() {
-	# The static lib re-uses the same objects as the shared lib, so
-	# overhead is low w/creating it all the time.  It's also needed
-	# by the tests.
-	_build dynamic static hiredis.pc
-}
-
-src_test() {
-	local REDIS_PID="${T}"/hiredis.pid
-	local REDIS_SOCK="${T}"/hiredis.sock
-	local REDIS_PORT=56379
-	local REDIS_TEST_CONFIG="daemonize yes
-		pidfile ${REDIS_PID}
-		port ${REDIS_PORT}
-		bind 127.0.0.1
-		unixsocket //${REDIS_SOCK}"
-
-	_build hiredis-test
-
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
-	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
-	local ret=$?
-
-	kill "$(<"${REDIS_PID}")" || die
-	[ ${ret} != "0" ] && die "tests failed"
-}
-
-src_install() {
-	_build PREFIX="${ED%/}/usr" install
-	if use static-libs; then
-		rm "${ED%/}/usr/$(get_libdir)/libhiredis.a" || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	local DOCS=( CHANGELOG.md README.md )
-	use examples && DOCS+=( examples )
-	einstalldocs
-}
diff --git a/dev-libs/hiredis/hiredis-0.14.0.ebuild b/dev-libs/hiredis/hiredis-0.14.0.ebuild
deleted file mode 100644
index 5ce5a79e75d6..000000000000
--- a/dev-libs/hiredis/hiredis-0.14.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Minimalistic C client library for the Redis database"
-HOMEPAGE="https://github.com/redis/hiredis"
-SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/0.14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-db/redis )"
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" )
-	default
-
-	# use GNU ld syntax on Solaris
-	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
-}
-
-_build() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBRARY_PATH="$(get_libdir)" \
-		ARCH= \
-		DEBUG= \
-		OPTIMIZATION="${CPPFLAGS}" \
-		"$@"
-}
-
-src_compile() {
-	# The static lib re-uses the same objects as the shared lib, so
-	# overhead is low w/creating it all the time.  It's also needed
-	# by the tests.
-	_build dynamic static hiredis.pc
-}
-
-src_test() {
-	local REDIS_PID="${T}"/hiredis.pid
-	local REDIS_SOCK="${T}"/hiredis.sock
-	local REDIS_PORT=56379
-	local REDIS_TEST_CONFIG="daemonize yes
-		pidfile ${REDIS_PID}
-		port ${REDIS_PORT}
-		bind 127.0.0.1
-		unixsocket //${REDIS_SOCK}"
-
-	_build hiredis-test
-
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
-	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
-	local ret=$?
-
-	kill "$(<"${REDIS_PID}")" || die
-	[ ${ret} != "0" ] && die "tests failed"
-}
-
-src_install() {
-	_build PREFIX="${ED}/usr" install
-	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	local DOCS=( CHANGELOG.md README.md )
-	use examples && DOCS+=( examples )
-	einstalldocs
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 89a97dc229cf..fff55de7625a 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,5 +5,5 @@ AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e4
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
 DIST icu4c-66_1-src.tgz 24361305 BLAKE2B db26e9380305601f8429366e2813ce3ccae11f34adde513d72a1ae09281a2078ce5eb7410bc788c717167018b4c2042fc83217fac22f34e26b94ee4621a6b4ec SHA512 78d87bce65a7bdf7e9a19bda13e353c60846816ff34025f829d1ff15f9ac49aa6061eb192173742be0eca105684ce0e39e95656147afe848520bf60274c8d246
 EBUILD icu-65.1-r1.ebuild 3450 BLAKE2B 6445ff5d1a3aabd1e13c3c28bc88d73d8e17987796ee78d34b5e6691ad9fc05476fabf9d1e7de3358e83b47ad06a52a73abb7009cc01f2236dc5ebe5bdde9744 SHA512 a9a93f1b1ecc9572ca6d4372722fac674a04782a6e96a883463f0ba56d5412bd9e9848b95c59de72d5db2d60c068f70a04b6d47062afeb370180e4643c619149
-EBUILD icu-66.1.ebuild 3459 BLAKE2B 25ea49e86534b982f5faefa03b5d22a2b68ca3d10357643b78b172d152d86299983237e9307cac57942f4791c19bfbdd92ebd2197f98523594bb8807cc3a5fb5 SHA512 e35c672ce6a91882897b3fdd0453a66e9dad977627ed3a3df70c946d0cc3fecdeeaa6d319d6cba710d69840b511c45cbf9531c40e86fc981b0ae8e1f9f002b56
+EBUILD icu-66.1.ebuild 3461 BLAKE2B 37520954048dfffe44283613d9c3e16163f4a91b6650c0aba6c58308171cf5a965c3c509c3368bc7f00be62d5f9967331201bba383e4ce05f90b088df4243160 SHA512 7cf2a24f268663dc45d4e79be2e896c1fdd4b2f29e404f54c92fedefd294fb09602ca9882239400f4fb818ca1b167773ac76bef21a18ddcc2b54e13565e0f918
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-66.1.ebuild b/dev-libs/icu/icu-66.1.ebuild
index 5a6d0068ddb1..eb697d7529b0 100644
--- a/dev-libs/icu/icu-66.1.ebuild
+++ b/dev-libs/icu/icu-66.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 7c0f84abd8fe..2eeff1ebd537 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -3,7 +3,7 @@ AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae
 AUX iniparser-4.0-out-of-bounds-read.patch 768 BLAKE2B d1de412aa113ed5e0c7f4f91bc6a18293fa1855b8982bcb1641d3e224c3528c2c0e35398555d12b0db9f08db7c318ce39668b0f6f091db34b063910e0ed31367 SHA512 c7b28f1cf3c853a00c56fbf686adc6ae11d7b6b5d838d6624d92ef6366400ce27a54332e2d17561275db08866bb050d3a4096b8e32ec109477537c839f0808d7
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r1.ebuild 1123 BLAKE2B 733d93b577ae7736bd622c77842a0f265bb4ef09e01e2c3e10783cc240d478488c25f98279a7913876d00e33e7b935b6375bc7b08401fe9d7ea06d1b70ae43e4 SHA512 3e050fa55aacc1a9f3cdd1b728ec605ade2861f89886501e5609e899ed839928c5d1ad551a85806aece2e0c41a39f30ea7c10484b0f27f4c68a48a4e85cf8c2b
+EBUILD iniparser-3.1-r1.ebuild 1124 BLAKE2B 60426fa1400c834afff787171c63412c07fc3f7b091e0b740445b9d8b667e5d58c107c302cd3fe216bf2c500e41f8396bb1552312ae5c5504a83bf78fc118a52 SHA512 367f845f53ee952e7dbb43fcd9716205b0d24c9ac271a5732cc783d5c11c5b85aa2d35dcb7304edf264aeb214aa2db445e761112c87cb3315452562773a33ed9
 EBUILD iniparser-3.1-r2.ebuild 1183 BLAKE2B 91a6c213b27fd375517b3b85ee507e29974894d664d372a1667a1bcfbde1167e3a9d69b630c7430a90c0335e01a4bbdbbf87c014d2089a59f37eaf49c5240df5 SHA512 7aade24bf81af8834d903d623da9b3a6b1a1f16d9733287cb57817a2af19ee547abe69c05040c5dea0ae4c1ea7df92380460a9b5d0d69b366bbbdeddca7af54d
 EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index 7b22da3d5edc..248075f03d21 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 14d56b2b2374..449f913df750 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -4,7 +4,7 @@ AUX isl-0.22-bmap-nullderef.patch 1223 BLAKE2B 21af9877b9a6ea9645ad1b86f40dfd6d4
 DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
 DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
 DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
-EBUILD isl-0.12.2.ebuild 1030 BLAKE2B eedd02afdd0d3aa94d9bf560e87a0dcae52db20c210cd08ffb2aa58e397889208267ad444f0e51ba18f26b2d613832dcbc974439468c055aebeb372b38982078 SHA512 4af79bbbd4abcd0bcf9f7b601b5e1e020e6ef2c82cc8b2a89dcd45cb3580d6d47bf4d86f5d9de40f378218c2e1a4a92746d37c89ff633c354ce2e948949f9783
-EBUILD isl-0.21.ebuild 1236 BLAKE2B f0b60cf471c074ef77e26e087b10dae4b9900c4d8335329906d6d4f762712912eff1981a3634d8bde928edd669631b8dc508d1e31aac82094a8c2f56df288fd2 SHA512 f47ad46918bb7c2a35c0bd916e1bc51c1b0e64f2970793e1cbaec3e09d919b75b18fa6a433d9613c272f3629d8a9705f8621b6a1173587ffd159336defe828c6
+EBUILD isl-0.12.2.ebuild 1031 BLAKE2B 250f4a805da5df7152375487b1266d2f11814078ba9cb26f7eb8f850a78845c083d6126cf65837f3efb119ec7a7f29e4870c0e33ce76f21a53ca89a92efab131 SHA512 03c6813fc31fdb31b307f2440234551bcf72819eac85750b2fbd4d987e431605518568a30a596cd7e372dd779fb9f424ab558c3827bec034891ebff0b7409be9
+EBUILD isl-0.21.ebuild 1237 BLAKE2B c8fb1fe3d56983cd796ca4a5c086a0c2e0e192efdfb37042a02916f562016f61b71f777f08ed6108caeb20171ca1418211b8bf0c156e89a256b2371114670369 SHA512 999765fedc16d3cd4419a5253e2a4dd37cfdc01a185448cb30607649b5755656e8138d43e6427b780ea0e0d7d115885c75ef6ab6d6625b27b5d416c0f1eb5996
 EBUILD isl-0.22.1.ebuild 1331 BLAKE2B e22315634005c66ad6cb1bc0960d5350233d194044cb7e96bcfdeb97d1228befde5a7f8a699e385e41e09a8420a92d3557f76a1464aa79f8e0235efdeaed244a SHA512 3cb1827059d630d334c22eede743300b0d6b6199525607653b8970bf3b8f4f533ba9c27447f759687643a05975d2a5d7afb8b54354f88c2d3724d50abb898a96
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index 8c5e4961779a..5dceee321adc 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/10"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index c3309878e1af..c02f6eb30f72 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/21"
-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"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 4a579da42560..6b4c3ce6ae29 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -12,7 +12,7 @@ DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff
 DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
 DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-EBUILD jemalloc-3.6.0.ebuild 1905 BLAKE2B 8369247535f8cd5e17c036c107f4e83d1a054bfed6f46ef67c0b4b207f718a19bbc65313a4cfd56424c1e2f8f1f4004289223a868c14e4b25ac36fc7d098c7db SHA512 8517e81035ace2f5a5a810d4f02df29187c28643f4ad166b0526aeeddcb295f99ced662dbca166670b8bb35165208f762300403f09260d7950b06b83339e60a0
+EBUILD jemalloc-3.6.0.ebuild 1906 BLAKE2B fe88312e1c4a308d749ef633864d05b989ad844163fbee7354289ba8a72e0a1f74712d93cc98060456664b7acc5ff87d9d70c3ef0e4fde06676afee2ea71acc2 SHA512 8735a2a7bf4a5a4bf185aa69538d7a392446385c45ec48b5d4f8a1d6c8050e303cd6164ee4757b3db071966c79c8484bd064119a9ea4fa219b93e37271e57b79
 EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B e39f6707e796afe8ea28e055d994f17e5f683e1bf1ab4ac67d492740cca2490553bf88685e8458dfaeb197a5b98ee6b58f242afee337d9cf73e9435c84f8931e SHA512 5d3a5d490de405548f193e29178cb41c876e093fb56af071bef0a8fd330c740b826127ea314e844583652380d02364729e3f8a0ab6ed76a97058ee93103e2712
 EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3753d6f40fad5d82509baf76446de952b418c5fed71160a29331398167ceb7c199a872e553555ad6611506e5a4a SHA512 2fbf17ce207095a1948d0180b0769294fb90e5500297152629dc8c666fae1f8c6d182d1d823a2efeaf8b36cd9f9016cc036c9ed3f4be52bc371ab858f9dbcd2e
 EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
diff --git a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
index d0cebafa3d23..f669f6c5d2e2 100644
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="debug static-libs stats"
 
 HTML_DOCS=( doc/jemalloc.html )
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index d5fbb37e3dba..a658004c805e 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,6 +1,8 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
+DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2 SHA512 6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b
 EBUILD jsoncpp-1.9.1.ebuild 1368 BLAKE2B 5ea4045f527ec2abb4d2585dcbc9257ce03d06175b1f85a0bca909c8575290316bf0ea833ec06b22cb45a70785f4dc80edaaa23debbda8b6e9668eddaf059109 SHA512 951d7df79acc8b22544cc83c9ff7fbe0b670722764eedc01024c115cf574e535ea5ef7bfeb833a0971f01ae0d1e927af7713bbee9dc4f5f0076c878075864229
 EBUILD jsoncpp-1.9.2-r1.ebuild 1373 BLAKE2B 285cfd5eb499bcc6d5f8b40e02745cbf4943a6c2d4cac4bc37876921916823b3d9724a168840c7c0852d40d8b9327d72e08bd547db6b2283a7aa482ee64ae568 SHA512 38b96a2d3a8f0c96b10ca69ab9e8f15071ceadcdda2ffce63118744b575dfa599964e61e4e789600dcb9bad719f57a339bc7f06c0ad19c990c407fae8ab9e5a9
 EBUILD jsoncpp-1.9.2-r2.ebuild 983 BLAKE2B 20049465d3efd00697c503f38bf6fcf5307a4692c782121af8b716d1c2ac4ae1f64f2dce4832f3102ee9d9bf9fc0413d48f5c345193b8696ad4af66c78a49f36 SHA512 cd7634e93310fb89cd00090cb23633aabc2ca97ecc9ed64b103fc722464905c364d2754b256052b6ed4258225d5da8097097d68d471d7f0e845fb4235abf065f
+EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1127 BLAKE2B 30a5ad4f739aa1ffab163520e17c58150dbf8b6d659a4ca6f89a8fba0cd0f3462bcfc009be942a3c9342dd927260437fc53362fc6d054935b1ceb636fe70906e SHA512 0d59d146079643119a106ed7e5d7f8d4af3357a50685891cbeba94e58ce8410ae4e82624c6583a279be70879af305378921f85148cdb18ecfb5957a7ba1d7de3
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
new file mode 100644
index 000000000000..7011d73b2478
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-any-r1
+
+EGIT_COMMIT="90ca694e4697497a8c2bc8c60a9c9f89e7290a10"
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 8bf5cc164019..1f9910a6580c 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,6 +1,8 @@
 AUX kdiagram-2.6.1-fix-horizontal-bars.patch 4650 BLAKE2B 4063f8dbd92621f7d05d9b771650e9094eb3caa175a601b3ba51066853e4b222ceeeb6ac006c78a6ae12e70e5b0b4f192a004bb07437c296b5d4c9907f21c681 SHA512 8e0a94c65249f7a8b52e0c6261e251a7bcc07103e5f2bf21c1fc06b171d60a8d726f4c475c91a9114a1b129443208a95340b1aad07f2d31b2be0988f7f1611c4
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-DIST kdiagram-2.6.2.tar.xz 673272 BLAKE2B 584101d14ad5252020d236e16229fa7efc8f69662d3497b0018fcb9d48d3312a9b6275b4569f13a12746780e170fe3ce607f7d75a8fa2cc3cf7a7a6c3c4747ce SHA512 008688e76e30b933576523e2204b029ce2a5f5d232002d481c7c49f4ad2955b3f46cbe4b51a046a771130f3584225127b21df30efc042cddc9440f81ea8f495a
+DIST kdiagram-2.6.3.tar.xz 673788 BLAKE2B 467c376a2979e5a8b0c33b014f0490819f9fafca7a87fa95e44c073d166424f84d82771c787995eba05b97c6c8949270cc7101342eb3a2a91ed92d89d2ddc0a9 SHA512 307b0b17c314d5c4672100e2e949c3e8faf38eee7f9d504a15a01da77434e2b6274cb1857d36ea868025499e806643e32c27bb87aa7dfbce36e8dec6e53b11ef
+DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
 EBUILD kdiagram-2.6.1-r1.ebuild 919 BLAKE2B 2684c35d2abc74af395572aba4b8fb3f80a2c6b4733896997e11859eca6c606a512a03687ec244cc5f894f51e8c8b3f5cb7c19f41f2079bda93b93d18c734835 SHA512 26e4aad4182a028cc715e62884e4fe14025ca3eccaf6aacad3ece196ebfec7b00b29da56feeb0ade51a0e612eaeb72cef85fc02869bcc9f51ecb2bb9123daa7c
-EBUILD kdiagram-2.6.2.ebuild 864 BLAKE2B f6c31d4ee10d7af31338841f2f8ff00f3f8f35fbd4be191c7c160559109624c26d123088468b949be9ab8dfbb49a8f0199cc133ffcd406852b3ae394ba2055d1 SHA512 ca0c9edad250edb32470e6c04373584388d2313bd9eab123d328de8ba5109474c37556794c9df17c205b6aea82a3fa1a1330035712eda0b04c32b6197433f4ec
+EBUILD kdiagram-2.6.3.ebuild 864 BLAKE2B f6c31d4ee10d7af31338841f2f8ff00f3f8f35fbd4be191c7c160559109624c26d123088468b949be9ab8dfbb49a8f0199cc133ffcd406852b3ae394ba2055d1 SHA512 ca0c9edad250edb32470e6c04373584388d2313bd9eab123d328de8ba5109474c37556794c9df17c205b6aea82a3fa1a1330035712eda0b04c32b6197433f4ec
+EBUILD kdiagram-2.7.0.ebuild 864 BLAKE2B f6c31d4ee10d7af31338841f2f8ff00f3f8f35fbd4be191c7c160559109624c26d123088468b949be9ab8dfbb49a8f0199cc133ffcd406852b3ae394ba2055d1 SHA512 ca0c9edad250edb32470e6c04373584388d2313bd9eab123d328de8ba5109474c37556794c9df17c205b6aea82a3fa1a1330035712eda0b04c32b6197433f4ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.2.ebuild b/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
index 3a28eac60d9f..3a28eac60d9f 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.2.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
diff --git a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
new file mode 100644
index 000000000000..3a28eac60d9f
--- /dev/null
+++ b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
+HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html
+https://www.kdab.com/development-resources/qt-tools/kd-chart/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO CHECK
+SLOT="5"
+
+REQUIRED_USE="test? ( examples )"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 3ceed4d93a3c..c9c43104ef2f 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,7 +1,12 @@
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
+DIST kpathsea-texmf.d-10.tar.xz 12784 BLAKE2B fcd9b46504c58da90babcbd1e5d4ea655d3cb85f4be0a7430da62758f9b11e68219adcafab9ae26756f3f9dfa97b460db3e8b8b1a27560d2f3a91e612336dc75 SHA512 f2cc6a1bbc7be463877fd57d5351fb9e7bda472f1094f93a6962e14f9d71067cdae87464b615818341728c9fbd32e67f060dc09a3590353715fbc31fe64f93ef
 DIST kpathsea-texmf.d-9.tar.xz 12120 BLAKE2B 80069cdb1c8e1edf8ae0b5af2de825afdf234840f9365c0033d7fb080a1e5e5692ae9ba4c191b83422724f35523a21551102ef91e8642f5cbd4df9e251357b11 SHA512 5718ef60d33013159b5913f198330f9ecb098ac4333dd536068e8c48bf6eb208039a9b29afba331b3e4942c0c77c46e6add1c116d273f1f53550116ac06e69aa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-module-kpathsea-2019.tar.xz 31480 BLAKE2B 897ceb8cb536f2d4a54ead2529da891eba83e4480b9ca527ab99337ed030f680bc25a12d4286e101965d146567720e3bb5fb8ff18a240365be9eeb7471c970bc SHA512 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d
+DIST texlive-module-kpathsea-2020.tar.xz 32324 BLAKE2B bf4365d3ae47ce5344916d6622d40c121a34e722d166c983224f356c75d1b3e10216182ee79a76cf1dc703741e5302d8b427215a72af3060bae05b698ac0c316 SHA512 53887f73784f96528081bf9ce39fdaff3c94b2af1827cc2da7abddf2821c86c45f014ddcb624b24ed6265b7de25132dd106040f736fea180c122c9026f6cd101
 DIST texlive-module-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
+DIST texlive-module-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
 EBUILD kpathsea-6.3.1_p20190410.ebuild 3154 BLAKE2B d395977efca119e2662610cb180ca5a3c4560d6d056669386142e335e4759c9bf4a1a92494a2f5b2fd2d024eefe168a20800baf205e814ada577a6345a200fe1 SHA512 c361a0b404051e0d2b3ac5d2381128c7cdacb0351708b5ac253e7f73563a9c1cf0146e07ba397b9baac59be8d9fa295c2c7342f0087d9952f17142199cf5ddef
+EBUILD kpathsea-6.3.2_p20200406.ebuild 3300 BLAKE2B bd9330e2547fc1b95f9a04974f4247f1e8492d7b44fb2ad69457d60ffba6eb7f7d48dce9eb783ecaabd2083ede10ef5fce5b33697949c3bbf047d57a68b52249 SHA512 d8503cb696d46e8b25093177cf09ab7174da691ac4c0df329edf55ed83d870f5b60ea1880778c2ebcb51025a2674ff5b1ae9fb258c92860ec7e17c1a26532500
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
new file mode 100644
index 000000000000..74023b4cbb34
--- /dev/null
+++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common libtool prefix
+
+TEXMFD_VERSION="10"
+
+DESCRIPTION="Path searching library for TeX-related files"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source static-libs"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+TL_VERSION=2020
+EXTRA_TL_MODULES="kpathsea"
+EXTRA_TL_DOC_MODULES="kpathsea.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+src_prepare() {
+	default
+	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize
+	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update || die
+	eprefixify "${S}"/texmf-update
+}
+
+src_configure() {
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #347798
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable largefile because it seems to cause problems on big endian 32 bits
+	# systems...
+	econf \
+		--disable-largefile \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
+	find "${D}" -name '*.la' -delete || die
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	# The default configuration expects it to be world writable, bug #266680
+	# People can still change it with texconfig though.
+	dodir /var/cache/fonts
+	fperms 1777 /var/cache/fonts
+
+	# Take care of fmtutil.cnf and texmf.cnf
+	dodir /etc/texmf/{fmtutil.d,texmf.d}
+
+	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
+	# texmf.cnf
+	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
+
+	insinto /etc/texmf/texmf.d
+	doins "${WORKDIR}/texmf.d/"*.cnf
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+
+	dosym /../../../../etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
+	dosym /../../../../etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
+
+	newsbin "${S}/texmf-update" texmf-update
+
+	# Keep it as that's where the formats will go
+	keepdir /var/lib/texmf
+
+	dodoc ChangeLog NEWS PROJECTS README
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index b9c7af2bece5..bd2da979c930 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,6 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
-DIST leatherman-1.10.0.tar.gz 815748 BLAKE2B de4ff5e60fbdd80a247498e831203aad7efbb8857c8d307f0ac2c2f19fdf5ba3d953cb4910db0267a303b13bd54bf763034ca8b342a820fa8e28a2c013267149 SHA512 66d630980db7a8e5eb394c07d4a8221169271af1eabfceec107343b6c3afddde04c7cadd72b0d8b89327c46b7127dfdf01fa54938a3bf1b44892020a4e7ea209
 DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-EBUILD leatherman-1.10.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f
-EBUILD leatherman-1.11.0.ebuild 1149 BLAKE2B fda0e19074801348d21878b2384d3e798fc5052ec95f504fd25345d73df8b3c9d07a4c68757429468218d73c9014a66ba6dc849f86c28c7778ee2a69cc5eea22 SHA512 79d9503051af852eadc7b97957d13ebe6c585480664951a09f0b18635025e3f796c99e54c7fb2bc7cac932b68d36ff4e6f1dc8ab062e278728855046d6eb4e7b
+EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f
 EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.10.0.ebuild b/dev-libs/leatherman/leatherman-1.10.0.ebuild
deleted file mode 100644
index 1421317e76f8..000000000000
--- a/dev-libs/leatherman/leatherman-1.10.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.11.0.ebuild b/dev-libs/leatherman/leatherman-1.11.0.ebuild
index aef4cd923095..1421317e76f8 100644
--- a/dev-libs/leatherman/leatherman-1.11.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
new file mode 100644
index 000000000000..658116c76b4c
--- /dev/null
+++ b/dev-libs/level-zero/Manifest
@@ -0,0 +1,3 @@
+DIST level-zero-0.91.10.tar.gz 291352 BLAKE2B eaec1aa89b529b84d312f21c91e03c9ae2911193ad25a3884b677108bd3cf18d70b56174f515ac6ec2d61de0a80bb70bdf98834e4f932729e5809855ba42d087 SHA512 d98caa0ec135dc111ba8d34c2102f704e384cf6f6eb8ff147642cb1ce1de2fc96804e4f35e68df41a7e5404ba3702e87ec29f2334b19d39752351af5f5c999cc
+EBUILD level-zero-0.91.10.ebuild 884 BLAKE2B a8ab92c96765be2b7515ff63fa3c1e185ee7ee4a317cda770794caf520fcd33fa77e7becc577f58e7bac040bb5d6215f84672ab5550079ed3013fdc50a4d9d7c SHA512 44ce70eb8c71b9f462f376017d186d1c066d90c780f8200793866ee7ad501797add2d7c3bc97d1329bda39811a266660f556e6177d87524a04432f51e5133a5d
+MISC metadata.xml 332 BLAKE2B fc1fda0254b44ee3a749ffca43baf6317073bbe9c992f520ebf8a7f2556c8380bad425644f0737d2db4e91316da39cef1e32e5e6ba56d9844cfaa0ca5b8236db SHA512 af6011c8ada6ad21e7e7b8b7f2aab8607ce3b2eb2284848e8168be35416b9f1be516b3b0980a1b6c57d8c8aaa86b31bc45375cc5b2778f1c509df3450c63a43a
diff --git a/dev-libs/level-zero/level-zero-0.91.10.ebuild b/dev-libs/level-zero/level-zero-0.91.10.ebuild
new file mode 100644
index 000000000000..99ac29609fcd
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-0.91.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
+HOMEPAGE="https://github.com/oneapi-src/level-zero"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-util/opencl-headers"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	# According to upstream, release tarballs should contain this file
+	# - but at least some of them do not. Fortunately it is trivial
+	# to make one ourselves.
+	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die "Failed to seed the version file"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dlevel-zero_BUILD_TESTS=$(usex test)
+		-DOpenCL_INCLUDE_DIR="${EPREFIX}/usr/include"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/level-zero/metadata.xml b/dev-libs/level-zero/metadata.xml
new file mode 100644
index 000000000000..9ca0b21dc7a7
--- /dev/null
+++ b/dev-libs/level-zero/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">oneapi-src/level-zero</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index ecf9e1eff2e4..923be4bf7b01 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -9,7 +9,7 @@ AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.110.ebuild 2249 BLAKE2B 4bc7114a695af391bd7f3dddd32234019e87ec918d396585ecedde99e4423f7f75e6703ccfe03567b9d8b0b34d055bef10545ade672138b9cd5c95030855d4ff SHA512 42c35b65576e6a88af938eef0bb424f130a797ac510633cfdb520936aef3403c28c50cb6b398975ce730d355e127c7a5cc1487753382072ad5e722ff01e11b6b
+EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B a1f396b417bb1b8c2579e3ca589d9e6df24818b13084d09fd480a8f64ab19eef5aa2a543f7e467786ef4177ebce3bf60b8f893b21ddcdc529e0026f14a1f6c74 SHA512 569e5ec134506b4e20f4eeb586dd88e3f2bdefcb737300fb4c6f103876207d1bd60fdb76f2e3b1b4d4ca4984a96efb1ee924d16547e1faf36dbeca28507c12b0
 EBUILD libaio-0.3.111.ebuild 2232 BLAKE2B 81065497e191a4e62b17d61df604b073522dbe9ced1ebd162081fca73765fcec638cc2d40ddf70daa11480c75ea51ef3197fc4905791721db96a7cb5721c4a82 SHA512 0f374c61ef9f6567739b5d948749184ef8e60ab5c9bf005f20339ed5199a954a64816998fcc060bd7b953fc17db02bca4654f8d426c2c088f07437e1fcb4797d
 EBUILD libaio-0.3.112.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
index 5b4be4c2b073..0fc7844e2691 100644
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ b/dev-libs/libaio/libaio-0.3.110.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index b94bd7885e8c..cfab2ab8688c 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -3,7 +3,9 @@ AUX libbpf-0.0.7-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d
 AUX libbpf-9999-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
+DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
 EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
 EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
+EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-9999.ebuild 1145 BLAKE2B 93059dc3ec391006275503f57b4f5fa2d9813d98cc199d04105eaa2092b507f651b941d3e54c87165d59996bbf7eb3383cf5b4b36d97e7ed73f9fe46e908d683 SHA512 708c2d50c9bbf1cc296bdad90d5e2790ec071684291816bf77267c7f153578bbaaddad494e2c1b9e9f8778692319391339fb24c17dbb935fdd4c98046269d4ca
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.0.8.ebuild b/dev-libs/libbpf/libbpf-0.0.8.ebuild
new file mode 100644
index 000000000000..43363c91efae
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 1ebff90b1167..cf3ec3312950 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,6 +1,7 @@
 AUX libbson-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 AUX libbson-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX libbson-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
+AUX libbson-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
 DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
 DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
@@ -27,7 +28,7 @@ EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893be
 EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f
 EBUILD libbson-1.14.0.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
 EBUILD libbson-1.15.1.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
-EBUILD libbson-1.16.2.ebuild 1059 BLAKE2B 022db180b2c17431c6c9c071a0ecb078902488238d8cfb67da7429629be30fd2b0f1041073b07bc25ada18ca9a8f4d0bfe219af9d38507d1ef47f96fc9feb575 SHA512 fd38bd3fc6bab05c0a30678c7d9687b8037d2b04e84d4a2ea3a1c2507c719212a5bcebfdf3fe6a4bb40e36a5dd48da0a185cf75f70bcd973478d743001257451
+EBUILD libbson-1.16.2.ebuild 1100 BLAKE2B b7348ccf954efdaf6e9e0c4623377f5446a93678b8785663865413da077552115dde5aad4b8d250c1b6d4e4ad2a6a86a7c63e9c89f5934fd6354700ee16d3f34 SHA512 741e9984914c91da6ae1802fa8aeb2e80ba89818a3f10961be228bf5bc9abab988ba1dae78391a325e34c86bc14c97adc123a8861aeeb176772a0dcb644e28df
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch b/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch
new file mode 100644
index 000000000000..7a165b61c59a
--- /dev/null
+++ b/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/716774
+
+--- a/build/sphinx/taglist.py
++++ b/build/sphinx/taglist.py
+@@ -24,7 +24,12 @@ THE SOFTWARE.
+ """
+ 
+ from docutils import nodes, utils
+-from sphinx.environment import NoUri
++
++try:
++    from sphinx.environment import NoUri
++except ImportError:
++    from sphinx.errors import NoUri
++
+ try:
+     from sphinx.util.compat import Directive
+ except ImportError:
+ 
diff --git a/dev-libs/libbson/libbson-1.16.2.ebuild b/dev-libs/libbson/libbson-1.16.2.ebuild
index b9aa783de3ef..6aca55220c67 100644
--- a/dev-libs/libbson/libbson-1.16.2.ebuild
+++ b/dev-libs/libbson/libbson-1.16.2.ebuild
@@ -19,6 +19,7 @@ DEPEND="dev-python/sphinx"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 	"${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
+	"${FILESDIR}/${PN}-1.16.2-sphinx.patch"
 )
 
 S="${WORKDIR}/mongo-c-driver-${PV}"
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 1674ce0f9b50..9861e8a1e5c9 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -3,5 +3,5 @@ DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d
 DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
 EBUILD libbytesize-1.4.ebuild 1211 BLAKE2B 8cb40347ee5d044fa305b13b389d0c0afb925dfe9a6c827b137c768699abddc50e8cb1f6f13be89625f4d26d1b6d6b4b0d8664fe30b77aa7427ef127fe47d291 SHA512 c14e40928448a88f618e0559d6b070a3dcb09c4b66ea39b346f3ac999668833ffd8ed95b4dee37529f8f6fe3e10dd62c335463e67f0acdd42c4c2d6ccbbc6adf
 EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
-EBUILD libbytesize-2.2.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+EBUILD libbytesize-2.2.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.2.ebuild b/dev-libs/libbytesize/libbytesize-2.2.ebuild
index 0d91bc5f9998..bdb2d302c576 100644
--- a/dev-libs/libbytesize/libbytesize-2.2.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc python test tools"
 
 REQUIRED_USE="
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 4f257f22e5bd..0a2bcbce9866 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -2,5 +2,5 @@ AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
 EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
-EBUILD libcec-4.0.4-r1.ebuild 2031 BLAKE2B f9401cb848c3107c0e6799c903054705e87172422dabed7d80d22caaa5e548066edc91a6930aedffeded9dd25474284f939966e65040a990f10e6346dabb2b04 SHA512 be107c0fcba6de25e9ca697e1b1c98438d6678d495aa055f30d360ec4c6e2f61246e4ad255496dcd8f1d83b554279b62c9f6b769a2838b62e358fcbf1f19f19a
+EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B 0df26366f9c72aa46ee605f9d1e10e39273262f6563336ccb0b87159780fa707d442abdcb3d35ba2e7a76d541d36fe67f5c02e35549c4eea1c96551537d61c4c SHA512 c144e5762709426543c623251b9552981d5a72eec0e259c6b10b3ccf5c227bea9b08d67a1c5783188ffdaae2cdbd7ba30c9d9f06962258dbcdde8c13e79b889d
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index c07d3a0f291f..0792ea9e3cb5 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 79161d5541bc..97ae38bb8d1a 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
-EBUILD libclc-0.2.0_pre20191024.ebuild 1553 BLAKE2B b5ad0f5615e3b6a8991a269e49e0aed7aa025a9453adc7deaee1b77471d354ca5eca897dd05c8d2f6259ad32bb402f42bab7e7720e6178f1e061dc0f94aefcc3 SHA512 39efd2513d5c8ed19604a3f338ef890b91fbea4cef376c10989397e91fb97d8d8095bffd5935e42e104f2a63ce217d3bcfa8d74ebecc559ba6b86c36a7df00d0
+EBUILD libclc-0.2.0_pre20191024.ebuild 1555 BLAKE2B c91b856f2bf27d055e79e983dda6b8f4471df390dc8c15b1259d35aa4132ce6eea1a550e4861c4f4359c835c61cfc761df73150b1ba59f850917ef129078331b SHA512 da10b37118fbd5ba4acd8fa706fa3ae0c7aecc97f8f1a3aca0e53159f30dccc149b2dc1772b17976510dd8c75a560df546231d11044fbefc1ce9828aa89f8800
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
index d6fdcddade34..76895636d570 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit llvm prefix python-any-r1 toolchain-funcs
 
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index ce896482edc7..c24a99246a61 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,5 @@
 DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
 DIST libdazzle-3.34.1.tar.xz 440496 BLAKE2B 88321e82f1961ffffc46c2e484b39a80e201498c1f5aaf3beabe59f9d24c21b446485aeb1e70821868d207d222e9a4c9c06353f3add28a1c12ba84f90f79e640 SHA512 bb55c21c8d15406e4f09514c36e3e633d13c0cdb6b30b40a7da7e1cb5e307f371c905dbd8ee5e56d04e225df4c1c8eb9cd273df76814a4cec6ea1328b998d95e
 EBUILD libdazzle-3.32.3.ebuild 1578 BLAKE2B c6453a3ac2cd5d1041883d333b28c897a7cbcf3098b510ce8727ff9c9eefd109181539bc250c4577477c751321b151ba2c2137028da63f530943cf51c7b162c5 SHA512 fce495a156c818aa470fc3b2bbdb9f2eeb17cadaaf1f8a38f950490b70b68008728406fab78d20fa48d0a66898e3a6c3e824eda10f66c987340aad3d4971b8f4
-EBUILD libdazzle-3.34.1.ebuild 1669 BLAKE2B e170f731901f94860fdf621930c027b6e70b11b32778c564f7c69e95c59caece80b59e685fdf9ec2823585c8920a5192c894f2dd1c17f918d5d7d039b6b72426 SHA512 1879f6973ae10891641fbe4dce126ccfaf482ec856b24d0cfcd1274b688185a55d335e03efeafeb4d32c2bb1bae018ce2aa81f4b5e533748dd36075d4c4f9c07
+EBUILD libdazzle-3.34.1.ebuild 1667 BLAKE2B 649f65fb8b4f68889b27894d94aa858e0eb6fdd9f8b8e13c50acc0f377931952611b139a13e617bffeabb6695288c34d2a2c15ed17de36eae82063e93de27f93 SHA512 ac46eb71815d8a15dbb19c759dd02227aa70109af192aaf4d5f4959501780a966d82592fb4f745607790eeb47169cd2cc5b924889f896c1bfaa8b45570aa60c8
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.34.1.ebuild b/dev-libs/libdazzle/libdazzle-3.34.1.ebuild
index 680a282a3a01..b3991be21c35 100644
--- a/dev-libs/libdazzle/libdazzle-3.34.1.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index c991e780375d..2fb9c433763c 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3892 BLAKE2B 2fbe0cca928c8f1b50c9eb0bfc1f8399b495249444746980cc2051ccab1f595f8334a45b836464bf4fda56f5d8707f89ffa1ee3abd17a7a3902cda6b2c9ef7cf SHA512 984fb0a99e14637548091016182729a36df9a580bf56e83c2b73e6b2fbd25c9c4609319e1af14a3daa31cafc8ff2fb1b21edcdb5d9f438bffee5e22eeb146b0f
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3898 BLAKE2B 5f7633ea2a86110eb004be957bd718040114cd98e99f5032b3a70c80b6e5e16179edd98508fd80742d75a6d879b52a520fa1656d2126762d7f214bf528a7ec91 SHA512 044aea67dde2dfd94e2285e39be64ec1c055d1948725ccf3539bb6aa67ae8bc587d7830a93f973d0e104904b4d59f292877966636c5975fcedf5002b4c49baa1
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index a5ed57e6ca97..95dcd5d6b281 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index cb3023a25b0f..1802b8670081 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
-EBUILD libevdev-1.9.0.ebuild 1219 BLAKE2B 989379846ee90c38e1d4f6f60b8605a432a83b2a1d071fc53ea438aea4d0a9abb5b8e0be4e3aa1e8bcc80046332e262299dcdfb908de904a7f202c3a53168b0b SHA512 e1b47cbad9968c03aa9ee3c458537b5b4f4f9c3fc4cec639e528226c9b6f7c522ee45836a262624ceb561dd16cf64ca0b762fd7f74949ee5ce3c4ad294995788
+EBUILD libevdev-1.9.0.ebuild 1218 BLAKE2B 7b46ff4ccc676591b57e2ea1d6d1ffc0e11af7fe0b3e751e7c14148d6a50f3fae86d1fba5777773c0838814ea1450609bad1b40832546debfcd27e1c7bbe43f0 SHA512 8974ce7c1fce1c21957ad8a8ce2c01db6ab413cc19f7c45c67165d8bc431f8a53e4223d8c28a258f2d9af75a1049c4598808d1c8f3f9ba42c5abc433d1191ab4
 EBUILD libevdev-9999.ebuild 1227 BLAKE2B e14b4f64ca8279fa83d6df895cf4cec92cab75bf88115e3ec8572bef16d9d365f3ce4b20161586601050c3a71f52b75858f125e7621c31c3bd3ee8a55aa88a5c SHA512 1088514caf2d2235214998945c8007bd9e57f417cc6a27c8bd33e72b2870ec59a227c2c74b241d51e0d062442fd9d53bbae13cfd7c06655b8b9ef5f7a57badf7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.9.0.ebuild b/dev-libs/libevdev/libevdev-1.9.0.ebuild
index 7c180b35ce81..68bbc0b36445 100644
--- a/dev-libs/libevdev/libevdev-1.9.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.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 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 3d8e5d1d3efe..bb32fcda472e 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 EBUILD libevent-2.1.11.ebuild 1685 BLAKE2B 9960594c47720f02f6f42a83e6be2e2fbc31994e607577f776b7659b34b16b2749b77de1f7792e83f0d5e39251f70e2ed680c95e04910157d043408c8be10c94 SHA512 6005bf285688874a459fa7ee3450aff8f803c9772d5082003f27bcd8f2aafb0f870cf15431a6abaaa749667f35c1f0929de67502d93231e6192913aceffa3cb0
-EBUILD libevent-2.1.8.ebuild 1668 BLAKE2B d98a0ec927c8683eca7124f28bb5e2eea080665108a572ddd056ad85aa8e93e43497a1055799431a1bb597f214119eb6a36106827397b04f02c156742b99193d SHA512 e777c4bb314c4e3783279badc0d163ce2eb99a64a07c12bf7a84c54406a67e986c7157bdf790cbd67c8f2530193f60483d5e16c078d9f1531b4ffa67af8e6ba4
+EBUILD libevent-2.1.8.ebuild 1669 BLAKE2B 54aa18351c31a916764cfa58ab80162aea085b2e47a79c580a15f98e88bfd24524dff4494b89c4d6de8447161672dc2ed0a20095e77093cea1f84f4fb8015990 SHA512 a1eeb850d53b60c071240591387d01377216a8272c83e6b507196ce4b2fdea80d7e123a52dbbaa35a36b4c09e2183a490df8ddfd4293c92f334b28bb94d8e2b5
 EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B 00950c513155950753eb2a59d53b082101f883581318f74f17b8ac19b8f01c032e3705e015ce9d389785b588e17ecb7b8b54601f1c150ac5c87689afd5b25ab2 SHA512 be226220566535a11b0372307b80c6505574bafdf644ad5242d374ea5e27a04c05181aaebfe61529b45805fb13d6bb5ac01da852f49417afb41891f038be6dc8
 EBUILD libevent-9999.ebuild 1262 BLAKE2B 22ce0e6670997f58d38256d01c014db1d0c1b3375c9c33e410cf9afa177b774695276fbcaea5e2729e5dbbf55290fc0c55556a94b0ca299cea06ae4451502b0e SHA512 f95954c09907a4983bdaac89f230d6f35382f52bd2a3cfaf78323406f2152a524860a59187e9766d65977cf33cc72777ed1c70cfbf924192d0690f62cbb34fc0
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index 631bf1bc7969..5af707d91492 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/$
 LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 154269265186..8e40eea5551e 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -13,6 +13,6 @@ AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r1.ebuild 2793 BLAKE2B bb768f8bf39d47a05c49fee015ba37c434de9c999b14239b0610cef06db73de26e3e643e6d384ad52643055bb75ea82498a9fc613ff5e970690f159bfb9bbc47 SHA512 8c99dddf3942ce513b61931e4247806fe3649357ef99ce8aa4b4b5f8a1a1ace51ebcb30a0474baca5c431680abaf76051de6ff6fe98baec5c05eaa943d7eff2a
+EBUILD libffi-3.3-r1.ebuild 2792 BLAKE2B cb9ff2ba67aaa92522f8e7a4d808db29c006bad4bd2eee00f1ddab0939c8a6bbb2ac05cd98d09a990787f12cf284523264daec11c50acd79c383f9af96c0094c SHA512 90c1e7e9f7d186f6100dc0d5a4c4bbc45c14cc6dfc4bc803bc1853c6b18a3ac5ce17ed30a84967ddee59881c3e2c8764efb4092a844ed81eec01ad7d20d7c6e0
 EBUILD libffi-3.3_rc0.ebuild 2044 BLAKE2B baa61bfb489c8a040f26a08e52e3cf0fda08f4bbdca9748cbd5156bcba50557fd25ade3a911cb03ec7c4a55d0a562aa5341f832d7e68fef7cfee680ef37a5e10 SHA512 624d4f3b6471bb10a47b9ed76070a663ee457a4c609e5f5c364d873595172648bb2472e168e6dbc756ee4dc4ff32a6921165a02a1864e699e975f472ed9444c3
 MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd
diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
index 0321d4117916..f5c93c381235 100644
--- a/dev-libs/libffi/libffi-3.3-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test test-bhaible"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 380432d9185e..ae62e85d806e 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,7 +1,9 @@
 AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e
 AUX libfido2-1.3.0-remove-openssh-middleware.patch 1606 BLAKE2B ad02fe91523187bb7107b22bfb8b140f9ff0f3ec78f1047655e06fe29b5c2fb0e5b0a1d5671e7dc1a770499c2baefeac635024d506432a9c7dcef445ed1a3cfc SHA512 35b916fb6cf937389df05396f3491b5f7326305994585e290c9fdc8b9ff01455c1895ab32e4223ae1be60c0df38f16150c9d3e8799d9b84c16d560cc8a04eef7
-DIST libfido2-1.3.0.tar.gz 1516842 BLAKE2B 18a0036127a9f643ef7ca917dab909bfa344caecdfdef3f1f0881bd7c84b73ea8273a57a2daccc95cc448d7777c389a8f573f663895abd78c48b3340a45f7764 SHA512 9cfb872b898fb6659e0c5e377b5f80738c22dadc4768be02b8cb5e4f4932cb4edde360cd84aac78eb3e3a57d3bc10b4147740a4830d16adcdefe7c48fa460d36
+AUX libfido2-1.3.1-no-werror.patch 736 BLAKE2B 5eecbff49108683d77ee284d67425ff846028067ec757916422aa9c833594fe5207fe398fbf61261d4b0554fce9442d368a83be7e52bbfbabb5ae0cff0906932 SHA512 5532e3ea9be09284582e3217c2567a35bdef8c0f8efa54b172cd21e91adb61770c42632f386b0adc70d75842bc570f6b55c041bd3ef7c538ddb88e51ff20891f
+AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169210890c67d61ea314c84100f4c0810f84cad540361105ddd3c36e1b8130eaa4d1c8c72e11b9bdc1518349eb80356a5eaf SHA512 5272d57fd384b9454c8385362a833d99e78b2f09f5fa30521d8750191800514c6322d1b5edf5bc239ff59d136a4200dbe9450180e8a8738741db0c18457b6709
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
-EBUILD libfido2-1.3.0-r1.ebuild 989 BLAKE2B 5894629d1c22d311bf27e5563f88a9ba4666f800a9c61dbf18cecb0042a18adf15a855a7965569e66695b5548f8704ea695467f72ef33cc71b6aa730a51eb635 SHA512 40e8ae45897fc44183b25414e2ed4de23ed80dd2b1553ddb145984f8130f45b0c25f145549b9e69b68072e7c7c247e2b9b20086d44ba52241c7b7f9569979a2d
-EBUILD libfido2-1.3.1.ebuild 880 BLAKE2B b415a97a5d3dea84b39ecffcd348f3cefea3b9dbe125e6b4227c333bfd3825cec2cf821d8039749db150321a47d0f02c4b835ad86d1f95ebe8b5a9b746674c3d SHA512 fbb26370067c121d13fc948212dcda35cf498368e20c17ea88e1abd51d1517d9b9e88c66288b6ba1595b80599a36cc67cb76b5e00f74fe8bb7cd7259e0f556b0
+DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513
+EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
+EBUILD libfido2-1.4.0.ebuild 880 BLAKE2B 210c2bd35e4992afb558cca76c03319d29c848bb834e6a7e975d283b765c2880eb7652e24ff9a0b1833e9c51613fcf45b732abb69c758374c4700ec277454fef SHA512 1662eb32ef4fdbf12ae997b720caeb93b05a01d692390d37da7c0d032a739b2c71fe4c32c716d6c3b3598da8516b4f30484c1cfd6cef2b515c07e3667affc4f7
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
new file mode 100644
index 000000000000..d2ebc1a54a1b
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9481c46..b347fab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,13 +107,11 @@ else()
+ 
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+ 
diff --git a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
new file mode 100644
index 000000000000..df34a85dacc2
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bb2e87..4d0ed00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,13 +128,11 @@ else()
+
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+ 	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+ 	if(HAVE_STACK_PROTECTOR_ALL)
+ 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 44e4a96..d04dacc 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -5,11 +5,6 @@
+ find_program(MANDOC_PATH mandoc)
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-	find_program(GZIP_PATH gzip)
+-	message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+-endif()
+-
+ list(APPEND MAN_SOURCES
+ 	eddsa_pk_new.3
+ 	es256_pk_new.3
diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild b/dev-libs/libfido2/libfido2-1.3.1.ebuild
index bd76b0619811..eb279f392c54 100644
--- a/dev-libs/libfido2/libfido2-1.3.1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.3.1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
+	"${FILESDIR}/libfido2-1.3.1-no-werror.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.4.0.ebuild
index ca7036d3d103..41493d5b2f7a 100644
--- a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
@@ -23,10 +23,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
-
-	# from upstream git, no longer needed with openssh-8.2
-	"${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.patch"
+	"${FILESDIR}/libfido2-1.4.0-cmakelists.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 9f0ad729c8d8..d0f8cb6d13be 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,7 +4,7 @@ DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b28722
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 EBUILD libgcrypt-1.8.3-r1.ebuild 2256 BLAKE2B c436e0aa9c4ab4f3f5fe77d226196e89a0cfdb70db8aa3a836f52e73310e6aab9c91be6072824492261a6b958f6a86f810dc184b19618011a5797f591fc6f025 SHA512 d9502953f12a937ba6c28cff649722f5e3ec15452b156bd023d90741addbb3233710909b3d7b16fa5dadcc2eddfb38e771a8644929d9735fef3afdd77464e6d9
-EBUILD libgcrypt-1.8.3.ebuild 2128 BLAKE2B 3a69fa768582336c7d5e24f292a5367a04a0f004c81e4612cfa69a569c54b24f23cffd0addabc80d21dffb376b626d421ae1944f22688b67ee05002248136972 SHA512 c934b405d86999a7c8b9e7fb2b29f2c22dc97eedf2aa22e7c90e00c0eba972037862cd8384f7d7a1fe7ee72477950056385d53c0c920f04868653dd72d0ef6de
+EBUILD libgcrypt-1.8.3.ebuild 2129 BLAKE2B 5745e330806e09786f1dcc70cf9b63f9dd6e0698492515ddafcd86948fcec506db4f7f1a46dd93bb132b462e71cdbb1427f7700ef8bf22686e53dbbc65c3a1c2 SHA512 ea5045972cb08b210e588b05b811e7c96dc9a18dea00a102fd1866d9f2f69ad43912204947726fb59429cbc103bd7693331b1596d50e00a609a018def45ba503
 EBUILD libgcrypt-1.8.4.ebuild 2263 BLAKE2B ff8f19cbec3c0f0bd42602b0c61e59e7e89d7fe5858786d5f8bf9e964ca0c8a0a5b64d9fb85710cdf33f27945ded955cf9e15b19618ed7bfd64b76c18b76e232 SHA512 4e07773243112a20c72d7b3a6fc7e1265970f87075d67b41ca402fef40b063dd1496670ccac126e10b38c859b95e98daa6b8a06f67bdc9369262dc301e89ea3d
 EBUILD libgcrypt-1.8.5.ebuild 2254 BLAKE2B d7a90086ec6b433f18fceec0d79c3518e8f7b5bb83690733848aa509c53b9d850f2898b506edeffb25eb1563843e424414ef656d66fb4bf9b0e98c47f9790910 SHA512 10e9f613fd6097850ae4e8daca620e8eac2bd3e5b35c3161d9107d56226a718bd967e820d3cd37448c4ce45301ce720b4361b22d6f58f0f7450d54a305ef57ba
 MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 74ef70bedd4b..3e97c8663b2a 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 4b4a434b6b03..bf086d6e3d4b 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,5 +1,5 @@
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
 DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b
 EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B 600a33b3c16b44bc332111dcd62bfcca0ec169f311babfabc53e69bbc6bf2baf79f9aed4ad5fe2b5295bfb9e57fe96b2bfed247bf1556b8cac3919b406543d2c SHA512 6c6ec2a346451b4fc26a5751e5d064d6b3e0c3c0c0c61a9c35a47ae5b22fc76bdd49c739458848572d7851b0c98bf20cd96fb7f1fa51a0c9f9d129deeee36c4a
-EBUILD libgdata-0.17.12.ebuild 1768 BLAKE2B b66d622b692a7ef9a98424dce9a53e2c20aaae417ce994ef9cc7bda13b195061031de2e13fd211f31ecb0b423d38a3db85b473c754e334b49d7c835d74cc851a SHA512 0329e26abeb15a278f2ca7d8428f2651b5d79d6caf5174bfa2de2eda8ee75e9fd84e17155f3d26b0e113568fe5514cbfba0d1d19e91f01de236ef5e9de77ef71
+EBUILD libgdata-0.17.12.ebuild 1766 BLAKE2B a8b587634c2eb5c81d1ea0b9aba10a18d20d9c9fbfac1a5cd2b13fa6b6bf5e218a135130d15f919135e9392cc2442dffa496b82338c2a40ebeb11413e200b329 SHA512 5fbcb54edaa3015814b9aad8e324ed4bddd33f3873b4189ea65ac8ea9b25bdd648587f80f9199ebda775787c9532286969ac59284c4a70a15aa5e73579b8a3ef
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.12.ebuild b/dev-libs/libgdata/libgdata-0.17.12.ebuild
index f9c87147c2cb..e96433e921f5 100644
--- a/dev-libs/libgdata/libgdata-0.17.12.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.12.ebuild
@@ -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/libgee/Manifest b/dev-libs/libgee/Manifest
index 233573cdabae..fd3cbb651275 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4
 DIST libgee-0.20.3.tar.xz 678488 BLAKE2B b35dbad89ebac58ab382a1733d7add2e6fcf1e1ba3a194f20ceb6c33b5cd01d18251147af0e7879e12951bda308597ef64776a9ba4eb3d2b86309136fc709713 SHA512 c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.2.ebuild 677 BLAKE2B 8b872d01193bc3587584d56917c3f72f484a8f4a6fe8e46175081c1193387714bc9366a07d722f31360e47f5bc7321424cdefb6ca28f8105a6b6acb4c9192ac6 SHA512 188ec20da58f446492660669d598355de59fbc513f28e00f512410358910b2fde17c401a0c4d9865a7e56c3c2d46c5913872080525a221f9fdddbd98d380ddbc
-EBUILD libgee-0.20.3.ebuild 683 BLAKE2B 7453708a00df000bfcd51a1a72da305f5186f87d83589cd4a104d0a9c3889d8af9fdad25b885352e81294649abb344a827161d3a62ae78fb4cc65b9f2ec7482d SHA512 da0e84575261ec07be2d2ea7bca06bb5d2677aae839046ae4de6a07a8bad84508d52e3a9f68cee952d868538b5f09c33519f6a2c7550e6f45c7e0eb91804bd26
+EBUILD libgee-0.20.3.ebuild 678 BLAKE2B 75c0a15827ba30b659bbfa0a56e7bb4aa509b1c08dd1e097fa8f9405427ba24672e29b874b0470ccf21d6a9c48b852d472aacdcfce1d13f66fc98c5650a1e48c SHA512 afc3b36cff8831e294a0b1d433cbe6c90ba0cd82a8b491198ea1a025d3082f97422ca62d53a426302fd3556f962adba88e93dc7d7476bbd5fd46498b71a4d0b6
 EBUILD libgee-0.6.8.ebuild 654 BLAKE2B c0623f735093a9a2a185597c24d3e45d8d98b8f6e523c4a65abeb83c9a96397065fc96ea3b74540a4210d27e6d2457795b26e5434e6d327c972a54fae6a21b73 SHA512 929c0ffc02ad05fb82bc2fc3ccbd2c627ed64d7c68c7400409946196fd930b70db65caff96a705c1f4cd6c4b449d7979f5239ae67c6ac3ffae2b15236d7294a7
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.3.ebuild b/dev-libs/libgee/libgee-0.20.3.ebuild
index ed497404f765..a93ce26249d2 100644
--- a/dev-libs/libgee/libgee-0.20.3.ebuild
+++ b/dev-libs/libgee/libgee-0.20.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 140f107335d0..2cafc305cf5a 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -3,7 +3,7 @@ DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2
 DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
 DIST libgit2-0.99.0.tar.gz 5307975 BLAKE2B 2ff6c48d29844c8efd292b636c018403f49ae5eef1ef41e2c8755cc35d935677fa965b52c05724aa133f8542a266bb0e0fabb34fcf710127332bd6137ea4ff12 SHA512 e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b
 DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904
-EBUILD libgit2-0.28.4.ebuild 1651 BLAKE2B 74131b4ca7dbebcd1a15ee10ba20d0d8326447b9ace6069f10bc81d1cc31eac4450cf03f2412be57a4a1651ceb2e6f40bdd13434e4efb26ca9edc0db7c221651 SHA512 da910710957b1f30208f77d5edc1573509629dd8bab12921962b1e9316a59d76d9749acbcf8a104798e96f137d3ac1c25fbe8fcef6ec23aea31cddb3829cca3a
+EBUILD libgit2-0.28.4.ebuild 1648 BLAKE2B 3f281a4dc503b2692a451fa10786aff3a8dff090fc311d38ec0cba20fedd13018683e78674df806b4f7370e6a8ac5c09943b9e3fe7b30691c82056deaa286ae9 SHA512 87dbeaafba6af0bca7cc509dcdae5ef8ac5848aa2af048b555424be1be60a0da2329750fd4a9b2858b37ba8bb2c109b4b99d6a31ae15cb5187bb79a507fe5bfc
 EBUILD libgit2-0.28.5.ebuild 1656 BLAKE2B 33741203200169f36f1bc5d1d1d02343c64c1b83073b6b20ca356a822b80859bd0d7d645ccaf12549b8ef8739be17e03184d9c873f50f6f2f12ab6fe8bed9570 SHA512 cb24af6bf368eec37269693ee9a05f247d6d306863d6ffd8aa61a895ab6f72e5696059dceb447af122e973efd2cfad93bf10e3ad7d784f2f0af46c266b8bed8c
 EBUILD libgit2-0.99.0-r1.ebuild 1807 BLAKE2B 0ca4832f7431c13be6a1905f4d1b1013749f13c634bb37a33c02e27ea86c184ab657dc338e9ba6de8f3e5c0f59ace25e935fe59bd6328a65a472f1927786b72c SHA512 fc887680be388fd765236eea01890398e3113e338f896ce12161e559c8cd1e1f4c27b46db781a3606a9e19e530b0020fdad48b0e2d0f713a914b5a8aa77709b6
 EBUILD libgit2-1.0.0-r1.ebuild 1707 BLAKE2B c92ce64bff80f7732b336ee8fee1be4fdd35e785d6c0b1d2b596fbbdb20a4d4c5b89c89be7fa78f6f9557574b2b97a7bc9bd657fd45e1cb58166a29d3ad5a98e SHA512 25469f44f82e9a25562c5fa1cb5a9c86fe5531aff961a4f6cdebc7b09fbdfe60266a7dad7bd2251dd1d59881f922cca0f84c394e115ecbc09ab1efad9444d5ac
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
index 7f89d8572ada..a1fcb8f72357 100644
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~ppc-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 167e7254e320..2a10b535437c 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -6,6 +6,6 @@ DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a
 EBUILD libgusb-0.2.11.ebuild 1274 BLAKE2B 5c10310f7036758dbe152d94086e34233d8b31b9114f7dd97375d1ac6735b6d50e0e8ae7467b8d726ba38c0c2b99dbf8456b747b46e009e70d23e3530525952d SHA512 86833878bef26182a98a04506c25d08c3fea84ba74f986dcc361954c5745e3d39f7288f93f607fc1c71a17cbb8eef18e21eeb94fe100f250ca4375de3efc0304
 EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
 EBUILD libgusb-0.3.2.ebuild 1497 BLAKE2B bdeb19cfcc0b05b846e546b6a1eac91f7cca3acdbf898922f6f8ec7dac36d0ed02d3184e85cbb94eb4c5af2cb55a88fe7ed42191f887cf64f8feb9c682bc764a SHA512 2d5f829dfb61c0a88284676a6e6eb4ef468c9faf17dac39a6da81c27c6ecabf2d8f79e9a2189437b2609a7c83455e9d0dbaf7ef6ee7fe8c50abacce2602a0335
-EBUILD libgusb-0.3.3.ebuild 1500 BLAKE2B 02bac6ee2981ba4317a1588dda5cf267c48742a06b492ee266b4a1ce717a322057ec0b89e4ac0353dcc0f5884fcae5f97389a01dfc038a2bf2badf61f4272fe6 SHA512 dcb1cf508d957e608a56f7af379784348d142117906429bfa7cf2cb7af96586e71044d426a3dbf5d892e325e5ae7ff362264d10bb7c911874872277f2ba29e57
+EBUILD libgusb-0.3.3.ebuild 1498 BLAKE2B bd02701a914e52df67989d7c48628d1ba8d4c11db98281f4b96785198ad16d2366ac7f004a512908b09b1187b68966d714f51a1326e22187a4c3e1d7f6e5c57b SHA512 696f7b804b9dc58467f518713bee875f8461f085f4b4c0be90e792e2f0c124188768e6e89b3d55289a0725b5fe2bbe28d3a05f34e8b0167797f83b5ca58c567d
 EBUILD libgusb-0.3.4.ebuild 1721 BLAKE2B a83aaf1d77754e18f57894c4f26eb0ba0f26df6911f3bb5a75125cdc23fe38806c7b6a4841f794079a26350cf367ff37fc76bfb2ce48f5fe96c993e55156d6e6 SHA512 1c7e8179de37f6cce41ba2e16b5974909ff223e1384606eb0e017255c4e4b7b75a909ac88661d8758f5b819d5d9f2787121b0ba7c7cea7ace9be9cd055fb4044
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
index f7b99287e233..46fd56005b7a 100644
--- a/dev-libs/libgusb/libgusb-0.3.3.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 4d8b18e5de5d..a4b26c5f2695 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -3,5 +3,5 @@ AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081
 DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
 DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
 EBUILD libgweather-3.32.2-r1.ebuild 1661 BLAKE2B 20ece70d6c99dd0e5994b78a48a07ff3ff8aeea889d1c9898f7b6d25b290fbbc63b2fa74e6af15bf478bed7bae6f7d6696c6229d789fd7810a2f26fda3b58e1e SHA512 03179df3494c8505456dc32165cacc58087745788246aaad0915e3f3df75d29689d94c9fe556a29dadb442cd496277a1101e52ee62d47dd0a78f304f957c2328
-EBUILD libgweather-3.34.0.ebuild 1718 BLAKE2B e6109a91869917bc3bc2dcc657f6486b03ba702ff28d47a3f41cc4d71de1f99941d30678d7960ee0925b0cea86637cdab47f394602527747bde2b4dc9a94474a SHA512 e9fde17ec91317a5a75af2fb7a69a3ea4596f738f519e1cb828a9e7e8c08e7b17a0953b8ca7c6013eed25fcf3e8100f11ad315396577a5641f692fb75d122e31
+EBUILD libgweather-3.34.0.ebuild 1716 BLAKE2B 9d3eba6e7f1e3b200dceda12ebf7525403b9805c7e6eec14429f9490b5f9414fa5145e1b600b6af943a2fda342a4bf8ce705e94ed4b5a88540a552b9dadb338a SHA512 a47c9c7a28fbc6533398ac6e47350f54ce9dbc50f6bab4e9d87fb97ec427dba7f000101cc0aa75a434288d1bec66e77117b4d0de1e70bb163f9b268222593680
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
index b5bcac02d640..c2bb3a9431e0 100644
--- a/dev-libs/libgweather/libgweather-3.34.0.ebuild
+++ b/dev-libs/libgweather/libgweather-3.34.0.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 602ffcbeff5b..1058e915b943 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,5 +3,5 @@ AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091
 DIST libical-3.0.7.tar.gz 881352 BLAKE2B ad256833a69ba2e76301b1d9f732ac22c3d5a0030bb81e2d8ef57471338fc583cf1dd21cccb1301d3fcfbe1905a42bebec7c811e90cc8b10faa6e773fc1366fc SHA512 4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 EBUILD libical-3.0.7.ebuild 2263 BLAKE2B 03649ff879a99b59fd764a2cf6bd71e3c7a97137c6c8bda0cbe5ebcc0284d537c867a3b88ef3a0d774374ef355ba6488a87c38d750966a21ec3b1b4c754b8dd5 SHA512 9f3097af4011011c75d6b4e344b6bcaf0cfa1ddbe2a2acea55fc08cb3c4454b69d388333c8bacc158d1d74ccd8be90907bc739af0fcdfa3e24a3fe6643011b89
-EBUILD libical-3.0.8.ebuild 2276 BLAKE2B 421d075c0e076f7cf394db5e7d46119c2a6ec9d909fc59d44ff7770317449ab810d8e3a4633eac99caf2794b0adea6793b2fb412b336be98ccfa2fa01d51fc64 SHA512 c2014dd1fd8fc7b7ab77ad46bae3a214af31fe1f353ea56df9d6ace3fdbd2cd97adc26975f9d423a54867a33b3c29da4965964806f4c9ee3d8154fb2ff53e3bd
+EBUILD libical-3.0.8.ebuild 2272 BLAKE2B 14746cc7d12cfd3e17ed621a6b45e8cab70906eadf2a9d2f6144998a4c6c5a3fd182b4b2ce0f74287a557f22279c2b6f410e6741952ba6fda6793ce6386f945e SHA512 9c69a82fd28fa385862ef20c274841cea2f91c0eae6f623dbaf5f003c899d073eb290c5990ec53455eec93b8af88f7c9b4d3c72e30bb9b59b57727358d582307
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
index ea328c4a2882..600bb9f4c53f 100644
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ b/dev-libs/libical/libical-3.0.8.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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index b7f388e25213..afd677632eda 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,5 @@
 DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
-EBUILD libinput-1.15.4.ebuild 2147 BLAKE2B c163fdd7790a7a2266f4690f9236d8a16211ad5404c81a0c325ae3afcaa4eb3a0d2eaf3f5bb5ff6121ec894eebc02fd49f6b4a88a51aba60367cc100e5d91ce5 SHA512 a3f8dbff4fa659685e11e9334409f2d14ccf5eafae7e61708775efc9cdc559fa293993a98306dce3b87612634a3567735eaf56d40f0a03443a85ba9fc90c8cc7
+DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
+EBUILD libinput-1.15.4.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
+EBUILD libinput-1.15.5.ebuild 2154 BLAKE2B 1db905d4b3cec898ea12d1bae75627c7597603fffb5f034aaeeeb24c97ef94d8bcdde5d97e9dc7293fcd1683ff64f8bd345c47486d4ad196d2aa39a3b395f7ae SHA512 679b56b53bdb4660d788f030987706c493f4033692b5ffa7e48dd5fe7feac48ce173ef18a943370cff6d1043c0b7ded113d1dce35bac8b38477b68472cac3506
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.15.4.ebuild b/dev-libs/libinput/libinput-1.15.4.ebuild
index 1e8da08891db..931b05cb869e 100644
--- a/dev-libs/libinput/libinput-1.15.4.ebuild
+++ b/dev-libs/libinput/libinput-1.15.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/libinput-1.15.5.ebuild b/dev-libs/libinput/libinput-1.15.5.ebuild
new file mode 100644
index 000000000000..7ae9b0b06559
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.15.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 79536a137d2e..f395b59e1283 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,7 +1,7 @@
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD libintl-0.19.7.ebuild 2095 BLAKE2B 845aa14a93c30a532ebaa077eb9fcbddc6b4b90b02e03c94fedee3b8c82bbe45cea2b4273dddfb26ecbad22d6ae176e4188de21122307891ae6925c1edac0fd5 SHA512 229e97a7dd2d6b2e7d2cb5b36caf8e1545edc4fbbfda6e3589c988fa938a882e2547c2002a7126fb9a273f4ab99042985ef599c1e51ede2fb5bf383e575f9453
-EBUILD libintl-0.19.8.1.ebuild 2097 BLAKE2B 10d815a08713932aa4bb3734240e17a40c6d5d2f8dbd5d6522418095107e867468833a3d419b94eb9d05168a552fa12bb46fb3210a806cac6251121bdc7c9ab1 SHA512 8ebc83ba55ecd06bef90043bd19ecd3f1582577ec6c5d61b99d9e4b2b21ecd5f3640358b9cd03574118e396942fdd7ced60e3ae1c6037126170dde3e6dc04c16
+EBUILD libintl-0.19.7.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
+EBUILD libintl-0.19.8.1.ebuild 2098 BLAKE2B 543d6c8dc4ae22824c09ff3d1b6e1cf0fdf76bfc730526bbf37537c3aab291aea2778123e66e855cae60a28fe7ceb6c34fff628757d1d846a54013f05e2ebd13 SHA512 bfd5afee77904d16a1a7385d4726bf24f699a8b23fffcf092ac6e9e6577454f595076e66c4104df150933e5518009c5fd36c500d8903dafb86bbcd53aa09f659
 EBUILD libintl-0.20.1.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index b5bd3497c592..d3833d165dc0 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index bffc10ff8a2d..ddced03cb3f6 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index b682ab3194f6..126848e56082 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,5 +1,8 @@
 AUX libjcat-0.1.0-disable_installed_tests.patch 1115 BLAKE2B 32ad1de4665efd498b7928fce8b1c92f38a059cefcbba245639baad0724afc6701016e965fe98a0f91f70caebea5337acf9af57cba25a9b15bfd53a6db1e37d9 SHA512 a049084c228dcbb7355b67a0a0c90a038f94bda30fd1d274f4cab9994b61b8fffbea62734e3f4ca1938a0e36754a72d86e907b7e86a2193f6dd37cc36e427b0b
 AUX libjcat-0.1.0-use_right_python.patch 1079 BLAKE2B 99d9adf5e55d395232db9454cfcdaa42964c40728ae5f34ac559feba5c35cc7668815054b454b9bb3032ca1cfd991a10e18075074825b2105dbe97ad15b1e633 SHA512 abfc5c355f0c12be96ad045d0be3b57b41121d9b77966f1575b2ebc07f27f7b2997df53c1037d77b49ef027fcaf6cc79b60405b734e26839bbdb52a9ba28c560
+AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd
+DIST libjcat-0.1.1.tar.gz 62579 BLAKE2B fed33602d2b036605238945d09ede1c524847624f1be6301a7f5ff64d21ba27c7c765b37c522f81dfd49071db6339738ad82b2ad0b25f0494bf4fd806c64b5de SHA512 fd644c003ad3a317a9f8886c2bad6dcfabf953e61bcbf02b30a292e9a85a591f854f71d7ac17692d5d98d976a435cf53beba1394c662fa78836389d66d4a5824
 EBUILD libjcat-0.1.0.ebuild 1227 BLAKE2B 9d9d232d74137bc7f75fa471bd775d8d6d31c40a01384cd8090851c551f51c5756f6bc1729182c9ed0551b2f941ba86746a91a8720d143fff2801beeba8141ea SHA512 0c6bc0f880fd9c467b395ae532091d03f0a3e35502cfc3f5dbba070415aea27bd72d355d64819b3baad7344b0616039332fd2b9d9f67bd3e6d2d0eac08b14dc2
+EBUILD libjcat-0.1.1.ebuild 1400 BLAKE2B 6f821af2a998b8e9b3d1d1f079f3974718393a4895b75f3a9996572351157c4d6035c0302fbcf79dc0392834ce9a63774793b9e77ad0ee5d09bf45e80bddd0fb SHA512 87715c486fc5caf8e43c06cf07a60cc3ffe2e56ceeecca1385d28acdefbb0eb18eb449bea697ffff93b4742c907484b73ecdfd78bc441c4ff5e72ceb5799b63b
 MISC metadata.xml 881 BLAKE2B d62ca31ca9bbed501e107ace34b346f1952097d9e8b97a5851ab237a9a9da3558dad259f5f73fe8625dd3ad237938ffbf278d55bc9b1bf867c72abb96c27c5ac SHA512 429970f0a12a0d2484080f6d99e65f5e0c7fc1a5b5b203bbadcddb07346930ddc0b3101bcad6e1ceb2ac947e3c69c89aeaccc20bf4619f4b707216885b0b922b
diff --git a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
new file mode 100644
index 000000000000..5cb3e00c6778
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
@@ -0,0 +1,46 @@
+--- a/data/tests/colorhug/meson.build
++++ b/data/tests/colorhug/meson.build
+@@ -1,3 +1,4 @@
++if false
+ install_data([
+     'firmware.bin',
+     'firmware.bin.asc',
+@@ -5,6 +6,7 @@
+   ],
+   install_dir: join_paths(installed_test_bindir, 'colorhug'),
+ )
++endif
+ 
+ if get_option('pkcs7')
+   # generate self-signed detached signature
+@@ -17,7 +19,7 @@
+                         '--load-certificate', pkcs7_certificate,
+                         '--infile', '@INPUT@',
+                         '--outfile', '@OUTPUT@'],
+-    install: true,
++    install: false,
+     install_dir: join_paths(installed_test_bindir, 'colorhug'),
+   )
+ endif
+--- a/data/tests/meson.build
++++ b/data/tests/meson.build
+@@ -2,7 +2,7 @@
+   input : 'libjcat.test.in',
+   output : 'libjcat.test',
+   configuration : conf,
+-  install: true,
++  install: false,
+   install_dir: installed_test_datadir,
+ )
+ 
+--- a/libjcat/meson.build
++++ b/libjcat/meson.build
+@@ -235,7 +235,7 @@
+     dependencies : [
+       libjcat_deps,
+     ],
+-    install : true,
++    install : false,
+     install_dir : installed_test_bindir
+   )
+   test('jcat-self-test', e, env : testdatadirs)
diff --git a/dev-libs/libjcat/libjcat-0.1.1.ebuild b/dev-libs/libjcat/libjcat-0.1.1.ebuild
new file mode 100644
index 000000000000..06f0e8d33d08
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	dev-lang/vala:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+# TODO: make vala optional
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 5832b21a31d5..969ac3e3fc8a 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,5 @@
 DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
+DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
 EBUILD liblouis-3.10.0.ebuild 1514 BLAKE2B 5fdb331c3cd0cffc293d4eb49d12686aa913757f22533a29d8f8ad9a498556d3128d2ef44275a40ead84b5ca169b14882131d39f67651b197a9d1441e90be4f9 SHA512 3e8be1ca7bdf9cdaf0ebc30daa19b06354a71ef18979cc8151d9b1dfd9bb54980b5afc69c429d983c059b3e4694916c1ec2ad6b2e92520fa350d58854a7a3b4a
+EBUILD liblouis-3.13.0.ebuild 1682 BLAKE2B 979eb181e93cd5e089af020249deeca069fa1e5c032cfbc0932c0cbbc25ccb9c98da1577f473d81244f5e99aa83ae9f0ba616337672ca326bab202995ae3838d SHA512 c026396e1e072a9e71cb39246b6a9259e352e71fad33c8995328922de22bb89c9298c3a1677c5882c89abfcc33ea4fc61114197fc78c8db76988bdd7d67e251d
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.13.0.ebuild b/dev-libs/liblouis/liblouis-3.13.0.ebuild
new file mode 100644
index 000000000000..c9ac3b45c4a7
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.13.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]
+	)
+	test? ( dev-libs/libyaml )
+"
+
+src_prepare() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils-r1_src_prepare
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	econf --enable-ucs4
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		# setup.py imports liblouis to get the version number,
+		# and this causes the shared library to be dlopened
+		# at build-time.  Hack around it with LD_PRELOAD.
+		# Thanks ArchLinux.
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
+			distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	if use python; then
+		pushd python > /dev/null
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
+			distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+}
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 89e698a2979a..a791b9d33d6f 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,3 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libltdl-2.4.6.ebuild 1118 BLAKE2B a56e7c18d643507487b23f84e263f37db9d0dd01f5b1de09f59795082399e9c26af198ceaf0695e11270566123a2b8eddbeec658f72cc18a0eeeaafefac15254 SHA512 a5aa921a8b86b76fd57a9db52253f1cf186ec3280193fea15f6367a3de4743508eb813246e32bba8530ca87924ad0ee0acf225acbf8594610e3457e57f61029a
+EBUILD libltdl-2.4.6.ebuild 1119 BLAKE2B 7517adf789818c0f291323feea6b73a985add960b4aa7f30d945ec16c4982ed83eabc263da7ea78ed4727125796f67496e0f5b7da3cfb7b924a6f624c38812f0 SHA512 9623f2cc6bf27e471ba497c6de7b9bb22bbef06d182821a761e4cc51fe2081f68175b43898a089d55d67a432d754b15588246841a3999e5a39d0b5ad9787a7d2
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index c35e8b25325d..802a381eb96e 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 9faaf662512d..536f5b254304 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,3 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
-EBUILD liblzw-0.2-r1.ebuild 473 BLAKE2B 0ceaf763062136d74a91687d6457558f55af3a799f7758bb61fffd94f4c448cd5afdf6b749facbd29d7b35e97507fa48271fa407de8e7dca1f9503e8d295d9c3 SHA512 1fbf9ed49710c97e198b26aa60bd7ebd7a0e40aeeeddcc973578b1e664d78947847e662b44e2eb0008844f8f1b54d0b1062e6dbc808efc6ae8de179dd7467d0a
+EBUILD liblzw-0.2-r1.ebuild 474 BLAKE2B 1113eaeeb3f775158c0c9626dee6343e1fa0e3863ca6defc3a0d87bac4b850995d36c1d0472d918a5cdd39893c593be6bda7c8da05272cd009b96f616e1b5791 SHA512 102d78cc3d3b52b1e3be6de1e470ec206b0203c15bb9a8ff6ecfb4b1db9b3b25bed183bd146d1a83c0532f5f641de49024d69ed95ef3216f88e7e679d6556fb8
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index e00c5982153e..ccfc8b9e57c6 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 m68k s390 x86"
+KEYWORDS="amd64 arm hppa ~ia64 ~m68k s390 x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 190d74699fe9..e52a4769d72a 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1047 BLAKE2B 9b335979de25cd22c5d55eef20284e5544be297ebb491062946cf5c1c18fcac580949a51e3fd0c93bb23cd302dd9c852e68c3a8e2c14393a1f8d50aa8bfee137 SHA512 e35caf7db8eb575fffa3d6903bbbf7b156e09cf5e7138c7a0343e12edb59c191e24809a388d9286a39c04863e2ba24332ab74573abceee64aa9d35ded7c4bdcd
+EBUILD libnatspec-0.2.6-r1.ebuild 1048 BLAKE2B 7374d90655b70a6568a89e63c641ca454f10f8663ea1a7070bcfb61e7ada6e3eb3d1bcbc21c38a1fdf9e017d21f3aa81fd4f1fcaf4eb8e19601b12db723009de SHA512 88c8505ef9ee11f5df3ffb59fc9b19ca4d86e6e6c18de1339c5f2dc82382a7b7bca866948bba624430c8db7dac6330a03d491e23408857ec57576f202957fcce
 EBUILD libnatspec-0.3.0.ebuild 1063 BLAKE2B 3ba0e5b3f679b02ecf61cbed46ba0a3653cba9a321d66acaefa6ea5ea88a0ea9df9b90d6ee2890c5c9b69ec15b0209aaecb72d5fbcd5ee7e483e224822de9fd2 SHA512 26bd63ed4e76c24d5a302cad94ce157e1b0cf96f5156aada6df38f076d8300510bad701b35dda950fb02530bedf5b0145174af4f7404145b03b85e90d3344880
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 6681c4079766..3f61a7d4e60b 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index c804fadb0894..e51a058d3c6c 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -8,6 +8,6 @@ EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e3615
 EBUILD libnl-1.1.4.ebuild 1130 BLAKE2B f82bb5df7f1a038dbcd7fce4ba45647b7977b6afbaf72a607dfa1f45b2d4d3e7f922af597d03f5f6ede83c2b041228b723f1a8b1b629f6ea566cfb1c56cd433b SHA512 3e1b6edc66c242d55914af818ed8f6177282cbce83287d92deedc9a4f3273c3542e185137559bf3ae88dd9c399a2bcf6e38220e15b302c6be63c521617527e51
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
 EBUILD libnl-3.4.0.ebuild 2374 BLAKE2B 244a5c7ab75393db34b8511ad0d694f89d5be5dd00c1cf9b3efdd2754f7d69029cd27df0cc1f1d76a7c19fe4e22cf8a807b39307842ccdb214be341773dedb97 SHA512 e475e155734081f30024553190903e2f158fbe7103508ccfcc1a2241dd3aa6758e56ca0414cf002def4e639795fabf847b512d413aa4fae7f6b64cc8f4b108ad
-EBUILD libnl-3.5.0.ebuild 2372 BLAKE2B a0cfd8778efa06deeee577ddff61ab7ef1da2a74aba8c2a331a54e4fde43bd85df04590f8e74fa3d8654ceb3956c00033ab9d7c0173c619cc71ebcab1166264b SHA512 f7443e21c8783f9d3fb71fe9786cef4ef00c26d7bd66199497ff92b3d6f8b4fb4078416e72186afb62aec58888c310ec64cd6fe5d3b251fd4a09e9aae7222d5b
+EBUILD libnl-3.5.0.ebuild 2371 BLAKE2B 59ff09b75143388b8669814060edb7f4631dd4bf252c47b460b1d532494bfbdc36e6290ae9c3f257ae2a396051b047439f2eabe7448b709debe7440550e72ced SHA512 0a22661ebee3d4731c8d40476527eb30833e6d56ab43d8f7bdc311d652330eb24d2ea4b16027fe48820da5fad059828bf84eff8ed14924cb52e536cc22e0a52a
 EBUILD libnl-99999999.ebuild 2132 BLAKE2B 4ac29a14c07f5769cdba9af5a53f7c384ed0587a31ba3368011dcfee342269060dfcccd4904e4b6fdf567882882adc46dbb02a1a34edd3f75f27591598d83867 SHA512 3891de572c343840a201a4a5bdb4a02a9b1cf07af5d9fc2b9dd864d7fb5fd07d85eb5d8c2488f616f4700050b205a3514b3a81cba40e4d31dd3cb00717c4acc7
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 314e0b54a40e..d4c68b526048 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index f2e9cdf80a16..a7040dd566f4 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -2,7 +2,7 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f8
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
-EBUILD libpcre-8.42.ebuild 2568 BLAKE2B ec722a0181b75ebdcbf5729a1e4c32ad6ed52d044f0bc8882205db323c800848676745418056df8438b8b521d013911abb1b1ff13eb78a5012bf92bc973b7092 SHA512 9728b636ae3bb5f7942b856334847da6496a33941d398f188460503af0a74aae656812d420b60a767cba3c4e9aae81f4cd4f6f4a8993189785ae99ab6d60bfc6
+EBUILD libpcre-8.42.ebuild 2569 BLAKE2B f0dfd202675e5f247d830162967a57692b10a85370e77303bab3f7e0f4a18912a4ae35a0fc017447d2b264d093ebd72477a62b50a9084a251f595c1ee2be5e37 SHA512 a843f1750600b74cc6760dbe9de5acd43161cba91aa17b11ebb99df9f6a6e5f6d025e4987b4f982b1b6200bc226e5746f87332196bedde01e58d8fb7144d95a1
 EBUILD libpcre-8.43.ebuild 2596 BLAKE2B 8d2f85ab27d8f05b57460ec5beb8b4548ec4f6777b09ef0cf800650815abb8e80d6a9ad2448bd05d11d6522871f6a5b2c7bfd0c29b8d128511fbd2ec741d80de SHA512 ccb7194af7ab82ba10baecab7fde2b61f53693dee91104868470dbf6f7522dc6d335fe6b816f76794b5360b07fad85749ef1552d972b45d3b0cba4dd07c834fe
 EBUILD libpcre-8.44.ebuild 2613 BLAKE2B 836f84d1151765f8617b8fd06c366cec6e128d870f4008af3e77c0c6df5305129cb859961ea0071d8ca14ef42e880f71992650cf1ce36701769b3429d2a27659 SHA512 aa7b36ed3f79843c649e5478477b887243130a4e7d0aec8f970b91a5090a46761e31b353d0fa855b382fb104dc8e1c06905d521f2554d63f0b6aa2cb551d9103
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index 95a4235f5058..0c2110d64d2c 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 67315913cde7..657c2d32409a 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,4 @@
-DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beafcb6bc84d99d588a9dc0a957697380d906474f6ac59ab509e6c7ee5a0879b8d6ec9d06a0aceb8b02c7b16f73602d034927dc836 SHA512 4a0e86756cb96e6143df3add6cd6bca4fb9bb8fcb6a4d2df1530847b946b2494132e9842da01d75b385c33555d96e25f1390788b9e41ca320c1d65f31c89b281
 DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
-DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
-EBUILD libpcre2-10.33-r1.ebuild 2458 BLAKE2B af15a14d6dda70a662663e0b966c75cf9b20eaad8da3b2cab819c23b602dd7ceb5f7c609570d94dff785c0e94fe870273b8ce259e2bebf6a9dac6acb9e6def2b SHA512 baf1e82fb09441ffbf8438333bf0201c47d205c4ee9fcbae72076825d50f0621e4c4bba0889325871f70fb9ac01cdb4544fca8be44da74e48f09ca51807a458b
-EBUILD libpcre2-10.34.ebuild 2542 BLAKE2B 6c702954710c73971306a0ed18d5a6734835d564a14cff0a74a07c09372e32d7f55d9c055a8b20e6b08c6e164b70c6e2f030c67397b1f00377c5939662bab811 SHA512 19a98ffe757ce26c8fd97c9014a0e533114636a087bd031e760019ea53c4aeff56ba8b1f4d3e3196832eb4999372fa46be81ce880d6f3fa8ca0d2eefb3d65ef0
+EBUILD libpcre2-10.34.ebuild 2533 BLAKE2B d37125e2860a9477770133820eee44d04d686771c72ace1a0089dec3d06b06ebcc6d2ad71a43f67a4b64c71d6836c7a5134a6ef2a33ab121d8bd4f938f10d9e1 SHA512 f6c09ed783695ad41e6564d1606a3444b6c2fbfd9ba643ab5287a93779fef6b0ce4407ce872ff54bca866897f58114048e938b4ffdd7b31af0fac49ed252105b
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
deleted file mode 100644
index 10f6cab208ff..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
-
-PATCH_SET="${P}-patchset-1.0.tar.xz"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-BDEPEND="virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
-		$(multilib_native_use_enable libedit pcre2test-libedit)
-		$(multilib_native_use_enable readline pcre2test-libreadline)
-		$(multilib_native_use_enable zlib pcre2grep-libz)
-		$(use_enable jit)
-		$(use_enable jit pcre2grep-jit)
-		$(use_enable pcre16 pcre2-16)
-		$(use_enable pcre32 pcre2-32)
-		$(use_enable static-libs static)
-		$(use_enable unicode)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 350a1fbc1612..073c2ee5689c 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 34aa6aa26461..9c947f608ca5 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -4,5 +4,5 @@ AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
 DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f
 EBUILD libpeas-1.22.0-r2.ebuild 2286 BLAKE2B 9e37f758c7ff0dff08ba4341400e35f8d0e98cf414a844675b17ee38c07c5c0912156ff724ecbc71a9eabb4ba7121255d68399c27784f50e9fae46cc92a90de1 SHA512 7eccc83b4ae82c4657e246c2cdb982f3f7c4cc9c13e731c924bce1549da4fe9d0a4a2a566ec848b9c29efed7813f05765874e336b01719b81b894a34c0130fcf
-EBUILD libpeas-1.26.0.ebuild 1834 BLAKE2B f8d42f2343279218f3f7674fc45b8935080ecab3a7c76ec6f7bf11d0274ece27dd5ca2fac45dbd1d01fdcce06634f09c84faef88af890479298b96f522466d57 SHA512 5fd092ed8da7dbe17d8c2ba70a4fc3aab60d10ab3491794a72fe6b04d10bde28e0841f382b2412bbda0f2d11a3a3f8d9293fe7b4e451ad3f319756b90539246c
+EBUILD libpeas-1.26.0.ebuild 1832 BLAKE2B 64baa0636c68e392bd6dbf82d38eb04c9751795b54888d0c4aef7173c00ad57847a1019759802b9938626b8d0c7170498cdb382f630cd5f3159a308bfb5a8d34 SHA512 ec196affec78d8a08b63aeacb5e0dcab6d1fd221cdf03d8724c14fdf97140780be716dd7ce4d7ca271b86fe7350c953fbdb036c277b03ba4c63e8cb842662da6
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.26.0.ebuild b/dev-libs/libpeas/libpeas-1.26.0.ebuild
index c7ca33771f79..38fe6093157a 100644
--- a/dev-libs/libpeas/libpeas-1.26.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.26.0.ebuild
@@ -11,7 +11,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 luajit +python vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index ea8a5c8c4add..307dd2207a75 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,9 +1,3 @@
-AUX libpipeline-1.4.1-gnulib-cygwin-sys_select.patch 854 BLAKE2B 8ce5b623838684260e2f9e78c505fbd844a19dd315acf2128a2779ac4ffeb43f438efd5deafeaa27b2e01396165aba2d5aebde1daf684c8a080fd64ccde3fcea SHA512 81752dc9b87911cca7244aa1d5e49a981d16b454ded30414d49adec5fb089c7575866624b2c4ba7592eab2002b2138f5337e01d51628b9b2ff4d3bfde632acb4
-AUX libpipeline-1.4.1-gnulib-darwin-program_name.patch 687 BLAKE2B abf27acb9ee567746ea657f740bae53e7d52de95499d377c3d1bfb50b1f5c993b0d83eca29ee388d5ba2f6b63fa0a714755e3d89289585d85e47237c83e20bed SHA512 b3f3a3fc82bcaa72d4afdc8ca7e3241a0032a4367a535ed84ddbf56a3c45e39c40a911254787dac10a3b2b4f6ca6f50b4b28de9b538609c0b5c2c4f6b7da0666
-DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
-DIST libpipeline-1.5.1.tar.gz 987822 BLAKE2B 672da75a22aebf28e953a9a399d641bae8fb97da20527eb1f72f248d9e0afca10da7426bcbceb50f5bf2574fa7091e7ded5080c4a731327a09cfa74fde3a6c10 SHA512 9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
-EBUILD libpipeline-1.4.2.ebuild 679 BLAKE2B 563be45fcb20d5c2fcfe46090bbb158befc7b8ecaa3a80d9a26f135db29d035370ae4d59ed7124750412feb5861977fe0a31e015dd5abc136a98bfeea80c9ddc SHA512 ce895f5406110a5f5fd5d1fe86947285d871954938bdd32ec0ac21ae97c722268bc2582cd3d5d1604235404d9486147753b28e13446b840e469800c934e3c0cf
-EBUILD libpipeline-1.5.1.ebuild 662 BLAKE2B 62707477864b323fdbf32ca8d016acd57d738eeb386577a7139cf119ae8e5eb9e8c8b3fa3c84108f76bb8c010056d36a4d2b60d4492996af3a0faea936b123d8 SHA512 1df89e17e512fb344a2b01501537dd31ab8b7677853ca9bd547a67b64e6e8dc8608483bb4da0d8c87e1eb5cf82613edfc4e7019ef41087e337ccdcf47cddfa51
 EBUILD libpipeline-1.5.2.ebuild 670 BLAKE2B b1059dfc0555227bfc9a26fd4c45c2a3fabd89dd75db054946f6b5f6a4532b334e7bded0192d56d0a054061913d9a9197510846accf9a14ca1ababb6825d97c9 SHA512 2a946a55cfc00674e4f350a3260738ab32296fb2cbac6f45cb46f508de58727e0f5b8ac5074b8fd11d84b8563381b170c05370b96f6dedb8e7c27bb9874c6f2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-cygwin-sys_select.patch b/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-cygwin-sys_select.patch
deleted file mode 100644
index bfafadd110e9..000000000000
--- a/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-cygwin-sys_select.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00065.html
-
---- a/gnulib/lib/sys_select.in.h.orig	2014-08-03 15:31:22.000000000 +0200
-+++ a/gnulib/lib/sys_select.in.h	2016-05-19 12:57:51.243064700 +0200
-@@ -81,7 +81,7 @@
-    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
-    in <sys/time.h>.
-    But avoid namespace pollution on glibc systems.  */
--# ifndef __GLIBC__
-+# if !(defined __GLIBC__ || defined __NEWLIB__)
- #  include <sys/time.h>
- # endif
- 
-@@ -102,7 +102,7 @@
-    But avoid namespace pollution on glibc systems.
-    Do this after the include_next (for the sake of OpenBSD 5.0) but before
-    the split double-inclusion guard (for the sake of Solaris).  */
--#if !(defined __GLIBC__ && !defined __UCLIBC__)
-+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__)
- # include <signal.h>
- #endif
- 
diff --git a/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-darwin-program_name.patch b/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-darwin-program_name.patch
deleted file mode 100644
index 7921fd70b455..000000000000
--- a/dev-libs/libpipeline/files/libpipeline-1.4.1-gnulib-darwin-program_name.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://lists.gnu.org/archive/html/bug-gnulib/2015-02/msg00079.html
-
-From: Margaret Lewicka <address@hidden>
-
----
- lib/error.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/error.c b/lib/error.c
-index 6683197..36a3db7 100644
---- a/gnulib/lib/error.c
-+++ a/gnulib/lib/error.c
-@@ -113,9 +113,13 @@ int strerror_r ();
- #  endif
- # endif
- 
-+#if defined __APPLE__ && defined __MACH__
-+#define program_name (((char **)*_NSGetArgv())[0])
-+#else
- /* The calling program should define program_name and set it to the
-    name of the executing program.  */
- extern char *program_name;
-+#endif
- 
- # if HAVE_STRERROR_R || defined strerror_r
- #  define __strerror_r strerror_r
--- 
-2.1.0
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
deleted file mode 100644
index 21cb4d6aa10f..000000000000
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils
-
-DESCRIPTION="a pipeline manipulation library"
-HOMEPAGE="http://libpipeline.nongnu.org/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-gnulib-cygwin-sys_select.patch
-	"${FILESDIR}"/${PN}-1.4.1-gnulib-darwin-program_name.patch
-)
diff --git a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
deleted file mode 100644
index 6e3df06cbb3e..000000000000
--- a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a pipeline manipulation library"
-HOMEPAGE="http://libpipeline.nongnu.org/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 0dc76d95be5f..43d646dc1754 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -7,5 +7,5 @@ DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b033012
 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
 EBUILD libprelude-4.0.0.ebuild 1828 BLAKE2B a05a24580f87db35b1286ba9d426760ad2c5c41194a76b10454f2af2e660e97f865b3e363619169e26e8721fc839a16e1d165efa5607105a3679db4684c29f37 SHA512 0b2036c7f1628750746a76d7534d4db122cfdc51a740c310766cb5a512b7892133846dc3478d59f01b1519ced3ea44a3d939371e54a6bb4f5b06a1689b4dbffc
 EBUILD libprelude-4.1.0.ebuild 1836 BLAKE2B 1e7cc7940ac30766b722cc656330a62d275c40992a736aa9ec273a420fd4a807ce6e6fff5671ef99f90034484bec8893ba2c06b7c0a9a93bb6964e4d06508b19 SHA512 169f3d549f8c20eab7c30917d027732dea1783cded9fe04166efdb35fd7b317b7275830cf4f3ea842754b0fb9da2848c2a5cf8c76ec62881706c57826f5d3eac
-EBUILD libprelude-5.1.1.ebuild 2086 BLAKE2B 4410015a5e2f086979c4996ecfd607c306a718b104ed65950b6cb4bbdaf19332968fba82104b98be1b767fe5716f19737ecfa32432522ebd39ee12c598b57f80 SHA512 fea178f6e2be8e773dafb15d338e219843add4147907192a4e54370c993f9727cc174892ba2a662ed4705a2729963c697eadbc8fc161040470560165364f5d08
+EBUILD libprelude-5.1.1.ebuild 2119 BLAKE2B 5959c8c75ae9d629e90cc239bd71ea78795328f356f120212ecacfc1aab70b64f62966c9cc8127e7a0f65199f6f0ca5666e6573d4d051d03ec94cdbf7a0a8bca SHA512 fd0277c0d0750e27adb2c314b44ce709b90837b23a1e625ad064e10ca7dfb7472f67b0586117d25f7982b7f56feffa7910f8d9377b2cdad62bdbe5508f77bbda
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
index 4f71c7c6adaf..72e4580f9527 100644
--- a/dev-libs/libprelude/libprelude-5.1.1.ebuild
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -98,4 +98,6 @@ src_install() {
 		cd bindings/python || die
 		distutils-r1_src_install
 	fi
+
+	keepdir /var/lib/spool/prelude
 }
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 3c0dd6b3eb00..6b6fcd432d4c 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.1.tar.bz2 423053 BLAKE2B 305dbad6bba47d489cc5af7a362564cf9d8800e72d2e77cdbb2ea6fbf4d6888ef07ea93a4af474a60e6c25df417d0222ba54ebfa458894508410cec1ffbae654 SHA512 0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 EBUILD libpwquality-1.4.1.ebuild 2013 BLAKE2B 3e5175e5df19d8f3238244c128b719513dc4eff7f0571430b294f5be76e8a148aeda7beab46d532b95c06bee6d688cfe3e2bc3f1eacd220cd9690712a76b5b65 SHA512 b6953f74fc4d216f7c9df11a520f5575ed0dc90aa4f151c5965010616d35f902624b8d2d10664b18aa14ed4ac6e09315967cdc6795eca9e2fb420c8b26c21846
-EBUILD libpwquality-1.4.2.ebuild 2024 BLAKE2B 5cbb4298dc8faf4052ad7bc44882cae35edf794d464233ae8db4b9abc8065466b5c8183ebdaafac54218c036ee0cd0b3282687b53b4c652a18c830ac96dd9063 SHA512 6280900b850abcf7ef2f7b55202c9af0be0bbccb6947560bcdcb8fd048dcd5906d6a09933815eecb116fb8d9a6766d84cfb682ce7c556890f5807f6c824d357f
+EBUILD libpwquality-1.4.2.ebuild 2023 BLAKE2B 5213ee58629f272751068e9ee640facae75a8e245d946b30733dd8664935cbe53ad6f22bbd4b38ef3209e6a5f57df0b890b579b38850ff35f59c365e7ffcee60 SHA512 0d5692da67b1fb2d9d1fcb001216981a7adc52c498cfe7e77c8b496c4c552172d5cdf7efbff6f6b9fe56e1fa9b467c1b23a0515ddc7c676586ce6dfafb6d64b2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index 65249a03eb2e..b8390c928bab 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -12,7 +12,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/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index dd7101127f24..b210e87564af 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -3,8 +3,10 @@ DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0
 DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
 DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B 27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d SHA512 ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a
 DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B bee04707047142833c6c27ec25b81678be929ec08995c0cbf79a744b9c211691a2b4dd086782900a4cead73c6885886a26ab4052a7b9d0f6e6057bbee5a11c1d SHA512 94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669
+DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c
 EBUILD librdkafka-1.1.0.ebuild 1540 BLAKE2B 9060364fe3e3927f991161e72a5d4fbcd1f9386538ab47f9c2640a93ae174a019ebede893281c52e65ac8ae306cfaa78e130ffd14437200cb92d958c91515ade SHA512 5025fd3a0bcfc99d7a771855e2304ae10990c0d4b62532fb7704ccf1e8127fb4ff2667440eb46ca15321294c7cc64773e233d80a07e0524677b0ee092c05982d
 EBUILD librdkafka-1.2.1.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 EBUILD librdkafka-1.2.2.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 EBUILD librdkafka-1.3.0.ebuild 1470 BLAKE2B e535184622dd91d7b4a652657a8cff72338253f51cc7c8129cf619dc9d74e2f9b74d02febf29bc8027d12500357e3ab58ff7bcde3506831385cf5d2f3371502b SHA512 4de59ee2c4094259678ef54025e0f9bc2740dc956ade0d1824fe1c71f14c35a595bd61c02535af05a55095bc126b2220d7046df6c5ff5fa4fb22869bcc06da41
+EBUILD librdkafka-1.4.0.ebuild 1467 BLAKE2B 624773f2b3236ed4ded12694d598536f6f440705211085a0cded3959b60ee9ee39fca469b55e603db3482ea637ccbc4154a52736fef4567357115770639ea436 SHA512 bd304614d8c2ef02a8caa3ac5980134b5ce79e2d48c8457b4378111a6c3b1701570cbde886e74a090f2dcd4a533fa3447250ff56a7d3b5b654420d258cd0b25e
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
new file mode 100644
index 000000000000..a9b61adfcaff
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~sparc x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index d00adcbb3f90..2917edc0d46e 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-1.1.0.ebuild 1511 BLAKE2B a37aa85b12f55d431a60adee964ff5244961652c706c55db4f5f0c65e6b59745eae098dbb6eeb6cc24118dbb8cf1509067687c7a40ab425c7f76c4b095e7d434 SHA512 9060b9cdc1e09c81ea4a12263c5028f2b39aab52aab3d10072ae0be9cfd313d70391a9aaa7108eb4da9fb64e4c1172fd87a8edd9b4cb1992a10df11ea3cf6ff6
+EBUILD libtommath-1.1.0.ebuild 1512 BLAKE2B 70c4c8648cf0f6013b5a0d5d2159bf0e39e95e6372c4f77bc97bff49e2fa6a0390cd526b7b310e5db6d9f6bcdc296276ab7a710ee4a53c693afbd44df6f880fc SHA512 a1ee6deaa7c0d8e067a5255434b7f9ced22d7dd3abfa72eb6ba0ca1ff7888160c5ab6d4ada19c9453ec5ebb494b96c63c52c05c9d5652e85a494b7551f32151c
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index f5876bab1bad..00e1ca8c897e 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 4a03c78b189a..a52f96dcedba 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,4 +1,4 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libunistring-0.9.10.ebuild 997 BLAKE2B bbe8b1bf1a75d99ebc39e81d1b5fb141df14c7ec6bce9b178ab5322966f274cb1faad179f6f003ccc463f823d9098a3f9a31b14e5cbf76d2975cb959e49f6f35 SHA512 95c33dcc020f4860f415e88a5b904f3a05c8923ac492e65af914f535fd32ab78a5139ed622ed375bbacb265e3ac9ed2ceffc2bc60906449bb9144ff6188947c3
+EBUILD libunistring-0.9.10.ebuild 998 BLAKE2B d54fe85c06afafcb0bb410f066611d2d94b16cce68a05c166bf80bb6cf2a65390a8a508ce90ddfb206a313d1aa144c4582319e6e9f6ba4fabe59f469fbe5f643 SHA512 b7ff6cc420baa832ac9bcaa99d5da9ad33bd1f581f6d94f6fc3e463e2ac431a6a1692ad7171a0ce1ad459670595e9a56d9aa27d99d6f0ebfa3a76e454272df1d
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index acdb730ca52b..81c3f6ca19e9 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index a2eccc2d55bb..c0748065b78f 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1142 BLAKE2B fdf58a3e87830abf27dd3305a600fe32e66b116b4dc9c60aaa3bba0dfbd0d9120489e03433cfe10a127a539c9d679e1dcf1f6944232d0f3780793cea107d903a SHA512 4238a42dcb1d90658672a4ffeddf86314959ac1031765d35196b2da83033af55bd09b178621635673fc8723412cd9f359f7fc73fae1ac8aa5ed89d157b20d55b
+EBUILD libusb-compat-0.1.5-r2.ebuild 1143 BLAKE2B 5e6e31a90c87cf93216cc812c2a56ee39638d05cc3d52be0693a0a69cb652fd7a6566fa50a758564ec44a47ebaf11536a6d30f02bbcdab91124ba7aafccb6b60 SHA512 f1c5d1e2b617e263af2de90221605cb03b435a5713451c0aa2039375f1a2c28101dcc87bedbdd36b9ebdd453af197dd066692bbad1ddb4687eeb2c63b97817ee
 EBUILD libusb-compat-0.1.5-r3.ebuild 1202 BLAKE2B 355b1282edc93dfafab7af10a183a5160b841ac978925756afcabfa47880c1344dbd3e655bc978e4c23d0330c5d02b3e1310ee0a0dbb92174e2e603da607e5b8 SHA512 b1bf0a66c3f8bb0933ca611cf524a615aebabd3d6b23fb87d7fa20e5adcb8cc4d35443d7517e1df8334981e7957991172869da43ef7ceb31cf9e978997f60614
 MISC metadata.xml 333 BLAKE2B ee2452df6eb77285ba7e918f882c543d413656aaf0a199ac369ef60d25b8790fa37e320101f9645d5042ed04826e00922d5d38752b31492deda2cc78e7c41b49 SHA512 10f5333485c01d415c73f195e22785a9584d9dcf9662317605d9c6f14507863be5769457d2080137d31ad79fd0e825b9f02ec4160c40a5347591726843148705
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index ab6481830b36..aadd5d9b4745 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 6bbd3e921745..8b3e59907822 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,7 +2,7 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
-EBUILD libusb-1.0.19-r1.ebuild 1578 BLAKE2B 447d43a9ea225c4d0d12fc4976213364d01f23840c265183467bc34376a14c179ed782ae8f1dbb233477e5637867d43a3fcf2d4340de61226f19f5f9153b7f37 SHA512 783e933ace68aff3bc2ffd33c7315d87a68ad11189a72ac5c67a0333c6548ba9fe760bc9b835bb463369c7f0898edcfea3315694dfa8105ffd4f78dd9a2e9251
+EBUILD libusb-1.0.19-r1.ebuild 1579 BLAKE2B 3b00f91164578403ec4979817fa3d8c83af1f43dac4cb948168696cb04003ec5ef2238740b51710cded491c8faf42bd88cf40ce9868d8575ea62926c0f863e39 SHA512 7b1fcb903de409c4411e50e3e57f60169fa554e3a7004ab2cc9882a3210225a38b8fda5fe89487f86dd7743676a72ddd8f61729d0f69062faff397a24533637e
 EBUILD libusb-1.0.21-r1.ebuild 1609 BLAKE2B 559d47334b5fd2c0db4edf47e18c8a62b21a0bcba8ae79ccbb221710ae0f49c1969a8f35faa7f993f4f959540fddf137b35153cce53ffa18adf213bf68c85e8d SHA512 a8aab2d2a224cf9bae1e8cdaf8ec2640a1fb3337e9c003d6b7222300eb38d7d31cbbb8ea3e9ca6511e49c7e696503408b4b0f5ad7262d1b671aabb392c3d6e65
 EBUILD libusb-1.0.22.ebuild 1601 BLAKE2B 9aea4268a1867da5a882310840ec7be499d226aabc9a73754f0151b925e14fb1948dce1f36a7bb0e2e3b2d908da5cd90b793b453dc086f9ed177911218d8955a SHA512 72dc67e74bea8a8ba876a4332895a71ec461cff5cb59bc07a04693b6fddceb3b3fa1c33fcadd10519fcedcdd7fdf8c2a9e9a6900152782dc5f39e957d78a8c6d
 EBUILD libusb-1.0.23-r1.ebuild 1665 BLAKE2B bfd0d4be723bae49cdcdab6e04f61c174e50cd10805bbc7b051766639f7cd804481da89fc79705999e5ce25daf5cf71d143b3d984296f0de7f8fd8a419168d29 SHA512 8e253aa82d3865b94f1597b256c53a8170b73a3e959967bf62d09dc38d135e01a64943a5478641e0426e0ae510d41dbeec96379a8b90006427d8401999dc090e
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index 9946d28ba894..3aa756f257a5 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 1725b1791264..7ffe5838d6e9 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,4 +1,6 @@
 DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f985f86974a30b2d0abe08327cfeb7dfdd7c5b31619fbfcd8f9ca2e03987e16856d8abfef8b9eb9afa7f8c7b0b27 SHA512 a05bfd7cab6ae74022e7120a48772a6594522fb5bc467c8c05eb4809d7c78b68fa4843d86e2e34a68d439767a27dbc49f3b1dcbc8df85bec64471c1b459989c3
+DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0
 EBUILD libuv-1.35.0.ebuild 1238 BLAKE2B c87031d7cecb688e0a6d6a2ababb0ae63758f8b3b9be8dbb4e49795a9157c29cd9bd850b8316718ec348672736a84fd51c75c0c0d3be2932aa38676741a3d8de SHA512 ef1451af4f77819ff7afb6f9edbe9d4116a9a3efaaf16ce531efd70ef36a6bb7278ee3be6e44742270169de6a301252985ac4e91ca29deaf53d1a1c2d0785dcb
+EBUILD libuv-1.37.0.ebuild 1247 BLAKE2B 1d14427ff52449afbb132ae4987dd3c931d7d2f9ca033bfbdf2c450777d19e27280a0b9bd3c2e8dff049d02ff4070003d92f389414cae2d0afd2ff13d550f3e4 SHA512 4621824e3357f24443d29fd50a6bf302cadb378c613fa95357c7ae86e27634541ccc0bdf7cd93c0aff2b9ad18645b33b7fdcd93348cad53094ed21efc6b41cae
 EBUILD libuv-9999.ebuild 1016 BLAKE2B 7d72cbf0f224869e127da3ea2826d2d69b7e080d43cea51d4fea2f5fa87f24b5a6b38f7b9ceb371c2cf93c4bb54f254a1a38d4e55be726ab387eab166751f9be SHA512 25d5485d6d1a55ab89db02f116e62e9538f1af795c44d57bce3b5f0e0e05704b2f5954fc3a2e5c4886fe76d22be145cbb66ced3375ec7a1cfb453596dcc35cc0
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.37.0.ebuild b/dev-libs/libuv/libuv-1.37.0.ebuild
new file mode 100644
index 000000000000..3deb47fd69a0
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.37.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index d703724fac97..2fd7de8cbac8 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -6,4 +6,4 @@ EBUILD libvterm-0.0_pre20181126.ebuild 788 BLAKE2B f7e9795a2b2a162d34bd32cb639d9
 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
 EBUILD libvterm-0.1.2.ebuild 832 BLAKE2B f037c535ecca36cc4140cd9bb2d46883526e252ba477189c283deadd8068cbd41e95fc775ea24e145d8b7ef581b6927f0e4f67b251fc6f50c9b2fd906550e89a SHA512 7d72d2bd2335e516dfed729797c57a1f4119f8c9e656f2c1d20333997dd1406efee3c699330007a46ab29c7e1a31d2c503d5fad3b1f2dbbeec793c756f82fb90
 EBUILD libvterm-0.1.3.ebuild 834 BLAKE2B c0a6e9a3360e78bb5d628a5755c5effa98169c0f663dd0309df67c6854baa6fa51b49eb9e37c893f26a959407d25c68d8ecece3d8a76f80c6922035006a38536 SHA512 20e7dabdc9ec8cf057fa8f6e04ed9cc20d0c1261a628eac8dc2e2f1d416941d3b12cfb245a67701b81cf932976b880447089960b896b2a4300ab34c520ed7373
-MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
index 119029816579..5c000c763084 100644
--- a/dev-libs/libvterm/metadata.xml
+++ b/dev-libs/libvterm/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bernardo@standard.ai</email>
-		<name>Bernardo Meurer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 1c21f61caad4..795b0d9b61db 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,5 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
-AUX libxls-1.4.0-infinite.patch 583 BLAKE2B 2d3dbe60123e6005d6c71fd24e0fee43f82137b2bb47e0240d8cda53bc56f970272bc9324c12ac7eeccd3cf90ddbd7a776c15a212723f3cdde874d8193150e5f SHA512 04ab1274723fbfc485d45a1fafd8fb21ccef0af3670b07ad8e4248a442d98a478a944dcaa0f40343026e3c22ae2dee26c27fcc37e73ba9a0cfb48d475446d00d
 DIST libxls-1.5.2.tar.gz 443227 BLAKE2B 3d12357e3c476b203ce7be76cfb828a0353732135303301f26880ca1607e9cf4a6781fafe7ebf4dae0914678de30168d80230dc0d83d189dca63c98d0cd54384 SHA512 83e443713944648d6bb5db03a03b3addff1d925a1c83c49e6bb9b29245da76ff351e6a76239e62c92400e5d513394a33366fb979d2bc0b0d8ed0cc7f024c5fc1
 EBUILD libxls-1.5.2-r1.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/files/libxls-1.4.0-infinite.patch b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
deleted file mode 100644
index 6f6e9fc1e1ec..000000000000
--- a/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-cellRow and cellCol need to be of a type larger than WORD.
-Otherwise for for documents with 65535 columns condition
-loops forever in the following line:
-    for (cellRow = 0; cellRow <= pWS->rows.lastrow; cellRow++) {
-In this case <= 65535 is always true.
-
-https://bugs.gentoo.org/607094 has an example doc of this kind.
-diff --git a/libxls/src/xls2csv.c b/libxls/src/xls2csv.c
-index b804267..1f0d4b3 100644
---- a/src/xls2csv.c
-+++ b/src/xls2csv.c
-@@ -104,3 +104,3 @@ int main(int argc, char *argv[]) {
- 	struct st_row_data* row;
--	WORD cellRow, cellCol;
-+	DWORD cellRow, cellCol;
- 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d378322bbf60..2574573ffd3c 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,5 +2,5 @@ AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba173
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
-EBUILD libxslt-1.1.33-r1.ebuild 3444 BLAKE2B b0fb1668834e0ecc7e9e2f3cc402d1ee5bf19131d63a62a5b9cbd031bff8d737c34e8442d3b2c4c8e46114f57e8db9cb314f1cdca25a5e9f41ca90273ecc92ca SHA512 b1ed499f51ce675d342749651787a1daa3e6194b83bef6747f047acd75937be68413b0782fa70ddbb6788fe00dde5f86bd912e3b2fe70295299810a68d4de985
+EBUILD libxslt-1.1.33-r1.ebuild 3445 BLAKE2B 190be63217e3bc52386bfedfd6696a037edb644b37a3afdc77044034db2b4ae164a634ec9e1799669df0a61d2437deac792c7030a1ad05b05a399d895bd44537 SHA512 bfc75fa72d0f2ca0be73f20444b3f686006df081a8a61c0b6b5e30ee5ea8b3073daa9a532cc0b52e3de8ab03153005e8404384409257cae2be4120f63a5a8c71
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 518dcc44e5a6..66a2d1b8dbd3 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index f7174c95d1c3..24962167fd37 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
-EBUILD libyaml-0.2.2.ebuild 1028 BLAKE2B 7708bba3722b153ae09321c6813c2653759c64bbdf758b110a4046e0a1debf29ab7b8c938f3cb07195947117feff708b17336e1baa33898e4e44e2babfa434a4 SHA512 d0f4b7945ff4883b9e7d7d4b65a4e1b6ebc1f82ac60b70ee2d916e34bc031e9dbed3667f13d5b91c46f7470c475003b775c8f15dbf60742f3bbe55b1582bf9db
+EBUILD libyaml-0.2.2.ebuild 1029 BLAKE2B f14f2e827272f14ffeb16f7094851a68a0fe794452c759d042a8e0b3b0c6701ac17bc85b0a0a16f9637b57dce2d5748b6d044a8c764880145c749bfb259ed03e SHA512 7d483f399e28f03da3f4681b0a54d42f16a939be4c024caf77dc372e502a0cd3143b0f81f8ba5fcf7e10dd605ebef631f0e9163c1f9de1fe5644e824c492cd56
 MISC metadata.xml 396 BLAKE2B f55ccf30afa81617e23963e2bb96cce1db4e06982320b1b53213736a79c15431da54a7ba2312c4b60226b881553d6470c0fa08a1ea88152789254208f302b64f SHA512 a373090c8dc67e0bafec51ee673e9a3c15821c7079061335ab95ec2c87cf629f57fc172fb8e17989a709b4770ab42537f87c22ac065cd24fcc1ca88a2c80bf76
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index a469c36b5c5b..d98952acd461 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 040439427db5..d47a2770b995 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -3,5 +3,5 @@ DIST libzia-4.19.tar.gz 623995 BLAKE2B 55bc17854614af92873059e741179d9bc4f35000c
 DIST libzia-4.20.tar.gz 624009 BLAKE2B f0342c144c3e0b9dd7720466b24d79632de6dc8597786ba22acccd4eee20cdfb4f941da5717fde27a7ee0097f4f57b20a93455c123fd518916c1552cab801bc2 SHA512 0780eb791fdd85778a074eddab933650d4fbb09a9b441432cf6e63fe97978d47c75155caa251820f283badb16ffa5ac2d323b1f98ab5864caaa020511ff856d5
 EBUILD libzia-4.18.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
 EBUILD libzia-4.19.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
-EBUILD libzia-4.20.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
+EBUILD libzia-4.20.ebuild 719 BLAKE2B 3d6ccf2b62b7ff127dab3bffa2c5b0d52ba374f389998d7b60662874ca34ded6eaf6f58851a0a7ade1ec7d9e1cbd9e6fde4d95a0fd774845c92a3e9af74827f9 SHA512 d69a02f5bc0f92b8fdc50afad08c06a8d32999aed136edb99ca7bdd74fa15f1f242fb21e34cd48fc28bd40303740a2528dcfd5a22151b486eb069049c234d037
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.20.ebuild b/dev-libs/libzia/libzia-4.20.ebuild
index 63b54d9c6b89..de56605304a1 100644
--- a/dev-libs/libzia/libzia-4.20.ebuild
+++ b/dev-libs/libzia/libzia-4.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index e60896f450bd..e93557d890ce 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -9,6 +9,7 @@ AUX mongo-c-driver-1.14.0-enable-tests.patch 849 BLAKE2B ddae62c9f8d6f94f3c8f2bc
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
 AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
+AUX mongo-c-driver-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -38,7 +39,7 @@ EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607
 EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47
 EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
-EBUILD mongo-c-driver-1.16.2.ebuild 2501 BLAKE2B 70f6e83f3a3220b56755a495581adfceedb5ee69bd6f919b5f14a2203d7ac86cc55555b7e845f330e12c7ff24d137297676febb65cddbfaf1df6da2b8b7d33db SHA512 8706ebc5bf7a8961d16b5a4f70c01983bc65f3ecbf67816935e54eb81a2422bd5914b350798deceeffeccdeaf311bb3615480160d1a366d2275f07ff2877a96d
+EBUILD mongo-c-driver-1.16.2.ebuild 2542 BLAKE2B c09f85b6e762b864208cbc25cd6f65d14e9918d289030d3f56826badda2ef6ea72fbfb09225c7001c866be69df2aee5d4bc2927a69c7fe31af42e161923bf6b6 SHA512 25549dbcd88d12a0f3dd21d10966211384dfeada442c5ffa3639d1ede0df5117fe73502c6dad7ef08095ca91fd765fd61844e0eabbf3523d3bdbe2653d924873
 EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
 EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
 EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
new file mode 100644
index 000000000000..7a165b61c59a
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/716774
+
+--- a/build/sphinx/taglist.py
++++ b/build/sphinx/taglist.py
+@@ -24,7 +24,12 @@ THE SOFTWARE.
+ """
+ 
+ from docutils import nodes, utils
+-from sphinx.environment import NoUri
++
++try:
++    from sphinx.environment import NoUri
++except ImportError:
++    from sphinx.errors import NoUri
++
+ try:
+     from sphinx.util.compat import Directive
+ except ImportError:
+ 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
index 66adfafad3a1..e5f55ceb6252 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 	"${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
 	"${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
+	"${FILESDIR}/${PN}-1.16.2-sphinx.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 3cb433cae56c..a46a8407d740 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,3 @@
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
-EBUILD mpc-1.1.0-r1.ebuild 910 BLAKE2B a54c2d37e16b79788730f2c84588dec0fb3463a27477c7bf92ab7365e0732f4ea3b1d242ed23623f9f93559c718bd374e7ff340efceea0994cfcfe8c4cf0759c SHA512 a7c9bab93e1c7744d733636e07d0adb6805960ab79efb6697e4dc496cd1c9bd96bb262253beaf555c4e40879e6ba6d6cedd38602f2b5a0d1bddf581fa9dec4bf
+EBUILD mpc-1.1.0-r1.ebuild 911 BLAKE2B a4f737a415faf743345c5f01a63e97ee130b0bc01f4773c60688b64111886e365f61807b173fa5090474cc6d522c918655793e63668a05827ccad3f0f7ec6900 SHA512 9be5809d00f2c567c2ce0c422479825685aec708bd3bc1a12656bb0872de11e1695872fca17d0949a4b48e4e16cd6179371e682cf2564a98c9208e486f610f0d
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 07c116f2452f..ccf53fd81003 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 8d81aff2a200..1092d8a3cf03 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
 DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
-EBUILD mpfr-4.0.2.ebuild 1643 BLAKE2B 1e0141dc2ac71e09bd397dfe8893c88cbf948a57a8551092f0a8c6448c047f8cbaef10201ea75071885a226b0f7845d164afed236f5a7c826f134cdd908c9011 SHA512 e5d84f687c09a997db9157a642ac9a64d563031f67129a17c129685ae1af5d2be20b5e9a2aa6284113553e10c1a08dae7d3e81370227d2182258bcc0bac1eba4
+EBUILD mpfr-4.0.2.ebuild 1644 BLAKE2B 0e93bbe9c14f289fad63c5055eaee18299d4daa1297581f2bf8241e75ef711814de09a6ce6154bb1979b6e452c674d6a5a59289deb8b134752c4bf9fdc35c7d9 SHA512 7ef27262e6172f59c952e61f5b2433225066778a3b7a7d3114542dc8356de625e4a59361c0606d302250c28c23ea565990b70eb139a9d0633475d9d8071de328
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 908b8e546ccc..b5731b6eb616 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 4897cb4287ea..b4a86c7dba46 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,6 +4,6 @@ AUX nss-3.47-gentoo-fixups.patch 5260 BLAKE2B 994233aad2a0016676e6aea2bf4331a131
 DIST nss-3.51.1.tar.gz 78310874 BLAKE2B c295b5fdf6e1d24cc79474f2c5a9e91fccf777212fbb072e8a64576ed1b060fea6ecbde1fa59bb07c998b9aa92bb7d450e722a8f34a72eaa35aef6cbd693420a SHA512 1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
 DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.51.1.ebuild 9022 BLAKE2B 3b0dbacc03de0558c3b7ea21296d8b67c598d92170935c8d426da82a1de72859a7f10ca107459b95a040845412eae192562ae3e28583eed3dd9d371a721d7841 SHA512 93bb2df5a5b66c5b89f083384933bf02ea37a2e83f928f8a68aa6be25a081bdfbff2d17b394e60eb65d847841296d78a67791b8ff8ca354e50d9fe326973f1df
-EBUILD nss-3.51.ebuild 9013 BLAKE2B 1896dc3b49f1da05984491bc9cef60b9f928601d5d27ed8c511b0f27a1665acb3a2c54cb1820cdf34b60e202a70756df414449ab9d4d6a5ebbc20227244796cd SHA512 04836b3cacc543a53ddb0a7ffa593e5eaab9fb663233c3410c6e5d4e46348638dd1e64017f2acc3a612e2869bbab41334cacebfc4a2b85f2c9ee94c8d1e9809b
+EBUILD nss-3.51.1.ebuild 9076 BLAKE2B 10ea62155df3c5b19e89875f2bf4932751d269feeb0ee6cb1640e25f9240efd53e4f70a75d640ae130bd39cc4ea2f2a858ff39ae1a5e7f001237cb694a1f43c1 SHA512 5a94e706858d39ab5dbe1d0bfdf43ba657a768811b48948bd5595dc6966651284ed3b224eaefd03c855ecb3b4c1d2ee61ea5aaf9bd34e32f0579dab08330de3c
+EBUILD nss-3.51.ebuild 9001 BLAKE2B 0cff38cb15c49d2791d940588cedb83a7226f4f7cfe81a0807ec808ac86f2cf61f2add00868bab13783d561a6f2252d5cff6045630fe764c167fdbd319d38d0b SHA512 6b3d93d9c8dde4e3d18086104b7271a5ee67edcc2fc6f90563464cddbac5a272f18e06c10f4a8996ef7a3ac510d68b3f1175ab348439e1a9aac5dfcbccf6320c
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.51.1.ebuild b/dev-libs/nss/nss-3.51.1.ebuild
index b1c3b3f782f1..6ad4600ae7d7 100644
--- a/dev-libs/nss/nss-3.51.1.ebuild
+++ b/dev-libs/nss/nss-3.51.1.ebuild
@@ -17,13 +17,12 @@ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
-BDEPEND="
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/nss/nss-3.51.ebuild b/dev-libs/nss/nss-3.51.ebuild
index 0b2315560be9..7cba16c1fb0e 100644
--- a/dev-libs/nss/nss-3.51.ebuild
+++ b/dev-libs/nss/nss-3.51.ebuild
@@ -17,13 +17,11 @@ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
-BDEPEND="
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 64de7750eef8..c1c082978405 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,12 +1,3 @@
-AUX ntl-9.2.0-sanitize-makefile.patch 4324 BLAKE2B 43a2a1276d2743bfd8394c89419012a2d8278d12394ed12f9b2ab60bb1ec9deb621b9c8c5e0835d5c6740c46344a03fb1f50331b7f8509caf73a16c1d92b8e44 SHA512 d1b0d21fd136bf6548901486f6893d34c538b110bf50a9a8b4ca810f77a32bbd64d67962310bf7666afd935d380969fb832848d5779e1d1101a06691abedec80
-AUX ntl-9.2.0-singular.patch 391 BLAKE2B 2d4dbfcb45c7cc82d8358d7d7d7c0f50a4eb6b1c3ef11a3baa47223a8dd1c0d1fe2f38b656829fedcf172617dd0504317f901b2f3552128b86765327a56163e5 SHA512 ebb25e7755232ff72d75538213cbfa3a600e9b78af3943e73da4de1aab28d3c8dda43f84eec716bc52768d510f6a68c3f5c969c5dea2c6050b25023ba440fe04
-AUX ntl-9.6.4-sanitize-makefile.patch 4049 BLAKE2B a5ed15742628e3880ae4804672d198b83372272f89c8ddd8528f78e4030a4926d3fabe920a073ef22409d16273c9c9a1a87d4a3a554d84d34c7b10eaff3eac98 SHA512 1af6473c85d75299db28542e244bcc1bc37011bc4a1b85cacd9c21a44c77a578d6d32b1295c10e00a25a50de88be479282060a3ab93ecb9738cb9e6888a9165f
-DIST ntl-10.5.0.tar.gz 1278729 BLAKE2B a061ac4e0989ea671c51a22904851e5b7919f3a7e55624048c576d6f48d2ba3d6f88baa6c656c9ef43ad2145a03df9d891372f8462a1c5b6b53bc1d05301d9f6 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
-DIST ntl-9.3.0.tar.gz 888710 BLAKE2B 153a6f1bd11f27ef2944e4df5e941c4ddbb1783449e2a72aa1a272fcf169997b01646cfac63ac3af5a85a7f9a4db99a664503615d323ba54784849e764316b0c SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d
-DIST ntl-9.6.4.tar.gz 915256 BLAKE2B 78d8415bb1fe858881f997383ca9adcc8af2499251fc1b2e8e2211a8c7b8edc249ef28f3705e302d438c19cc07bd31d8b36681cb6b5a846d4f0b35ff09d310ff SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868
-EBUILD ntl-10.5.0.ebuild 1477 BLAKE2B df1abab9af41dfa2e74767a5d29ffb21f630291b811b9b15233c071444f3424b9fc10cbaf3168cce9670d90e86aea30c258a072454988bae98c5219251480811 SHA512 4a192510603542f0d269efe628922042c4a867741373f5ed5d0acbfc292620dda7e9ff7549af2e64e09dc63a900b33c6671c0e0e362210680ba853fd662a751f
-EBUILD ntl-11.4.3.ebuild 1625 BLAKE2B 762362d90f0abd5cf1b87025bab68c7a4ffaeed1432ea687b22abbaad48a6af1094006252e281bc66c4f54fc19b58aca5096015b88825c223cb54cf5b19c2325 SHA512 a0e73e16711d2037880e94119ff7bc2f31b291eb8faa1b893daa776fb34a49f72e9f1d0ed79b290c71f59495e4a9fa09eab7f655210544bc079aa5eeca631d12
-EBUILD ntl-9.3.0.ebuild 1803 BLAKE2B 8fbb3743fd8ad0dcfc982e39d17e7ff853ee4711dad0621c3baf209e4eec60c42205bf333d602048194411ca61a9199f1031a14bc510e576d04ad1954e1137a6 SHA512 ccf8254177675efa4833f9042349d7cb45991180a328b1369371a654c50e841076312841a127e8004bdf837c7140f89bccbd9ef1fcf96a6f3a7708a2b976bd17
-EBUILD ntl-9.6.4.ebuild 1731 BLAKE2B 65923c6eb86909476d4763b19a0a98fdd5aac72519a2cf2a8ba3296339a50e14f0735ace03b0a52d0ef096a8b85f2bdad9f9fd38cd92d0b8821bf3679fdca8f3 SHA512 b9c617747de890d894c004006ccccf6b4660f38c758819a66ec70c42e51122a55141d59619ea62aa3046ea358ed12ee12de20c6a8ea5f544ce51b7b6482c386a
+EBUILD ntl-11.4.3.ebuild 1622 BLAKE2B fb57d2648841652dbc333a1be4ee8d4690a8c7342525b0a3ac639fcb2c6532cf3984482be1ded238ba95bc00acdfe834c5d8d1ba8adb892e4a60b9ad59faa46e SHA512 c1fe99867f3872aac98844a04923122cdd217d0c3c9e348c56b288cba60ae8fb74505abd02ffcab8976188b00d0b68b55901b855956845ff9636b3a9810a799e
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch
deleted file mode 100644
index 2e8b77ae4b92..000000000000
--- a/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur ntl-9.2.0.orig/src/DoConfig ntl-9.2.0/src/DoConfig
---- ntl-9.2.0.orig/src/DoConfig	2015-07-09 21:45:26.959930693 +1200
-+++ ntl-9.2.0/src/DoConfig	2015-07-09 21:46:52.250122780 +1200
-@@ -38,14 +38,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-diff -Naur ntl-9.2.0.orig/src/mfile ntl-9.2.0/src/mfile
---- ntl-9.2.0.orig/src/mfile	2015-07-09 21:45:26.959930693 +1200
-+++ ntl-9.2.0/src/mfile	2015-07-09 21:57:40.631583489 +1200
-@@ -109,6 +109,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -141,6 +151,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -314,6 +326,8 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
-+
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -322,11 +336,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -373,22 +387,37 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo:	lip.c g_lip_impl.h c_lip_impl.h 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_OPT_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo:	ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
-+
- CheckPCLMUL: CheckPCLMUL.c
- 	$(LINK) -o  CheckPCLMUL CheckPCLMUL.c $(LDLIBS)
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -402,7 +431,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -459,21 +488,19 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	cp ../include/NTL/have_LL_no.h ../include/NTL/have_LL.h
- 	cp ../include/NTL/have_builtin_clzl_no.h ../include/NTL/have_builtin_clzl.h
- 	rm -f ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -558,4 +585,11 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	  $(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	  ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	     $(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	     ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 
diff --git a/dev-libs/ntl/files/ntl-9.2.0-singular.patch b/dev-libs/ntl/files/ntl-9.2.0-singular.patch
deleted file mode 100644
index 58f9491c12a0..000000000000
--- a/dev-libs/ntl/files/ntl-9.2.0-singular.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Modfiy new.h to accomodate Singular.
---- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
-+++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
-@@ -12,7 +12,8 @@
- #include <NTL/config.h>
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// commenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #endif
diff --git a/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
deleted file mode 100644
index ed2e533fe430..000000000000
--- a/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- ntl-9.6.4/src/DoConfig
-+++ ntl-9.6.4/src/DoConfig
-@@ -24,14 +24,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
---- ntl-9.6.4/src/mfile
-+++ ntl-9.6.4/src/mfile
-@@ -113,6 +113,18 @@
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
-+
-+
- #################################################################
- #
- #  That's it!  You can ignore everything else in this file!
-@@ -144,6 +156,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -317,6 +331,7 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXAUTOFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -325,11 +340,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -378,16 +393,28 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo:	lip.c g_lip_impl.h c_lip_impl.h 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_OPT_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo:	ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
-+
- CheckCompile: CheckCompile.c
- 	$(LINK) -o  CheckCompile CheckCompile.c $(LDLIBS)
- 
-@@ -395,6 +422,9 @@
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -408,7 +438,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -465,20 +495,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	sh ResetFeatures '..'
- 	rm -f ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -570,5 +598,11 @@
- 	$(LINK) -o DispSettings DispSettings.c $(LDLIBS)
- 
- 
--
-+sharedso: DIRNAME $(SHOBJ)
-+	$(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	$(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 
diff --git a/dev-libs/ntl/ntl-10.5.0.ebuild b/dev-libs/ntl/ntl-10.5.0.ebuild
deleted file mode 100644
index 4987f69dd780..000000000000
--- a/dev-libs/ntl/ntl-10.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic ltprune toolchain-funcs
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/35"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test threads bindist"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:0=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	# Currently the build system can build a static library or
-	# both static and shared libraries. But not only shared libraries.
-	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 \
-		$(usex threads NTL_THREADS= NTL_THREADS= on off) \
-		$(usex bindist NATIVE= NATIVE= off on) \
-		|| die "DoConfig failed"
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		prune_libtool_files --all
-		rm -f "${ED}"/usr/$(get_libdir)/libntl.a
-	fi
-
-	cd ..
-	rm -rf "${ED}"/usr/share/doc/NTL
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc doc/*.html doc/*.gif
-	fi
-}
diff --git a/dev-libs/ntl/ntl-11.4.3.ebuild b/dev-libs/ntl/ntl-11.4.3.ebuild
index ff46212b8526..b19d42f860c2 100644
--- a/dev-libs/ntl/ntl-11.4.3.ebuild
+++ b/dev-libs/ntl/ntl-11.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/43"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/ntl/ntl-9.3.0.ebuild b/dev-libs/ntl/ntl-9.3.0.ebuild
deleted file mode 100644
index e2a691d8a312..000000000000
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# sanitize the makefile and allow the building of shared library
-	epatch "${FILESDIR}"/${PN}-9.2.0-sanitize-makefile.patch
-	# enable compatibility with singular
-	epatch "${FILESDIR}"/${PN}-9.2.0-singular.patch
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on NTL_LEGACY_SP_MULMOD=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a
-	fi
-	dolib.so lib*$(get_libname)
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
-	fi
-}
-
-src_test() {
-	# the current ebuild need static library to run tests
-	emake ntl.a
-
-	default
-}
diff --git a/dev-libs/ntl/ntl-9.6.4.ebuild b/dev-libs/ntl/ntl-9.6.4.ebuild
deleted file mode 100644
index e672e758c1bf..000000000000
--- a/dev-libs/ntl/ntl-9.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:0=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-PATCHES=(
-	"${FILESDIR}/${P}-sanitize-makefile.patch"
-	"${FILESDIR}/${PN}-9.2.0-singular.patch"
-)
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd .. || die
-	default
-
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on NTL_LEGACY_SP_MULMOD=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a
-	fi
-	dolib.so lib*$(get_libname)
-
-	cd .. || die
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc doc/*.html doc/*.gif
-	fi
-}
-
-src_test() {
-	# the current ebuild need static library to run tests
-	emake ntl.a
-
-	default
-}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 9028efaa31af..ad3ed9f04041 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.12-r2.ebuild 1289 BLAKE2B 65b27579e5479f321cd239a96f0bcd6ed28370c7500b5adbf25c45c4989e7cf1f653409727eecd14726ee6de007777d6776cab463c736760bb648a09bd3d1991 SHA512 6a9b659fc0b7d28183c377ffe9bd78894d42d4f927e5933646ea14ec8ff99ebb245106b251e32c1d98fa5a40c238f8b178f3d225494e84994478920a891d9caa
-EBUILD ocl-icd-2.2.12-r3.ebuild 1328 BLAKE2B d5a90f66a72d04b5929bb4c9bf68cc7b4ee1b89cebe9687caacb50b68325ad14a6cd3de502f6a22888e04bb078fbe5937db4507ba257285a40e14f7bb548b96e SHA512 555a8b7a4bfdf252206965446c10fc2aa651093149a939593c5bbe3eb526a9b2aebfd01eabdc74b72ac81422eca60594b28a5fd4f81125699f6c118afd394ee8
+EBUILD ocl-icd-2.2.12-r3.ebuild 1202 BLAKE2B 05c210fb5d2f2729aac92291bc7fddc6b19cee869fcc23c3d1a4252cc8ad4ab641046ef7202f47b23c9dce29c8dc72f01db5d7275c501b07ef097b2ffb06f297 SHA512 f3c7910d537ecc8dfd15a1e0da77d27d2c0f5fc800727902a217b51c7f452d8f0252b0f3043ca9239ddc80e891e73072f57f1860e1eb307804793974f9b5412c
 EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 05ddc8149f9a60bd1de2862be075fbd9d815352e68bc1c35315d72c2d32a7a54de4da2786adca0e919f46a2e1686e06112d6f666c97a898a971fb04c8cde4136 SHA512 9852a177d53bcdaabc0f36b6bcbcfcef587e34e97131cd4e97d5494efa58abb34595e57defc0916596f9a7035b1d4bf84daa964462458fc6a6b025deb2e624a4
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index 980cac2e7506..4bf66a6c1ab6 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -19,12 +19,9 @@ IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
 DEPEND="dev-util/opencl-headers"
-# nvidia-drivers block is hopefully temporary, until it has ceased
-# to depend on eselect-opencl
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader
-	!x11-drivers/nvidia-drivers"
+	!dev-libs/opencl-icd-loader"
 
 PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
 
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index cf3fcd644eb1..7ab1bdb66288 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,3 @@
 DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
-EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1196 BLAKE2B f82ff384f1c03600654b9fb8a0c8bdd2bb35a8d42076ce467ac7476ddabf9d555e4f1ceb9623715d99a8b80d2290f5737698a8a69326dc2eb3f54de4f52d5186 SHA512 6267c8a27254c6386a4fe051242eb620f0d15afd21a1815d3fb524b84ef0edca5d264d16ae095b6786ae1414f75c51671660224cf394375b09df451456705687
+EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1070 BLAKE2B b24fac6217b7b8c5f23b1a6cb6d6556fc54736d9d3fd7e966a6cb96266a4b26950c46fc3b384fda608fa1d05d91f07ddd4d60573c1d40a9f12f3d9aaf8d86486 SHA512 ad6267973a1f4f4a8874f71525985f9394e83904e8ee5a66aff07fea0b8e01b04c0b66235b1e04ca65690f3a5c3cf50f92040ad0cec2e3565b312961def01027
 MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
index 07b5df1216f9..47205d26a955 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
@@ -20,12 +20,9 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-# nvidia-drivers block is hopefully temporary, until it has ceased
-# to depend on eselect-opencl
 DEPEND="dev-util/opencl-headers
 	!app-eselect/eselect-opencl
-	!dev-libs/ocl-icd
-	!x11-drivers/nvidia-drivers"
+	!dev-libs/ocl-icd"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index a30a8a2cdcf7..280e595715d7 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,4 +1,4 @@
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1723 BLAKE2B 7721a9c879528fdea53f880650c719be71bb16810119bc56aff019b37dc6f6fedea132c9ccb36800c0b828948733bf9a82ede81db2747d753b84d5992ae35e5b SHA512 5d233f359d1bf327cc87e16196b947c47cb315d7c21a2e2f731561f3ee613d8b72144a91864d9dbcdd1f64d7de6d97b8faa253e9f29f588e4cc98cad34960a8c
+EBUILD openct-0.6.20-r4.ebuild 1724 BLAKE2B a10ebca4f33d7cdeac1addceb84e6bd412adffa1d3ca54afd13d6563c9fba702018d4dba353bb851b6a711520f9a3e7d870dbd6c60abe25ed1a37d33a2714bc1 SHA512 6e18385f71b4f2e47f40f1beec642b34c162dc5a7a584ca9194890533d8a7f72d11477f560c0c38d31426a198901fe22159febf2fc55952ebc26d2a4614ee83a
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index 4336e09aa2f9..a41bb1c04b9a 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
 SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index c93f1dff33d5..859089030687 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,3 +1,3 @@
 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
-EBUILD opensc-0.20.0.ebuild 1595 BLAKE2B bbfcde26a91e1b71d2275fd3bdc5b2eefa4ba6aca4cd77d6350e34c0d6ff38f6af204aa66713cc6123eb25449d29dff0cd17d9e1ed5198121d630ea62fd3a02a SHA512 4539b08078c0332546eea107a5dbe489e743fb2cacb3ce8d07e4644a293ccdc503b4ae9091841391b726dadea8ea94ed2ed43d894195863619c068b05f86fa62
+EBUILD opensc-0.20.0.ebuild 1644 BLAKE2B 5d9381c45835959f5b58fed17bcb462c65e57e7cfa97e77b824e1310baf57a73bdc6f60a9ce25ab68cfcbc82e546e8c1f7ff855b52cb70073d716c14447e434e SHA512 3b05dd6371fe7898d5cda9dac9f1ad4da67365b81fa0402b0b77b2d97bebc1a3260cd2dab5028a56f3636e274d97a349a6cf9b26bfa46a3f675ba6591310ce4d
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index b5a3fd35a32d..d32490c9e604 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bash-completion-r1
+inherit bash-completion-r1 libtool
 
 DESCRIPTION="Libraries and applications to access smartcards"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
@@ -36,6 +36,11 @@ REQUIRED_USE="
 	ctapi? ( !pcsc-lite !openct )
 	|| ( pcsc-lite openct ctapi )"
 
+src_prepare() {
+	default
+	elibtoolize
+}
+
 src_configure() {
 	econf \
 		--with-completiondir="$(get_bashcompdir)" \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a226dbbb948b..5d92d76adc51 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -16,8 +16,10 @@ DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea
 DIST openssl-1.1.1f.tar.gz 9792828 BLAKE2B eba30dd12772cd714666ed8e5371e068623d8bfd4ff45863d10e82c65551654508a27f22f7ef1edadb543ab56f3c4c40ac3bcad665c667eb06ee90c69b24782e SHA512 b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c
-EBUILD openssl-1.0.2u.ebuild 9864 BLAKE2B d7330cd7c75d921b3a8b80dd33674672b7e22e083d13315645dfb6737e6c073078355719b2a412f92e736bde6cfdd91019fd73bce8497529c5bf926945c4dfbd SHA512 7537ce252bf49349589a4f7108107e649beba6953c98500e0e98ea325bf64f44f502ca14e19b186f347ddcc2dbc343964b10b9cd66da3edcab5b9e59a56d6f8f
+DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
+EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
 EBUILD openssl-1.1.0l.ebuild 9592 BLAKE2B 8778c7cff0b81a5bfc1b8161b45c7a5a4f89cc7bb07e9c8e213a034a651d80ac3acd0939fd9eb986f1965119e399868c3106a4ce3c58b637e2289582543d6105 SHA512 691be7e7221f7bfc7e95e1d118f8d32b40e45afe5b213c342a40f610088cb3e5a7acc1351f27330653775a5f773cbc16e5531302c343af768b2d385967983970
-EBUILD openssl-1.1.1d-r3.ebuild 10435 BLAKE2B 0b8f210c5e4f5eea0a2dd7e82f7026b4486f4590adfc6ea3765b73fa6e60ac3188c166e89197de673c5abe68f384e840e98d6032cf3152ea18b52551de4418b0 SHA512 9b723d9d11a1146453de9fdb1c1d337985c140ce3802da5a36abaf6fa683afbea31c19f454a4b7098cf4fe004b1dff92188242994cfa7ed80c6d40621cc8d581
+EBUILD openssl-1.1.1d-r3.ebuild 10436 BLAKE2B b5ca5102365b4773db76c2060d1c0a786cc91a7aa339ef10a4cbd25a1e7a72bdc21e7fc8165306bb53458170ae19eb4980899259886ce4fcd25ef22036f6511a SHA512 52a486e668901024c54d7e9ae2c82f3c7d2e8012820da38150ec0547d9354f146fc92ddcb969449631cf6ffb7d7cf3536e0d9107eede349dfa1e9f09f4ba25d2
 EBUILD openssl-1.1.1f.ebuild 10195 BLAKE2B da0c3d13bf583fe264e01968b48757467b1b820809724524154232851c32dda2ed2088fe852b02d59b87b9971e77793f4fb4263708e3e7a2b5670b198dae9a88 SHA512 0e8be7b427d0d8b090e0704de4b0aeeff758a706cf93c3d53834cff0a9f6c8faabdd16bb21e5a39fcde0415ca6a9c611a98a78af4e17386c95e69deb245847eb
+EBUILD openssl-1.1.1g.ebuild 10194 BLAKE2B 0ae0778f72fc24afc3445dfbde251c29fc58ceebbd0d408c603f737a56c3651da2a21a9028ef8e2882e5eb1922bffc356840c551d2af84e2d389975762a7de6c SHA512 48e13082a7a9a78e6c80e21b45d07a14697b4b714af6cb720d32f59cfe99957c0c6224bbf9d66e5b1bd364a58058c6902efd1409bf50addb9f833b3f29d1a9db
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index 7b1dfa29cbaa..ab6d946a8b33 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index e41efa34b689..7de6ff8b593e 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild
new file mode 100644
index 000000000000..cb9a8e24cc5c
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1g.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1e-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index a2f9d78a7ba9..48185af135de 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 873 BLAKE2B df950b3dcec9a824269f7bcc74c5e368fce29f71c43f6ff1c0526a4bd22a9c4887408c04da1c7826eecafc6cbdba37a3e0749f4a69369c29a1c3c379b8430020 SHA512 c0ad7967f051fe9f5d7f50c152f9dafc00caee2e7208eda5f04a52c01b70fd56c43703b7655ef2756a4064f3c6a834ed7af43cc1b2ab0b68a472711bbb3f22c3
+EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index e8df64c79fa2..b97a1597e36b 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 8561755fddd9..6fb30f627f82 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,4 +1,8 @@
+AUX disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
+AUX disable-containsintegerpoint1.patch 1039 BLAKE2B c608e3e2e03350ac72b987284e4d05089bd4bcd3ae3aa53864eec21a3475c88a0c6f66062ff19f9fe9d84179d68e2acb9b979a2fc54e439878188604e7f98b86 SHA512 3fc14d9161e0b6ab0ea70bf3d35e85efcafa0a5fa62cf5c7d3af624517688ea2a0747cdd8e7859c500f03d6cda1fa958136b3322484de1450db8892191bdfa1a
+AUX disable-mipproblem2.patch 1098 BLAKE2B b15da536e0e46a2edbec44e4c68a97e57b96d71639b382aa5efe4032e788db241e49e717e3b7b99f602633980b7b269d1f743c1cc9eb21eca4c03aa6e54ba121 SHA512 430917cae1dcff8772643be468fe69116ba2b58c9d7cac505584e4bc27b830f7a61cc213d364a26ccf08196b594fe1552f5566e71184286dff1b56fd5a60a635
+AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8d6262609eccf70e29f6442a7b261b22ffc112ff30cfddc0b8f2a80ffd787d2e9f14f8bb1ba35c095110d695 SHA512 d802c597e408ca50fe01e240c868b2fb5cc2ca3ff00cf15ff1de1c1dc5d0cf0b88da25de0d1151f8011e331f85e343348150285bb515c9ffc17806ff4edd082d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.2-r1.ebuild 1255 BLAKE2B 612a952756364bbacb0c24fe5c3315be58ede4e7cb10c51cadda39cd877f2b3bcad7435d5c9021148de9198ecda30167b9a70ae7ab04093a274037ff6da80d9a SHA512 d1b1660084489f1ac8d15f948e319a97c7a94405807cf933c0c8a17d7977eb358a95a7245f47680640aa452b4f610a18d86573636c6dd4dac449fdf9cbba064e
-EBUILD ppl-1.2.ebuild 1596 BLAKE2B a1330aef84f7a9024e170aeff4adee135245c8f4ab1b5643db1508df14b738cf0ac8d2ae195b9c930e2a4393513af4fb04b0b1cb8f4fcad970fe60c2aa713be6 SHA512 d6ed03ac19c4789e99a0c797da5b93229ee02935373607c33f3227c16672d288d0c2ddd2c9fec5cd2cc81bc5b6441bc97d28dadd89b8a97815f1cd792a8c813a
-MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
+EBUILD ppl-1.2-r2.ebuild 1666 BLAKE2B 6a3083a1a69c6cd5e34d85b4e9112c835ce916286e378b0270a0aa8f4ba62515beda7d2d8260da1e7bf788bcacb9985a56813de8d848ed4260f1a9c3afd98342 SHA512 2961a2a457f75c89e5417093b4c5b60a2abf4b63bb3d95d321b67d1b03e06cd73986d43a18362cf73daf8d57002ddaa97620d063fd1cf4a1ac0af453625e6fe2
+EBUILD ppl-1.2-r3.ebuild 1707 BLAKE2B 76ae5f1deb692cf77ec6737bf6934d572d3926828a89e0f1bb705567fae5b220ff03090a1ebbf8017525fa6bd530bb9dd5dc7ae7821103979ed51c4a5310c1a0 SHA512 c88528a7f0e2d1036fbb74973bfc917577c615f6d3e51e9a8cc8ff842913b933f4a493644f23101adc1f4a9620495f749b9731c40eefaba261623a6c4ee5ea12
+MISC metadata.xml 859 BLAKE2B 73b368a2852176bfc7e38a89b8ec0c239fd4e96a838bad0fd883d50125cb25cbe2962fddd3c62d420a3bb97287d80c47c356f063dcacf39057d4bd07cb3b110b SHA512 a7f896a4a2a485c18df3cf03038621bfaf93057eefb43ff093f9cf89d0d71937e96de0ef0fd5dc20fd12580cc60bebd80d74e64fd40941e9f3bfe1f91d1666bb
diff --git a/dev-libs/ppl/files/disable-boeing-tests.patch b/dev-libs/ppl/files/disable-boeing-tests.patch
new file mode 100644
index 000000000000..ca208b8707ff
--- /dev/null
+++ b/dev-libs/ppl/files/disable-boeing-tests.patch
@@ -0,0 +1,1176 @@
+From 14ceb43dee3c3a029dd5398d809796011dd3d772 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 14 Apr 2020 10:52:53 -0400
+Subject: [PATCH 1/1] demos/ppl_lpsol/examples: disable the boeing[12].mps
+ tests.
+
+These two tests fail due to numerical noise on 32-bit systems, and
+this commit disables them to prevent build failures on Gentoo. This
+one is a bit trickier than the other test removals because we need to
+hack the expected output out of the expected_mpz file as well.
+
+Warning: this is only half of the solution. The boeing[12].mps files
+must still be deleted by the ebuild. The patch does not do this to
+avoid running afoul of the 20KiB patch size limit in Gentoo.
+
+Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=1078
+Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=2113
+---
+ demos/ppl_lpsol/Makefile.am          |   21 -
+ demos/ppl_lpsol/examples/Makefile.am |    2 -
+ demos/ppl_lpsol/expected_mpz         | 1070 --------------------------
+ 3 files changed, 1093 deletions(-)
+
+diff --git a/demos/ppl_lpsol/Makefile.am b/demos/ppl_lpsol/Makefile.am
+index d6d6a38b2..7c73ba455 100644
+--- a/demos/ppl_lpsol/Makefile.am
++++ b/demos/ppl_lpsol/Makefile.am
+@@ -115,8 +115,6 @@ endif !ASSERTIONS_ENABLED
+ TOUGH_EXAMPLES_FOR_ENUM = \
+ adlittle.mps \
+ blend.mps \
+-boeing1.mps \
+-boeing2.mps \
+ egout.mps \
+ kb2.mps \
+ lseu.mps \
+@@ -161,8 +159,6 @@ adlittle.mps \
+ afiro.mps \
+ bgprtr.mps \
+ blend.mps \
+-boeing1.mps \
+-boeing2.mps \
+ kb2.mps \
+ sample.mps \
+ sc105.mps \
+@@ -172,13 +168,9 @@ ship08l.mps
+ 
+ DO_NOT_OUTPUT_OPTIMUM_LOCATION_PROBLEMS = \
+ adlittle.mps \
+-boeing1.mps \
+-boeing2.mps \
+ rout.mps
+ 
+ INDIVIDUALLY_CHECKED_PROBLEMS = \
+-boeing1.mps \
+-boeing2.mps \
+ ex12.mps \
+ mas74.mps \
+ modglob.mps
+@@ -291,19 +283,6 @@ check-local: ppl_lpsol$(EXEEXT)
+ 	  echo "*** ppl_lpsol -e -r $$m -oobtained $$file" >>obtained; \
+ 	  ./ppl_lpsol$(EXEEXT) -e -r $(CHECK_OPTION) $$m -oobtained $$path >/dev/null; \
+ 	done
+-	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000518 boeing1.mps" >>obtained
+-	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000518 $(srcdir)/examples/boeing1.mps >/dev/null
+-	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.0000000105 boeing1.mps" >>obtained
+-	-$(SIMPLEX_NOCHECK) -r -M -c0.0000000105 $(srcdir)/examples/boeing1.mps $$m >/dev/null
+-	$(ECHO_SIMPLEX) "-n boeing1.mps" >>obtained
+-	-$(SIMPLEX) -n $(srcdir)/examples/boeing1.mps >/dev/null
+-	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000863 boeing2.mps" >>obtained
+-	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000863 $(srcdir)/examples/boeing2.mps >/dev/null
+-	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.00000000213 boeing2.mps" >>obtained
+-	-$(SIMPLEX_NOCHECK) -r -M -c0.00000000213 $(srcdir)/examples/boeing2.mps $$m >/dev/null
+-	$(ECHO_SIMPLEX) "-n boeing2.mps" >>obtained
+-	-$(SIMPLEX) -n $(srcdir)/examples/boeing2.mps >/dev/null
+-
+ 	$(ECHO_SIMPLEX) "-r -m mas74.mps" >>obtained
+ 	-$(SIMPLEX) -r -m $(srcdir)/examples/mas74.mps >/dev/null
+ 	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.000123 mas74.mps" >>obtained
+diff --git a/demos/ppl_lpsol/examples/Makefile.am b/demos/ppl_lpsol/examples/Makefile.am
+index f621a68d4..ce333c7c5 100644
+--- a/demos/ppl_lpsol/examples/Makefile.am
++++ b/demos/ppl_lpsol/examples/Makefile.am
+@@ -26,8 +26,6 @@ adlittle.mps \
+ afiro.mps \
+ bgprtr.mps \
+ blend.mps \
+-boeing1.mps \
+-boeing2.mps \
+ egout.mps \
+ ex12.mps \
+ ex1.mps \
+diff --git a/demos/ppl_lpsol/expected_mpz b/demos/ppl_lpsol/expected_mpz
+index 2bb4f1658..5024da1f6 100644
+--- a/demos/ppl_lpsol/expected_mpz
++++ b/demos/ppl_lpsol/expected_mpz
+@@ -3937,1076 +3937,6 @@ Optimum value: 0
+ Optimum location:
+ x1 = 0
+ x2 = 0
+-*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000518 boeing1.mps
+-Optimum value: -335.2135675
+-Optimum location:
+-PBOSHNL0 = 0
+-PBOSHNL1 = 12
+-PBOSHNL7 = 0
+-PBOSHNL8 = 0
+-PBOSLAX0 = 14
+-PBOSLAX1 = 0
+-PBOSLAX7 = 0
+-PBOSSEA0 = 0
+-PBOSSEA1 = 0
+-PBOSSEA2 = 49
+-PBOSSFO0 = 60
+-PBOSSFO1 = 73
+-PBOSTPE1 = 1
+-PBOSTPE2 = 0
+-PBOSTYO1 = 3
+-PBOSTYO2 = 0
+-PBOSYUL0 = 28.13380282
+-PBOSYUL1 = 347.7678621
+-PBOSYUL2 = 0.325
+-PBOSYUL3 = 336.7733351
+-PBOSYUL4 = 0
+-PBOSYVR0 = 0
+-PBOSYVR1 = 0
+-PBOSYVR2 = 26
+-PBOSYWG0 = 0
+-PBOSYWG1 = 0
+-PBOSYWG7 = 37
+-PBOSYYZ0 = 19.03169014
+-PBOSYYZ1 = 195.9683099
+-PBUROAK0 = 11
+-PBUROAK1 = 16
+-PBURSEA0 = 83
+-PBURSEA1 = 0
+-PBURSFO0 = 278
+-PHNLLAX0 = 104.0482353
+-PHNLLAX1 = 33.04
+-PHNLLAX2 = 68.20588235
+-PHNLLAX3 = 98
+-PHNLLON0 = 0
+-PHNLLON6 = 5
+-PHNLPAR0 = 0
+-PHNLPAR6 = 1
+-PHNLSEA0 = 0
+-PHNLSEA1 = 157.7943925
+-PHNLSEA2 = 0
+-PHNLSFO0 = 35
+-PHNLSFO1 = 0
+-PHNLSFO7 = 0
+-PHNLYVR0 = 94.20560748
+-PHNLYVR1 = 0
+-PHNLYVR7 = 39.79439252
+-PLASSEA0 = 70.01327253
+-PLASSEA1 = 342.9867275
+-PLASYVR0 = 0
+-PLASYVR6 = 37
+-PLAXOAK0 = 32
+-PLAXOAK1 = 0
+-PLAXOAK2 = 46
+-PLAXSEA0 = 0
+-PLAXSEA1 = 0
+-PLAXSEA2 = 0
+-PLAXSEA3 = 546.0147059
+-PLAXSEA4 = 3.720588235
+-PLAXSEA5 = 139
+-PLAXSEA6 = 66.26744186
+-PLAXSEA7 = 0
+-PLAXSEA8 = 57
+-PLAXSEA9 = 5.415868673
+-PLAXSFO0 = 33.04
+-PLAXSFO1 = 260.8488372
+-PLAXSFO2 = 839.9632721
+-PLAXSFO3 = 87.90697674
+-PLAXSFO4 = 168
+-PLAXSFO5 = 98
+-PLAXSFO6 = 1464.240914
+-PLAXTPE0 = 8.581395349
+-PLAXTPE1 = 0
+-PLAXTPE2 = 18
+-PLAXTPE8 = 4.418604651
+-PLAXTYO0 = 41
+-PLAXTYO1 = 0
+-PLAXTYO2 = 0
+-PLAXTYO8 = 0
+-PLAXYVR0 = 0
+-PLAXYVR1 = 153.755814
+-PLAXYVR2 = 39.24418605
+-PLONPAR0 = 0
+-PLONPAR1 = 0
+-PLONPAR2 = 2
+-PLONSEA0 = 0
+-PLONSEA1 = 151
+-PLONYVR0 = 0
+-PLONYVR1 = 0
+-PLONYVR7 = 51
+-POAKONT0 = 0
+-POAKONT1 = 13
+-POAKSEA0 = 37.89108456
+-POAKSEA1 = 77.15303309
+-POAKSEA2 = 6.955882353
+-PONTSFO0 = 177
+-PONTSEA0 = 23.10431985
+-PONTSEA1 = 24.89568015
+-PONTSEA2 = 0
+-PPARSEA0 = 0
+-PPARSEA1 = 68
+-PPARYVR0 = 0
+-PPARYVR1 = 0
+-PPARYVR7 = 24
+-PRNOSEA0 = 0
+-PRNOSEA1 = 291
+-PRNOYVR0 = 67
+-PSEASFO0 = 0
+-PSEASFO1 = 839.9632721
+-PSEASFO2 = 146.6809139
+-PSEASFO3 = 236.6
+-PSEASFO4 = 0
+-PSEASFO5 = 50.75581395
+-PSEASFO6 = 168
+-PSEATPE0 = 15.81395349
+-PSEATPE1 = 0
+-PSEATPE2 = 0
+-PSEATPE3 = 49.60465116
+-PSEATYO0 = 59.98837209
+-PSEATYO1 = 0
+-PSEATYO2 = 0
+-PSEATYO3 = 95.01162791
+-PSEAYVR0 = 164.8598131
+-PSEAYVR1 = 0
+-PSEAYVR2 = 0
+-PSEAYVR3 = 392
+-PSEAYVR4 = 0
+-PSEAYVR5 = 70.01327253
+-PSEAYVR6 = 0
+-PSEAYVR7 = 50.75581395
+-PSEAYVR8 = 47.16549296
+-PSFOTPE0 = 0
+-PSFOTPE1 = 0
+-PSFOTPE2 = 0
+-PSFOTPE8 = 6
+-PSFOTYO0 = 0
+-PSFOTYO1 = 0
+-PSFOTYO2 = 0
+-PSFOTYO8 = 17
+-PSFOYVR0 = 260.8488372
+-PSFOYVR1 = 37.15116279
+-PTPETYO0 = 111
+-PTPETYO1 = 0
+-PTPETYO2 = 0
+-PTPETYO3 = 0
+-PTPEYVR0 = 57
+-PTYOYVR0 = 91
+-PYULYVR0 = 36.4084507
+-PYULYVR1 = 134.1343917
+-PYULYVR2 = 139.6904909
+-PYULYVR3 = 4.766666667
+-PYULYWG0 = 0
+-PYULYWG1 = 271.3172923
+-PYULYWG2 = 0
+-PYULYWG3 = 178.6827077
+-PYULYYZ0 = 0
+-PYULYYZ1 = 266.6818464
+-PYULYYZ2 = 0
+-PYULYYZ3 = 431.9057717
+-PYULYYZ4 = 1913.412382
+-PYVRYWG0 = 14.67957746
+-PYVRYWG1 = 271.3172923
+-PYVRYWG2 = 138.0031303
+-PYVRYYZ0 = 4.352112676
+-PYVRYYZ1 = 241.2835753
+-PYVRYYZ2 = 126.3643121
+-PYWGYYZ0 = 14.67957746
+-PYWGYYZ1 = 138.0031303
+-PYWGYYZ2 = 0
+-PYWGYYZ3 = 125.3172923
+-PBOSOAK0 = 11
+-PBOSOAK6 = 0
+-PBOSBUR1 = 7
+-PBOSBUR2 = 0
+-PBOSONT1 = 4
+-PBOSONT2 = 0
+-PBURYVR1 = 26
+-PBURTYO1 = 2
+-PBURTPE1 = 1
+-PBURHNL0 = 11
+-PBURHNL6 = 0
+-PHNLOAK0 = 0
+-PHNLOAK1 = 24
+-PHNLOAK2 = 0
+-PHNLOAK8 = 0
+-PHNLONT0 = 9.705882353
+-PHNLONT6 = 6.294117647
+-PHNLYWG1 = 3
+-PHNLYYZ1 = 24
+-PHNLYUL1 = 40
+-PLASTYO1 = 5
+-PLASTPE1 = 1
+-PLAXLON0 = 13
+-PLAXLON6 = 0
+-PLAXLON7 = 0
+-PLAXPAR0 = 8
+-PLAXPAR6 = 0
+-PLAXPAR7 = 0
+-PBURLON1 = 1
+-PBURPAR1 = 1
+-PLONONT1 = 1
+-PLONOAK1 = 1
+-POAKPAR1 = 2
+-POAKTYO1 = 7
+-POAKTPE1 = 2
+-PONTPAR1 = 2
+-PONTTYO1 = 2
+-PONTTPE1 = 1
+-PPARSFO1 = 2
+-PRNOTYO1 = 5
+-PRNOTPE1 = 2
+-PTPEYWG1 = 21
+-PTPEYYZ1 = 13
+-PTPEYUL1 = 6
+-PTYOYUL1 = 7
+-PTYOYYZ1 = 17
+-PTYOYWG1 = 25
+-PLAXONT0 = 6.294117647
+-GRDTIMO1 = 0
+-GRDTIMN1 = -49.01286158
+-GRDTIMO2 = 0
+-GRDTIMN2 = 0
+-GRDTIMO3 = 0
+-GRDTIMN3 = -47
+-GRDTIMO4 = 0
+-GRDTIMN4 = 0
+-GRDTIMO5 = 0
+-GRDTIMN5 = -47.24353963
+-GRDTIMO6 = 0
+-GRDTIMN6 = -81
+-N1001AC1 = 0
+-N1001AC2 = 0
+-N1001AC3 = 0
+-N1002AC1 = 0
+-N1002AC2 = 0
+-N1002AC3 = 2.355140187
+-N1003AC1 = 0
+-N1003AC2 = 0.1603208556
+-N1003AC3 = 0.7214438503
+-N1004AC1 = 0.28
+-N1004AC2 = 0
+-N1004AC3 = 0
+-N1005AC3 = 0.0859375
+-N1105AC3 = 0.8382352941
+-N1006AC3 = 0.07582720588
+-N1007AC1 = 0
+-N1007AC2 = 0
+-N1007AC3 = 0
+-N1008AC1 = 0
+-N1008AC2 = 0
+-N1008AC3 = 0
+-N1008AC4 = 0
+-N1008AC5 = 0
+-N1008AC6 = 4.65801495
+-N1009AC1 = 0
+-N1009AC2 = 0.07488107822
+-N1009AC3 = 0
+-N1009AC4 = 0
+-N1009AC5 = 1.921947674
+-N1010AC1 = 0
+-N1010AC2 = 0
+-N1010AC3 = 0
+-N1010AC4 = 0
+-N1010AC5 = 0
+-N1010AC6 = 7
+-N1011AC1 = 0
+-N1011AC2 = 3.085065996
+-N1011AC3 = 0.6951730236
+-N1011AC4 = 0
+-N1011AC5 = 3.897217244
+-N1011AC6 = 0
+-N1012AC1 = 1.510832058
+-N1012AC2 = 0
+-N1012AC3 = 0
+-N1012AC4 = 0
+-N1012AC5 = 2.417331293
+-N1013AC3 = 0
+-N1013AC4 = 0
+-N1013AC5 = 0
+-N1013AC6 = 0.9241727941
+-N1014AC3 = 0
+-N1014AC4 = 0
+-N1014AC5 = 1.691245404
+-N1014AC6 = 0.2228170956
+-N1015AC3 = 0
+-N1015AC4 = 0.7048194147
+-N1015AC5 = 0.1595430366
+-N1015AC6 = 2.135637549
+-N1016AC3 = 0
+-N1016AC4 = 0
+-N1016AC5 = 0.7
+-N1016AC6 = 3.3
+-N1017AC3 = 0
+-N1017AC4 = 0
+-N1017AC5 = 0
+-N1017AC6 = 0.1617647059
+-N1018AC1 = 0
+-N1018AC2 = 0
+-N1018AC3 = 0
+-N1018AC4 = 0
+-N1018AC5 = 0
+-N1018AC6 = 1.196428571
+-N1019AC1 = 0
+-N1019AC2 = 0
+-N1019AC3 = 0
+-N1019AC4 = 0.2345133807
+-N1019AC5 = 0.7654866193
+-N1020AC1 = 0.2228332753
+-N1020AC2 = 0
+-N1020AC3 = 0
+-N1020AC4 = 0
+-N1020AC5 = 3.200696136
+-N1020AC6 = 0
+-N1021AC1 = 0.664202377
+-N1021AC2 = 0
+-N1021AC3 = 0
+-N1021AC4 = 0
+-N1021AC5 = 2.453858782
+-N1022AC1 = 0
+-N1023AC1 = 0
+-N1026AC1 = 1
+-N1027AC1 = 0.476744186
+-N1028AC1 = 0
+-N1029AC1 = 0.523255814
+-N1030AC1 = 1
+-N1032AC1 = 0
+-N1032AC2 = 0
+-N1032AC3 = 0
+-N1032AC4 = 0.8274647887
+-N1032AC5 = 0
+-N1033AC1 = 0.4860357964
+-N1033AC2 = 0.5004769224
+-N1033AC3 = 0
+-N1033AC4 = 0
+-N1033AC5 = 2.061996183
+-N1034AC1 = 0
+-N1034AC2 = 0
+-N1034AC3 = 3.174783885
+-N1035AC1 = 0.6827679474
+-N1035AC2 = 0
+-N1035AC3 = 0
+-N1035AC4 = 0.7269371829
+-N1035AC5 = 0.2529831862
+-N1036AC1 = 0.1083333333
+-N1036AC2 = 0
+-N1036AC3 = 0
+-N1037AC4 = 0
+-N1037AC5 = 0
+-N1038AC4 = 0.2383968781
+-N1038AC5 = 1.271450017
+-N1039AC4 = 0
+-N1039AC5 = 2.077705904
+-N1040AC4 = 0
+-N1040AC5 = 0
+-N1040AC6 = 9.513243659
+-N1041AC4 = 8.856901224
+-N1041AC5 = 0
+-N1041AC6 = 20
+-N1042AC4 = 0
+-N1042AC5 = 0
+-N1042AC6 = 0
+-N1043AC1 = 0.1725352113
+-N1043AC2 = 0
+-N1043AC3 = 0
+-N1044AC1 = 0
+-N1044AC2 = 0
+-N1044AC3 = 1
+-N1046AC3 = 1
+-N1047AC1 = 0
+-N1047AC2 = 0
+-N1047AC3 = 1
+-N1050AC3 = 0
+-N1050AC4 = 0
+-N1050AC5 = 0.0731874145
+-N1051AC1 = 0
+-N1051AC2 = 0
+-N1051AC3 = 0
+-N1051AC4 = 0
+-N1051AC5 = 4.651904242
+-N1051AC6 = 20
+-*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.0000000105 boeing1.mps
+-Optimum value: 286.9746573
+-Optimum location:
+-PBOSHNL0 = 0
+-PBOSHNL1 = 10
+-PBOSHNL7 = 0
+-PBOSHNL8 = 0
+-PBOSLAX0 = 0
+-PBOSLAX1 = 0
+-PBOSLAX7 = 12
+-PBOSSEA0 = 0
+-PBOSSEA1 = 40
+-PBOSSEA2 = 0
+-PBOSSFO0 = 48
+-PBOSSFO1 = 73
+-PBOSTPE1 = 0
+-PBOSTPE2 = 0
+-PBOSTYO1 = 0
+-PBOSTYO2 = 0
+-PBOSYUL0 = 372
+-PBOSYUL1 = 224.0530973
+-PBOSYUL2 = 0
+-PBOSYUL3 = 11.94690265
+-PBOSYUL4 = 0
+-PBOSYVR0 = 0
+-PBOSYVR1 = 23
+-PBOSYVR2 = 0
+-PBOSYWG0 = 33
+-PBOSYWG1 = 0
+-PBOSYWG7 = 0
+-PBOSYYZ0 = 193
+-PBOSYYZ1 = 0
+-PBUROAK0 = 9
+-PBUROAK1 = 15
+-PBURSEA0 = 69
+-PBURSEA1 = 0
+-PBURSFO0 = 243
+-PHNLLAX0 = 0
+-PHNLLAX1 = 126.296875
+-PHNLLAX2 = 100.03125
+-PHNLLAX3 = 104.4375
+-PHNLLON0 = 0
+-PHNLLON6 = 0
+-PHNLPAR0 = 0
+-PHNLPAR6 = 0
+-PHNLSEA0 = 0
+-PHNLSEA1 = 135.2523364
+-PHNLSEA2 = 0
+-PHNLSFO0 = 0
+-PHNLSFO1 = 0
+-PHNLSFO7 = 31
+-PHNLYVR0 = 80.74766355
+-PHNLYVR1 = 0
+-PHNLYVR7 = 35.25233645
+-PLASSEA0 = 365
+-PLASSEA1 = 0
+-PLASYVR0 = 0
+-PLASYVR6 = 33
+-PLAXOAK0 = 42.765625
+-PLAXOAK1 = 0
+-PLAXOAK2 = 46
+-PLAXSEA0 = 543.96875
+-PLAXSEA1 = 0
+-PLAXSEA2 = 0
+-PLAXSEA3 = 0
+-PLAXSEA4 = 6
+-PLAXSEA5 = 139
+-PLAXSEA6 = 0
+-PLAXSEA7 = 0
+-PLAXSEA8 = 66
+-PLAXSEA9 = 12.03125
+-PLAXSFO0 = 164.828125
+-PLAXSFO1 = 842
+-PLAXSFO2 = 0
+-PLAXSFO3 = 168
+-PLAXSFO4 = 168
+-PLAXSFO5 = 144
+-PLAXSFO6 = 1212.171875
+-PLAXTPE0 = 0
+-PLAXTPE1 = 18
+-PLAXTPE2 = 9
+-PLAXTPE8 = 0
+-PLAXTYO0 = 0
+-PLAXTYO1 = 0
+-PLAXTYO2 = 0
+-PLAXTYO8 = 36
+-PLAXYVR0 = 116
+-PLAXYVR1 = 0
+-PLAXYVR2 = 57
+-PLONPAR0 = 0
+-PLONPAR1 = 0
+-PLONPAR2 = 0
+-PLONSEA0 = 0
+-PLONSEA1 = 127
+-PLONYVR0 = 0
+-PLONYVR1 = 0
+-PLONYVR7 = 45
+-POAKONT0 = 0
+-POAKONT1 = 11
+-POAKSEA0 = 41
+-POAKSEA1 = 57
+-POAKSEA2 = 0
+-PONTSFO0 = 155
+-PONTSEA0 = 25
+-PONTSEA1 = 12
+-PONTSEA2 = 0
+-PPARSEA0 = 0
+-PPARSEA1 = 53
+-PPARYVR0 = 0
+-PPARYVR1 = 0
+-PPARYVR7 = 21
+-PRNOSEA0 = 255
+-PRNOSEA1 = 0
+-PRNOYVR0 = 60
+-PSEASFO0 = 574
+-PSEASFO1 = 0
+-PSEASFO2 = 156
+-PSEASFO3 = 224
+-PSEASFO4 = 0
+-PSEASFO5 = 168
+-PSEASFO6 = 168
+-PSEATPE0 = 0
+-PSEATPE1 = 0
+-PSEATPE2 = 42
+-PSEATPE3 = 0
+-PSEATYO0 = 0
+-PSEATYO1 = 0
+-PSEATYO2 = 126
+-PSEATYO3 = 27
+-PSEAYVR0 = 104.2523364
+-PSEAYVR1 = 0
+-PSEAYVR2 = 0
+-PSEAYVR3 = 0
+-PSEAYVR4 = 0
+-PSEAYVR5 = 0
+-PSEAYVR6 = 0
+-PSEAYVR7 = 0
+-PSEAYVR8 = 545
+-PSFOTPE0 = 0
+-PSFOTPE1 = 0
+-PSFOTPE2 = 0
+-PSFOTPE8 = 0
+-PSFOTYO0 = 0
+-PSFOTYO1 = 0
+-PSFOTYO2 = 0
+-PSFOTYO8 = 15
+-PSFOYVR0 = 268
+-PSFOYVR1 = 0
+-PTPETYO0 = 0
+-PTPETYO1 = 0
+-PTPETYO2 = 0
+-PTPETYO3 = 99
+-PTPEYVR0 = 44
+-PTYOYVR0 = 74
+-PYULYVR0 = 182
+-PYULYVR1 = 88
+-PYULYVR2 = 0
+-PYULYVR3 = 0
+-PYULYWG0 = 161.3018868
+-PYULYWG1 = 178
+-PYULYWG2 = 31.69811321
+-PYULYWG3 = 0
+-PYULYYZ0 = 0
+-PYULYYZ1 = 0
+-PYULYYZ2 = 245.3018868
+-PYULYYZ3 = 2104.698113
+-PYULYYZ4 = 0
+-PYVRYWG0 = 194.3018868
+-PYVRYWG1 = 178
+-PYVRYWG2 = 4.698113208
+-PYVRYYZ0 = 328.6981132
+-PYVRYYZ1 = 0
+-PYVRYYZ2 = 4.301886792
+-PYWGYYZ0 = 0
+-PYWGYYZ1 = 4.698113208
+-PYWGYYZ2 = 245.3018868
+-PYWGYYZ3 = 0
+-PBOSOAK0 = 9
+-PBOSOAK6 = 0
+-PBOSBUR1 = 0
+-PBOSBUR2 = 0
+-PBOSONT1 = 0
+-PBOSONT2 = 0
+-PBURYVR1 = 23
+-PBURTYO1 = 0
+-PBURTPE1 = 0
+-PBURHNL0 = 9
+-PBURHNL6 = 0
+-PHNLOAK0 = 0
+-PHNLOAK1 = 2.234375
+-PHNLOAK2 = 0
+-PHNLOAK8 = 18.765625
+-PHNLONT0 = 0
+-PHNLONT6 = 14
+-PHNLYWG1 = 0
+-PHNLYYZ1 = 21
+-PHNLYUL1 = 35
+-PLASTYO1 = 0
+-PLASTPE1 = 0
+-PLAXLON0 = 11
+-PLAXLON6 = 0
+-PLAXLON7 = 0
+-PLAXPAR0 = 0
+-PLAXPAR6 = 0
+-PLAXPAR7 = 0
+-PBURLON1 = 0
+-PBURPAR1 = 0
+-PLONONT1 = 0
+-PLONOAK1 = 0
+-POAKPAR1 = 0
+-POAKTYO1 = 0
+-POAKTPE1 = 0
+-PONTPAR1 = 0
+-PONTTYO1 = 0
+-PONTTPE1 = 0
+-PPARSFO1 = 0
+-PRNOTYO1 = 0
+-PRNOTPE1 = 0
+-PTPEYWG1 = 18
+-PTPEYYZ1 = 11
+-PTPEYUL1 = 0
+-PTYOYUL1 = 0
+-PTYOYYZ1 = 15
+-PTYOYWG1 = 22
+-PLAXONT0 = 14
+-GRDTIMO1 = 0
+-GRDTIMN1 = -105
+-GRDTIMO2 = 0
+-GRDTIMN2 = -91
+-GRDTIMO3 = 0
+-GRDTIMN3 = -47
+-GRDTIMO4 = 0
+-GRDTIMN4 = -43.5
+-GRDTIMO5 = 0
+-GRDTIMN5 = -87
+-GRDTIMO6 = 0
+-GRDTIMN6 = -81
+-N1001AC1 = 0
+-N1001AC2 = 0
+-N1001AC3 = 0
+-N1002AC1 = 0
+-N1002AC2 = 2.018691589
+-N1002AC3 = 0
+-N1003AC1 = 0
+-N1003AC2 = 0
+-N1003AC3 = 0
+-N1004AC1 = 0
+-N1004AC2 = 1.0703125
+-N1004AC3 = 0
+-N1005AC3 = 0.0703125
+-N1105AC3 = 0.9296875
+-N1006AC3 = 0
+-N1007AC1 = 0
+-N1007AC2 = 0
+-N1007AC3 = 0
+-N1008AC1 = 5.28156777
+-N1008AC2 = 0
+-N1008AC3 = 1.986798016
+-N1008AC4 = 0
+-N1008AC5 = 0
+-N1008AC6 = 0
+-N1009AC1 = 0
+-N1009AC2 = 0
+-N1009AC3 = 0
+-N1009AC4 = 0
+-N1009AC5 = 0
+-N1010AC1 = 7
+-N1010AC2 = 7
+-N1010AC3 = 7
+-N1010AC4 = 7
+-N1010AC5 = 7
+-N1010AC6 = 7
+-N1011AC1 = 0
+-N1011AC2 = 0
+-N1011AC3 = 0
+-N1011AC4 = 0
+-N1011AC5 = 0
+-N1011AC6 = 0
+-N1012AC1 = 0
+-N1012AC2 = 0
+-N1012AC3 = 0
+-N1012AC4 = 0
+-N1012AC5 = 0
+-N1013AC3 = 0
+-N1013AC4 = 0
+-N1013AC5 = 0
+-N1013AC6 = 1
+-N1014AC3 = 0
+-N1014AC4 = 0
+-N1014AC5 = 0
+-N1014AC6 = 1.909090909
+-N1015AC3 = 0
+-N1015AC4 = 0
+-N1015AC5 = 0
+-N1015AC6 = 3
+-N1016AC3 = 0
+-N1016AC4 = 0
+-N1016AC5 = 0
+-N1016AC6 = 4
+-N1017AC3 = 0
+-N1017AC4 = 0
+-N1017AC5 = 0
+-N1017AC6 = 0.09090909091
+-N1018AC1 = 3.782713663
+-N1018AC2 = 6.749720385
+-N1018AC3 = 7
+-N1018AC4 = 0
+-N1018AC5 = 4.039001305
+-N1018AC6 = 0
+-N1019AC1 = 0
+-N1019AC2 = 1.412371134
+-N1019AC3 = 0
+-N1019AC4 = 2.587628866
+-N1019AC5 = 0
+-N1020AC1 = 0
+-N1020AC2 = 0
+-N1020AC3 = 0
+-N1020AC4 = 0
+-N1020AC5 = 0
+-N1020AC6 = 0
+-N1021AC1 = 0
+-N1021AC2 = 0
+-N1021AC3 = 0
+-N1021AC4 = 0
+-N1021AC5 = 0
+-N1022AC1 = 0
+-N1023AC1 = 0
+-N1026AC1 = 1
+-N1027AC1 = 0
+-N1028AC1 = 0
+-N1029AC1 = 1
+-N1030AC1 = 1
+-N1032AC1 = 1
+-N1032AC2 = 1
+-N1032AC3 = 1
+-N1032AC4 = 1
+-N1032AC5 = 1
+-N1033AC1 = 0
+-N1033AC2 = 1.371681416
+-N1033AC3 = 0
+-N1033AC4 = 0.6283185841
+-N1033AC5 = 0
+-N1034AC1 = 0
+-N1034AC2 = 0
+-N1034AC3 = 0
+-N1035AC1 = 0
+-N1035AC2 = 0.04608448823
+-N1035AC3 = 0
+-N1035AC4 = 0.01051928536
+-N1035AC5 = 0
+-N1036AC1 = 0
+-N1036AC2 = 0
+-N1036AC3 = 0
+-N1037AC4 = 0
+-N1037AC5 = 3.220930233
+-N1038AC4 = 0
+-N1038AC5 = 0
+-N1039AC4 = 0
+-N1039AC5 = 0
+-N1040AC4 = 10
+-N1040AC5 = 10
+-N1040AC6 = 10
+-N1041AC4 = 5.79377625
+-N1041AC5 = 20
+-N1041AC6 = 20
+-N1042AC4 = 20
+-N1042AC5 = 20
+-N1042AC6 = 20
+-N1043AC1 = 0
+-N1043AC2 = 0
+-N1043AC3 = 0
+-N1044AC1 = 0
+-N1044AC2 = 1
+-N1044AC3 = 0
+-N1046AC3 = 1
+-N1047AC1 = 0
+-N1047AC2 = 1
+-N1047AC3 = 0
+-N1050AC3 = 0.109375
+-N1050AC4 = 0
+-N1050AC5 = 0
+-N1051AC1 = 20
+-N1051AC2 = 20
+-N1051AC3 = 20
+-N1051AC4 = 0
+-N1051AC5 = 20
+-N1051AC6 = 11.52971853
+-*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing1.mps
+-Feasible problem.
+-*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000863 boeing2.mps
+-Optimum value: -315.018728
+-Optimum location:
+-PBOSORD0 = 302
+-PBOSORD1 = 0
+-PBOSORD2 = 0
+-PBOSORD3 = 0
+-PBOSORD4 = 0
+-PBOSLGA0 = 712
+-PBOSLGA1 = 268
+-PBOSLGA2 = 0
+-PBOSLGA3 = 1372
+-PBOSCLE0 = 4.108024927
+-PBOSCLE1 = 137.8919751
+-PBOSCLE2 = 0
+-PBOSCLE3 = 0
+-PORDBOS0 = 34
+-PORDBOS1 = 0
+-PORDBOS2 = 0
+-PORDBOS3 = 268
+-PORDBOS4 = 0
+-PORDLGA0 = 0
+-PORDLGA1 = 515
+-PORDLGA2 = 0
+-PORDLGA3 = 0
+-PORDCLE0 = 470.294686
+-PORDCLE1 = 148.705314
+-PORDCLE2 = 0
+-PORDCLE3 = 0
+-PLGABOS0 = 1162
+-PLGABOS1 = 0
+-PLGABOS2 = 458
+-PLGABOS3 = 0
+-PLGABOS4 = 0
+-PLGABOS5 = 1123
+-PLGAORD0 = 712
+-PLGAORD1 = 0
+-PLGAORD2 = 0
+-PLGAORD3 = 0
+-PLGACLE0 = 0
+-PLGACLE1 = 249
+-PLGACLE2 = 268
+-PCLEBOS0 = 131
+-PCLEBOS1 = 0
+-PCLEBOS2 = 0
+-PCLEBOS3 = 0
+-PCLEBOS4 = 0
+-PCLEORD0 = 178.5972891
+-PCLEORD1 = 249
+-PCLEORD2 = 16.40271092
+-PCLEORD3 = 268
+-PCLEORD4 = 0
+-PCLELGA0 = 0
+-PCLELGA1 = 0
+-PCLELGA2 = 409
+-PCLELGA3 = 0
+-BBOSORD0 = 0
+-BBOSORD1 = 0
+-BBOSCLE0 = 0.1616272102
+-BBOSCLE1 = 7.026778587
+-BORDBOS0 = 0
+-CBOSORD0 = 12
+-CBOSORD1 = 0
+-CBOSORD2 = 0
+-CBOSORD3 = 0
+-CBOSORD4 = 0
+-CBOSCLE0 = 0
+-CBOSCLE1 = 8.811594203
+-CBOSCLE2 = 0
+-CBOSCLE3 = 0
+-CORDBOS0 = 1.5
+-CORDBOS1 = 22.5
+-CORDBOS2 = 0
+-CORDBOS3 = 0
+-CORDBOS4 = 0
+-CORDLGA0 = 13
+-CORDLGA1 = 0
+-CORDLGA2 = 0
+-CORDLGA3 = 0
+-CLGAORD0 = 22.5
+-CLGAORD1 = 22.5
+-CLGAORD2 = 0
+-CLGAORD3 = 0
+-CLGACLE0 = 16
+-CLGACLE1 = 0
+-CLGACLE2 = 0
+-CCLELGA0 = 0
+-CCLELGA1 = 5
+-CCLELGA2 = 0
+-CCLELGA3 = 0
+-GRDTIMO1 = 0
+-GRDTIMN1 = 0
+-GRDTIMO2 = 0
+-GRDTIMN2 = -76.79770851
+-GRDTIMN3 = -10.27177739
+-GRDTIMN4 = -21.60844089
+-N1003AC1 = 0
+-N1003AC2 = 6.724489796
+-N1003AC3 = 0.4
+-N1003AC4 = 0
+-N1005AC1 = 0.01346893419
+-N1005AC2 = 0
+-N1005AC3 = 0
+-N1005AC4 = 0
+-N1011AC1 = 0.5855648822
+-N1011AC2 = 0
+-N1011AC3 = 0.2937198068
+-N1011AC4 = 0
+-N1013AC2 = 7.265306122
+-N1013AC4 = 2
+-N1015AC2 = 0
+-N1015AC4 = 1.422222222
+-N1017AC2 = 0
+-N1017AC4 = 2
+-N1019AC2 = 2.540816327
+-N1019AC4 = 0
+-N1021AC1 = 0.01346893419
+-N1021AC2 = 0.1254559795
+-N1021AC3 = 0
+-N1021AC4 = 0
+-N1002AC1 = 0
+-N1002AC2 = 4.798925367
+-N1002AC3 = 0
+-N1002AC4 = 0
+-N1004AC2 = 0
+-N1004AC4 = 2
+-N1006AC1 = 0.5990338164
+-N1006AC2 = 0
+-N1006AC3 = 0.6937198068
+-N1006AC4 = 0
+-N1008AC2 = 11.85714286
+-N1008AC4 = 2
+-N1010AC2 = 0
+-N1010AC4 = 0
+-N1012AC2 = 0
+-N1012AC4 = 1.422222222
+-N1014AC2 = 4.673469388
+-N1014AC4 = 0
+-N1100AC2 = 2.734693878
+-N1100AC4 = 0
+-N1102AC2 = 0
+-N1102AC4 = 0
+-N1200AC2 = 14
+-N1200AC4 = 0
+-N1201AC2 = 11.45918367
+-N1201AC4 = 0
+-*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.00000000213 boeing2.mps
+-Optimum value: -73.3689691
+-Optimum location:
+-PBOSORD0 = 28
+-PBOSORD1 = 0
+-PBOSORD2 = 0
+-PBOSORD3 = 0
+-PBOSORD4 = 249
+-PBOSLGA0 = 258.2518986
+-PBOSLGA1 = 686
+-PBOSLGA2 = 35.74810145
+-PBOSLGA3 = 1372
+-PBOSCLE0 = 0
+-PBOSCLE1 = 0
+-PBOSCLE2 = 0
+-PBOSCLE3 = 142
+-PORDBOS0 = 302
+-PORDBOS1 = 0
+-PORDBOS2 = 0
+-PORDBOS3 = 0
+-PORDBOS4 = 0
+-PORDLGA0 = 0
+-PORDLGA1 = 0
+-PORDLGA2 = 515
+-PORDLGA3 = 0
+-PORDCLE0 = 0
+-PORDCLE1 = 619
+-PORDCLE2 = 0
+-PORDCLE3 = 0
+-PLGABOS0 = 0
+-PLGABOS1 = 712
+-PLGABOS2 = 0
+-PLGABOS3 = 686
+-PLGABOS4 = 426.7481014
+-PLGABOS5 = 918.2518986
+-PLGAORD0 = 258.2518986
+-PLGAORD1 = 0
+-PLGAORD2 = 453.7481014
+-PLGAORD3 = 0
+-PLGACLE0 = 517
+-PLGACLE1 = 0
+-PLGACLE2 = 0
+-PCLEBOS0 = 131
+-PCLEBOS1 = 0
+-PCLEBOS2 = 0
+-PCLEBOS3 = 0
+-PCLEBOS4 = 0
+-PCLEORD0 = 0
+-PCLEORD1 = 0
+-PCLEORD2 = 712
+-PCLEORD3 = 0
+-PCLEORD4 = 0
+-PCLELGA0 = 197
+-PCLELGA1 = 70
+-PCLELGA2 = 0
+-PCLELGA3 = 142
+-BBOSORD0 = 0
+-BBOSORD1 = 0
+-BBOSCLE0 = 0
+-BBOSCLE1 = 0
+-BORDBOS0 = 0
+-CBOSORD0 = 0
+-CBOSORD1 = 0
+-CBOSORD2 = 0
+-CBOSORD3 = 0
+-CBOSORD4 = 0
+-CBOSCLE0 = 0
+-CBOSCLE1 = 0
+-CBOSCLE2 = 12.8
+-CBOSCLE3 = 0
+-CORDBOS0 = 19.2
+-CORDBOS1 = 0
+-CORDBOS2 = 0
+-CORDBOS3 = 0
+-CORDBOS4 = 0
+-CORDLGA0 = 0
+-CORDLGA1 = 0
+-CORDLGA2 = 10.4
+-CORDLGA3 = 0
+-CLGAORD0 = 0
+-CLGAORD1 = 0
+-CLGAORD2 = 10.4
+-CLGAORD3 = 25.6
+-CLGACLE0 = 12.8
+-CLGACLE1 = 0
+-CLGACLE2 = 0
+-CCLELGA0 = 0
+-CCLELGA1 = 0
+-CCLELGA2 = 0
+-CCLELGA3 = 0
+-GRDTIMO1 = 73.01076
+-GRDTIMN1 = -100
+-GRDTIMO2 = 0
+-GRDTIMN2 = -90
+-GRDTIMN3 = -45
+-GRDTIMN4 = -45
+-N1003AC1 = 7
+-N1003AC2 = 0
+-N1003AC3 = 0.6856076556
+-N1003AC4 = 0
+-N1005AC1 = 0
+-N1005AC2 = 0
+-N1005AC3 = 0
+-N1005AC4 = 0
+-N1011AC1 = 0
+-N1011AC2 = 0
+-N1011AC3 = 1.314392344
+-N1011AC4 = 0
+-N1013AC2 = 2.635223455
+-N1013AC4 = 0
+-N1015AC2 = 5.275510204
+-N1015AC4 = 2
+-N1017AC2 = 0
+-N1017AC4 = 0
+-N1019AC2 = 4.630082668
+-N1019AC4 = 0.9244444444
+-N1021AC1 = 7
+-N1021AC2 = 0
+-N1021AC3 = 2
+-N1021AC4 = 2
+-N1002AC1 = 7
+-N1002AC2 = 0
+-N1002AC3 = 2
+-N1002AC4 = 2
+-N1004AC2 = 0
+-N1004AC4 = 0
+-N1006AC1 = 7
+-N1006AC2 = 0
+-N1006AC3 = 2
+-N1006AC4 = 0
+-N1008AC2 = 0
+-N1008AC4 = 0
+-N1010AC2 = 7.265306122
+-N1010AC4 = 0.9244444444
+-N1012AC2 = 5.275510204
+-N1012AC4 = 2
+-N1014AC2 = 0
+-N1014AC4 = 0
+-N1100AC2 = 7
+-N1100AC4 = 5.274621909
+-N1102AC2 = 4.354572464
+-N1102AC4 = 0
+-N1200AC2 = 14
+-N1200AC4 = 0.9244444444
+-N1201AC2 = 9.369917332
+-N1201AC4 = 0
+-*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing2.mps
+-Feasible problem.
+ *** ./ppl_lpsol -s -p1 -c -oobtained -r -m mas74.mps
+ Optimum value: 10482.79528
+ Optimum location:
+-- 
+2.24.1
+
diff --git a/dev-libs/ppl/files/disable-containsintegerpoint1.patch b/dev-libs/ppl/files/disable-containsintegerpoint1.patch
new file mode 100644
index 000000000000..00494674073d
--- /dev/null
+++ b/dev-libs/ppl/files/disable-containsintegerpoint1.patch
@@ -0,0 +1,38 @@
+From c88aa34ffe31d4314ea87e27a2c974927bcd962e Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 14 Apr 2020 10:40:29 -0400
+Subject: [PATCH 2/3] tests/Box/Makefile.am: disable the
+ "containsintegerpoint1" test.
+
+There is an upstream report about the "containsintegerpoint1" test
+failing on Arch Linux, so this commit proactively disables it.
+
+Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=2120
+---
+ tests/Box/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am
+index adfcb8432..56e4fa535 100644
+--- a/tests/Box/Makefile.am
++++ b/tests/Box/Makefile.am
+@@ -73,7 +73,6 @@ congruences1 \
+ constrains1 \
+ constraints1 \
+ contains1 \
+-containsintegerpoint1 \
+ difference1 \
+ discrete1 \
+ disjoint1 \
+@@ -201,8 +200,6 @@ constraints1_SOURCES = constraints1.cc
+ 
+ contains1_SOURCES = contains1.cc
+ 
+-containsintegerpoint1_SOURCES = containsintegerpoint1.cc
+-
+ difference1_SOURCES = difference1.cc
+ 
+ discrete1_SOURCES = discrete1.cc
+-- 
+2.24.1
+
diff --git a/dev-libs/ppl/files/disable-mipproblem2.patch b/dev-libs/ppl/files/disable-mipproblem2.patch
new file mode 100644
index 000000000000..e2a507047f9c
--- /dev/null
+++ b/dev-libs/ppl/files/disable-mipproblem2.patch
@@ -0,0 +1,39 @@
+From 5199ade9ce4b09fdcc4bb4117d796eafe260cf56 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 14 Apr 2020 10:16:59 -0400
+Subject: [PATCH 1/3] tests/MIP_Problem/Makefile.am: disable mipproblem2.
+
+The "mipproblem2" test sometimes fails on PPC64 systems, and the
+easiest way to work around that is to simply delete the test. Guess
+what this commit does.
+
+Gentoo-bug: https://bugs.gentoo.org/717258
+Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=2653
+---
+ tests/MIP_Problem/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/MIP_Problem/Makefile.am b/tests/MIP_Problem/Makefile.am
+index 80f66cbb2..911fca67d 100644
+--- a/tests/MIP_Problem/Makefile.am
++++ b/tests/MIP_Problem/Makefile.am
+@@ -55,7 +55,6 @@ TESTS = \
+ ascii_dump_load1 \
+ exceptions1 \
+ mipproblem1 \
+-mipproblem2 \
+ mipproblem3 \
+ mipproblem4
+ 
+@@ -73,8 +72,6 @@ exceptions1_SOURCES = exceptions1.cc
+ 
+ mipproblem1_SOURCES = mipproblem1.cc
+ 
+-mipproblem2_SOURCES = mipproblem2.cc
+-
+ mipproblem3_SOURCES = mipproblem3.cc
+ 
+ mipproblem4_SOURCES = mipproblem4.cc
+-- 
+2.24.1
+
diff --git a/dev-libs/ppl/files/fix-clang-build.patch b/dev-libs/ppl/files/fix-clang-build.patch
new file mode 100644
index 000000000000..648ff59aa307
--- /dev/null
+++ b/dev-libs/ppl/files/fix-clang-build.patch
@@ -0,0 +1,37 @@
+From: Roberto Bagnara <bagnara@cs.unipr.it>
+Date: Sun, 11 Feb 2018 08:11:09 +0000 (+0100)
+Subject: Added missing "template" and "typename" keywords.
+X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff_plain;h=c39f6a07b51f89e365b05ba4147aa2aa448febd7;hp=3a5e1e20a94cffb830182f22132b153d6691b7c5
+
+Added missing "template" and "typename" keywords.
+(Thanks to Dmitrii Pasechnik.)
+---
+
+diff --git a/src/Determinate_inlines.hh b/src/Determinate_inlines.hh
+index 2749953..5b47275 100644
+--- a/src/Determinate_inlines.hh
++++ b/src/Determinate_inlines.hh
+@@ -289,8 +289,8 @@ operator()(Determinate& x, const Determinate& y) const {
+ 
+ template <typename PSET>
+ template <typename Binary_Operator_Assign>
+-inline
+-Determinate<PSET>::Binary_Operator_Assign_Lifter<Binary_Operator_Assign>
++inline typename
++Determinate<PSET>::template Binary_Operator_Assign_Lifter<Binary_Operator_Assign>
+ Determinate<PSET>::lift_op_assign(Binary_Operator_Assign op_assign) {
+   return Binary_Operator_Assign_Lifter<Binary_Operator_Assign>(op_assign);
+ }
+diff --git a/src/OR_Matrix_inlines.hh b/src/OR_Matrix_inlines.hh
+index b20b697..8124b7f 100644
+--- a/src/OR_Matrix_inlines.hh
++++ b/src/OR_Matrix_inlines.hh
+@@ -97,7 +97,7 @@ OR_Matrix<T>::Pseudo_Row<U>::Pseudo_Row(const Pseudo_Row<V>& y)
+ 
+ template <typename T>
+ template <typename U>
+-inline OR_Matrix<T>::Pseudo_Row<U>&
++inline typename OR_Matrix<T>::template Pseudo_Row<U>&
+ OR_Matrix<T>::Pseudo_Row<U>::operator=(const Pseudo_Row& y) {
+   first = y.first;
+ #if PPL_OR_MATRIX_EXTRA_DEBUG
diff --git a/dev-libs/ppl/metadata.xml b/dev-libs/ppl/metadata.xml
index d1dc39110e28..3520098af316 100644
--- a/dev-libs/ppl/metadata.xml
+++ b/dev-libs/ppl/metadata.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>toolchain@gentoo.org</email>
-  <name>Gentoo Toolchain Project</name>
-</maintainer>
-<use>
-  <flag name="lpsol">Build the ppl_lpsol linear programming problem solver</flag>
-</use>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="cdd">
+      Build the ppl_lcdd program for vertex/facet enumeration
+      accepting the same input format as the programs shipped with
+      <pkg>sci-libs/cddlib</pkg> and <pkg>sci-libs/lrslib</pkg>
+    </flag>
+    <flag name="lpsol">
+      Build the ppl_lpsol linear program solver that uses
+      <pkg>sci-mathematics/glpk</pkg> for its input routines
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2-r2.ebuild
index f312858082bb..091d9ca0a9f3 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
+
+inherit autotools
 
 DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
 HOMEPAGE="http://bugseng.com/products/ppl"
@@ -10,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
-IUSE="+cxx doc lpsol pch static-libs test"
+IUSE="cdd +cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
 	lpsol? ( sci-mathematics/glpk )"
@@ -20,21 +22,30 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
-pkg_setup() {
-	if use test ; then
-		ewarn "The PPL testsuite will be run."
-		ewarn "Note that this can take several hours to complete on a fast machine."
-	fi
+PATCHES=(
+	"${FILESDIR}/disable-mipproblem2.patch"
+	"${FILESDIR}/disable-containsintegerpoint1.patch"
+	"${FILESDIR}/disable-boeing-tests.patch"
+)
+
+src_prepare() {
+	default
+
+	# The patch should do this, but then the diff makes it run
+	# afoul of the Gentoo patch size limit.
+	rm demos/ppl_lpsol/examples/boeing[12].mps || die
+
+	eautoreconf
 }
 
 src_configure() {
 	local interfaces=( c )
 	use cxx && interfaces+=( cxx )
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--disable-debugging \
 		--disable-optimization \
 		$(use_enable doc documentation) \
+		$(use_enable cdd ppl_lcdd) \
 		$(use_enable lpsol ppl_lpsol) \
 		$(use_enable pch) \
 		$(use_enable static-libs static) \
@@ -42,15 +53,11 @@ src_configure() {
 		$(use test && echo --enable-check=quick)
 }
 
-src_test() {
-	# default src_test runs with -j1, overriding it here saves about
-	# 30 minutes and is recommended by upstream
-	emake check
-}
-
 src_install() {
 	default
-	use static-libs || find "${ED}"/usr -name 'libppl*.la' -delete
+	if ! use static-libs; then
+		find "${ED}"/usr -name 'libppl*.la' -delete || die
+	fi
 
 	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
 	rm gpl* fdl* || die
diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r3.ebuild
index 6980ae7142cf..91ea71b2109c 100644
--- a/dev-libs/ppl/ppl-1.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r3.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
 HOMEPAGE="http://bugseng.com/products/ppl"
@@ -10,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~sparc-solaris"
-IUSE="+cxx doc lpsol pch static-libs test"
+IUSE="cdd +cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
 	lpsol? ( sci-mathematics/glpk )"
@@ -20,6 +22,23 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/disable-mipproblem2.patch"
+	"${FILESDIR}/disable-containsintegerpoint1.patch"
+	"${FILESDIR}/disable-boeing-tests.patch"
+	"${FILESDIR}/fix-clang-build.patch"
+)
+
+src_prepare() {
+	default
+
+	# The patch should do this, but then the diff makes it run
+	# afoul of the Gentoo patch size limit.
+	rm demos/ppl_lpsol/examples/boeing[12].mps || die
+
+	eautoreconf
+}
+
 src_configure() {
 	local interfaces=( c )
 	use cxx && interfaces+=( cxx )
@@ -27,6 +46,7 @@ src_configure() {
 		--disable-debugging \
 		--disable-optimization \
 		$(use_enable doc documentation) \
+		$(use_enable cdd ppl_lcdd) \
 		$(use_enable lpsol ppl_lpsol) \
 		$(use_enable pch) \
 		$(use_enable static-libs static) \
@@ -36,7 +56,9 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || find "${ED}"/usr -name 'libppl*.la' -delete
+	if ! use static-libs; then
+		find "${ED}"/usr -name 'libppl*.la' -delete || die
+	fi
 
 	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
 	rm gpl* fdl* || die
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 50c52a9ff109..9ac18ac0d5b4 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -11,6 +11,6 @@ DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 EBUILD protobuf-3.10.1.ebuild 2909 BLAKE2B 4b09a1969c93889e20d666641e308ef9c9a40506340427a5702aee4c12d10d94c71524693fc43159c7c9ae2c148999b60749c5d07d63f13ccb9233fab5970f94 SHA512 d37cf60bec4c3fba24f64a330ecb081a6adee3b5c4a717d5530d7e340393cbf02c95b84906e95c61587f68f71719e89d866181f550f946fb9fadbcba2f8bcba1
 EBUILD protobuf-3.11.2.ebuild 2907 BLAKE2B e0d3ef76cbc74c1c8c4f4424d2c8dd40a0ba153d82b4aee0f4ea08858ad9b63636319c04ee07ad78546e4631586696f7ae708a3ad13bb13febd930336b692032 SHA512 51367595a42beeb4fdcd1439cc6ded6a0dcf08e629123db9791cbc6b5e1c13fed54ca2b736971c530c698643aea77680b350186aceddf1459796a9929c4a393f
-EBUILD protobuf-3.11.4.ebuild 2899 BLAKE2B 532feddf1e10c98bdb52afbbc37256f39b90308b51faaa98a529e1f39d4318eb590eb467defc60265e6122f4c4ae1b0370559e2676d63d8ed6e3ed9358b31af4 SHA512 86f30b8222009a412c62b85439972938d5162860d2e5707dfe9f7b7178c8f2ff213066559f2346c54fae6647c773c4f2f1520d65e3f006544c1767f22c7d8f94
+EBUILD protobuf-3.11.4.ebuild 2898 BLAKE2B 3ac70b32ce07dcf467450c1d819afa64dd5b19bf231280ac76867b2d12d65d72c92068cbbc5c84545bc72369ebf27b6d31b7565cf2d751b942fbf9d45758d504 SHA512 d327248e60f0f591509d2710d4d6f2c6733663071648c9933027363eb26c9f4a1396bf29b2d62326af7483baab04eddd565720ac13a78b00fd1e9115cc172d38
 EBUILD protobuf-9999.ebuild 2679 BLAKE2B 86ff0785f236a285bd2f01a95546791a05528a8e45612a76c149f90a807ba292211bd5950b5f97530f14dffc69a78b17fd7657b9f2dd2c5270bf78a5f0ec71e7 SHA512 8f50fce8cca5c71acfb026c50c561de922c9f4bcdeee6559f1d01ed840c80d4922a777e854871501006cc743928f563b26e8b0c73691318a7a097cd6f615b5a0
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild
index e194dea21b76..10dfc3a1a39a 100644
--- a/dev-libs/protobuf/protobuf-3.11.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.11.4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 3343277724fe..175aaf1d28c3 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,3 +1,5 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ptexenc-1.3.7_p20190410.ebuild 1278 BLAKE2B 9d4dbf43dfc448124488b6edd286a4f0148e402ef0599c94bbe83b2dcafba24499d96f2c2adcc2c61925c0e2ad34d387975dd02cf5e05d482bf70caef846b36b SHA512 0345c16a25122225b1b2817881408f611b13e97b573bfdb839a0fc7f96aa2d82e27a3e94e8a9c7ece75ebcebea0925c8665788ada261330d67c1bc918ace91aa
+DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+EBUILD ptexenc-1.3.7_p20190410.ebuild 1285 BLAKE2B 7959ff8d6c6bf357f94151d1201e18c6f92f936671f06f7ab115e10f17298309d85609948658c856aa4faf4a31c5e9b03a374afd1e67773ee8e955ac9c1230be SHA512 a645c62cda7ec23a5741ee3e0a0f73af489e910a8db537d4c19f1f7df374f872b7311e1a4c81273357584226aed8477af19138e2f24d5fce2b34e622f391dba2
+EBUILD ptexenc-1.3.8_p20200406.ebuild 1328 BLAKE2B 7da6a54ad3557a28b50f692559afd0d74c33ea58b6121409c1318ff15d09244e106179cac00a700085029d82ab8ee57a21a64907e79baf34286f7be45ab2e7e6 SHA512 1c43c9983bc4766a5e5d7b595e8ee452aaa2988f23c87675ed6a3705b7b9b65a5667bf194c3cb672e5abf9594cbc36ca5ae66ed013c2f65ff74fb352b403a002
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
index 60b3803d49b6..f1168e084811 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -40,7 +40,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -delete || die
 
 	insinto /usr/include/ptexenc
 	doins ptexenc/unicode-jp.h
diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
new file mode 100644
index 000000000000..916edfaaf400
--- /dev/null
+++ b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
+HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="iconv static-libs"
+
+DEPEND="iconv? ( virtual/libiconv )
+	dev-libs/kpathsea"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=377141
+	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
+
+	cd "${WORKDIR}/texlive-${PV#*_p}-source"
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+}
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		$(use_enable static-libs static) \
+		$(use_enable iconv kanji-iconv)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /usr/include/ptexenc
+	doins ptexenc/unicode-jp.h
+	use iconv && doins ptexenc/kanjicnv.h
+
+	dodoc ChangeLog README
+}
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index ecfa86c81e4e..affbc78ee52a 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,7 +1,10 @@
+AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a22627ea49bd46b7600c9d289847a97f428abdc036c8647d23a5e70848d97db678c38872c841183dd871a00252c7949ca0c39920c15514d96e6eb1 SHA512 c18d8a4dbad433d96d396e1065c60fe85c1c0114adedb4f6151d1aeb65a3fedb5a2b94eb2e2a1e1b272c79e65ddd2d9128ee098d133e66452ae7fead62b73892
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
+AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.14.1-r2.ebuild 1333 BLAKE2B bb574159c67e7a4151cfdce1e970119cd50f8b87187b4ad4765a85f3ab25b72d1940da9da142d48c2b3a4bdc80e3bdfe0b2320d50ad9e476593edccfd4e5a921 SHA512 63592c3c641c4780c68d44989a59310ba1ac994830746e949627a682a32a7eeec83740da8d3c765972b41eb8bbd6c34268dd219d9d7f934870f6e08cf3a9a2a5
+EBUILD redland-bindings-1.0.14.1-r2.ebuild 1334 BLAKE2B 2a2da7b97e0061fcb33b6ca78a7f1adff1acdb0860b6bdf9787c8fdfc7d1006cd74beebd8bffe2a6d101deebcc21d40523ed5677a1f63cbe640d4bef9ad3e914 SHA512 47bf9ede3040c06353d5e1bef9d53ea06579270ae39e84882fce89e1e5a8ebe4708736a34096f872dda0bb766e687c581402bb9a5d2a0226ea35334d3e732f58
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2911 BLAKE2B d227d239347cacde4131411fc643b4c0326476c9713ed1bafe4d6065fda6fc1c955d10b3845cc86f7c293b08f11a13dee0439b2affc831a9f69625d5451386fc SHA512 a9cfe1c713dcba1cff830be8ad3e6d349d40d51cd84e946d9ac290d4c6d81ac24d8ad31a0ef1e7c976fadfe30a4f0fd95bd6e14eac79b19cd0ca7cb29b2f51df
 EBUILD redland-bindings-1.0.17.1.ebuild 2654 BLAKE2B e2d9817c25e7830523064b5306b8cc286f4e78a417657cb01bffe754b2c61fc8e637c98ff2d345a3e9d570cdd6cf6116c2e7808261b9248237f63c15f55bad70 SHA512 f3d22574c9d826766c51b9964ad71b0a77d5fc0586061953de19d9cada5b81c270772a31a1db2cf8d7a08538844157cbd3cff60acc90852810dee654b3c70011
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch
new file mode 100644
index 000000000000..af8e3d560d7b
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-add-PHP7-support.patch
@@ -0,0 +1,64 @@
+Origin: Based on patch from Petr Písař <ppisar@redhat.com>
+Date: Tue, 13 Jun 2017 15:29:15 +0200
+
+--- a/php/redland-post.i
++++ b/php/redland-post.i
+@@ -132,8 +132,11 @@ librdf_php_world_init(void)
+     exception_ce = zend_exception_get_default();
+     INIT_CLASS_ENTRY(ee_ce, "RedlandException", NULL);
+     redland_exception_ptr = zend_register_internal_class_ex(&ee_ce, 
+-                                                            exception_ce, 
+-                                                            NULL TSRMLS_CC);
++                                                            exception_ce
++#if PHP_MAJOR_VERSION < 7
++                                                            ,NULL TSRMLS_CC
++#endif
++                                                            );
+ #endif
+ 
+     memset(&librdf_php_locator, '\0', sizeof(raptor_locator));
+--- a/php/redland-typemap.i
++++ b/php/redland-typemap.i
+@@ -1,17 +1,17 @@
+-%typemap(in) librdf_uri* %{
+-  if(SWIG_ConvertPtr(*$input, (void **) &$1, SWIGTYPE_p_librdf_uri_s, 0) < 0) {
++%typemap(in) librdf_uri %{
++  if(SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_librdf_uri_s, 0) < 0) {
+     /* Allow NULL from php for librdf_uri* */
+-    if ((*$input)->type==IS_NULL)
++    if ($input->type==IS_NULL)
+       $1=NULL;
+    else
+       SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
+   }
+ %}
+ 
+-%typemap(in) librdf_node* %{
+-  if(SWIG_ConvertPtr(*$input, (void **) &$1, SWIGTYPE_p_librdf_node_s, 0) < 0) {
++%typemap(in) librdf_node %{
++  if(SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_librdf_node_s, 0) < 0) {
+     /* Allow NULL from php for librdf_node* */
+-    if ((*$input)->type==IS_NULL)
++    if ($input->type==IS_NULL)
+       $1=NULL;
+    else
+       SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
+ 
+--- a/php/test.php
++++ b/php/test.php
+@@ -26,11 +26,9 @@
+ /* ------------------------------------------------------------------------ */
+
+ print "Testing Redland...\n";
+-$dlls = array("redland.so", "php_redland.dll", "redland.dylib", "redland.bundle");
+-foreach ($dlls as $dll) {
+-  if(file_exists($dll)) {
+-    dl($dll);
+-  }
++if (extension_loaded('redland') !== true) {
++    print "Redland extension not loaded. Cannot run tests!" . PHP_EOL;
++    exit(1);
+ }
+
+ $world=librdf_php_get_world();
+ 
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch
new file mode 100644
index 000000000000..8f8dd409c0d3
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config-r1.patch
@@ -0,0 +1,77 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,7 +58,6 @@ AC_CHECK_PROGS(TAR, gnutar gtar tar)
+ AC_CHECK_PROGS(LUA, lua)
+ AC_CHECK_PROGS(PYTHON, python)
+ AC_CHECK_PROGS(PERL, perl)
+-AC_CHECK_PROGS(PHP, php)
+ AC_CHECK_PROGS(RUBY, ruby)
+ AC_CHECK_PROGS(SWIG, swig)
+ # Gnome
+@@ -153,15 +152,28 @@ if test "X$LUA_VERSION" != X; then
+   fi
+ fi
+ 
++dnl Find php-config script.
++AC_ARG_WITH([php-config],
++  [AS_HELP_STRING([--with-php-config=PATH], [Path to php-config [php-config]])],
++  [with_php_config=${withval}],
++  [with_php_config=php-config])
++
++if test "${with_php_config}" = "php-config"; then
++  AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
++elif test -x "${with_php_config}"; then
++  PHP_CONFIG=${with_php_config}
++  AC_SUBST(PHP_CONFIG)
++  AC_MSG_NOTICE([found ${PHP_CONFIG}])
++fi
+ 
+-AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
+ if test "X$PHP_CONFIG" != X ; then
++  PHP_VERSION=`${PHP_CONFIG} --version`
++  PHP_INCLUDES=`${PHP_CONFIG} --includes`
++  PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir`
+ 
+-  PHP_VERSION=`$PHP_CONFIG --version`
+-  PHP_INCLUDES=`$PHP_CONFIG --includes`
+-  PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
+-
+-  if test $PHP_VERSION '>' 5.0.0; then
++  if test $PHP_VERSION '>' 7; then
++    PHP_SWIG="-php7"
++  elif test $PHP_VERSION '>' 5.0.0; then
+     PHP_SWIG="-php5"
+   else
+     PHP_SWIG="-php4"
+@@ -200,6 +212,8 @@ if test "X$PHP_CONFIG" != X ; then
+   AC_MSG_RESULT(compile '$PHP_CFLAGS' link '$PHP_LDFLAGS' suffix $PHP_SO_SUFFIX)
+ 
+ else
++  AC_MSG_WARN([php-config not found])
++
+   # This allows 'make clean' in the php directory to work when
+   # php isn't available
+   PHP=:
+@@ -445,13 +459,17 @@ if test "X$with_php" != Xno ; then
+   with_php=yes
+ fi
+ 
+-PHP_VERSION=`php-config --version 2>/dev/null`
+-if test "X$PHP_VERSION" != X; then
+-  languages_available="$languages_available php($PHP_VERSION)"
+-  if test $with_php = yes; then
+-    languages="$languages php"
++if test "X${PHP_VERSION}" != "X"; then
++  languages_available="$languages_available php(${PHP_VERSION})"
++fi
++
++if test ${with_php} = yes; then
++  if test "X${PHP_VERSION}" = "X"; then
++    AC_MSG_ERROR([Failed to detect PHP version])
+   fi
++  languages="$languages php"
+ fi
++
+ AC_MSG_RESULT($with_php)
+ AC_SUBST(PHP_VERSION)
+ 
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
index 863f1025123d..16af4f5f980b 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
new file mode 100644
index 000000000000..522be190cd48
--- /dev/null
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
+PHP_EXT_NAME="redland"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PATCHES="yes"
+PHP_EXT_SKIP_PHPIZE="yes"
+
+inherit php-ext-source-r3 python-single-r1 autotools
+
+DESCRIPTION="Language bindings for Redland"
+HOMEPAGE="http://librdf.org/bindings/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE="lua perl python php ruby"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="sys-apps/sed
+	virtual/pkgconfig"
+
+RDEPEND=">=dev-libs/redland-1.0.14
+	lua? ( >=dev-lang/lua-5.1 )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby dev-ruby/log4r )
+	php? (
+		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
+		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
+		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bool.patch
+	"${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch
+	"${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	use php && php-ext-source-r3_src_prepare
+}
+
+src_configure() {
+	if use lua || use perl || use python || use ruby ; then
+		econf \
+			$(use_with lua) \
+			$(use_with perl) \
+			$(use_with python) \
+			--without-php \
+			$(use_with ruby)
+	fi
+
+	use php && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	if use lua || use perl || use python || use ruby ; then
+		default
+	fi
+
+	use php && php-ext-source-r3_src_compile
+}
+
+src_test() {
+	if use lua || use perl || use python || use ruby ; then
+		default
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots) ; do
+			php_init_slot_env "${slot}"
+			cd php || die
+			${PHPCLI} -v
+			${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!"
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_install() {
+	if use lua || use perl || use python || use ruby ; then
+		emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
+	fi
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+
+	use python && python_optimize
+
+	if use php; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			doexe "php/${PHP_EXT_NAME}.so"
+		done
+
+		php-ext-source-r3_createinifiles
+	fi
+
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
+	einstalldocs
+}
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index fb4953bd616a..d656ecb56d7e 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,7 +1,5 @@
-DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
 DIST totem-pl-parser-3.26.5.tar.xz 1318700 BLAKE2B 18cea2edff1206ed9c77ac07fb018da0c9bc5550599b45e363d745166f4828adba6a2f77b763602af011c0a12e9f1f9765402fbafbe097fb69890ec7a9520825 SHA512 ce110d92f60da328272a8135a57ba60785ea4bca1fde3703a734969e7ba5b382ef19dc3b8930a5641d8f8effabf627f7e9b2727ee94e69e6144e0f085079e14d
-EBUILD totem-pl-parser-3.26.3.ebuild 1930 BLAKE2B 840f460efe1d98b7778751a6eb5692ffbb2609089dd74269e1a8f578a7dff0e5402ab8d2690c22c6a6dfc1ceb3863c9038bd244b6f26f0ebb560754410389dd7 SHA512 adaaba47806b4d525f8920684dfc7baec49eb8ffb11e1d7aa745f761b3cdc6ec28187d0315079494e22fd80b606d4141e1b09b852ab3c0f724b3358c32053592
-EBUILD totem-pl-parser-3.26.4.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
-EBUILD totem-pl-parser-3.26.5.ebuild 1933 BLAKE2B 72745ad96c7f8e072d28a81041d1fbbb1d7cb67421dfe387e69286548fc45e2042220a2dad4a18234fe5e12157abb19d508564a94f5dcf7f0617fd79df832463 SHA512 7aa9b7d27de83942e49452e7f6ff83edb28c64d8bc2ad83e7386b93b3f8efc19e6452397e14f7820d600420703057038dd32f02590b7e65e465c3afb401ea433
+EBUILD totem-pl-parser-3.26.4.ebuild 1930 BLAKE2B 5f16ca9d7d8ce0424eaf066f5dd811b8692a59cac9545d5774176e457f639e6d4db658b83ddfc3a01f6d662f1be575c5304560ab2d2fe3b003b41783ecad3f8d SHA512 3f9b54bcdeaf5e148a2f26cd549173de682c260239389301ec4a1736dffc2d52ed8d93e7b79ad452839443ee7d4e9390b5cc8247add116372887873e03a7800b
+EBUILD totem-pl-parser-3.26.5.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
deleted file mode 100644
index ee9851afbf07..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt gtk-doc +introspection +quvi test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	quvi? ( >=media-libs/libquvi-0.9.1:0= )
-	archive? ( >=app-arch/libarchive-3:0= )
-	dev-libs/libxml2:2
-	crypt? ( dev-libs/libgcrypt:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )
-"
-
-src_prepare() {
-	# Disable tests requiring network access, bug #346127
-	# 3rd test fails on upgrade, not once installed
-	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
-	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
-	#	-i plparse/tests/parser.c || die "sed failed"
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# uninstalled-tests is abused to switch from loading live FS helper
-	# to in-build-tree helper, check on upgrades this is not having other
-	# consequences, bug #630242
-	local emesonargs=(
-		-Denable-quvi=$(usex quvi yes no)
-		-Denable-libarchive=$(usex archive yes no)
-		-Denable-libgcrypt=$(usex crypt yes no)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
index 5d2ffd44e4aa..ce4cfe8754cf 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
index 353b21ee7b05..5d2ffd44e4aa 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 5aff57bb04dd..a81a9bd5b3b1 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -1,8 +1,10 @@
 DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f
 DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df
 DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc
+DIST univalue-1.0.5.tgz 20114 BLAKE2B 21f1432bf62325547db7a1ce0c84d80f47b160dc19de3567eea4678a0f242fb2c814daa6955f7a2b45c5b75e859b6d2ecdfcd68abe58f573752c0f037a099d10 SHA512 9c2273d82267aaecd2b017d00ae8bc40f7f40fff10ce6176bbea0df93d7c9478fc76a38101f0b55ded0a3c4fc49f00c868aad33deca4d936b85342ec6a394eab
 EBUILD univalue-1.0.2.ebuild 600 BLAKE2B 2fceb5490a188a82f12d3144e7a2c708803de0882e814ad29f67d736133996e5ca64d6e8ef6b6d2b95a1e0293980f324d602435d745aa74495452ae3357289d6 SHA512 feff1fa04de126a4e9217846c9ed115a8647dfeff365f52cf8309cb6e6c0d9ad3e728146c8232b8661ccdda786b304c3b15554f6a8469dcd55a80a888961f128
 EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
 EBUILD univalue-1.0.4.ebuild 724 BLAKE2B fbfb620290be3fa105633bad5c9d2855b9a6fc4eda41487bb9ad22b7ddc2e88aa49bae8ded734a4b46138ea27dfcdbf0013d8310469dd61a2fdfa71225f54287 SHA512 8365ca1146a8d8a7e0f6eaddb8e4450f394569d44af1a3cc9d56226d520508bff8d089ce94a4c46ea9997bc55efb9cfc4a95797bcd559c3a187297a0745ee272
+EBUILD univalue-1.0.5.ebuild 579 BLAKE2B 9afbba833ffbbd36a60630d9c8d8a0e66f0ddd9302bfe5250bf52d08219e926ebca42e3d8fbe59d9d75b953939e29af1db32dbf000a4eb790da8ebd8706a0c90 SHA512 64ce87a1a28e6043cc552a87d2d9a33bff9a264edb06cfe9f28d8cb64d22a6b9eef5a247b1726f7761d6300e9bf45225dd5973f949cae79aadc615667b97c565
 EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.5.ebuild b/dev-libs/univalue/univalue-1.0.5.ebuild
new file mode 100644
index 000000000000..5c07a1e07b00
--- /dev/null
+++ b/dev-libs/univalue/univalue-1.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 18520b4ab77e..25e8f1622e2d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,13 +1,11 @@
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
-DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
-DIST vala-0.46.6.tar.xz 3383032 BLAKE2B c7f38cf617f3a0d5a5915ebedd320ef6a5c3714e21618e95756529e1fb09abc12417f31aeefc0111e828da5c2dabd6195b07bb1cc69c6e74f73d72fe7403637a SHA512 ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
-DIST vala-0.48.2.tar.xz 3433912 BLAKE2B 25b10235b81b34e0baf6a3cceed660affca9d226ca4f04e96d0dbf4d2ba10635452806bca4f9a82387778bbf813f8ee43c36cf476ab81c524cefaba0febcbad0 SHA512 0ea2d2c56d6d01007fe41e13bc51faa5e780259bc55f34a2d84270a5b6a0a46d59cce5eb195f81c78f1acbfb118cc3c5882edf0d187788791ee3ce865faece89
+DIST vala-0.46.9.tar.xz 3413264 BLAKE2B 6bc14f9316b3d5a2c81b0fbaed48ca85ffec37c616746b1bf432c883838097938e13931d06efc1e4abd027441e31fe73b2e76ba9b578ea33948f4dbe38a18bf2 SHA512 64ce902a15de9a477d50e3b0a0f64007c1acea7ad620ad224ed49cecbb029ebf8c9fcd79df6f0c64f46c0fd25cbf34f94be145a937460329dc9c38087073f240
 DIST vala-0.48.3.tar.xz 3438824 BLAKE2B 4d743a158e12134f31f2e9850713594e3bd668b2a5e74d05df2d828b10a2272dc2cb228bc0041a394dc08633db3e2497eb095c5526763d69225388198995e470 SHA512 e73eade8b0cfa312d896c81b76e045bc9b8b71bd89298c0f8d78b2f596eebf64dc0eea8d1e266b2c17a774105560ed47590fbe00d65b1fda8db6823ac3ba4bb4
-EBUILD vala-common-0.44.11.ebuild 647 BLAKE2B 04d8867e2fd69ddf29f7c73a7d0dd3b8dbedfb3dcd27edb2d52d2b88f7650e085793ae0cf40d81c3d43f4faec5133d54bc0e4613bdc338bc841b7e3e04f10cab SHA512 a2423ab12a50c03a5bc729904061e067d8af00d5249254e14aa65c282aff77a7cb6f65691174c5f06015115259411de1c39fc7412f9d84f1aee74317503ca3a4
-EBUILD vala-common-0.44.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
-EBUILD vala-common-0.46.6.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.46.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.2.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+DIST vala-0.48.5.tar.xz 3445096 BLAKE2B a41fd6b5b06526eb1a743c2e8681b4e3891b19a24213669f28407f9e8e29c3aa1a077458558491e0af05aed5659a7a6d4a0a18d711465d9c936e719245b944b1 SHA512 129097880c0dbe40cb84dc60a0af454b247759131ce29e9b5cbf74ca9dae35917e1ba973eff1d5ee025e54afe5a0881eb37d11ab433346e5e4c9a7625952b2d3
+EBUILD vala-common-0.44.11.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
+EBUILD vala-common-0.46.7.ebuild 648 BLAKE2B bef1f9b405c113f64ad5b837c7eda45b732a70e60e07642594a83d6ad671ef527ecfaa505c9022b1d580ed5f3355d3496430f80f8bd9e2c0f6734c851ba9591b SHA512 0c5a454d9d047335378e28bba9ecff5ef5b4e6e5ab9c4eb111303fe62b608fd5d1dd4b23eb38b42143eddb4d86df36bfc7dbdc6d513ba10e0b3cdc35f13d88c1
+EBUILD vala-common-0.46.9.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.3.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.5.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.44.11.ebuild b/dev-libs/vala-common/vala-common-0.44.11.ebuild
index 07984987f97c..580d77e0c60c 100644
--- a/dev-libs/vala-common/vala-common-0.44.11.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
deleted file mode 100644
index 51429ad4aeb1..000000000000
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-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"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.46.7.ebuild b/dev-libs/vala-common/vala-common-0.46.7.ebuild
index ee55cfcad100..5d28b8df0561 100644
--- a/dev-libs/vala-common/vala-common-0.46.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.46.6.ebuild b/dev-libs/vala-common/vala-common-0.46.9.ebuild
index ee55cfcad100..ee55cfcad100 100644
--- a/dev-libs/vala-common/vala-common-0.46.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.9.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.48.2.ebuild b/dev-libs/vala-common/vala-common-0.48.5.ebuild
index ee55cfcad100..ee55cfcad100 100644
--- a/dev-libs/vala-common/vala-common-0.48.2.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.5.ebuild
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index c4e902601da3..0a72342546d3 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-protocols-1.20.tar.xz 111684 BLAKE2B 2ddd3d0b0dde94fda4788a1fd6631b6fcf22fb134e74a55f2c310ab4b72802d3b069d294e3d7b68ea6ddfdb0f944ac9011b73a9678e65eec924135822f697087 SHA512 d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977
-EBUILD wayland-protocols-1.20.ebuild 789 BLAKE2B ee8aa6f882f8a77b30fcf0c7bf709789ee14f588048003bbf55faf5f214a1660893f38dbfc71c93918b70a5d9f63bdb0ed8ea42e5ed5def6af495e2c96233347 SHA512 ffb09cea1602d671db3bf41899c518f0d9445390248a0f02180e9a5d392e63b9240bb842ffd8ae8368a6458f4ce4aa4cf4c8676f8f90b25b95edc5dc8b75e3d3
+EBUILD wayland-protocols-1.20.ebuild 788 BLAKE2B 011799cab45a7a0f05f28d03976fb3cd4f1174b1a2f031d4f77c52e13034ca6d41cf9b778e53ffa7ca75e68cf20a0b435a7fef7b3868267683872100f7b8362a SHA512 0334a6fb5f7a8e63ec41043e253f0261cb7da949ac79e2c2d406e3813235dc8a9b02b999d74e161553d922b358bf363d5d2692b3e4b5eb5cef89cc6457dd4068
 EBUILD wayland-protocols-9999.ebuild 797 BLAKE2B 274c9c89ba60e38e61dce64166f211de987b029cb4592544063d39c1b2ac3baba8af8b214a338839747b7a59475bcf81fbeac8503ee6446ecd4e8ccdf0a758da SHA512 0d02e092e3257afc3077d6e39ba218ed8614693feca0420557cc0ac1511f62a9cd8b43bc9c890e9e47b889c684e1b3fc2c1e82489164a4940205d87a5d097b04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
index b18cbaf811c6..398ec9d1527b 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index c3efaa9010b7..c976dc367533 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
-EBUILD wayland-1.18.0.ebuild 1739 BLAKE2B 37de2e15da85c9277951538c6e06eccc239bec251470f731d96939cb63fbb2f74862ccde980eaf798f3d3cd9420fbf96b4c582a445f75f63d231e69fcdb03741 SHA512 8282a07094dee1aa3865f4362db2ea25d32398f30caaa96daf3be2118e41847acf641209d68d1f040babf9616a10c1a9b4aef5adeb6fa86c6c3dfbe61357fad7
+EBUILD wayland-1.18.0.ebuild 1738 BLAKE2B 9cfa25523f970b0f996070517f55a47495af1c0b88175f39af30c4773b803c6e60baf17aa08eb1895a5d8c77b163aaf75b6c5b5c69f72ca26ae0a9cfccd74a98 SHA512 5c723b771e25a5dad594d92e8d6aa4d81bf4d1ea4e222899a2c4bae4a29487e0ec6a945f5985c9e3d1bb163022e2b55680e1bcd514aa82f7b903d1b6984a4d68
 EBUILD wayland-9999.ebuild 1747 BLAKE2B 22e3835f0b5466b3e99e6651257bb3dd47b2c6e25e4f0798380a4c49c1265314f57a217d8d2e92c328b4015e6270fd98d0e5f70a6136775d5033af778356d0a4 SHA512 0a22fc2cc7d2f638bf023925e28c76c9bac922e90b2cc5d3bf8617b8ac9ff31d290d80c902585b9fe5218844f23d8500be4910e85f00b1d51e75c75f2d66e531
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild
index f9fa7327e78d..8619b96241db 100644
--- a/dev-libs/wayland/wayland-1.18.0.ebuild
+++ b/dev-libs/wayland/wayland-1.18.0.ebuild
@@ -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 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7226c3358c8d..722800132966 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,9 +1,7 @@
 DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd4885fe9678aace45365573bac8e0e8e2c712795af2021ff52de9eeabb91f65a2f0447d1963424b1ae6558be95b737d1279e98 SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7
 DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
-DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B 971788479ed9732f0cd64fbba81c1b30db4cc1ab606dcd7ff3389dc30d88c9f46d40fb0446f8eab106194e0b718140bb2dead274988f2ba33eae4fdd449b727b SHA512 6f6dc696c2af464df8c2d675fc3ac28c81b77ef209239e2d91d24b23ef902611bcd61214d1536a8655612f01c20ff7bcd20e8f09b11614517aa7067ae57c674f
-EBUILD xapian-bindings-1.4.14.ebuild 6526 BLAKE2B 941a33ed03f622a0e69449ee60bb2fa60ffbf63009283ccebe7fa283079c9c82694de22f9bc1783c27e4d8909b7fa7d26b4d25305abd0357ddab1277f0c96e3e SHA512 bc8713fbeb95008dc448c3ee8a1d641dbbb88a6abd4aa3d0fe4f5498bc1fab421b7f5dbd8ae06ac66de441c3fccddf39a4553b8558cbff149b6f51ddc319dc57
-EBUILD xapian-bindings-1.4.15.ebuild 6532 BLAKE2B 89b750d9ea616eee0ed3b7c49c178e32623d035b2c1fa16c71995363a0a3eec333ddfc6afd612f7c20cb2a35d6587df81afbda1088b6f036466b5a2394865cb8 SHA512 48f42634cb8ac541f20239868abe3f157118284779c321ebe6df3e601cfd1214d01c91dbace51b68e82256513451b43dfdf9010698bfe122e9de594c5dfa95a0
-EBUILD xapian-bindings-1.4.7.ebuild 6490 BLAKE2B 8823da5b50c821d7ef8f32da57d0b31b33b6d47c31bbabee4d4f8b9304ebe792245e544931f609e396087f760a4b4fba505169a04c68a3ab2d55354663890506 SHA512 ad88c2a5af74c3888f71b10d6983108ad69be339711dd09697360a54e93d8fccb8384f139929809347330e97fe0823667ae8f3c4f5c54168c8cfffae309ffb63
+EBUILD xapian-bindings-1.4.14.ebuild 6539 BLAKE2B 61affb35c53857983b1343e356c79e1fa6d69cb7773c38cf92bd6d6ceaea055162df18504084ec92599d5727e11a5987e26b10ff5d1b807925808a7b45e170b6 SHA512 99050c1182e6a5e63d50190060a6a1e22cd5137995efbbc89b42d017d0d770216f9ff6fe0f76fa3e75ab46cf19a7fca6838cc717cc5d6e4c4ebfb54bed8ef54f
+EBUILD xapian-bindings-1.4.15.ebuild 6540 BLAKE2B c1e47eae8a9aa91c66a7e2baa0bb89dd8c0b49b2a7c99d00f4706bfbf801fefe9b84c75e30a1410f04b1d9c11599da02d3a6e3f0e8be3907a06b963b5a75eca2 SHA512 2c6bd849da83e6ad193aeeef1418575cff5845e4b5385494712e85739b469cf5d97ab55372ea56e0b21dc78dfec119f45134224db952269ead653b5e8760fa2b
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
index 159d070db12e..8785a8f8933b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3 php7-4"
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
index 261fa82b7336..674147465eb2 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3 php7-4"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
deleted file mode 100644
index 16555fec4a0b..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php5-6 php7-1 php7-2"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.7:0/30
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-		)
-		if python_is_python3; then
-			myconf+=( --with-python3 )
-		else
-			myconf+=( --with-python )
-		fi
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index fe747b31714f..ee921ccc372e 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,11 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
 DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
 DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3
-DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5
-EBUILD xapian-1.4.11.ebuild 1844 BLAKE2B 0ef54276319620157c37d20dd624ec50245d04f46d480e54fc1306491ff7b9989f426ae0659095efc0278e3114f19ab96630896e0ca6ac0f4c1059b1c915f33b SHA512 58d8597e88cb312251661f469c3ee5711e19ad39b6c7de0e0ca6756b2d1105dd3894229c854d8f59dcd39d61c58b17294d90b0904abbd18b7f60a85834f6ad61
-EBUILD xapian-1.4.14.ebuild 1799 BLAKE2B 3606db05531a84acd989d142de998f88f135cf033496535f6e6d62bc89af5f1e00f9313aa927fee795b4efdc832c8570e34baee7d434129a9ad454f4975f4157 SHA512 c678ab822870e76c27406bac016b166f684116255a24bde979b692a31ab18c65e36b25508818bf5526823fd1a2c7b5b96f7637c3b84cb6bc375d851079222cdc
+EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f
 EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
-EBUILD xapian-1.4.7.ebuild 1854 BLAKE2B a16bcca3519f22f9968b037bf28e78caa1020155252c11cac443b062ba5adb542c6683cb6ea56a7c4bcf4d7f2d29580a551adcb8ad8eb20d2915c1f085857381 SHA512 42bfbf87a440fc28d9166b58237d0d344ac033ff55d69d4366faebe4ca137c8ffc8af4b276c14a8f2a14a5d24f1abf686c0f40965e86142d325e98f4ab32dcdc
-MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
+MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index d403b02634a3..36cab194041e 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -17,7 +17,6 @@
 	<use>
 		<flag name="brass">Enabled brass backend db support</flag>
 		<flag name="chert">Enabled chert backend db support</flag>
-		<flag name="glass">Enabled glass backend db support</flag>
 		<flag name="inmemory">Enabled inmemory backend db support</flag>
 		<flag name="remote">Enabled remote backend db support</flag>
 	</use>
diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
deleted file mode 100644
index 4d2f6ddf80e8..000000000000
--- a/dev-libs/xapian/xapian-1.4.11.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
index 66333a587b65..cb7643fe28a1 100644
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ b/dev-libs/xapian/xapian-1.4.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
deleted file mode 100644
index b5da2d4f5cb3..000000000000
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 6c67d095d19a..6ea18758b864 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,7 +1,7 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-DIST xxhash-0.7.0.tar.gz 52372 BLAKE2B e59a80ab3970f4830d0de17d3c91de1049fd671dba777d143fae2cf372970c717b6b586bfaca13c49c7dd2f57257d41ebad500632f25bc47125570ed715a47fa SHA512 2d7a06a5cabc945ac841df4451a744f0a666e4afcce77f5eea70bd68547ac46ebf776dd0e3645ef0204c7ff1dea3f5ff8228a8d9894dae0077f865ffdc123c66
 DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1
-EBUILD xxhash-0.6.5.ebuild 847 BLAKE2B 48f98894d126b879e436e31bd892d1165b29717392ac205c4328302cb2d18afc0556575e24e4eb64885bc3cc6e8897523b3cb4a6ca11e88556819840252eeb2a SHA512 fb1291e220f14af3d4306d5d871da859c81e01badab782c54b47a9ea6a0c226c70b0506c5475ae5ce2e3f2a79424a4162ba4b9c168dd5a151674060778333532
-EBUILD xxhash-0.7.0.ebuild 857 BLAKE2B 9583e7ed38d1f737324e3070874300d69c825c76b568a57db143886fa1145efdc46b6891e3606b08adebb6aa6c69e83ee301e94b3a24e37a26c01275b7e8f00a SHA512 2d179bfd9cee06f12b79995a11e02318fa7c31ec86f28e9829cd558e2c26c4cf1ebc0bc3fc1a687d24f1f96436fa0a15f5c9a66cc154a34151b988fb111b3044
-EBUILD xxhash-0.7.1.ebuild 910 BLAKE2B 3d7a05558c8845a9027f34902af7c373480e4296c8b45fb8f604ddb8c28ab9713bb9048ca9683020d2220a1c3d8d4a0f846127e3255be9219b95395648b38058 SHA512 da8975796275af0757b5ad36965fccfceb86f0a2afca5f69097bc44f444bc7055e4820150b22b2576e84925693648ce996081dd3ac303237a8982987c445ca17
+DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
+EBUILD xxhash-0.6.5.ebuild 848 BLAKE2B 6cfe1aebfa2b2f8916cc7e67b6825778a89738085997b8c68192b02c91a626a5335d44c9a9f52e0657a4ea44b565dfb6530be22f2074a4c9e62696445e6795fb SHA512 429f6506a171461eadfb9384e17d85401f39a2509e40ac32e1425883fefd33c7d2a81003057a7ea09c197482503f4d9a7d78f8e8192c83032437e290fa95dbd8
+EBUILD xxhash-0.7.1.ebuild 911 BLAKE2B 85828c2222881127191be553385587e3c9a0aafeabdf5acdd8680afccab1826cb09036fac2f394ec148e7327f9795e228369f0eb7804b28268bbead75a799dd4 SHA512 249e2057876105d54a37e3cc14b69f7d549d2b1e5a4b14e720212c494d2bbed2f87b9f0dcc373a8bfb07d9596e3ef735bef4a9bbd45d7f53563dbed6fc08d7a6
+EBUILD xxhash-0.7.3.ebuild 911 BLAKE2B 85828c2222881127191be553385587e3c9a0aafeabdf5acdd8680afccab1826cb09036fac2f394ec148e7327f9795e228369f0eb7804b28268bbead75a799dd4 SHA512 249e2057876105d54a37e3cc14b69f7d549d2b1e5a4b14e720212c494d2bbed2f87b9f0dcc373a8bfb07d9596e3ef735bef4a9bbd45d7f53563dbed6fc08d7a6
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index b153f3b2fac5..61a2042258c1 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="http://www.xxhash.com"
+HOMEPAGE="https://www.xxhash.com"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.7.1.ebuild
index a432ad182cca..f99938d54c17 100644
--- a/dev-libs/xxhash/xxhash-0.7.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="http://www.xxhash.com"
+HOMEPAGE="https://www.xxhash.com"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
diff --git a/dev-libs/xxhash/xxhash-0.7.0.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index 1471f457de2c..f99938d54c17 100644
--- a/dev-libs/xxhash/xxhash-0.7.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,10 +6,11 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="http://www.xxhash.com"
+HOMEPAGE="https://www.xxhash.com"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
+# https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="static-libs"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /dev-libs
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)