gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-libs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
629 files changed, 5255 insertions, 10533 deletions
diff --git a/dev-libs/9libs/9libs-1.0-r3.ebuild b/dev-libs/9libs/9libs-1.0-r3.ebuild
deleted file mode 100644
index 22450aa79dbf..000000000000
--- a/dev-libs/9libs/9libs-1.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A package of Plan 9 compatibility libraries"
-HOMEPAGE="https://www.netlib.org/research/9libs/9libs-1.0.README"
-SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
-
-LICENSE="PLAN9"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Bug 385387
-	epatch "${FILESDIR}/${PN}-va_list.patch"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--includedir=/usr/include/9libs \
-		--enable-shared
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-	dodoc README
-
-	# rename some man pages to avoid collisions with dev-libs/libevent
-	local f
-	for f in add balloc bitblt cachechars event frame graphics rgbpix; do
-		mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die
-	done
-}
diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
index 8e9ba36eccd2..cc510097ffa9 100644
--- a/dev-libs/9libs/9libs-1.0-r4.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r4.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
 
 LICENSE="PLAN9"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index f827f4ccb883..b49c023b2c1b 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,5 +1,4 @@
 AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783
 DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2
-EBUILD 9libs-1.0-r3.ebuild 905 BLAKE2B a359141d09d964fcf6d45f406c52bb05f2256021c0c1c7fba813ea02964464ab389a6cb13583172f45017c5099eb97db972f82b8b9f2e7aad43c6066576e8633 SHA512 809aed79b0ac99150d2c4535a18b5275daa9306f23b6d8ae4469b6d2271f85e488632edafbf32839cd576f9e1d44093c3023b26f6c652e265572d239b185809c
-EBUILD 9libs-1.0-r4.ebuild 1088 BLAKE2B 97dde042b6525a171521c97e35a9215dc2ca8f4efdf2e7248253bfc0dd439fc1c032d2c8d6cd1e80f17c639e09616ce649a714754c8f0928798ac5136f54125b SHA512 fe2ddd6f2aad6512a89fca607457a7ae53d34b75b3573257dee630ada6690860a36398057758f039946bf42b84427b17402ed90c99c40d068630edf73291e821
+EBUILD 9libs-1.0-r4.ebuild 1086 BLAKE2B cb8aedf43f07c1cfe9662dfb8f89012f468ba39c7729a9fdaa2a3c50233501809d7146321eebc9c20a2cacdd74e14d5c095bd7bd2d613e670828bdd5b1df62d1 SHA512 dcd4db6f4ddbab96c968dc3f007e0bae663a0765a721a4f6ae6279ab0983851a3e0d734f95f6858fe39f1c0d8434bff47e76133cb85aa3aca406f91e644d0f74
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index d5a8c64e0f6d..82e2bed1fb1d 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby24"
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 9b687194b25a..54c74855c7f9 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,5 +3,5 @@ AUX Ice-3.6.3-libressl.patch 6461 BLAKE2B ab5f4b8812adb7f7b15257bbc5f2745ca3da46
 AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57
-EBUILD Ice-3.6.4.ebuild 9410 BLAKE2B 891f785e18fab23bbe4100e16293bdb8b92bbd2a43b393051b66b898726d3c75348d8d907f2dca70b194fe061dcfa4b43b08bf6c096cd1caf3eb77da5f7f5666 SHA512 9290b16e43bb79116c4b67c1a66d3612463889615b7870aba18504d66eedc9bb4531f4c84e7e15601ced3f69943943cc31d805580c81ba5156051b7ba8faa3c2
+EBUILD Ice-3.6.4.ebuild 9401 BLAKE2B 55ac2c1d5aef6266c6ad09fc17bcc538ecc6b37d04ca67b09d7fa00cdf4c86c9e3a730c4317e51b5130d3cb64a26c94c5facd880dc1863600f3e692bb1e58cd7 SHA512 43d9abb3c82bc7c82339fd6af0c7ff008d5e741203fae28e76c10ddf26491b0c8c75da44cec58344c8689b1db5a8b1fccda0e38a3a69a3852635c0a6578c4df6
 MISC metadata.xml 561 BLAKE2B 83daa42cf58f641a94bf0b24125dbca8cfd34d86d540cb7daecea4c089309279eb0a423f5f785efff9bafe34347fcfada2be36700a1f94afbdb6308e7d883d9f SHA512 35dcc56cb261e0f98fe6ae2da115ce7c66bd8568e9313eefb2c55d3d03cfda451d7f64738b0e50f64e01c5b7f8e60e1e0d8c6219be6b22dee45cd505a28aaa41
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6723bad7230d..2f001390b295 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 21a46ccec1ba..3bff1c6b9480 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +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.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.7.15.ebuild 1637 BLAKE2B 49a20321fb54b0ace4458e0d4a3b257a317b559d2520d5bc584d4d4fb37e2b5c39cd3d2463ffce7f70324a76eae29b59508b8a6a96ac3b9fa30df26b42a82a92 SHA512 664365e7c5d4e4f37d0accbfa3faac3faa65a4a027ce85cd351b60b155563b4eddd3d40f1764a4000ce4ded3500b41dfe5922d2a803dd4dfa4a19b4a9909ea20
-EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
+DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
+EBUILD appstream-glib-0.7.15.ebuild 1636 BLAKE2B 5b0eea6311cd40bb66068198302ca52229483a68b65fd3c8ec2b04d9a73f8a7b25d93c0fdb2a7bdeec5870634f1e332b09b400683725884bcc40e076cdea8ff1 SHA512 8b37bae9b37cb27c9ac430fbbfa0b29c5de9511997c4c33d97225e864a204bf4bef74f062126c3c8c1ef8ddf5faafe80898e6691c5d276206d93ddb073014501
+EBUILD appstream-glib-0.7.16.ebuild 1709 BLAKE2B c8085d06fc9044599952d1abfb28c0d1ddb898c1fe48b3500ffa34d2362a1a9c81690424b0754b83d591b84aa01f3b17a2d61364154467f6f864f9d21ecd2d31 SHA512 0154d92b3840d49cc9b0343dd74f3c0cf4367b9868fc80b02f5264023eccf72664c1511a86b8518a2b4f5fa0a47513ae64ae16483946ccedbba9e60e7786a94f
 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
index 0a4e30e25446..093bf90960b6 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index 92e711c76a42..ec8fc78191ff 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ 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="doc +introspection stemmer"
+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
@@ -21,10 +21,9 @@ RDEPEND="
 	>=net-libs/libsoup-2.51.92:2.4
 	>=dev-libs/json-glib-1.1.2
 	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-	app-arch/gcab
 
-	x11-libs/gtk+:3
-	>=media-libs/freetype-2.4:2
+	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 )
@@ -38,27 +37,31 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
-	doc? (
+	gtk-doc? (
 		>=dev-util/gtk-doc-1.9
 		app-text/docbook-xml-dtd:4.3
 	)
-	>=sys-devel/gettext-0.19.7
+	>=sys-devel/gettext-0.19.8
 "
 # ${PN} superseeds appdata-tools
 RDEPEND="${RDEPEND}
 	!<dev-util/appdata-tools-0.1.8-r1
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-tests-run-in-2020.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddep11=true
 		-Dbuilder=true
 		-Drpm=false
 		-Dalpm=false
-		-Dfonts=true
+		$(meson_use fonts)
 		$(meson_use stemmer)
 		-Dman=true
-		$(meson_use doc gtk-doc)
+		$(meson_use gtk-doc)
 		$(meson_use introspection)
 	)
 	meson_src_configure
diff --git a/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch b/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
new file mode 100644
index 000000000000..40ffe3edb6d1
--- /dev/null
+++ b/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
@@ -0,0 +1,37 @@
+From 953c8e529d7291e60a95e580967ed79ce2c9ccf0 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 6 Jan 2020 11:04:56 +0000
+Subject: [PATCH] trivial: Fix CI by moving 'future' back a bit
+
+2020 seemed like such a long time in the future all those years ago...
+---
+ data/tests/broken.appdata.xml       | 2 +-
+ libappstream-glib/as-app-validate.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml
+index f7a5386e..cf80f5b4 100644
+--- a/data/tests/broken.appdata.xml
++++ b/data/tests/broken.appdata.xml
+@@ -40,7 +40,7 @@
+         <p>This is a duplicate release on the same day!</p>
+       </description>
+     </release>
+-    <release date="2020-01-01" version="0.6.2">
++    <release date="2050-01-01" version="0.6.2">
+       <description>
+         <p>This is a release in the future!</p>
+       </description>
+diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
+index c1103ace..f50e4e41 100644
+--- a/libappstream-glib/as-app-validate.c
++++ b/libappstream-glib/as-app-validate.c
+@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app,
+ 				     AS_PROBLEM_KIND_ATTRIBUTE_MISSING,
+ 				     "<release> has no timestamp");
+ 	}
+-	if (timestamp > 20120101 && timestamp < 20251231) {
++	if (timestamp > 20120101 && timestamp < 20351231) {
+ 		ai_app_validate_add (helper,
+ 				     AS_PROBLEM_KIND_ATTRIBUTE_INVALID,
+ 				     "<release> timestamp should be a UNIX time");
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index e9cfa9ab8fc1..9824543a3835 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,8 +1,5 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d
-DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.5.4-r3.ebuild 3663 BLAKE2B 3ac1fdbf387feac1530a38a5df55e5a1d749c9f09c978f994c5d84c59405b59624ae4edb4609df0db93e7a0fa550e08d3cda0286946b28d6af7308ff5e21a6ba SHA512 a0a5ea6e7858c820a5043b6cda4996851c1219ee9a3831946753fe73aa490a16486be050b78df97561b0041a6087d0a3b5600fe5ee3b729a68cb43da1497b615
-EBUILD apr-util-1.5.4.ebuild 3192 BLAKE2B acca90abfbf304e6d760c4a7be0d9bc02832230c73dea3bffa4733a7afb15ff2bd427dd4b327a63438a1b983fce851a6de6e5f0c71ba75e1277299a8befa7685 SHA512 2a0d3b5a93a79b87a6a61d8279191efd60237e206fb9c469d7acc0435488004895221b6ac76b1b0a8ebffe3a3726973e47cd04ce5ca437b3eaba53909b69dd13
 EBUILD apr-util-1.6.1-r3.ebuild 3727 BLAKE2B 48672ffd944893c31c11c036117611d48d28c1588605a5797f38567cb380a3fdfb0c941e7d3c770ae0bfb299e2426767ded858cbef84a7f3ac664acef84e74d2 SHA512 96a21b33cf45af1c3b1f699e84b4ab86ffd54b1975d8506f7f5308877bd324af62cb637af440094a6acb45b316a7f08ddb88154396ec990161bf9924fce7a4b3
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
deleted file mode 100644
index 05a79fc756d3..000000000000
--- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.5.2"
-
-inherit autotools db-use eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="
-	dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4:= )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(CHANGES NOTICE README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-)
-
-src_prepare() {
-	default
-
-	# Fix usage of libmysqlclient (bug #620230)
-	grep -lrF "libmysqlclient_r" "${S}" \
-		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
-		|| die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=()
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	local myeconfargs=(
-		--datadir="${EPREFIX}"/usr/share/apr-util-1
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-expat="${EPREFIX}"/usr
-		--without-sqlite2
-		$(use_with freetds)
-		$(use_with gdbm)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with nss)
-		$(use_with odbc)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_with sqlite sqlite3)
-		"${myconf[@]}"
-	)
-	econf "${myeconfargs[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED}usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
-	fi
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED}usr/$(get_libdir)/aprutil.exp" || die
-}
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
deleted file mode 100644
index ce02048009f1..000000000000
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.4.6"
-
-inherit autotools db-use eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4 )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=()
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	econf \
-		--datadir="${EPREFIX}"/usr/share/apr-util-1 \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-expat="${EPREFIX}"/usr \
-		--without-sqlite2 \
-		$(use_with freetds) \
-		$(use_with gdbm) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with nss) \
-		$(use_with odbc) \
-		$(use_with openssl) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		"${myconf[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete
-	find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
-	use static-libs || find "${ED}" -name "*.a" -delete
-
-	use doc && dohtml -r docs/dox/html/*
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
-}
diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest
index 4d91d83713e3..e2dce9ea21cd 100644
--- a/dev-libs/atcore/Manifest
+++ b/dev-libs/atcore/Manifest
@@ -1,3 +1,3 @@
 DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
-EBUILD atcore-1.0.0.ebuild 994 BLAKE2B 8f988a72f795cc0f2b235e3cb76b4ffb775d8c41c0110a45e1b1737bed91ed5f24da2bd0027b22516617e0ffe1a6e03210d4caebce135831403cb7777ac76bf1 SHA512 4502b90c165193ebff91f5590f5d8867b4234dfd502bc78d84d5e8c072bb81db2ce6d97426bdfc3405399ad55844f7490ced8cd44a77d655179b0b7cb07c7ff6
+EBUILD atcore-1.0.0.ebuild 1005 BLAKE2B a9d87bf968c6a3ab5254dda8c41179dcf82643e44db9cefbc3f57c3fc43c90126d6a9ee53895263ba37ecf07d30eb5b7ee37bd1d88b718229ab2eee66a30bd9e SHA512 01891209c823292dac3b336ea18fd4ca75f404ae96f7cd27e474b73cd3ba7330aee1f87353c9c24e1f163d9d2dc898a8f5d6e7999f1cf74ea7defb3591a0146c
 MISC metadata.xml 305 BLAKE2B 75067008e2b19ae5f79db1eaac07e5e01b9f0139d8e18c1b31edc0298bc2ce688f8115c6ae0a8d5a9a1d496338a57837fcfc60c2e97e75e370c1e195715bcdec SHA512 f266cc30e4f6a4cbc4e61c44a83450b714dc88a9873de30957d0ba34b5b923757676f581e49251f6ea06841d85095e9695b4938ba9174cd0dad937dbcef16e19
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
index ea5b5987fee2..dabc43053436 100644
--- a/dev-libs/atcore/atcore-1.0.0.ebuild
+++ b/dev-libs/atcore/atcore-1.0.0.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="API to manage the serial connection between the computer and 3D Printers"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
@@ -14,28 +15,27 @@ LICENSE="|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc gui test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
-	$(add_qt_dep linguist-tools)
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	doc? ( app-doc/doxygen[dot] )
 "
 DEPEND="
-	$(add_qt_dep qtserialport)
+	>=dev-qt/qtserialport-${QTMIN}:5
 	gui? (
-		$(add_qt_dep qtcharts)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtwidgets)
+		>=dev-qt/qtcharts-${QTMIN}:5
+		>=dev-qt/qtgui-${QTMIN}:5
+		>=dev-qt/qtwidgets-${QTMIN}:5
 	)
 "
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	ecm_src_prepare
 
 	sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die
 
-	use gui || punt_bogus_dep Qt5 Charts
+	use gui || ecm_punt_bogus_dep Qt5 Charts
 	use test || cmake_comment_add_subdirectory unittests
 }
 
@@ -45,5 +45,5 @@ src_configure() {
 		-DBUILD_TEST_GUI=$(usex gui)
 	)
 
-	cmake-utils_src_configure
+	ecm_src_configure
 }
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index e2107ae69315..768cbb9dec08 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,10 +1,5 @@
-AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c3cdd4a674446250b34ba06bf3de0f348b3bcabfa3ebe69d556b1fd0f63a46aea9e87674028e22f48dc4be6fbd465249a998d3ce257038128e27 SHA512 ba6fed3b6da993541a3033c1dace0f9bac6ec1b1603080e2d20db0b69491c52916c7f116aa6ec614384405c7984b3db87b051a503f2eb6adc2ef173aab638d81
-DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
-DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.28.1.ebuild 1446 BLAKE2B 3e9c9e8b1b047c59cc66bc9646e20a82a41f3b2ba6b58bff75de5ea9c5341e17640bf814f49c951db080e4c3fbb3e26e8580b1b047eaaf27a9208a2211b1c97f SHA512 4bacb9f02f8d7d067dd2bef3788b80cf0b36f0a0fd48eace9549efa082fd01f2ede7054f8b9d2b4fac04c83b4d001c70f30a641ea355dea52e0a660c7a8634eb
-EBUILD atk-2.30.0.ebuild 1227 BLAKE2B 0a21234fffdf74308704e199dd20ae4c4b6229c29d0265ce2734d0ece6b5fcfb9298ce65e6496b53f0a757863856e73dcc7d7a8287ab33b9371c65b0cb064c8c SHA512 7a23da2f804ef760dd5fc941f77f745c259203cb7e58c6cc218300a52c901e75c1efbd427245e7ec484ad8eaa57802d8855a0005c48e25a086b6d52e34863aa6
-EBUILD atk-2.32.0.ebuild 1167 BLAKE2B 77292c0b375f95f1985a7ccc4426a6c1f3615b7a482fb2dfa749e66cb3ea775374c3b2a66753b555814781fa88e2b90be81c40c4c311c9ae3fff2b8db134abca SHA512 efbe20f0687c83825aa8ca24b1c57712626898f1deae925ea466d89fb1a81731957d1be818e00dbf0193601c4610e38589f5728db6f4c778a46061ef15d560c7
+EBUILD atk-2.32.0.ebuild 1164 BLAKE2B 691dab81bfaff32036d7dabcb449131f5dbf9e4cac30fb2d99c966e3bb30fabb3cbb27dccc1852763dc05de1909e9d3220686e1cad8e493e07f77d5fb7faf6cb SHA512 1991872e63c0028df601bcafc22f5ba8dc81c6d59fb2b9126d08fdadc948f81811158817e62a8920bb6d6a775dcb99a7461251b8d60e65ac1adc05ba8398a43d
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.28.1.ebuild b/dev-libs/atk/atk-2.28.1.ebuild
deleted file mode 100644
index 6df4ce591ae7..000000000000
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=sys-devel/gettext-0.19.2 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-#	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-#	if multilib_is_native_abi; then
-#		ln -s "${S}"/docs/html docs/html || die
-#	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
deleted file mode 100644
index 29a7ef911b61..000000000000
--- a/dev-libs/atk/atk-2.30.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson multilib-minimal xdg
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-basename-instead-of-filename.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 8b62f7db6a39..aeafaeb7dcae 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.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
@@ -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 ~sh 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 ~sh 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/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch b/dev-libs/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch
deleted file mode 100644
index 763a15056702..000000000000
--- a/dev-libs/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 14115cc94086fb2a0a5cd32e67c70f623847df64 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Thu, 30 Aug 2018 11:39:25 +0200
-Subject: [PATCH] build: use @basename instead of @filename
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=789619
----
- atk/atk-enum-types.c.template | 2 +-
- atk/atk-enum-types.h.template | 2 +-
- atk/makefile.msc              | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/atk/atk-enum-types.c.template b/atk/atk-enum-types.c.template
-index df2f546..b3c0b13 100644
---- a/atk/atk-enum-types.c.template
-+++ b/atk/atk-enum-types.c.template
-@@ -7,7 +7,7 @@
- 
- /*** BEGIN file-production ***/
- 
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
-diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
-index 7b4cec4..8321c24 100644
---- a/atk/atk-enum-types.h.template
-+++ b/atk/atk-enum-types.h.template
-@@ -14,7 +14,7 @@ G_BEGIN_DECLS
- 
- /*** BEGIN file-production ***/
- 
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
-diff --git a/atk/makefile.msc b/atk/makefile.msc
-index f407b7d..ed4656b 100644
---- a/atk/makefile.msc
-+++ b/atk/makefile.msc
-@@ -104,7 +104,7 @@ atkmarshal.c : atkmarshal.list
- atk-enum-types.h : $(atk_headers) makefile.msc
- 	$(PERL) $(GLIB)\gobject\glib-mkenums \
- 		--fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n" \
--		--fprod "/* enumerations from \"@filename@\" */\n" \
-+		--fprod "/* enumerations from \"@basename@\" */\n" \
- 		--vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
- 		--ftail "#endif /* __ATK_ENUM_TYPES_H__ */" \
- 		$(atk_headers) > atk-enum-types.h
-@@ -115,7 +115,7 @@ atk-enum-types.h : $(atk_headers) makefile.msc
- atk-enum-types.c: $(atk_headers) makefile.msc
- 	$(PERL) $(GLIB)\gobject\glib-mkenums \
- 		--fhead "#include <atk.h>" \
--		--fprod "\n/* enumerations from \"@filename@\" */" \
-+		--fprod "\n/* enumerations from \"@basename@\" */" \
- 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
- 		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- 		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
--- 
-2.19.2
-
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 44cdcc205de4..16da20e748f4 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,3 +1,3 @@
 DIST aws-c-common-0.4.11.tar.gz 306933 BLAKE2B 5a2370a3696e4d90b67bc03fbf88f152e1a2d6e4d4a9ff2a9423a2cf18c14a1e3b6d978250c3359f4ebb2cf5e524e416b11604dc09dc45f5c8a5a6f982b344a7 SHA512 1e00f6aa025578978551fc8ca1bc09b448f79ac28bdc969af4312569ffca035d656dc68825da15ad8f4f890bbdb03327c624147dded1ce402e9dab1726290890
-EBUILD aws-c-common-0.4.11.ebuild 511 BLAKE2B ee38d0430d7ea3ecb2c5cea103d9cc8c6ab19b73fed8efc24d4dcd13c0340332af6af889d2779405ae1a9b0adfc57e079e7255f4eafe9eeae5b85763dd154e35 SHA512 b2a2245f686c21312416f8476c83e46a5788898fd043e3e7f7a8caa8c47eff4f8b599b91afb0ce632c4bb2f051e8345b4aaf48709f77f77c5f8f6d6b64a78b0c
+EBUILD aws-c-common-0.4.11.ebuild 499 BLAKE2B 651345b7c6e7cb6ae4e285ea5028fcba4431865d13599fb3409783be631a091ac6681cb9a81a1b1e6011dc78ceb32eeb9ac8824dc4e59f1be2c43cfe6d04b7ad SHA512 d06cccb62a6d66f81d45537be0ecc6eeb14c926df935eef5d955e9aa6a12f6e3967e3df1a2af304094146d04261fb6f5f155329bd76fd406b0c05688d7e59562
 MISC metadata.xml 527 BLAKE2B 794ec45e133fb3a39495c56b783b1d7bb5ca7cdd44840a3a305c3137dc5f72cedd7e4acc2e19aae8fc55a43521cc387462337df0ee1a6f0c662fb23b05afd996 SHA512 d859baf8f23805e9f9da7957e88d250f5f34fb24bcfb5c6760c479280d425af641dfc750995b328db197b8b9ee4ea7fee41ceed1a9c06e6b3e4acc7da1cb70e4
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
index f3ee9be44b13..f0198268ad0d 100644
--- a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Core c99 package for AWS SDK for C"
 HOMEPAGE="https://github.com/awslabs/aws-c-common"
@@ -12,13 +12,13 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 72194d6828e6..938a3d89f7bd 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
 DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9
-EBUILD aws-c-event-stream-0.1.3.ebuild 676 BLAKE2B 87b3f6b408087db7ca28a306ebd0e5d1dc94d85fd0d722a8e782fbcbe65eca945a59ebb6d77e8958bfaaa8710bb80a25f84ed1b0b70a569c859080d7145b1809 SHA512 15d07c1c5f959a56f520c54ade9105a64a7be78e0a0dad6640f2734bfdf2c3d62fc22d181dadcfe5ea7d342ec981a32530eed53d31e6705703a85250da26e91c
+EBUILD aws-c-event-stream-0.1.3.ebuild 664 BLAKE2B 1ce8ccef25923dcfed76f6ed79458ea2c2570939edd450d83033b543c9e36b1095daa02a79d1f899115f1ade5467b9f1ccde604df55c285ea30cb6b8c1a63f7a SHA512 19e3c1e9a6df30c7b9cfe77951517bc41b5a547e9dbe212dc8472893dd2c96f8f4524934420b47a7b627d5e629431efadfb5d378c1f9535ad8cce6ab56c128e3
 MISC metadata.xml 360 BLAKE2B c3adf10e8868a7699a1c7798e4221cff255e9505062692d7db7b733e9d5cf7b568183a294c9e0e7b125e9a6c0d848d370a43ed6cd32e498eab4adfe1c46e7abb SHA512 571bbdb2968c5b6f49dcf41e7706775f2bab9302eef8795f9ccbd51922436161af01b17857370bc49960cb1f40a670ca759ff76381e92f7cd18ee51b9361f10e
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
index b33495cc06ca..50dc823f254f 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C99 implementation of the vnd.amazon.eventstream content-type"
 HOMEPAGE="https://github.com/awslabs/aws-c-event-stream"
@@ -12,8 +12,8 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -29,5 +29,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 3d6be1d54970..ea1f0624c4f2 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,3 +1,3 @@
 DIST aws-checksums-0.1.3.tar.gz 78242 BLAKE2B e78f3bb34e124351ad494e86e579613799afebcfe491fb36b20190121f2bf9de9d96714ad304a7fcd702708f5be417c6dbafe65606b2fe42c340edc796a3ecf3 SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
-EBUILD aws-checksums-0.1.3.ebuild 548 BLAKE2B 38b560431403331937d71abf13d41080a680f271361e925eb1ce6fa3574e5ef25c587dd4f9436bcdd37c1477057b767072f8c307c18c033aa02d13ab48dc6faf SHA512 084ca14c86b202da22daf0d7e8769e451e19092a9f1ad4d372b139508713ae4c81ac83600ae7111e191eb5718c10af6b60c19e8a7f2db5f241879497d5de2038
+EBUILD aws-checksums-0.1.3.ebuild 536 BLAKE2B 2078883a7d3521896f5759b4f240693bb31da6cd1ede0841f5ac4c785bf92b15164f30a7df0df649413a15f421dce0ad8b9688cc040cb1b77d1993c63c880d8a SHA512 32a92b41b5bd40dd2ea80e9442315942e7bb7c9e211edd3e4a766afcb948e342cbd1f95d4ae6635fe2459b6f578891036d5baaf7d323e9f5d67ebf93ae349e9f
 MISC metadata.xml 555 BLAKE2B 48bbce733b96fcf28e492a782ad5681c554e20a269477851b734a16c9bff126ce545920754491532fc5ac026707290d7c988e162d0815586da19986a6793c4a0 SHA512 4d5a312fb968d62d31279d1e3f998688c54b9f9829a3c839227e10e931422f865fa29450469d0a8cd08c05849d098e05b8c5bcf962039dded80932d1d25e0b42
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
index a0d6bce25cf4..aaf6a73ee9aa 100644
--- a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks"
 HOMEPAGE="https://github.com/awslabs/aws-checksums"
@@ -12,13 +12,13 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 013b69d6f3c8..fbea24fa2c92 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST aws-sdk-cpp-1.7.178.tar.gz 22589166 BLAKE2B 40364307fb676a89cf2b363d02dfa95e03c6e0b02e34c3d5376820dd7721f13108bf1f1713ff5f39dfc7d98f5cd368718601a397f55c4e26a37cd62d346cbf70 SHA512 b5c969d8b0b9ca5aa7b6af762bf79647ee407cae2686b90c4acefb6a113cf4e7a582e4e5aebd2e6289685e6ac373f9f994e57cd34bd12543b2b36142e00df478
-EBUILD aws-sdk-cpp-1.7.178.ebuild 6297 BLAKE2B b0add7627f38f0983d8be4c604998c47ba2dcfbc91da49c88866a5b7a98a42c3ca560723c657065e9018642a99a1857a63417ff6558605b56bb0f591f22a0915 SHA512 a25be1dcf28aea3fd685e421676573389c65e8f3ea0e6a6b826e953e05d7f3c16432d45b8e49db7edb1cc36f9e28a69485caba2cce8c708db71f178ee00339c3
+EBUILD aws-sdk-cpp-1.7.178.ebuild 6285 BLAKE2B 8971ad0a063b5a1113f1e15c80bf609d31d81760285e6c158de066bb242591bb3a59ff8cb51525c8d411b0c1a94ae2780aa7d384a56a187e267bd46beb3e8771 SHA512 23a3d8d16ea8d8ff3791e3fd81a52e92c1035432148a8a92c089c19c90f21423cb1064a6555aeaa9ff67c6c234f62a90989814d6c172a7b91d847f0e87c719f6
 MISC metadata.xml 19286 BLAKE2B 2f347b29348e37e9b80827e6b2a2dd5a70b5d354e9eb226e8fbcd7eea26f57f831e13e57bde15e5ca97ac9403bb6acef68612e2a30c22db8136ac501630e3670 SHA512 5c072bae80814025ffc5eac7d2eb6199360e99e4b806be97a7770c2b6b570d122ac399feb137b65fd02f52bd8c5b1e8e61e75fcd91d7ae24489ef05ee018bb0f
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
index 1ce4d2c80bf7..1d647355d4e5 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="AWS SDK for C++"
 HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
@@ -25,8 +25,8 @@ MODULES=(
 )
 
 IUSE="+http libressl +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	http? ( net-misc/curl:= )
@@ -147,5 +147,5 @@ src_configure() {
 		-DNO_ENCRYPTION=$(usex !ssl)
 		-DNO_HTTP_CLIENT=$(usex !http)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 33395ff1b680..fcaa8ef461e6 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,5 +7,5 @@ AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfe
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r3.ebuild 2872 BLAKE2B 3aa3f5947e4b0febe3b20a3d44174c894eb747e7bae4298ad3acb881f2d85f64853b9b8e09ecb8be4f4d93611b0ba7a2744ce6fbf17b0546cc7dbcc17aae4bbc SHA512 c69487a7ad53caa87b98b4a276f5d8dce898fa0f9d9aceaa3ea73e1e9673104289ab0688377909defe7b381309413d3ff23b802199db9ddb9b80d53f1485f341
+EBUILD beignet-1.3.2-r3.ebuild 2868 BLAKE2B b32d8bd2015fe45936f7cc2cbcdd204ce9d5aad0d1b9b4b445ded59d371d5ab89957faa67a6153a77626dd4b99320b6eb8808045f47587fd32fe2d17a783150d SHA512 c58ebd5b0f2df3a59d4ac695d5b98ab4722c0029cc47a87e58149d81676ad5bbac1e7d6f79ab68a630bf67cb883fa6ad2c654164c1888543b67b0dc6dadcdbe6
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index ffa7b2b286a0..439ab63df2ed 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm
diff --git a/dev-libs/boost-numpy/Manifest b/dev-libs/boost-numpy/Manifest
deleted file mode 100644
index 3daba8152087..000000000000
--- a/dev-libs/boost-numpy/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD boost-numpy-9999.ebuild 1014 BLAKE2B 28d281979a92353aaa778e2ea2f19e01a879dbd041f1aecd816d24b1f1025da56d8d9688f1a4aa183e17aea0ed069e5763f67ac7fcb8e4a8c2a165b5462934ea SHA512 c33b5f1cad7a187d6b03c58ec2518f23ba236c62f5bd89fbdb135f1f71b7ce559774ed8713e6e4caa7b687d5eb3101b8029ee0bb7fc17b583ffebc41d6b07057
-MISC metadata.xml 537 BLAKE2B 9f60a0689c92fcc61b005c56d5412b33423c03fad54e589a3ce268ba875538555f152f54e6b7107bf4c0294cd00811ac081acff6d4cddcfdcfd747f20ea9cce0 SHA512 44ff7d8681515dc0c0179e3922115c8260f19c39832ac0f190037a2d1dd117998e89163e33ecb4ca3214d2effd852e3bea5e0902cd269e3834aab82e91f622e7
diff --git a/dev-libs/boost-numpy/boost-numpy-9999.ebuild b/dev-libs/boost-numpy/boost-numpy-9999.ebuild
deleted file mode 100644
index d7c8b5b6a0d6..000000000000
--- a/dev-libs/boost-numpy/boost-numpy-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Boost.Python interface for NumPy"
-HOMEPAGE="https://github.com/ndarray/Boost.NumPy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ndarray/Boost.NumPy.git"
-else
-	SRC_URI="https://dev.gentoo.org/~heroxbd/${P}.tar.xz"
-fi
-
-LICENSE="Boost-1.0"
-SLOT=0
-KEYWORDS=""
-
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	<dev-libs/boost-1.70[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Make sure that new Python ABI names are searched too
-	sed -i \
-		-e 's/PythonLibsNew/PythonLibs/' \
-		-e 's/python3/python/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r libs/numpy/doc/*
-	use examples && dodoc -r libs/numpy/example
-}
diff --git a/dev-libs/boost-numpy/metadata.xml b/dev-libs/boost-numpy/metadata.xml
deleted file mode 100644
index fd7a29272578..000000000000
--- a/dev-libs/boost-numpy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>heroxbd@gentoo.org</email>
-    <name>Benda Xu</name>
-  </maintainer>
-  <longdescription>It is intended as a replacement for the old numeric support in Boost.Python proper, which is now out-of-date and does not support C/C++ pointer access to the data.</longdescription>
-  <upstream>
-    <remote-id type="github">ndarray/Boost.NumPy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 7bbc06012b94..16b17ce8633b 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,8 +1,11 @@
 AUX boost-1.71.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b481576a08138be826f7383a689a6c0725d491a244dc8697fc39fac1a79e4639ba51b3a3eb7ee2f2e11a20883de0ecd3dd3c2fc2c9cd SHA512 28952e7cd791678be0963beb0a29e3e40b54a8c3618c66a8b8d21ab63c414771cfa1e9961f08c0b3818bd4c311c122e777109e15002a71230b0c3c9dbc4d6075
 AUX boost-1.71.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
 AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0
+AUX boost-1.72.0-boost-mpi-python.patch 1703 BLAKE2B b797f66c07bcec021e0a9a169cfddf8572828cd94114ff0dc40e9f08f9e5041f5cef3a8d0400cf5cc447bb75cf9e1c1c4d500930d154f34920b3501eb991eccb SHA512 61e9ef28b40f4226f09f235d59bd2d1ad571530b78c3fb50fd1f2bc47c185cc7cbd72b469fddcd6795a8578f3ba0b6abf12d8f175806e7b0d29cdd6223c145aa
+AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 103b669670ff1365837c4590bbba6ec112ef8f185115a60cd853cead370c514517950e6105a4f39c030d8c0931352c44eb7d03c6790ab88c6978acfa02e3a142 SHA512 b2d9e870545c8509abda1110e8de3807cec72373fd5539edabf83825b9fd893562835e7557ea74c309a02e245e9cf80e567b39bf08a5e98c9d3124cd8b10e064
+AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-1.71.0.ebuild 10437 BLAKE2B b0267ac55c5f80ff25aff70d0e789a76dd68489f0a7491b2b409127a2f5fa7ab3e0f2b59abeee63b7e585b9cd8703d264c149197f68d9d17fc7c38622cd26db4 SHA512 48b29502f7cf875cdccb7d1203a7ff51bac79225e99a88c5c21fa09f1b9b8c8411b5a70e4870e1e0499c84b812b25e451bec1908897328592ccfe801c3db5403
-EBUILD boost-1.72.0.ebuild 10479 BLAKE2B 04c1b99222969bdb527316b8c0056a3e84bd83cdecba78e71e95dd16969ecfce2e091a1cd1fded400c0d69172781713e1438b10249a65cb80491622dc15ac01e SHA512 ff57a99c717975379ae993d328939212374dc4855c40d8c3b76ef1ad93a41abcf5f4b231ebd9a9e44fe18fcb648cb034991f55ef17fd483df73f687154c9a4f8
+EBUILD boost-1.71.0.ebuild 10426 BLAKE2B 9981f0056288a926da95ee05130e99b34506805d049d4b027de2e5a12af21e952606366844990af3d973437b91189539d4f6834188cd669ed69d05b82f3f0c91 SHA512 cdee407c8cd9d71ee115c44ec1801b65a89bf1a595c3d2a069db41c5f1697b9ebb289561a92ba29cf81b3dc3c114450127735e8aa707d8fa5db87a276895e627
+EBUILD boost-1.72.0.ebuild 11354 BLAKE2B c77acfdad122c2f2774a5501c2e37f2ffacc140059b426f7fef199bd96af073aea10c2930f23b52ca803242cec71f5767190c86451554a5b81636989e5aae67f SHA512 3ac28a2b2bd015d7fdebb2c3195ebe57e621c3fe63c4afc469e667101774c1d6d4ec8d985e4026ae9947f8867d3fc990c3e57d677ad1ee59783782f5afe30358
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index faa5a9609109..2b06cb47632a 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
@@ -327,7 +327,7 @@ pkg_postinst() {
 	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
 	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
 	elog
-	elog "Then you need you need to recompile Boost and all its reverse dependencies"
+	elog "Then you need to recompile Boost and all its reverse dependencies"
 	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
 	elog "requires a complete rebuild of the boost-dependent ecosystem."
 	elog
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
index 7434b5bd5d16..b44e04ef83de 100644
--- a/dev-libs/boost/boost-1.72.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -54,6 +54,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
 	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
 	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Bug 703294, incomplete Boost.Serialization refactoring
+	"${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch
+	# Bug 703036, per python-impl Boost.MPI
+	"${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch
+	# Bug 704128, missing include on Boost.Ranges
+	"${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch
 )
 
 python_bindings_needed() {
@@ -215,7 +221,24 @@ multilib_src_install_all() {
 		rm -r "${ED}"/usr/include/boost/python/numpy* || die
 	fi
 
-	if ! use python; then
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				local pyver="${EPYTHON#python}"
+				python_moduleinto boost
+				python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so
+				rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die
+				dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so
+
+				# create a proper python package
+				touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
 		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
 	fi
 
@@ -329,7 +352,7 @@ pkg_postinst() {
 	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
 	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
 	elog
-	elog "Then you need you need to recompile Boost and all its reverse dependencies"
+	elog "Then you need to recompile Boost and all its reverse dependencies"
 	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
 	elog "requires a complete rebuild of the boost-dependent ecosystem."
 	elog
diff --git a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch
new file mode 100644
index 000000000000..8fb164a6278b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch
@@ -0,0 +1,50 @@
+Tag Boost.MPI python impls properly to avoid name clash
+https://github.com/boostorg/mpi/issues/112
+
+--- a/boostcpp.jam
++++ b/boostcpp.jam
+@@ -185,7 +185,7 @@
+ 
+ rule tag ( name : type ? : property-set )
+ {
+-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+     {
+         local args = $(.format-name-args) ;
+         if $(layout) = versioned
+@@ -223,7 +223,7 @@
+ {
+     local result = $(name) ;
+ 
+-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+     {
+         # Add Python version suffix
+ 
+--- a/libs/mpi/build/Jamfile.v2
++++ b/libs/mpi/build/Jamfile.v2
+@@ -58,13 +58,13 @@
+ rule python-tag ( name : type ? : property-set )
+ {
+     local result = $(name) ;
+-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+     {
+         local version = [ $(property-set).get <python> ] ;
+         local lib-suffix = [ version-suffix $(version) ] ;
+         result = $(result)$(lib-suffix) ;
+     }
+-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
++    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID)
+     {
+         result = $(result)-$(PYTHON_ID) ;
+     }
+@@ -168,6 +168,8 @@
+                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+                 <link>shared <runtime-link>shared
+                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
++                -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
++                <tag>@$(__name__).python-tag
+               ;
+ 
+             mpi_python_libs = boost_mpi_python mpi ;
diff --git a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch
new file mode 100644
index 000000000000..0c9f72583efd
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch
@@ -0,0 +1,29 @@
+Missing #include, as the split_member.hpp include is not
+part of the nvp.hpp interface, and hence cannot be relied
+upon to be included transitively.
+
+Confirmed on
+https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430
+
+Bug: https://bugs.gentoo.org/703294
+
+--- a/boost/bimap/detail/map_view_iterator.hpp
++++ b/boost/bimap/detail/map_view_iterator.hpp
+@@ -22,6 +22,7 @@
+ 
+ #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
+   #include <boost/serialization/nvp.hpp>
++  #include <boost/serialization/split_member.hpp>
+ #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
+ 
+ #include <boost/iterator/detail/enable_if.hpp>
+--- a/boost/bimap/detail/set_view_iterator.hpp
++++ b/boost/bimap/detail/set_view_iterator.hpp
+@@ -22,6 +22,7 @@
+ 
+ #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION 
+   #include <boost/serialization/nvp.hpp>
++  #include <boost/serialization/split_member.hpp>
+ #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
+ 
+ #include <boost/iterator/detail/enable_if.hpp>
diff --git a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch
new file mode 100644
index 000000000000..a6002074ab93
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch
@@ -0,0 +1,49 @@
+From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
+From: Oliver Kowalke <oliver.kowalke@gmail.com>
+Date: Sun, 1 Dec 2019 20:40:28 +0100
+Subject: [PATCH] Revert "Cease dependence on Range"
+
+This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
+
+see #44 (One test fails to compile after boostorg/coroutine submodule updated)
+---
+ boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
+index ea96981..640896f 100644
+--- a/boost/coroutine/asymmetric_coroutine.hpp
++++ b/boost/coroutine/asymmetric_coroutine.hpp
+@@ -14,6 +14,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/config.hpp>
+ #include <boost/move/move.hpp>
++#include <boost/range.hpp>
+ #include <boost/throw_exception.hpp>
+ #include <boost/utility/explicit_operator_bool.hpp>
+ 
+@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
+ 
+ }
+ 
+-// forward declaration of Boost.Range traits to break dependency on it
+-template<typename C, typename Enabler>
+-struct range_mutable_iterator;
+-
+-template<typename C, typename Enabler>
+-struct range_const_iterator;
+-
+ template< typename Arg >
+-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
++struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
+ { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
+ 
+ template< typename R >
+-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
++struct range_mutable_iterator< coroutines::pull_coroutine< R > >
+ { typedef typename coroutines::pull_coroutine< R >::iterator type; };
+ 
+ }
+-- 
+2.24.1
+
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 041b05662eb2..9299b621c446 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -4,7 +4,7 @@ AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 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 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
-EBUILD botan-2.11.0.ebuild 2493 BLAKE2B ff01dd555ab285fec89ddd821d35838724842bc00e1dcdc2d18ba66973780c1a0a990ce408c48cb81921b1e7ef32600867253444b80c7302a32fab1e0343864c SHA512 fb406e8d1752d2d456902bf69bb9f2bb7e1fbedffb232015d4829d371850a49d5e350e2d386bf24d95b947af461f258ce8b953945e055e8f0659e3a55b878311
-EBUILD botan-2.9.0.ebuild 2530 BLAKE2B 550a64323758808af1525767900553a56fc7e80b857923c678d718bde1bcc04e9265e1671b3cd16dca9bc4ac7b2dcf1b8ae86c6f4c098cb63fbbcad880230efd SHA512 d22a695d68e9e05add7aedc7d79985261238593b5ff626d28e40eb49d4d287ea3dcfba6c272a3ccb951d5a8d453e36bd47ff3d6581eba247492fb9f16dc15aa3
+EBUILD botan-1.10.17-r2.ebuild 4266 BLAKE2B 936acf09bc742418239c96e56d130d7dafd312801fb786242f3a2ead3d7e452f27b198298e52dfe17d8a25494695ed9f86771eb1b3338b9d0d0cbfad9cdd0ff0 SHA512 f8486d59c0580381aa92bfbff6474c4c85e7e7578ba6d4c3839e1731e7c3d12d21e936425ea833ace3c42aed6afe0ec2b73aa34f54e9c774fcaf076875c05590
+EBUILD botan-2.11.0.ebuild 2489 BLAKE2B 18c43d9731222af51a59db900d06fca3bca6e8c0f82ae42b4cf893630a32cc6cb87d7c3047ae7fc29ad3c278b9a109e5bc25359e155727d78b9f84b65f40b2f7 SHA512 d24b1f6f6f8632aed02df9ede93b175bd9221d890294118820acb6bf006620779b2ecd7f5df1229721fcb86379fd2b4f74be8e1361c98ee8b23d0b19ede1f30d
+EBUILD botan-2.9.0.ebuild 2526 BLAKE2B 1e612758f12cd500359f5e0dd042f411deb09dedc61891179064abe5678ea0f21ff08acdaab9e1ac2a9db27226fd2658271544f01ef76771264f65fd24b37d6f SHA512 5373e771998abb99ada45ca612ed073925df567d78ea5b022bb4c004926e18da60282dcffe80d8f7bbeb69e3cc7c58b78bd0ce482dbad2a52b43e6441e3dd991
 MISC metadata.xml 301 BLAKE2B d1a73485448b1088e1b111211b6a83573a3dc0f12c8870181a0446ace38120473c34f9ba19ce66c35941ec02a77015645894bdb646aa311baf4cd523c2528d7f SHA512 f2a77fdccb86cb75295e672fa686560a232f927337449527c62c6a07b396b36c95aada8673ca0316394c2b55ff5783e5f60a74aa132630514f7e430252338568
diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
index 132f27c34fb1..9bea1c6a6626 100644
--- a/dev-libs/botan/botan-1.10.17-r2.ebuild
+++ b/dev-libs/botan/botan-1.10.17-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.11.0.ebuild b/dev-libs/botan/botan-2.11.0.ebuild
index 0b8587ddfd92..8afc43d3519b 100644
--- a/dev-libs/botan/botan-2.11.0.ebuild
+++ b/dev-libs/botan/botan-2.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild
index 0f61ea3a3a99..41f6e58805ca 100644
--- a/dev-libs/botan/botan-2.9.0.ebuild
+++ b/dev-libs/botan/botan-2.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
new file mode 100644
index 000000000000..e4dd730f16fa
--- /dev/null
+++ b/dev-libs/boxfort/Manifest
@@ -0,0 +1,3 @@
+DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
+EBUILD boxfort-0.0.1_pre20200110.ebuild 947 BLAKE2B 988aef44b60cb262fc05095e8489442c156de8f0a96a6adbbd2f1a72e89a1d8dfcac65499784aa2b030dcab69e24e11e4f385926fcfc4b2bcfe3b1f26a23f95e SHA512 a84b29f219540489281aa49c1072f41808a97b3ec9a439249a4e1326d5eced987fff31571f5b1c4214cfc0293d48c0ba42d2441c86cfbb696cf2256110db6141
+MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
new file mode 100644
index 000000000000..a5088a597a6a
--- /dev/null
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-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
+
+BOXFORT_COMMIT="1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57"
+
+DESCRIPTION="Convenient & cross-platform sandboxing C library"
+HOMEPAGE="https://github.com/Snaipe/BoxFort"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> boxfort-${BOXFORT_COMMIT}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+
+python_check_deps() {
+	has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/boxfort/metadata.xml b/dev-libs/boxfort/metadata.xml
new file mode 100644
index 000000000000..6b226abcada8
--- /dev/null
+++ b/dev-libs/boxfort/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Snaipe/BoxFort</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/btparser/Manifest b/dev-libs/btparser/Manifest
deleted file mode 100644
index 00bce697e1bc..000000000000
--- a/dev-libs/btparser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST btparser-0.26.tar.gz 564940 BLAKE2B 979b530764d0ebb413c670c44aeb05bc3ac6dfbce54d35ff62ca851aa671a58aa223972ad3a6880e0d8f2e9c849ff60ee3adbc35cfae0f996aa085e771383375 SHA512 c5520f0aae3217482b97eac7c9cc5ae9be596df936ce958d84cb8e46a67c4b97a9184f9cd4bcab185d35c64f5ea98acd6cfb6f98512b9fa492a3aa9931d6668c
-EBUILD btparser-0.26.ebuild 880 BLAKE2B fa0287ce4182a32bb640f270ebe2348f68f22459d02c1132c0e79553ab059f0679a7db8ce954c7e7f602bed76c7154d8143e975bae47d9ee23dca00b43b98174 SHA512 b5d6fe52819d2f629c696d82bcb6a322ec2a442eb2074c5bc7444760f25106c7b27995e7c0846f98727069818ba11e723ea17cb581738180c7d4a538c481f19d
-MISC metadata.xml 341 BLAKE2B f3a4f723dbe9bd67b919dc3dbbae6ec4390122123dcd9441727a0697eefc03bd8805ddde5e5ee4175b7c06f275c83142f4dedb6c94492d28562c56f31cbd4df8 SHA512 ba348a6b7ada0d823316f48c43d8a94e081c099a18ea2488905ee2b27c8a8106639ce15ce83749a5534259c9245c118e19aa32a9fc6177e8012bf9e21f9124a3
diff --git a/dev-libs/btparser/btparser-0.26.ebuild b/dev-libs/btparser/btparser-0.26.ebuild
deleted file mode 100644
index 797e437f244b..000000000000
--- a/dev-libs/btparser/btparser-0.26.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="Parser and analyzer for backtraces produced by GDB"
-HOMEPAGE="https://github.com/abrt/btparser"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="amd64 x86"
-
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.21:2
-"
-DEPEND="${RDEPEND}"
-
-# Incomplete tarball for tests
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf # to prevent maintainer mode
-	gnome2_src_prepare
-}
-
-src_configure() {
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	gnome2_src_configure \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/btparser/metadata.xml b/dev-libs/btparser/metadata.xml
deleted file mode 100644
index f7b718373ec3..000000000000
--- a/dev-libs/btparser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">abrt/btparser</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index e24a33f771c2..5a0899b7f640 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -6,8 +6,8 @@ AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df44
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
-EBUILD capstone-3.0.5_rc2-r1.ebuild 1441 BLAKE2B 12c70e34b8d4f1d948f10c492122f02ac11e3014b0d4190604c1342f66b3e70d6a13705330d21d806feb45a829b0500e91e8d32578dec09bb834e342ba01bcf2 SHA512 3ac32e4f00bae9728bbb1d0229423ac92206010928582a17b71b9e5ace92214b32a25b315ccf5fb2d0b33348986f0c90778926b966aeb6554c2bfda77754c834
+EBUILD capstone-3.0.5_rc2-r1.ebuild 1437 BLAKE2B ae4c1737e5371dfa688a5fa8926f27d696e660d825c2e3b5acb8e4231da4804859f4a72cb08eaf8d997b15ad9e09fe818641f9d15e50633db1e5f6f94c7e5786 SHA512 a1c46de9984c0726737cbbab900bd80afe548b56a33c18c34ff7b6a8fad8730eb9f3d81b56b7fa38b0f32389458407dc459006362f958bf1b1946a8e9647f472
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
-EBUILD capstone-4.0.1.ebuild 1647 BLAKE2B af35af2e175af85de9339bdc94c8e9594626d0cf4793b776fa4669c844dbf235544387a9731c9376a4329e45f03f8832e448deaaf3878c38791c789bb6518ac3 SHA512 034b39d4b57a6e34505db08c469cb52db55eaa1bab3b55094ba888272de18978c1a9cc6693b5679ddbc1355b93cdfcaf28217e01a6215f3dfbd4d77288179a57
-EBUILD capstone-4.0.ebuild 1508 BLAKE2B a83acf938b0e6d90855bf8d199b49458db34000e54d226e6cc20409c716e7b1609268c0e50547bff8b8bb646926e51e7a9448541bff6578cc9dbae7c80d0facf SHA512 45e5c83938c97786c9dc6b1e076c605c7f24197d199960ba8a0c9aa77e38a2dbb6cb7746296fe65419ebfd0f054801d98656f720ef7b5580dfb1bbfdac19a678
+EBUILD capstone-4.0.1.ebuild 1643 BLAKE2B 592c6ffb2f204e8c49fcfc094346e6c5716f96d146f9a7bad5e19ed088127fd8845c2de9bf625288bc1678ab6c0e3a1f4aa5c35c8f9fd3ae9f1d5e87c672caf1 SHA512 f6babd7599bfa1469f28f896512fb1c7fdfe04408a5bb22ed2e0bd1f68f7309e4faf07cece7f7dfe65210f541dd2789796577b2876886a82ea143c8f97b6b6bd
+EBUILD capstone-4.0.ebuild 1504 BLAKE2B f9429a6dceaff0dc031421d81f30ff77f918a18516bfe9e997eac3524c55b4b99a326219652c3f5976e7c0f6f8d1d2dff5aa1c0c2735e0cdbb8a6bc412621941 SHA512 e81f9992cc537ef98c16849e4b19ad20d6eee4d368a6382a330cb0cb0078fac69a436e18d4678c3cc2878f5081a3db42e1f5bdc6a20131369272a013514a86dc
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index f33b120cb404..6407273eaf65 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
index 668f96bde919..a7b6f1e60192 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
index 18d7547f3dd0..80f4a2016cfc 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 53509a321449..efd08fe4d335 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,3 +1,3 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 577 BLAKE2B 19c2db87bfa38cce710fd83e492bee9354da65da5ace76113ee11b6e3a622d477fd97b2ee1b4bd24868709ffbea53249234337e388e76103d51f8b5e41cf952c SHA512 9fa1c957f5c658fed69244240e01f0e9f0551cfe4d9aab735410e36987d462602297eda0ed1f66784b7d81ea0fce91bed515b2d5bf4d7d36e7157c5235d04e5d
+EBUILD cgilib-0.7-r1.ebuild 606 BLAKE2B b17c1f608f88d4f7e230a0f6d37ce01d478a43e270f35ead5c0df7b980c4d10e93de9db5f97cf437935688fd0628ec6c403c06e5c09995d821e6bd9d14474b6b SHA512 db4d06a89ba5f7b9fdd999a2058571db90f350af2b96bb69a8ccf94266e7f34b6ba7f0fa0b93ab0c7617be8b33c422e8a741d07207311662a807665ae60e0b11
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index adb2e501783e..e137e32204df 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="A simple and lightweight interface to the CGI for C and C++ programs"
 HOMEPAGE="http://www.infodrom.org/projects/cgilib/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+SRC_URI="http://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/cityhash/Manifest b/dev-libs/cityhash/Manifest
deleted file mode 100644
index f2f8b939adb1..000000000000
--- a/dev-libs/cityhash/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cityhash-1.0.3.tar.gz 352237 BLAKE2B 1a6eddc58c9e44b76be55666126f02a84d28b9f03afa2f05da8c6fa95d16a6b69df8d93c153c67f0392facdd235a98296183e2787f2211b2502081307cef5bc9 SHA512 1d284755af4adcbb9d235d19a00ea0ab3e20676eec3e455da24a855e254996139d3c123f8d074bcaf7d53de04d34949ace799181d428fc322091c93c39702de0
-DIST cityhash-1.1.0.tar.gz 355571 BLAKE2B 9c0f6d032060c76b6fef724aa1ef79aff56d2a1ee223d2a74e58bbf7e0e7225079f5cdb0367c812f489744cc12a5af1f3163b4e4d96b450e5c13ff9e352b20c4 SHA512 aff5a513fd23c9ec11a02a62151d95e36959ef54fd75a9ae4b94ee72fe93a38295c343c03ed0b0c667c79191ca1119cf2362d7bb8b2f6d6dfa50e5134c9a2654
-DIST cityhash-1.1.1.tar.gz 376456 BLAKE2B 51e8f7cdf4b8f2f1957bb926b649b63087ab6067a916d2fa422c941e1b7911d4ee030cadf310afd349f2c136c0f7b6a8e1128b25021414b9e6be55a73e09e6b5 SHA512 f5476a608fad87770aa6622f3c9ac441db1a0b1731e5235bf8599499943184a1fe5b91329cb9153b363a3e34605f7641b233114440e8895791df7d13452bb4f6
-EBUILD cityhash-1.0.3.ebuild 417 BLAKE2B 0d8cb40fc6936c6f4a550a63c916ac0d59fd95ea73c871f14b40ec8e8322541bbda461cdc9b653fe99f08819940df00aa886eb59f2bf0ec6c77cdec14c8c7377 SHA512 ed3219fc14d87eabe123ab6dab50c271322a3f0100ef6f5980ccaac02fa44b1056f728b765ee2edad771cc094995156118420bf713a7413f17a27cd1c24aa643
-EBUILD cityhash-1.1.0.ebuild 417 BLAKE2B 0d8cb40fc6936c6f4a550a63c916ac0d59fd95ea73c871f14b40ec8e8322541bbda461cdc9b653fe99f08819940df00aa886eb59f2bf0ec6c77cdec14c8c7377 SHA512 ed3219fc14d87eabe123ab6dab50c271322a3f0100ef6f5980ccaac02fa44b1056f728b765ee2edad771cc094995156118420bf713a7413f17a27cd1c24aa643
-EBUILD cityhash-1.1.1.ebuild 417 BLAKE2B 0d8cb40fc6936c6f4a550a63c916ac0d59fd95ea73c871f14b40ec8e8322541bbda461cdc9b653fe99f08819940df00aa886eb59f2bf0ec6c77cdec14c8c7377 SHA512 ed3219fc14d87eabe123ab6dab50c271322a3f0100ef6f5980ccaac02fa44b1056f728b765ee2edad771cc094995156118420bf713a7413f17a27cd1c24aa643
-MISC metadata.xml 327 BLAKE2B f5ebb816bda91f32ef48da7325df42b9d4ddea856a1fe43b3b8add13649c38af3f0773ebac1108c86dca99487e2ea0a9d1d5b4e519b72afc86004c7aca6e036e SHA512 1eed425a6df4d772ff3afd7f336331fc4cdabcf60c30ebd8095b223c38b0ea53e3167578ef6a01a7692b5ce91dbaa381f62a9e567d48cfdc0f3f793857becaa3
diff --git a/dev-libs/cityhash/cityhash-1.0.3.ebuild b/dev-libs/cityhash/cityhash-1.0.3.ebuild
deleted file mode 100644
index 1216ca30895a..000000000000
--- a/dev-libs/cityhash/cityhash-1.0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Google's CityHash family of hash functions"
-
-HOMEPAGE="https://github.com/google/cityhash"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-#IUSE="sse42" should be added by someone with a modern CPU
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/cityhash/cityhash-1.1.0.ebuild b/dev-libs/cityhash/cityhash-1.1.0.ebuild
deleted file mode 100644
index 1216ca30895a..000000000000
--- a/dev-libs/cityhash/cityhash-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Google's CityHash family of hash functions"
-
-HOMEPAGE="https://github.com/google/cityhash"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-#IUSE="sse42" should be added by someone with a modern CPU
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/cityhash/cityhash-1.1.1.ebuild b/dev-libs/cityhash/cityhash-1.1.1.ebuild
deleted file mode 100644
index 1216ca30895a..000000000000
--- a/dev-libs/cityhash/cityhash-1.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Google's CityHash family of hash functions"
-
-HOMEPAGE="https://github.com/google/cityhash"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-#IUSE="sse42" should be added by someone with a modern CPU
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/cityhash/metadata.xml b/dev-libs/cityhash/metadata.xml
deleted file mode 100644
index fd584fe3d964..000000000000
--- a/dev-libs/cityhash/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">google/cityhash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/cl/Manifest b/dev-libs/cl/Manifest
index dbf19843eea0..66ff911559a3 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -1,6 +1,6 @@
 DIST cl-1.2.3.tar.gz 137921 BLAKE2B 66e79e60d9e5b16b7ff15ecfbccb928ce293a39ad72b403d885c676cd5eed0d1a08e7359a5f38bdfe22db485aacc314c0956585a04fdf3d2d6c10903b352172e SHA512 aaa19700b1b54921ea8194e1b7fcb2dbb11f22c32108fd99d0cd9796c7524a49653dcc97c8c8b34f7739d0b972cbbc3cf61b929e342429b524b11df93e434863
 DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630eae0fb2097f4b2ae0690e41bb96d3fd947186d90b88a68982f5af03bf0cf0f6375304f6a1d05395f018701 SHA512 f7a7f24abf6c374b42f9aa809984c818ac2514d013ff224b3392b2b5df1ba75f2b393ad0bcd822c4118dd0034ed4e815f83041f0b2350ba71def1b33b42e8801
-EBUILD cl-1.2.3.ebuild 617 BLAKE2B ad5a0183bb6e637ca146bd1c7c470c0989dbaa507312fe4d2a4e037f7360c1f2c7a9a15c0e60b8ab24bd9b5da9b91b4aac715521a19bb4bb57d58947486aaa4b SHA512 b73796dd9347e79f2bd908c90a7527a2f8c119c96ef248751136b1e60df240f4fe1fb43955569045450470745502ad36b0296127ca665f86d4f76c9c5de4ea17
-EBUILD cl-1.2.4.ebuild 616 BLAKE2B 15a804f2ca70c1c1111dc72383fda4f992489a59b5781225bb071e9b930147d49bc7ca13c41dd72a8f9a509ce7e22b17a3c990b796d51a90d201fc5edabb39f6 SHA512 a06d5ad4bc38c8c2a626a3c695910b2491195b2725e2daedc849c62d00d582ae9a2fe8a2059420adadd9a89702e62381f4213aad09ebb3911df83050493e1297
+EBUILD cl-1.2.3.ebuild 635 BLAKE2B 67ac565e74b69c2460b151735f2649363c03851327c45ba6ac55c29e070e06e916d8013684a6de4a94598ac28ca36cb74b251333b9e6524cf760fa231e8ba1a3 SHA512 62f58fed675694ac63511f3564fa6795e411f620ca23c6dfac94c7a10be94e20606613d59a2fe2851a0f03c1ce3d3fb5404c9cbdfe316ef080105b45b5c144ba
+EBUILD cl-1.2.4.ebuild 634 BLAKE2B 74ec2ef353fc14e19ab540cf94013a2e875fbaf43aeebdc0944bb3f0587ddcc5f0564b5912bdc3998b7915869cb70669205abf906f24dc11469a1e3a408ead38 SHA512 5ed4ad8eca7d4dac33783a4422df7b6cc4d2c4e406e17ef002675782f6237d44e3fc65c63af3b09f50e388e0d2cfc0194686bed91061ff9ea0442ff3f8ff6ba7
 EBUILD cl-9999.ebuild 598 BLAKE2B bf094e1740ce11fa5df1acb211576b4c2535b28abcb50ea8cee089597ecafff60e0b2638b45f270ab274f93a093d524dd3822e8d41a9b2456ccf5905d0f986f6 SHA512 9c19c9546d93683432aff81fe2bccc305b663c832fb85514879884dc76c6b52f149173ed0e05e5a0851e66bcc839bb1b5a4b9368e8a91d6057094e3b04d09c21
 MISC metadata.xml 319 BLAKE2B 103a4cc1fa1801324ec45de442cb3a2b21f73ee1215b0fc9fcda884783d42e3ebcfb903cdff4b2ed1b4dae60efb1fb07faf3d40905eedf4c412d9896ed8856e8 SHA512 b3bcd712352fb18ec4125fc66e6d5c6bae148afc1530742a834b6026c911c9b2848d51c133366a18d59dc7bd30c7943b506211f1fb905e7ca224239ba5d09bea
diff --git a/dev-libs/cl/cl-1.2.3.ebuild b/dev-libs/cl/cl-1.2.3.ebuild
index 04a7a2574ca8..b291edca5bff 100644
--- a/dev-libs/cl/cl-1.2.3.ebuild
+++ b/dev-libs/cl/cl-1.2.3.ebuild
@@ -6,7 +6,7 @@ inherit eutils multilib
 
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/tonyrog/cl/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/cl/cl-1.2.4.ebuild b/dev-libs/cl/cl-1.2.4.ebuild
index 060444f5d50b..0a1c0d77c1a1 100644
--- a/dev-libs/cl/cl-1.2.4.ebuild
+++ b/dev-libs/cl/cl-1.2.4.ebuild
@@ -6,7 +6,7 @@ inherit eutils multilib
 
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/tonyrog/cl/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index b1eb92f0578c..02a22661925a 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,3 @@
 DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
-EBUILD clhpp-2.0.10.ebuild 962 BLAKE2B 40113f00b7e8418cd2f2c60398bddff3a660d16ebd331f86e408ef4c02fb7e09f3639958b8260d4dbf96e7e80f417d717508ef67e33ba38907a1402fcc516a91 SHA512 f07fbb7909ea0140c82e10d286de56230aca67a6bfacaf7e5fba311374cee57bbdbfaee86f97c25a77a29f0fa69f4aa91419a1355549d58671bd4d1470a70aa7
+EBUILD clhpp-2.0.10.ebuild 952 BLAKE2B c9e73b82210db05466e0c5eede4d6594fd42f3dc405b767fed7bcfd47db1b4242d9960c0350128f69036d622f88827fe80034cdd4d317f2074db556d9bb5260e SHA512 c9e447c75d2a407bea0731b740da007fcc74c4733dad2f3e80e3f901385670539bcc62e087c324e426ff2e575a4bf402eb6d589bb04bae171a9d0deda77295be
 MISC metadata.xml 336 BLAKE2B cf9637d462e3606aa1a49639f60217f003e2271fa064d6bb36e9d1744c3b84815c0b75c2d42a3e761876879ea7eb92c32986f8e54926ed7e544690035985a86a SHA512 77d25c077302f6e92b83c869c45c9f91131160fa250f5a5087067e3291a1a0954e883ae110d20d9420cd9c01720803977ccf1d5ff6250bee91d6e5192798e55d
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.10.ebuild
index d3904087f96e..00c6a559dd9e 100644
--- a/dev-libs/clhpp/clhpp-2.0.10.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 DESCRIPTION="Khronos OpenCL C++ bindings"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
diff --git a/dev-libs/cppcodec/Manifest b/dev-libs/cppcodec/Manifest
index 3db5c1391876..bdf2e748386c 100644
--- a/dev-libs/cppcodec/Manifest
+++ b/dev-libs/cppcodec/Manifest
@@ -1,4 +1,4 @@
 DIST cppcodec-0.2.tar.gz 33984 BLAKE2B 248487326d3fafb104d469d16cddab86fe63dec6eecb74af6211c262a42ff8806ee97619459f9dca648107748e30268206e84d64efba47a9ea1c398eb4c06919 SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3
-EBUILD cppcodec-0.2.ebuild 777 BLAKE2B 2e191c3e6e69180df8c6e4a010b12e4e9924157dfc729225e358b58dd0ea63297f2115ef9bfcd8be307a28003edf1147ce0c4a009ce53d6e4f6d18a9234391e1 SHA512 b06784a7b988695e99acb58b292f89baf79508208558304ad952674b7c02f89cad7c9a168eae135c2c2c34d48bd9875c22dd80f15857a204063fdc8e9dd2361c
-EBUILD cppcodec-9999.ebuild 774 BLAKE2B 7b73f884b925c89694cd41531fada72c3851564c91e4d45fd14c10cf01b8e971d5c2a43073eb914efd4a5f1a9b5f4296fee538b8ca6a8f2d753efe2059542932 SHA512 7fc8be9364a979796773ab3024c05dcd21e8c44e3ba8531029f360a5af57ff9b53c47db49816482090ac4cb27303c35af5f0a04c1bf7c3dddf7083c1c412c430
+EBUILD cppcodec-0.2.ebuild 784 BLAKE2B d129f70a45306a4d920a901e8d399d7a41bdc71a15fb6c360468660141c176cff9f9e6a1973869eb073c417e6e75bb8ad132e9135015a47f9b478ee1e3250d6f SHA512 08325fc8fe28c24bbb20d3e2efc234c214a3469fc02a4c05664654103be6072913d2ca7cd925164ca9b732189e357c7539cfb92d595925f86c5fc071c02f8026
+EBUILD cppcodec-9999.ebuild 786 BLAKE2B e8b0a0a1f319805f4811733dbb8010370e6e2778f96fc20655487c25cc1bb672ac3b0d5dc86983ca95fbe2ed374ee16c71b4517464d80429e6703c56d9584352 SHA512 12463a8d0cf1adcaac9a24e5fb89ee88c87ffdbc770c7c52908ca15aeb5d61f8dcd201a007dd76a18dac315a59989380189b1ad9804dcdd466a677323611fc1a
 MISC metadata.xml 385 BLAKE2B b2d35f81b4df3fc6de6d0be3bb253131817980e55fb6b4e1f43c06ec07fb6bd4b6d102248873dd4b8831aa05139879a05953f0f6efccea05a1bb00e8cf5a94b1 SHA512 195de9b1b75f92cc00a943e8dcbda580d7994c0a94947fa964b46ab4ad979ffd85d6658d59908aafe8f265241bfb322eac1ec6586e403246c3eaedf7b2799c11
diff --git a/dev-libs/cppcodec/cppcodec-0.2.ebuild b/dev-libs/cppcodec/cppcodec-0.2.ebuild
index 28d85ba816a9..7bd99656f4df 100644
--- a/dev-libs/cppcodec/cppcodec-0.2.ebuild
+++ b/dev-libs/cppcodec/cppcodec-0.2.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/tplgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/cppcodec/cppcodec-9999.ebuild b/dev-libs/cppcodec/cppcodec-9999.ebuild
index ed1f2f4c8f3d..3f142b6b6db7 100644
--- a/dev-libs/cppcodec/cppcodec-9999.ebuild
+++ b/dev-libs/cppcodec/cppcodec-9999.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/tplgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
new file mode 100644
index 000000000000..94e4e94b6d81
--- /dev/null
+++ b/dev-libs/criterion/Manifest
@@ -0,0 +1,9 @@
+AUX criterion-libdir.patch 977 BLAKE2B 4d8c3510563d32a0b9bb8d61d90379173403f51046b87345e41f3f85014c8f88ff90b8c15fa0de1d99f4440c4d6d1a6f2735f73bf3e2f49bb87e6618ac16a97f SHA512 ff63aa827deb529c8e87978af9646cb52cc632edb7cd31fe398a989786303fef3830af3fbcedc59b1aa09268abc6c697f31355d084387e28067ebd3a1ad2c792
+DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
+DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16
+DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
+DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
+DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
+EBUILD criterion-2.3.3.ebuild 1072 BLAKE2B 11263468ead77bec500b65fad1873f37f11d01041843e1aa137812d4e1385b706920d397c32b9c23671a0a061b4ef0eaf38cd70e75ca8b31037cd69ba02f5b04 SHA512 1592287e01a1ebebfd13658db3de23a5c10d8ed162da81460519d522de23a898c994660861ba825ee57b6863f1aeb01930d98bfaf096f370d33de40c6eabc2e7
+EBUILD criterion-2.4_pre20200110.ebuild 1855 BLAKE2B d779528295bb21d92af34fda959032a1303d62e9e79f86ff5439deae42bb02d58365b11ef572973115d0506ca0641cee1438963d84de851dd99724b598c6f96f SHA512 cc297c64de4d778b0ed4156c3015c39380fad8a79536267985fdb953c7898cbc8006b87a59c4344d10d41171915cce757bd2c0e7a297b1279d90db34537955e5
+MISC metadata.xml 464 BLAKE2B 336514e525410272f84e05c76be4fad57be4198bc88ebcc5f048615f233a0b69035b27728e15b2190ba04c13671aee6756be24b4fe8a5b09118b78abef918529 SHA512 42131d0130a9d260ac5f305a261c883a3c6222c21abdeef290d9f71f3080932acbd4127eb44266b4c69c782eb63f18df4fcf4a5a97829d9f8483fc1d3d853a1c
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild
new file mode 100644
index 000000000000..1f2eda350a62
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake python-any-r1
+
+DESCRIPTION="Cross platform unit testing framework for C and C++"
+HOMEPAGE="https://github.com/Snaipe/Criterion"
+SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/nanomsg:="
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/${PN}-libdir.patch"
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_EXECSTACK="usr/lib*/libcriterion.so*"
+
+python_check_deps() {
+	has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCTESTS="$(usex test ON OFF)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use test; then
+		cmake_build criterion_tests
+	fi
+}
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
new file mode 100644
index 000000000000..d26ebb1a9568
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-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
+
+CRITERION_COMMIT="4b5174ebda04ab76fe65eec25b5b6ea0809055e7"
+DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
+KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
+NANOPB_COMMIT="6a6903be6084bb3f5a98a3341acef2aa05c61df9"
+
+DESCRIPTION="Cross platform unit testing framework for C and C++"
+HOMEPAGE="https://github.com/Snaipe/Criterion"
+SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
+	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
+	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
+
+LICENSE="BSD-2 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/nanomsg:=
+	dev-libs/libgit2:=
+	virtual/libffi:="
+DEPEND="${RDEPEND}
+	dev-libs/boxfort
+	test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
+
+python_check_deps() {
+	has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	rm -r dependencies/{debugbreak,klib,nanopb} || die
+	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
+	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
+	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" dependencies/nanopb || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch
new file mode 100644
index 000000000000..91b28b06b947
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-libdir.patch
@@ -0,0 +1,30 @@
+diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake
+index 593f2d1..a771fd5 100644
+--- a/.cmake/Modules/PackageUtils.cmake
++++ b/.cmake/Modules/PackageUtils.cmake
+@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
+   endforeach ()
+ 
+   install(TARGETS ${_LIB}
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib ${install_flags}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
+   )
+ endfunction ()
+ 
+diff --git a/src/criterion.pc.in b/src/criterion.pc.in
+index 18ac3d6..23737a4 100644
+--- a/src/criterion.pc.in
++++ b/src/criterion.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include
+-libdir=${prefix}/lib
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ 
+ Name: @PROJECT_NAME@
+ Description: A KISS, Cross platform unit testing framework for C and C++
diff --git a/dev-libs/criterion/metadata.xml b/dev-libs/criterion/metadata.xml
new file mode 100644
index 000000000000..5df5b2863638
--- /dev/null
+++ b/dev-libs/criterion/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Snaipe/Criterion</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index ce66e9f6acfa..28032d245da0 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -8,4 +8,4 @@ EBUILD crypto++-5.6.5-r1.ebuild 1507 BLAKE2B 4f2893230ded13387853392a152e07d06ab
 EBUILD crypto++-7.0.0-r3.ebuild 1067 BLAKE2B ea668821b86e1ce420bbc49f469526807479a1fe173fdb26446fec8dba74ddc311b5258ada39f3e3dcc92c571d9455762c70fbaf40f6913686ecf2dc1e5b3ea5 SHA512 81aa77ff0eb1468bf6e6d115c062e4493645843ded79840968d7a7276ed1651ffa2b5a11440e3e80b349f90ee78e3edb1b263e5ddf87a77f0096db76069b5dab
 EBUILD crypto++-8.2.0-r2.ebuild 1747 BLAKE2B b1942241db59fd6f8681daa9963d86ae740cce43fd004f57de4432af668b5584d5049db6c6eff804673948b4ee9f85e2a3b2865493db42e6a69a6d063967d9f0 SHA512 b31518efdacbf66c0f5698898ef98a4d8dea36809c3d1f84070cd2014920736209852194df0444794ebe1e9e261b2576e97862a78b77743b680e00b060b789e2
 EBUILD crypto++-8.2.0.ebuild 1112 BLAKE2B 60bc4870f0d483abc922f3590681cb7644ff3b2cd4234f2724e8d6b719afa04df730df7405435e45ede1a53e8cf6541fdc30e293a29321a7ff90b857ccd08d85 SHA512 6eea13d6963413a0dd4302ceafaa17d24d6e811f5b2295bdc209fb652aca79f6a699c2367e4921072b3edd5c1564e81c36a87bb827e411a55ea996a4fce81047
-MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
+MISC metadata.xml 428 BLAKE2B 6ca5f3c3550c7f7f20310c7dfeedc7925110a37d7924b2dfe7f34e3e6be5c3f2fa514135490bbe67390a4041bd81b3096dc21993978de631bf45f88f8ebbd3a6 SHA512 3c656067d4fef5353733a2c3ac3ca3798a0c57e8863e4479c304b4c5f4c1f1100f14b1188244b4f5125daf0ba1c9f5dca79e0cd0270cbff0001628511125e18b
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml
index 3227b3be7c78..4c8d518abcc4 100644
--- a/dev-libs/crypto++/metadata.xml
+++ b/dev-libs/crypto++/metadata.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>noloader@gmail.com</email>
-		<name>Jeffrey Walton</name>
-	</maintainer>
-	<use>
-		<flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">weidai11/cryptopp</remote-id>
-	</upstream>
-	<slots>
-		<subslots>so version</subslots>
-	</slots>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">weidai11/cryptopp</remote-id>
+  </upstream>
+  <slots>
+    <subslots>so version</subslots>
+  </slots>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index c43342bf0e04..08ef56ad2e9c 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,5 +1,6 @@
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 BLAKE2B 2d932e05863da6b108eec405e792003d6d8df4bde07bd044537729232a9b23e7261cbb33b82df7c5685ee96aae3e0aed62317f89e970fbedffea65bf9d89ccdc SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
+AUX cyrus-sasl-2.1.27-CVE-2019-19906.patch 706 BLAKE2B 5165697869a0ce71ecba927165e164df12b1329183e4215a888b64e0e7ca00fa22662bd97ddc2bc6e057c7655c0792f9ce6c20dfc5c351fbcb9a4af4168ce001 SHA512 3b9448f32216ce794b615b3c7c2e6acd6c01892ff35db78a55d44adc4cee3f540a443d5da5f07124bea134e2cfd88a45bb02b169a6015313d540caf363ab8378
 AUX cyrus-sasl-2.1.27-as_needed.patch 1141 BLAKE2B 7d289e96ef1f4593dd48db270dd698a7cf6f21aae3c58043b0f8af30c2d935b24d2a4902f39c9fcfc3261833d1b09032511919f15fc94f62527e46ea25cb2fcc SHA512 9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94
 AUX cyrus-sasl-2.1.27-autotools_fixes.patch 749 BLAKE2B b7f832a5e937053deaf1696f8dbf777ebf789df8165fe90f6d1be7efc47e4114a8a467c74f4acf06245e7ffab22f62436159cd610ebe5c5b0cef61f1cb01fb71 SHA512 0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64
 AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c7b4ef8415df55bf9c5ce821902331792056e6df63e366fd3adebfdf09f0292aae889d0db632521f37ec5ebf74005b71a474ccc6fe250 SHA512 4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904
@@ -16,4 +17,5 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.27-r2.ebuild 8118 BLAKE2B fab752538f93a5a09ebfddeb45d8274a25a68f8fb65bfe633503aafdba1e5f8772cb3265a29a9f0c09e9ff9dd0a91e2c186bd5b7c5dd33700968fa7199257f2b SHA512 db586ef972936f3f8d2d007a799cadfb16e00ab3caf076acf06d1b7344a495825d5128cd3789b4e25b513ab48f39ab4eebe586cdd631c28b88511d79cd67636d
+EBUILD cyrus-sasl-2.1.27-r3.ebuild 8159 BLAKE2B 5b2c95bef9d0f8c62fd26e4aea21edcc0eed0158e99cee1c7cf94bc545dbbd9d7a4f50b77a66dda0b52cbe05f65a1b60384fd68134f8f0170f835db72f62ebd8 SHA512 20154ba52f371fb290a7b1104d0ef8e67095dafff0b84aac4a41ba5adb840302ea7d5d2a1ef8a495378c603e69333cc1753cb8511cc302d2bc642bb38adc2e98
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
new file mode 100644
index 000000000000..800fbc9b1ac2
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+
+CDEPEND="
+	net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+	java? ( >=virtual/jdk-1.6:= )"
+
+REQUIRED_USE="ldapdb? ( openldap )"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+
+DEPEND="${CDEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
+	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
+	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
+	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
+	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
+	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
+	"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.ac || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# #486740 #468556
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Java support.
+	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		--with-sphinx-build=no
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	if multilib_is_native_abi && use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		# Default location for java classes breaks OpenOffice (bug #60769).
+		if use java; then
+			java-pkg_dojar ${PN}.jar
+			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+			# hackish, don't wanna dig through makefile
+			rm -rf "${ED}/usr/$(get_libdir)/java" || die
+			docinto "java"
+			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+			dodir "/usr/share/doc/${PF}/java/Test"
+			insinto "/usr/share/doc/${PF}/java/Test"
+			doins "${S}"/java/Test/*.java
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	doman man/*
+
+	keepdir /etc/sasl2
+
+	# Reset docinto to default value (#674296)
+	docinto
+	dodoc AUTHORS ChangeLog doc/legacy/TODO
+	newdoc pwcheck/README README.pwcheck
+
+	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+	edos2unix "${ED}/usr/share/doc/${PF}/release-notes"
+
+	docinto html
+	dodoc doc/html/*.html
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
new file mode 100644
index 000000000000..82b9e1fb6dbe
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
@@ -0,0 +1,20 @@
+Description: CVE-2019-19906: Off-by-one in _sasl_add_string function
+Origin: vendor
+Bug: https://github.com/cyrusimap/cyrus-sasl/issues/587
+Bug-Debian: https://bugs.debian.org/947043
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-19906
+Author: Stephan Zeisberg <stephan@srlabs.de>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2019-12-19
+
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t
+ 
+   if (add==NULL) add = "(null)";
+ 
+-  addlen=strlen(add); /* only compute once */
++  addlen=strlen(add)+1; /* only compute once */
+   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
+     return SASL_NOMEM;
+ 
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 76b36cb940cf..de1c94bce4c4 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,6 +1,6 @@
 DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
 DIST darts-0.32h_pre20181117064816.tar.gz 38856 BLAKE2B db4bf7ca88ceb81dcaee4494708d3f469dfc4f1ce53aa731f291d4b7d73f2c48a9e8d97caf32fd0bdd66aaba1c9e3e2e0289a5f2fdf7f5f1f2351c3808d6a98c SHA512 092cc833fff937365117f5b780f09a1ffdd25104ab57e36f7cba25a9a6bee289c105cae997a50b61b5b542c1c34d71bddf132d0ca14d563198b57caa9af2ac22
 EBUILD darts-0.32.ebuild 729 BLAKE2B 1dc4fef45e356b9a262761d3856ef7f738b410abf05ae38b3e9234d7add6628373742188d5de7e7d909e03da6ab80116f78758c18d82d90228dc0ea1c1ae6e4f SHA512 00b64494e1fe11c587c0a6112e6934574d081657a87f3ae0e9dce4fb5f769b946e52d58039f2d07b4d8ec57a048769fdd6e0830e73b5e1ca4ed11726dfbed954
-EBUILD darts-0.32h_pre20181117064816.ebuild 1353 BLAKE2B 8e2c0c1693cf8fb04771c4fd37fdf9b5b95f59bb45eb4580516baefa4f3aed401b16b14bfee11df28aff5c44cdb15320db4562c9b1f0ff8f83784004cf807522 SHA512 590c632a2626d2b86708b93af8fbe1fd0684e6348a90f4d142d7a6f91d2553631f3f3304120b53675a276ca4b366beaf0ca327d73376678488f9363931e10401
+EBUILD darts-0.32h_pre20181117064816.ebuild 1350 BLAKE2B fb4e22d356fbe4d0066110ace2c42916089c8afbbf1b2ba9b479627fe2f492dc6fda96b19cfc3dc0242f194567c4857318222a2850d8b0dc242aeb740f16a1f4 SHA512 ea90cefe82e89883b35a612569e5e5745fdedc9b262b9e19e875496d30bbe7a0e8eff203f6794a6c75cfa6f3729b867480b2f8f5ec23d994bb2de7b39d90383d
 EBUILD darts-9999.ebuild 1209 BLAKE2B fc98dc93002e7a6e7d4269cf2a13b8228056b29b72f8dee5519587bf8d4888678ee0748a86074d5e6b73d877a8d8fea7fa77eb31b998295cd99145b36496a0f2 SHA512 892651f7fdebb19693f99e03d1f3fda914aef6b91d56192692292252a1a3978bbf58e229bd0e9e051b3845ce7d5046d6aac05f86da850e252e3bf85913516592
 MISC metadata.xml 317 BLAKE2B ba86d84ef277a4804384827cd7ee4e9a94fd436a8c3b195c8f7060f69191a55f15530a4c8794ea810e3a3c568de194b85fd2d813baf3dc17c52c3297042b8cd7 SHA512 d00da6fdec16d16929003623603ebbc9ef6f6bd92da8773553a219d49b396e8ea18aba30d5a505ec934cf4688940a8ffde7e24d5e9eb2e210bf0801e9cfc795d
diff --git a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
index a377777d7d3f..92cb98b7532b 100644
--- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND=""
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index bfc37b4bf6f3..579e05adf786 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,5 +1,5 @@
 DIST distorm-3.3.8.tar.gz 219869 BLAKE2B 91be3a56f1ffcff96ab345c8dd42a4f17b22f40299c5c16b77b3074ba2e071d747aa2e91adeea3cb78e3787cc42d5ad4544b89c3ed5b7940d9156168acc8da62 SHA512 bf65fe500089b4aa38d6430eb985f1dc3494b43c829379c56f91b5b4b25d19504fa3781a2fb2b03946f541962f6e564e46d6ec464c469ee21ecb773303b8494e
 DIST distorm-3.4.1.tar.gz 220042 BLAKE2B a845fb3b5a3c98c1b25601896785273668b48c8477dd29c5db4c4ddcf3cdfe73095e3c4c883ca0909820430989a412d9b47c87471450eba2a4d969a9a03d32c1 SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
-EBUILD distorm64-3.3.8.ebuild 511 BLAKE2B 78d69d4c5a2ca795cfa16816e32639dbc101cee5791be4056cfc8b3f6bb87f39dd7e185bdb02b3ca6c76dd559ed081182bb1a7dc9b3b0e40bbdd529a30d530ed SHA512 c62d3efe2adfec5da4c7c49a2ce5e7adbf46e632ec6899151386f759555468f78965fae19b07d1c8c908d83ba36793ade075a7aa08133b53c5b1adea2a315628
-EBUILD distorm64-3.4.1.ebuild 511 BLAKE2B 78d69d4c5a2ca795cfa16816e32639dbc101cee5791be4056cfc8b3f6bb87f39dd7e185bdb02b3ca6c76dd559ed081182bb1a7dc9b3b0e40bbdd529a30d530ed SHA512 c62d3efe2adfec5da4c7c49a2ce5e7adbf46e632ec6899151386f759555468f78965fae19b07d1c8c908d83ba36793ade075a7aa08133b53c5b1adea2a315628
+EBUILD distorm64-3.3.8.ebuild 507 BLAKE2B e0d7040ef16fcf664b681e038147379ae463a51d8c4790ecffcfc0572563e8bc1b51683185a09b3c8f2058a377e24546ede7e6383f98d5b1350e63f74684fd3d SHA512 ab1f0ea5faa28c7fa35804f5e49d371e90d2e54fa95f79d32ccdbda46709bdd2425538b64bf2d0ed87778331031c6acb5a96eca22156b5bdabdf559d3c5bd1c2
+EBUILD distorm64-3.4.1.ebuild 507 BLAKE2B e0d7040ef16fcf664b681e038147379ae463a51d8c4790ecffcfc0572563e8bc1b51683185a09b3c8f2058a377e24546ede7e6383f98d5b1350e63f74684fd3d SHA512 ab1f0ea5faa28c7fa35804f5e49d371e90d2e54fa95f79d32ccdbda46709bdd2425538b64bf2d0ed87778331031c6acb5a96eca22156b5bdabdf559d3c5bd1c2
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.3.8.ebuild b/dev-libs/distorm64/distorm64-3.3.8.ebuild
index 7642f63664f1..7dfb9b4d3560 100644
--- a/dev-libs/distorm64/distorm64-3.3.8.ebuild
+++ b/dev-libs/distorm64/distorm64-3.3.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-libs/distorm64/distorm64-3.4.1.ebuild b/dev-libs/distorm64/distorm64-3.4.1.ebuild
index 7642f63664f1..7dfb9b4d3560 100644
--- a/dev-libs/distorm64/distorm64-3.4.1.ebuild
+++ b/dev-libs/distorm64/distorm64-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index bf67179a61c5..b11cdd24aecb 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -6,5 +6,5 @@ AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6f
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r4.ebuild 1750 BLAKE2B 9669a1d5b365f1d24c3ff6ca4e3df5f5af97a779c5f046eed3f0f13f8a85325e642872859c3900459120ee29338b9bb559ae73eb7cc5211e91dfb8a64edfc3de SHA512 b9f4531a4db6864f217fd61338b4fcb0111a36ade6a663c65445ca33a6b49cc1188ac73490d2c9c3c3b03b61e71c2aa9f912f63931853f6563261e3b4c31d42f
 EBUILD dmalloc-5.5.2-r6.ebuild 1916 BLAKE2B 431e238b85cb9fbb37a082202a33c715f5249e2da0252302d2b681b14c093b6590d258cf3e0190a66ce905933258bb8d9f802d42d006c5056eb162f4893dd364 SHA512 4bfa2ea6d13ad1cfa1524a1fc20dcfaee27d06153793c7947a6f4dee9a6ff59e2df3c18a6ea11ac2496cdab625fb57e3df8fc04cb16b200abca3846d4d90576b
-EBUILD dmalloc-5.5.2-r7.ebuild 1859 BLAKE2B ffe84f2ef5469befec20815930c4ceb5b7d47acb00f8558762de400e39e3a495c71f86a9418c4005c632cac9c2674685b91bdae2e76ed06c4254104c750471d4 SHA512 c6e015728e7f0a998bacdbaa0aeab56386a07b2748ecbbf15b286a0cdb584368918c70835ab1390f6bec2d3477e788e524d0f2fcdf2b49cdc4f2781d52c28532
+EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B b3816e5dd9133d47f2d68f5acc312a596dea6beb69d49aa16476004cc10197477d4a88ae6456ce0c49d0c512871f48df38550b817c1e90f407a0f6003d1c25eb SHA512 0968fed38e6aea52ef7d66737a99e6c0642077eda07b0060df050621d7675368eb251e357f32ad6951ad3e835158f3924bc25ed345f02728c49ff010d942830d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 1bb0426e3da6..51717d85c5e6 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 5a92e40a6c88..0775e15f5e6e 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,4 +1,6 @@
 AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
+DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
 EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
+EBUILD double-conversion-3.1.5.ebuild 463 BLAKE2B 4b65ca6b7edc17fecde068b415034adf95702956fb0f39b50a6c3787cc9c2c06f30749e530d060532ee0ecfd88d0b937412cdcf6de5fa1939a17d0df00006c49 SHA512 410c3295c4930671052206a6ddff0f9c6258e19a1d137d0a4c988d895394b10945e77cd3caf73abdde400a5c9218578dbbf0137d3dc6115c69b627b5e413c97e
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
new file mode 100644
index 000000000000..f1eee1853367
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 09065801ea8c..eb3f1edf5ba1 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,6 +1,6 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
-DIST editline-1.16.0.tar.xz 250376 BLAKE2B a9e080eb2b105f7c83dfbb26dfaebf07d7d2d664098504f4995b12b14b100420118ab70454afbba63518f4c510e2349b68923fade2412940e190177cfab442df SHA512 99e1070d9d658aaec82582d5148a58e7039182f9d73e755547bc090682821fbfb29af19261f38db9a0f022e304e8f8e779e79f7b21f57ad5c80af5bcf316c6f6
 DIST editline-1.16.1.tar.xz 251848 BLAKE2B 06cb75343f89c8698efc7c682c0ef968ca078e101b4c49193e009da18ebfe4cf9e3f630e27a25f2c0a05ca99e56efd0935db6da3d04027613a7c9078d01747ad SHA512 4c4e96c9218ab29c559dc8f0c2ca4015c149c70af1696cd43e7ddb38aba7eb68452a22718932bf40a83d3377ad73d26734109db13ecd4470170ef6fbcab6a9fc
-EBUILD editline-1.16.0.ebuild 779 BLAKE2B 69e9135b9e9ad50fd347cb21bfbae40fc826167a53c05f8267171d54f48d665903eaa454851e651a1cc83065d6fc0f1328338a9c2810234ca4f0d6a836d73621 SHA512 f85547ae9ae1143454bcb8540ed30752a12234716f36d77ddbe69ea3886f6cd9f60df67fe18439bde49895164c2b65c214611263ef092009f69ab0d014609e79
+DIST editline-1.17.0.tar.xz 252508 BLAKE2B 4e59de72a7c8e6d538685b01c32b55283ec9244927d79848bf5277beb8095fc125289c61c6c6e02cda8821df481d5f926569512030c42cd50bc8f5a050bb89d8 SHA512 e8a519d5380a84913e1438ac0cd52400078457be5dcfa4eadc7112d7c2c4ff6601b8e3da4eef55296b42c6e9b5ed5fb269698dd62c4542eef824b6dd262ddd5c
 EBUILD editline-1.16.1.ebuild 779 BLAKE2B 69e9135b9e9ad50fd347cb21bfbae40fc826167a53c05f8267171d54f48d665903eaa454851e651a1cc83065d6fc0f1328338a9c2810234ca4f0d6a836d73621 SHA512 f85547ae9ae1143454bcb8540ed30752a12234716f36d77ddbe69ea3886f6cd9f60df67fe18439bde49895164c2b65c214611263ef092009f69ab0d014609e79
+EBUILD editline-1.17.0.ebuild 779 BLAKE2B 720abc5941aece6f32b6380f048aa093ebfddccbbea9f7180ee96946be614eef95248981d53f3c993cf7c83f0eea22e52b7f16653e4e6ba87b2bbf6fc7332774 SHA512 16b833462f06fe21d320a0e74aed88958e5992fd73a6dd6b061a2fca604bd8a8b10a81c17acb1268aac69a3571a9fc66c6e3a899c909b19518c242428904a699
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.16.0.ebuild b/dev-libs/editline/editline-1.17.0.ebuild
index d11555380163..2846c63aa397 100644
--- a/dev-libs/editline/editline-1.16.0.ebuild
+++ b/dev-libs/editline/editline-1.17.0.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
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index a0ba047852d8..161869a5e298 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,5 @@
 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
-DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed
 DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
 EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
-EBUILD efl-1.23.2.ebuild 7479 BLAKE2B 71595b8282e68b883bea05412bffc03427d083296703aa057853df4829c4bff58334147b726949b3246a23c861a3ab894fdfdcfe29e235c6a8c03132a8ef7286 SHA512 859a09198ca5bf083544f8b2b21e81874c0fc69722ebb70507e15f42f8791b569fd337011d1345dd2a4a418ee2a3cbb7c4ceabb25272cbc85f37376bddbfce14
-EBUILD efl-1.23.3.ebuild 7474 BLAKE2B bc053b6d6fec7b7fb88acddaa68e83688a7cdb4f4c02fcbf8c2711c4a8261496ba815c4bf0b3de8d11bda772d82a09b334b862a361bcbc0a46a05949a4f1b04b SHA512 3f3f59ebfca187633e641b7e49da7907e825aebada2f70916b8ad4bb51ebac31500857473294b80d94fc0d38d424d937fae8aa017a4b6931b98452e42c538c42
+EBUILD efl-1.23.3.ebuild 7475 BLAKE2B a75a6ba0f44b7d164fc31150aefb1f5c36fefbb63a96b918d223bc63c0dabcaf5ad58ad642b70c81409679d71c2a6177c2d485f7d52a6dc2ca4ebfb201c635c1 SHA512 ee778fdb8784f1945f73e1b407b7a572504fb696ebee9e1b0b24e04c8f6018440122e88937595f78f960060021961eaf5bb537827dab97a63da9c36d9a837954
 MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.23.2.ebuild b/dev-libs/efl/efl-1.23.2.ebuild
deleted file mode 100644
index 4f5cd47d3360..000000000000
--- a/dev-libs/efl/efl-1.23.2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
-	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
-	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
-	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
-	tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
-	xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2 opengl )
-	^^ ( lua luajit )
-	ssl
-	drm? ( gles2 )
-	gles2? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	X? (
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20191101 )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? ( gnome-base/librsvg )
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	local emesonargs=(
-		--buildtype=release
-
-		-D buffer=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D install-eo-files=false
-		-D mono-beta=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D xgesture=false
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use elogind)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use systemd)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif use gles2; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	if use static-libs; then
-		emesonargs+=( -D evas-modules=static )
-	else
-		emesonargs+=( -D evas-modules=shared )
-	fi
-
-	local disabledEvasLoaders=""
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local disabledEmotionLoaders="gstreamer,"
-	! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
-	! use vlc && disabledEmotionLoaders+="libvlc,"
-	! use xine && disabledEmotionLoaders+="xine,"
-	disabledEmotionLoaders=${disabledEmotionLoaders::-1}
-	emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
-
-	local disabledGenericEmotionLoaders=""
-	! use vlc && disabledGenericEmotionLoaders+="vlc"
-	emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
-
-	local bindingsList="cxx,"
-	use luajit && bindingsList+="luajit,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use doc; then
-		cd doc/ || die "Failed to switch into doc/ dir."
-		doxygen . || die "Doxygen failed to run."
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	meson_src_install
-
-	if use examples; then
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
index 22e657b9eff3..822a2a5b0caf 100644
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ b/dev-libs/efl/efl-1.23.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
@@ -11,8 +11,8 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
 	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
 	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
@@ -269,8 +269,8 @@ src_compile() {
 	meson_src_compile
 
 	if use doc; then
-		cd doc/ || die "Failed to switch into doc/ dir."
-		doxygen . || die "Doxygen failed to run."
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
 	fi
 }
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 3a0b7199a917..da25201dbff7 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,6 +6,6 @@ DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
 DIST elfutils-0.178.tar.bz2 9007557 BLAKE2B 241b611dbfac37f35a670fbe80096c21b870e4b26fcddc8af26fba0373c9cd72eae42aabae2803b7b16c3bf649aeda036b1ea1b40952b43c4021ed23fcb51e80 SHA512 356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5
 EBUILD elfutils-0.176-r1.ebuild 1971 BLAKE2B e9ea01a2147d318c75c8c6157c2d830db85cba78585e96d182a52c39c55b97da56bbab955dd34bda74a9e28fcdc49441ba08812b86e055e53f3aabe01723d4e5 SHA512 f73f6d944944730a1b0d389a2b6a1a7dff50c7f1aba0332472180100c4869e5266b78c76f451d8ed00cbc6e58e2bd9d07f50ba9f97c1bae0a1b7940e21d0bea4
-EBUILD elfutils-0.177.ebuild 1990 BLAKE2B 5ac49f5d08c38e3b6819fac2c7b2e2df9211a0c95a7c72e6e930f41752d593c09747d932585aa39272a5478ffff8fd8d0557f98e69df2f6fa08464ec61d45642 SHA512 7e7ec503accb8f504fdd9eee61d6d96a26216730e3ef65a3d1b36e9d0ae38a4eaa62c2bb56a1364620253a437b1b57573febdb2834cb7b284e64aa8d9b34d8ff
+EBUILD elfutils-0.177.ebuild 1988 BLAKE2B 7166420f05ef008c6289c6f23adeaeef1f7d2a80df9b807154d4966b440bb96afef9f2029b24d4656286641f2524afb93e0fb0e9aa6b141c40c3cd41abbebb19 SHA512 8effb6a01bb9d16d0d68cdd731b05ca227347fd2ad94e5473b240bfd410d6c9881981b8637816ddfe7cd7e2bca912863b1f00299347c29b3ec3ff5d33dcb05e8
 EBUILD elfutils-0.178.ebuild 2094 BLAKE2B ed3352adc5be205c5eed92b686704eead7fc490645de277bcdba05ce03c7564a7601f6393a7e6538d25d7c9ea4433a570151077d9cfed733742130cdb2c7dca2 SHA512 e22bb08e2943398310f23be66939fe818594a926de5caef787cef0d6d6d5a0b7e4d6ee21e94590685b46a9ccef0bf118988251997cac92989c18fade7e9501db
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 205fdc10fcdf..618da713a0a4 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index a6c758604707..78aa5971ee69 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -13,7 +13,7 @@ EBUILD ell-0.22.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96a
 EBUILD ell-0.23.ebuild 1048 BLAKE2B 3ad500373c36074fd147ba65234f25b61ce46b9f1d7235625c749369e4a8b2e89682c48a6b78ebebf185be232a38ecd539eb644099cc4339cc538196c894b21f SHA512 07e80a76a8e6ae61b4c5183613140efc63704175772cdd90f734a08808ddd38659c5b1d4d10a25bd5a60c259e4f3ee754eccf9cafb1df51e1c9db914f9523a58
 EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
-EBUILD ell-0.26.ebuild 1050 BLAKE2B e825e91aa3cff7bf8a798c1ce32e0503b9384180d970e38c2a03419f0d25273c665a0210e84b15a1f3ce25e72d694b0b6e50684eabe4c188a5db1bacfd5ff549 SHA512 3a842d423c1e62182f786cab574520c4ec47781a1c64405999bb4133342a3e12d6c41afa71f1d6f4f56ceefe57d6cd78ade6fee3fdd7615c554b9a07cb83fe36
+EBUILD ell-0.26.ebuild 1048 BLAKE2B 3ad500373c36074fd147ba65234f25b61ce46b9f1d7235625c749369e4a8b2e89682c48a6b78ebebf185be232a38ecd539eb644099cc4339cc538196c894b21f SHA512 07e80a76a8e6ae61b4c5183613140efc63704175772cdd90f734a08808ddd38659c5b1d4d10a25bd5a60c259e4f3ee754eccf9cafb1df51e1c9db914f9523a58
 EBUILD ell-0.27.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild
index 50e688b1b154..9c1223c6f05c 100644
--- a/dev-libs/ell/ell-0.26.ebuild
+++ b/dev-libs/ell/ell-0.26.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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 ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index c9ac80e4746c..356d5da1b7de 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
-EBUILD flatbuffers-1.11.0.ebuild 709 BLAKE2B 9852190b172b501dc2607f5f29b03610b06990e3c5e4e08ba4634e0306dd6ba03f9866371e713b72669d0de7610c7ebdaa1793c225424c1d08b4cdfa6049d997 SHA512 75839617e7f54e2560471b7a7fc3c9056008a742cdb8eb1de00c8375e32403d1c70af2e4f6699a66cfba97425d7eb4396cdf22b7df65cbaefb03b556b778901b
+EBUILD flatbuffers-1.11.0.ebuild 697 BLAKE2B 389c3f6f198cba2729771f48fc5e93d3ee78378e2b623a81aa53270f28b62cb4906a96407754f08b68e2b628f7458ee35bf12650f1153931cd7a5b18ac2725c3 SHA512 9040890f80c55163c711df6a38129bb0a590cc78940a2f9104e02809966e3c9a3da8b6f01192d5e3990e80e8f1b04ccdd7cf096493e0733684a59420ffc8713f
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
index aa501d3ba73a..9f8719c337cb 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Memory efficient serialization library"
 HOMEPAGE="https://google.github.io/flatbuffers/"
@@ -26,5 +26,5 @@ src_configure() {
 
 	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 57c2e2cefeda..e3410fa0056c 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,9 +1,5 @@
-AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
-AUX 0.11.4-vala-0.42-tests-compat.patch 1445 BLAKE2B 913bb02f130c5f0d0485afa7c270c885cfac6e22d71fd53c0dffb2098659ac0dd27a57fa18641a0cee3b23bf394222a91dfd32c4e7c604e77c6a69ff4fd799f0 SHA512 61c32261a8eaefa381131c4f3115940d72a5b5af451d80a86d2d391b403436466f57d319fac97b4ab1a083c8b87bad656d2dc33f863bc9b0761c9b9275eb7162
 AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5
 AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
-DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
 DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
-EBUILD folks-0.11.4-r1.ebuild 2590 BLAKE2B c0181f04f4b1abeb6313bb70333cb843d0a6dbae10e38482c12ed4a6e5de25d9192319c97c56e5adab921abed78500cf2f4d16440635f4b13b195c41800269ca SHA512 a90d812c4949a1d3c4d6f7b9086c3d99a4b22ba3f13e94a2be6f95885ee34fa69c37b32ebfa721135cef50d09336d3563bfd84ce208e4986b44e84fe7a34ec59
 EBUILD folks-0.12.1.ebuild 2418 BLAKE2B 5535c5ab78643462090c1613e028f0976d512a837788c3f07347cfefbd7795d5b5c2288d6bd38b0b9c0f8bccba4f7ba63b629fdf8bdc2451c86962964e5b6849 SHA512 9780b550f38d7178a3c4b429db12e505974942a858a3e633a711a67eea4dcc66bb1962c954717f6ea710b182a01a9fc227d7de01badab7e6e19245456643b900
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
deleted file mode 100644
index 21b0e44ab968..000000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Fri, 23 Mar 2018 17:55:11 +0100
-Subject: [PATCH] inspect: Adapt to binding change of
- Signal.add_emission_hook() in vala 0.41
-
-https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
-
-Reviewed-by: Philip Withnall <withnall@endlessm.com>
----
- tools/inspect/signal-manager.vala | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
-index 4d1b6480..7c5b17a0 100644
---- a/tools/inspect/signal-manager.vala
-+++ b/tools/inspect/signal-manager.vala
-@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
-         return false;
- 
-       ulong hook_id = Signal.add_emission_hook (signal_id,
-+#if VALA_0_42
-+          detail_quark, this.emission_hook_cb);
-+#else
-           detail_quark, this.emission_hook_cb, null);
-+#endif
- 
-       /* Store the hook ID so we can list or remove it later */
-       HashMap<uint, ulong> hook_ids =
--- 
-2.18.1
-
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
deleted file mode 100644
index 7b453ebf1a9f..000000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 30 May 2018 14:20:27 +0200
-Subject: [PATCH] tests: Use FileAttribute.* enumeration
-
----
- tests/folks/avatar-cache.vala | 2 +-
- tests/folks/object-cache.vala | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala
-index d25245c0..ee32e9e4 100644
---- a/tests/folks/avatar-cache.vala
-+++ b/tests/folks/avatar-cache.vala
-@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase
-     {
-       // Delete the files in the directory
-       var enumerator =
--          dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-+          dir.enumerate_children (FileAttribute.STANDARD_NAME,
-               FileQueryInfoFlags.NONE);
- 
-       FileInfo? file_info = enumerator.next_file ();
-diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala
-index 62d208e6..f2a5188d 100644
---- a/tests/folks/object-cache.vala
-+++ b/tests/folks/object-cache.vala
-@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase
-     {
-       // Delete the files in the directory
-       var enumerator =
--          dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-+          dir.enumerate_children (FileAttribute.STANDARD_NAME,
-               FileQueryInfoFlags.NONE);
- 
-       FileInfo? file_info = enumerator.next_file ();
--- 
-2.21.0
-
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
deleted file mode 100644
index 01e0bbbfc3f1..000000000000
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.42"
-
-inherit gnome2 vala virtualx
-
-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"
-
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.40:2
-	dev-libs/dbus-glib
-	>=dev-libs/gobject-introspection-1.30:=
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-
-	bluetooth? ( >=net-wireless/bluez-5 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( >=app-misc/tracker-1:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			>=gnome-extra/evolution-data-server-3.9.1
-			>=dev-libs/glib-2.40:2 ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-vala-0.42-compat.patch
-	"${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
-)
-
-src_prepare() {
-	# Force re-generation of introspection files, otherwise it does not match installed libs
-	find -name "*.vala" -exec touch {} \; || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(use_enable bluetooth bluez-backend) \
-		$(use_enable debug) \
-		$(use_enable eds eds-backend) \
-		$(use_enable eds ofono-backend) \
-		$(use_enable telepathy telepathy-backend) \
-		$(use_enable tracker tracker-backend) \
-		$(use_enable utils inspect-tool) \
-		$(use_enable test modular-tests) \
-		--enable-vala \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings \
-		--disable-libsocialweb-backend
-}
-
-src_test() {
-	dbus-launch virtx emake check
-}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 421a6b07e391..13d0632dae92 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
-DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
 DIST fribidi-1.0.7.tar.bz2 2074943 BLAKE2B 9f2fccf46073c097ce89ab0b4ba640440b285e538a15a0ec3f8aba62ee5e892431e909c29fdcb793167eaea09fd4673ac33fbe12c7306ff9d26cbf871b9f565d SHA512 c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0
-EBUILD fribidi-1.0.5.ebuild 949 BLAKE2B 3d4c8524eb883cd96b6173c147575becdbb0128f05a91c7d6515bd3d1eb4e5f635636224240ecd389341ca24215f85bdab85ccb586db0259f683d6810685ac04 SHA512 450d49ba5396afc544f8bb7f0c6d8d9d7b4177ccc34bb50e6b8f56b6f6e943b4471bfc47ac7165485e070bc30b27703e838a01e2032aa696871a74494a62ffd2
-EBUILD fribidi-1.0.7.ebuild 1008 BLAKE2B 2f713298a279759176d4d82e86edd924b79c161ee69344e0a34a1d9dac375e289d1b3f85ef275c83124752052bee5e062af146d4e7842e7965ce6c539980b29d SHA512 43f157951a4d86e28411e1960e273fe933aef17323f11cfd72390f4759da9900d978c3d84b03fb5c76f3d674189c652cc26bc03d7aaecf45ce0d218253c0ffec
+DIST fribidi-1.0.8.tar.bz2 2077095 BLAKE2B 2b9a0887a02bf6bdd7f285aa1df012e5e8f675fc930b612f53a2cce5ef4ef275610ce9a1aec9debf4c5239164fdab4b175e36f8f07288949adf2496d01c95f67 SHA512 d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
+EBUILD fribidi-1.0.7.ebuild 838 BLAKE2B 29a886910e3751f47bced9de2155e456d9358378dd607ab3b9573f298a3f67fd4bd3064f9d36398c1ac7bf83092e669c1aa56699e0aaac5fb2ec3e694bffcb18 SHA512 9c1543c38b74a50b452a4f37e238008090ed2f797fb304757c3f09632f9c4334e3a93f6e4a5e57e7f71497efb4bf3ebee40ea77ff3cef3516a15b76eea156757
+EBUILD fribidi-1.0.8.ebuild 1006 BLAKE2B 3df89a6817664b4818861fcf53456c0e99868f80ea69bb2bd42d6c941495d6bcd16ca49029657e553beef4b2cb4e744a3c74efd06c0956416c09ec9249d08384 SHA512 d3d16c12a225057fbe8f73ac436a7c40a27dd2dcbd293e2e4942e8afaef3f5e33403a06b0ffd72b160941a3435a800bc896eaac1ef8b16e5cf1257888a98b320
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
index c68773ca628a..0323eb305a18 100644
--- a/dev-libs/fribidi/fribidi-1.0.7.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha arm s390"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.8.ebuild
index d7e0df067e60..901daca87d6f 100644
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit multilib-minimal
 
@@ -11,14 +11,16 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+DEPEND=""
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
 
-DOCS=( AUTHORS NEWS README ChangeLog THANKS )
+DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
 
 multilib_src_configure() {
 	local myeconfargs=(
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 62647ec06c16..c597aec6e404 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.28.0.ebuild 712 BLAKE2B d8a1cb04635910a8180fe89e7043bf83d8354f94ed5514699e01da520ffbc183d5a70aa2ff4563e9cf508f0e3d845ac4620a5bbf9c27101e9efbbf22ac468894 SHA512 8b09991df57fae9387cb7de7e6a5844468a4d0826ef01015295258a9a856d6ea49d79f920f656160117a2dfc5d81527941e788824ff22b1b5cd6fc217e06d350
+EBUILD gdl-3.28.0.ebuild 717 BLAKE2B 5420ef2fa53f6675cdf177e3023f27639d99ee74349f06b7c93238ed11d46a342661e2536703f598e045bf962f7df7c1136100166b5b0faa2146a8a113cb443f SHA512 80ce35b4557c73bf7efa803c4c495145d016735328d792ddeb542fd8118ed03e3187e5651239c3843e4b4be1b789260e095ea02ee9b7df06b1fcef0f294bcc9a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 2e0b06ba0e4a..81ce966a715c 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index a1ec5708bbcf..70583e5c7018 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,8 +1,6 @@
-DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
-DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
 DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51
-EBUILD girara-0.3.1.ebuild 1083 BLAKE2B c9ee97c48f5913e23aa56863341a37e9c1599eb3d0fae707d00486927cc475208b3d3f6e43e0eaf64958b940cad5740380cf659677dd9b7a02d0621d47f7b368 SHA512 31727a23a627fd6b48911d6319e69bcef3ec763d064ac035b0e3494b2551935327f2e800e8fb94fbf80a272fb5ede4a585dfa88cc7ba52e5c6cc5d9797aefacb
-EBUILD girara-0.3.2.ebuild 1077 BLAKE2B 89e2e2e59facb53bd15a3e9ef8b1c2c30ca9caf57487eb6e9cf3cf1d5479ff12cae8bb690e9b8a66dca280da896e10ac504c95731ae4bf89ba1e0ef8a69b6639 SHA512 0ffbf0888981ff105220e900acea9c77d466ca10fc34c2c99da552888000a555b3939f75aca8fd0fbbd26e870c9ed372b3327c729438e6ca8e2f5409b28b1b0d
+DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a
 EBUILD girara-0.3.3.ebuild 1090 BLAKE2B b203bcae62b7ff78315dadfef1b2af05940b674eb4e419545f76c681e015b4981087e27aed5856a27c0d9e25b029349dc5b377f480243ac799ebf4c6ac7d791c SHA512 5dbccfe1093db8dc02e52c443a6209e925fe18d16ff01fa4bb1c96c227524e17b54948da9147c17afa2814b998a238ca3f3a4f91e66c3012620b293e4a3e7583
+EBUILD girara-0.3.4.ebuild 1093 BLAKE2B 7d753f9c98ea966691fd46cee3951712463711c3b4a112200ac107a8cf2b160e8b70b1b65babaf78853ea90fb440efd384b5cb414c680a67fca16170dce43593 SHA512 8e02f847e54cf0e56ac3f001050d1b61d9acfc0460bff16660969f2e84ee147aa30d9e9a772297b53bfac89649cbe21adb1a1660e10e504e7345376dd604ac5c
 EBUILD girara-9999.ebuild 1093 BLAKE2B 0a62f68c47c162d367315463e9630bcda7d7a2ccc68b371734d0cfaab65d4f5047afb1f0caa9d34d2e047dc411197764a764e20050a6751e63666168f12e93ad SHA512 16e945dfee00040368ccc5e025cc613a36682020529afb9013d4a9533583d340a318c692f4877b7e8acbcb42fa8f500bb15c96e0b55268313928f26101e9f86c
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
deleted file mode 100644
index 7c63532c0a51..000000000000
--- a/dev-libs/girara/girara-0.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2
-	 dev-libs/json-c
-	 >=x11-libs/gtk+-3.20:3
-	 >=x11-libs/pango-1.14
-	 libnotify? ( x11-libs/libnotify )"
-
-DEPEND="${RDEPEND}
-	 doc? ( app-doc/doxygen )
-	 test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-json=true
-		-Denable-docs=$(usex doc true false)
-		-Denable-notify=$(usex libnotify true false)
-		)
-		meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.2.ebuild b/dev-libs/girara/girara-0.3.4.ebuild
index c1c097b8d7b9..635971d037ae 100644
--- a/dev-libs/girara/girara-0.3.2.ebuild
+++ b/dev-libs/girara/girara-0.3.4.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
@@ -13,8 +13,8 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 22e66cb75208..dab421cc8853 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
-DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
 EBUILD gjs-1.48.7.ebuild 1575 BLAKE2B 9575ca81c0f54cef94269398582a432584989999fa11266e7c7ba76a4429132d2b02993d6c23f3906f3bce08e0fbe040cfda63759ff163c4a36ff94a784293ee SHA512 b3322a094c9c1c10c2ee1693dc0e6532a58f34ac44c41b3ee12247490ada15ffeb4b21888712968f8fc6a38fa779020fc43f4dae65fae9ae5b652332e9f7a4d3
-EBUILD gjs-1.54.3.ebuild 1556 BLAKE2B 9fd9e8b7ae9511995a83a99a916c7c5afaf45b9a65a27aa4dc2f75c7f0ed77c794daa9bb7a541b36d3c8a230b628c4eb4705053120a08ff504ff1588e46c67cd SHA512 6ed337d8f79d3848159cb5ee234e6482e22b2cad42244e29b2ea3257dd1aca2fc9b6385bc8532703e109e576e609b95bba4474951335fbb51de755971a4a5ad7
-EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2d84c8877630973c34d759580e59af1b1616c17bb75248f18ed7d7383b39972e994dae7148e0083e8243bdcd555d022a79016e06d2f0b82f21340b230116906e SHA512 1827f6ddca0a590e275160110d630300519c8be48ae6eb0dfd8a912e4cd40ada8ad2b7c57a33bf2b2dfa9d266e5fd2e56714510834f805264e10bc083d90af1e
+EBUILD gjs-1.56.2.ebuild 1715 BLAKE2B 84fae82355e32da4da69fcc4a495851b5b8ff29750e00cc565485c3dd01c9e5b56e87c0878fa3640b75c13af02deae814433d03beb78fa243fb49227874c2d16 SHA512 083bc1d5e24cfaec246322bd5fbe5a33b99f489b0e21e724006f44e3bf587f06b3cdb4d2a45d20f1d85a9a2c57d0c628fc59153eaf07733fae87d88ee4ec6976
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
deleted file mode 100644
index b23457717dd4..000000000000
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline test"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0
-	>=dev-libs/gobject-introspection-1.53.4:=
-
-	readline? ( sys-libs/readline:0= )
-	dev-lang/spidermonkey:60
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--enable-profiler \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_enable readline) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
-
-src_test() {
-	virtx default
-}
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
index f747eb708a79..42e995523e17 100644
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 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.54.0
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index aa49f4955abb..86a4ccc60338 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,11 +1,5 @@
-AUX 2.58.3-CVE-2019-12450.patch 2807 BLAKE2B 68835ace4cd450bebc79d03059a03af313044a3f0d27bc4c33124c98dcbb3e20db525b2cbf7ec31627ce79754c3dfb86de7e97a7cbaab4709608a7ddb2015fc1 SHA512 ee6a1ee0ba89817be4e77cbfbfe8f25ad056d2a89f16aaf721b88e616e46374ac1e8488f1c4fc1fb689c260a3d0f9a54c7eddd826a77816830dc656d5698cd28
-AUX 2.58.3-gdbusmessage-limit-fix.patch 4343 BLAKE2B 07841524575efd1124d2f0956f27b27b016987786f388b9b76d6afc8e9f4eea2814b2d7d08ffb5721ae2d957a533066c407339baeb6f55d37d1f6d730e6ebf25 SHA512 c76a9b5ebbac0b596090fa4f5032ce62b3f985e9a5bd383a759f9014da8c33e27e0ea1a75d7796748a0f0ee751545a12c346d555e3ddafa82822cd9d5ab49e1b
-AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
-DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
-DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
+AUX 2.60.7-gdbus-fixes.patch 10740 BLAKE2B 0e42e8444c6308aebdeb240c935969015758bef744a21c4fa9d87eec6e52c0422660ad8ce6f2a2c1caf66369b66e8e7979345449a5322f37bed54f607df82473 SHA512 dbee2969935cb3d24d9bd518c78a02b815ff3bb468d1b04acef50ccd8dd5c38b7121a12f69df51d8a6f9944342e3101fe0bf5b3d87e3ae9e65257238769548eb
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.58.3-r1.ebuild 10912 BLAKE2B d7e4d3145a37b7235a481febec833f15cd3129ddc004e5203b5d62a3213ee428c99500497d5800c844017cadcfb2a9e35336997c0d64af4470851209e5fe1d06 SHA512 947306752168cee891d4d97ca86d95ca5e3a395a3cab849e171338a21b9297cc803e968d4a5468cd585666719f8a8e2d1cb0cdaba6b9ddc0d48bf3ff30aec9c3
-EBUILD glib-2.60.6.ebuild 10144 BLAKE2B bdc664e55173540a83ffc84dd5845bb125c305bebf6a8d5bff36ca0a50767a1db22a6de09f70d9da037c32fd706800ffa7d0d59701466959654d61ba9f17e679 SHA512 83d66effe9c6934eb0e8720ae861fc4d05107070eb8539a06794271d4d17cba0d5267040bf059b5752e57a8c95bd911d46a7c32c37cb3e0400ed1a75725bd38f
-EBUILD glib-2.60.7.ebuild 10145 BLAKE2B bdcd02e148bf05cd18a3b19e7829dfb85c279270c197c6ac9bd65c0ea5a715480c5ee62b56fb443d8d8d9e1120e9767b52ffb9b0fd3470c3ccee0b523ecfe56a SHA512 50d3b20b79d0294828e08b3c0284c2caf19aeaa0d94f0199afe9f5137e62d4401be01753c2717ec950214a5e2da430594d30d5a014f8acd5fe3e43a7f6210f1e
+EBUILD glib-2.60.7-r1.ebuild 10225 BLAKE2B a372327f0c949e571df0c39cf0241676f8135a27137cd9a3dd2870a583e11a78c5d19891ef305036d5743ef984cddca61350fc5bb9775c7f0ec35646c64852c2 SHA512 32bab19ea1e1af187594907f8d64d08f8b06500da1c243d8ec97a3fff457d29c3f9b4332984f13d387a5a56572cca3e88380129b05944841ba0ea8d74006e292
+EBUILD glib-2.60.7.ebuild 10138 BLAKE2B e46475b1609157713a0434389d8e3cbdc1513e76916d09cddb09ec9d6350c9683c4fb5397be2fc7352d51e626ffe2e2bd7cc6eeb80366bc04d656a78df24d704 SHA512 e9169b1ec23bc7283fb70d603e3040a89e0736682862dcd2bd19256aecb0e744d4248102e5e53d735bd5631e99421ad88d1bffe52080f78777e53fdc0bc35ae2
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch b/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch
deleted file mode 100644
index 949ac56431f1..000000000000
--- a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e6b769819d63d2b24b251dbc9f902fe6fd614da3 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Thu, 23 May 2019 10:41:53 +0200
-Subject: [PATCH] gfile: Limit access to files when copying
-
-file_copy_fallback creates new files with default permissions and
-set the correct permissions after the operation is finished. This
-might cause that the files can be accessible by more users during
-the operation than expected. Use G_FILE_CREATE_PRIVATE for the new
-files to limit access to those files.
----
- gio/gfile.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/gio/gfile.c b/gio/gfile.c
-index 1cc69166a..13b435480 100644
---- a/gio/gfile.c
-+++ b/gio/gfile.c
-@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile                  *source,
-         out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
-                                                                    FALSE, NULL,
-                                                                    flags & G_FILE_COPY_BACKUP,
--                                                                   G_FILE_CREATE_REPLACE_DESTINATION,
--                                                                   info,
-+                                                                   G_FILE_CREATE_REPLACE_DESTINATION |
-+                                                                   G_FILE_CREATE_PRIVATE, info,
-                                                                    cancellable, error);
-       else
-         out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
--                                                                  FALSE, 0, info,
-+                                                                  FALSE, G_FILE_CREATE_PRIVATE, info,
-                                                                   cancellable, error);
-     }
-   else if (flags & G_FILE_COPY_OVERWRITE)
-@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile                  *source,
-       out = (GOutputStream *)g_file_replace (destination,
-                                              NULL,
-                                              flags & G_FILE_COPY_BACKUP,
--                                             G_FILE_CREATE_REPLACE_DESTINATION,
-+                                             G_FILE_CREATE_REPLACE_DESTINATION |
-+                                             G_FILE_CREATE_PRIVATE,
-                                              cancellable, error);
-     }
-   else
-     {
--      out = (GOutputStream *)g_file_create (destination, 0, cancellable, error);
-+      out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error);
-     }
- 
-   if (!out)
--- 
-2.20.1
-
diff --git a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch b/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch
deleted file mode 100644
index 0828132003d3..000000000000
--- a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 2d655ef8954695cabf9e99cc61411de2bb4cb847 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Mon, 28 Jan 2019 14:36:42 +0000
-Subject: [PATCH] gdbusmessage: Fix check on upper limit of message size
-
-There was a typo in the figure checked against. Add a unit test.
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
-
-https://gitlab.gnome.org/GNOME/glib/issues/1642
----
- gio/gdbusmessage.c        |  2 +-
- gio/tests/gdbus-message.c | 72 ++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 72 insertions(+), 2 deletions(-)
-
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index 169e6fd15..2ad51f888 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -1984,7 +1984,7 @@ g_dbus_message_bytes_needed (guchar  *blob,
-                    "Unable to determine message blob length - given blob is malformed");
-     }
- 
--  if (ret > (2<<27))
-+  if (ret > (1<<27))
-     {
-       g_set_error (error,
-                    G_IO_ERROR,
-diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c
-index 88a9c5d86..74e0f712e 100644
---- a/gio/tests/gdbus-message.c
-+++ b/gio/tests/gdbus-message.c
-@@ -141,6 +141,74 @@ message_copy (void)
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+/* Test g_dbus_message_bytes_needed() returns correct results for a variety of
-+ * arbitrary binary inputs.*/
-+static void
-+message_bytes_needed (void)
-+{
-+  const struct
-+    {
-+      const guint8 blob[16];
-+      gssize expected_bytes_needed;
-+    }
-+  vectors[] =
-+    {
-+      /* Little endian with header rounding */
-+      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          50, 0, 0, 0,  /* body length */
-+          1, 0, 0, 0,  /* message serial */
-+          7, 0, 0, 0  /* header length */}, 74 },
-+      /* Little endian without header rounding */
-+      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          50, 0, 0, 0,  /* body length */
-+          1, 0, 0, 0,  /* message serial */
-+          8, 0, 0, 0  /* header length */}, 74 },
-+      /* Big endian with header rounding */
-+      { { 'B', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          0, 0, 0, 50,  /* body length */
-+          0, 0, 0, 1,  /* message serial */
-+          0, 0, 0, 7  /* header length */}, 74 },
-+      /* Big endian without header rounding */
-+      { { 'B', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          0, 0, 0, 50,  /* body length */
-+          0, 0, 0, 1,  /* message serial */
-+          0, 0, 0, 8  /* header length */}, 74 },
-+      /* Invalid endianness */
-+      { { '!', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          0, 0, 0, 50,  /* body length */
-+          0, 0, 0, 1,  /* message serial */
-+          0, 0, 0, 8  /* header length */}, -1 },
-+      /* Oversized */
-+      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
-+          0, 0, 0, 0x08,  /* body length (128MiB) */
-+          1, 0, 0, 0,  /* message serial */
-+          7, 0, 0, 0  /* header length */}, -1 },
-+    };
-+  gsize i;
-+
-+  for (i = 0; i < G_N_ELEMENTS (vectors); i++)
-+    {
-+      gssize bytes_needed;
-+      GError *local_error = NULL;
-+
-+      g_test_message ("Vector: %" G_GSIZE_FORMAT, i);
-+
-+      bytes_needed = g_dbus_message_bytes_needed ((guchar *) vectors[i].blob,
-+                                                  G_N_ELEMENTS (vectors[i].blob),
-+                                                  &local_error);
-+
-+      if (vectors[i].expected_bytes_needed < 0)
-+        g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
-+      else
-+        g_assert_no_error (local_error);
-+      g_assert_cmpint (bytes_needed, ==, vectors[i].expected_bytes_needed);
-+
-+      g_clear_error (&local_error);
-+    }
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-+
- int
- main (int   argc,
-       char *argv[])
-@@ -151,6 +219,8 @@ main (int   argc,
- 
-   g_test_add_func ("/gdbus/message/lock", message_lock);
-   g_test_add_func ("/gdbus/message/copy", message_copy);
--  return g_test_run();
-+  g_test_add_func ("/gdbus/message/bytes-needed", message_bytes_needed);
-+
-+  return g_test_run ();
- }
- 
--- 
-2.20.1
-
diff --git a/dev-libs/glib/files/2.60.7-gdbus-fixes.patch b/dev-libs/glib/files/2.60.7-gdbus-fixes.patch
new file mode 100644
index 000000000000..e2a066beec73
--- /dev/null
+++ b/dev-libs/glib/files/2.60.7-gdbus-fixes.patch
@@ -0,0 +1,301 @@
+From 1cfab12a28d97716ad581c30fbbf3e94e4d7f303 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Mon, 14 Oct 2019 08:22:24 +0100
+Subject: [PATCH 1/3] gcredentialsprivate: Document the various private macros
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ gio/gcredentialsprivate.h | 59 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+
+diff --git a/gio/gcredentialsprivate.h b/gio/gcredentialsprivate.h
+index 4d1c420a8..06f0aed19 100644
+--- a/gio/gcredentialsprivate.h
++++ b/gio/gcredentialsprivate.h
+@@ -22,6 +22,65 @@
+ #include "gio/gcredentials.h"
+ #include "gio/gnetworking.h"
+ 
++/*
++ * G_CREDENTIALS_SUPPORTED:
++ *
++ * Defined to 1 if GCredentials works.
++ */
++#undef G_CREDENTIALS_SUPPORTED
++
++/*
++ * G_CREDENTIALS_USE_LINUX_UCRED, etc.:
++ *
++ * Defined to 1 if GCredentials uses Linux `struct ucred`, etc.
++ */
++#undef G_CREDENTIALS_USE_LINUX_UCRED
++#undef G_CREDENTIALS_USE_FREEBSD_CMSGCRED
++#undef G_CREDENTIALS_USE_NETBSD_UNPCBID
++#undef G_CREDENTIALS_USE_OPENBSD_SOCKPEERCRED
++#undef G_CREDENTIALS_USE_SOLARIS_UCRED
++
++/*
++ * G_CREDENTIALS_NATIVE_TYPE:
++ *
++ * Defined to one of G_CREDENTIALS_TYPE_LINUX_UCRED, etc.
++ */
++#undef G_CREDENTIALS_NATIVE_TYPE
++
++/*
++ * G_CREDENTIALS_NATIVE_SIZE:
++ *
++ * Defined to the size of the %G_CREDENTIALS_NATIVE_TYPE
++ */
++#undef G_CREDENTIALS_NATIVE_SIZE
++
++/*
++ * G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED:
++ *
++ * Defined to 1 if we have a message-passing API in which credentials
++ * are attached to a particular message, such as `SCM_CREDENTIALS` on Linux
++ * or `SCM_CREDS` on FreeBSD.
++ */
++#undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED
++
++/*
++ * G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED:
++ *
++ * Defined to 1 if we have a `getsockopt()`-style API in which one end of
++ * a socket connection can directly query the credentials of the process
++ * that initiated the other end, such as `getsockopt SO_PEERCRED` on Linux
++ * or `getpeereid()` on multiple operating systems.
++ */
++#undef G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED
++
++/*
++ * G_CREDENTIALS_SPOOFING_SUPPORTED:
++ *
++ * Defined to 1 if privileged processes can spoof their credentials when
++ * using the message-passing API.
++ */
++#undef G_CREDENTIALS_SPOOFING_SUPPORTED
++
+ #ifdef __linux__
+ #define G_CREDENTIALS_SUPPORTED 1
+ #define G_CREDENTIALS_USE_LINUX_UCRED 1
+-- 
+2.20.1
+
+
+From 5f9318af8f19756685c1b79cf8b76f3e66614d84 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 18 Oct 2019 10:55:09 +0100
+Subject: [PATCH 2/3] credentials: Invalid Linux struct ucred means "no
+ information"
+
+On Linux, if getsockopt SO_PEERCRED is used on a TCP socket, one
+might expect it to fail with an appropriate error like ENOTSUP or
+EPROTONOSUPPORT. However, it appears that in fact it succeeds, but
+yields a credentials structure with pid 0, uid -1 and gid -1. These
+are not real process, user and group IDs that can be allocated to a
+real process (pid 0 needs to be reserved to give kill(0) its documented
+special semantics, and similarly uid and gid -1 need to be reserved for
+setresuid() and setresgid()) so it is not meaningful to signal them to
+high-level API users.
+
+An API user with Linux-specific knowledge can still inspect these fields
+via g_credentials_get_native() if desired.
+
+Similarly, if SO_PASSCRED is used to receive a SCM_CREDENTIALS message
+on a receiving Unix socket, but the sending socket had not enabled
+SO_PASSCRED at the time that the message was sent, it is possible
+for it to succeed but yield a credentials structure with pid 0, uid
+/proc/sys/kernel/overflowuid and gid /proc/sys/kernel/overflowgid. Even
+if we were to read those pseudo-files, we cannot distinguish between
+the overflow IDs and a real process that legitimately has the same IDs
+(typically they are set to 'nobody' and 'nogroup', which can be used
+by a real process), so we detect this situation by noticing that
+pid == 0, and to save syscalls we do not read the overflow IDs from
+/proc at all.
+
+This results in a small API change: g_credentials_is_same_user() now
+returns FALSE if we compare two credentials structures that are both
+invalid. This seems like reasonable, conservative behaviour: if we cannot
+prove that they are the same user, we should assume they are not.
+
+(Dropped new translatable string when backporting to `glib-2-62`.)
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ gio/gcredentials.c | 42 +++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 39 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gcredentials.c b/gio/gcredentials.c
+index 57a39f2a2..ff9b7e0b8 100644
+--- a/gio/gcredentials.c
++++ b/gio/gcredentials.c
+@@ -265,6 +265,35 @@ g_credentials_to_string (GCredentials *credentials)
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++#if G_CREDENTIALS_USE_LINUX_UCRED
++/*
++ * Check whether @native contains invalid data. If getsockopt SO_PEERCRED
++ * is used on a TCP socket, it succeeds but yields a credentials structure
++ * with pid 0, uid -1 and gid -1. Similarly, if SO_PASSCRED is used on a
++ * receiving Unix socket when the sending socket did not also enable
++ * SO_PASSCRED, it can succeed but yield a credentials structure with
++ * pid 0, uid /proc/sys/kernel/overflowuid and gid
++ * /proc/sys/kernel/overflowgid.
++ */
++static gboolean
++linux_ucred_check_valid (struct ucred  *native,
++                         GError       **error)
++{
++  if (native->pid == 0
++      || native->uid == -1
++      || native->gid == -1)
++    {
++      g_set_error_literal (error,
++                           G_IO_ERROR,
++                           G_IO_ERROR_INVALID_DATA,
++                           "GCredentials contains invalid data");
++      return FALSE;
++    }
++
++  return TRUE;
++}
++#endif
++
+ /**
+  * g_credentials_is_same_user:
+  * @credentials: A #GCredentials.
+@@ -294,7 +323,8 @@ g_credentials_is_same_user (GCredentials  *credentials,
+ 
+   ret = FALSE;
+ #if G_CREDENTIALS_USE_LINUX_UCRED
+-  if (credentials->native.uid == other_credentials->native.uid)
++  if (linux_ucred_check_valid (&credentials->native, NULL)
++      && credentials->native.uid == other_credentials->native.uid)
+     ret = TRUE;
+ #elif G_CREDENTIALS_USE_FREEBSD_CMSGCRED
+   if (credentials->native.cmcred_euid == other_credentials->native.cmcred_euid)
+@@ -453,7 +483,10 @@ g_credentials_get_unix_user (GCredentials    *credentials,
+   g_return_val_if_fail (error == NULL || *error == NULL, -1);
+ 
+ #if G_CREDENTIALS_USE_LINUX_UCRED
+-  ret = credentials->native.uid;
++  if (linux_ucred_check_valid (&credentials->native, error))
++    ret = credentials->native.uid;
++  else
++    ret = -1;
+ #elif G_CREDENTIALS_USE_FREEBSD_CMSGCRED
+   ret = credentials->native.cmcred_euid;
+ #elif G_CREDENTIALS_USE_NETBSD_UNPCBID
+@@ -499,7 +532,10 @@ g_credentials_get_unix_pid (GCredentials    *credentials,
+   g_return_val_if_fail (error == NULL || *error == NULL, -1);
+ 
+ #if G_CREDENTIALS_USE_LINUX_UCRED
+-  ret = credentials->native.pid;
++  if (linux_ucred_check_valid (&credentials->native, error))
++    ret = credentials->native.pid;
++  else
++    ret = -1;
+ #elif G_CREDENTIALS_USE_FREEBSD_CMSGCRED
+   ret = credentials->native.cmcred_pid;
+ #elif G_CREDENTIALS_USE_NETBSD_UNPCBID
+-- 
+2.20.1
+
+
+From c7618cce3752e1f3681f75d0a26c7e07c15bd6a2 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Mon, 14 Oct 2019 08:47:39 +0100
+Subject: [PATCH 3/3] GDBus: prefer getsockopt()-style credentials-passing APIs
+
+Closes: https://gitlab.gnome.org/GNOME/glib/issues/1831
+---
+ gio/gcredentialsprivate.h | 18 ++++++++++++++++++
+ gio/gdbusauth.c           | 27 +++++++++++++++++++++++++--
+ 2 files changed, 43 insertions(+), 2 deletions(-)
+
+diff --git a/gio/gcredentialsprivate.h b/gio/gcredentialsprivate.h
+index 06f0aed19..e9ec09b9f 100644
+--- a/gio/gcredentialsprivate.h
++++ b/gio/gcredentialsprivate.h
+@@ -81,6 +81,18 @@
+  */
+ #undef G_CREDENTIALS_SPOOFING_SUPPORTED
+ 
++/*
++ * G_CREDENTIALS_PREFER_MESSAGE_PASSING:
++ *
++ * Defined to 1 if the data structure transferred by the message-passing
++ * API is strictly more informative than the one transferred by the
++ * `getsockopt()`-style API, and hence should be preferred, even for
++ * protocols like D-Bus that are defined in terms of the credentials of
++ * the (process that opened the) socket, as opposed to the credentials
++ * of an individual message.
++ */
++#undef G_CREDENTIALS_PREFER_MESSAGE_PASSING
++
+ #ifdef __linux__
+ #define G_CREDENTIALS_SUPPORTED 1
+ #define G_CREDENTIALS_USE_LINUX_UCRED 1
+@@ -100,6 +112,12 @@
+ #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct cmsgcred))
+ #define G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED 1
+ #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
++/* GLib doesn't implement it yet, but FreeBSD's getsockopt()-style API
++ * is getpeereid(), which is not as informative as struct cmsgcred -
++ * it does not tell us the PID. As a result, libdbus prefers to use
++ * SCM_CREDS, and if we implement getpeereid() in future, we should
++ * do the same. */
++#define G_CREDENTIALS_PREFER_MESSAGE_PASSING 1
+ 
+ #elif defined(__NetBSD__)
+ #define G_CREDENTIALS_SUPPORTED 1
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 752ec23fc..14cc5d70e 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -31,6 +31,7 @@
+ #include "gdbusutils.h"
+ #include "gioenumtypes.h"
+ #include "gcredentials.h"
++#include "gcredentialsprivate.h"
+ #include "gdbusprivate.h"
+ #include "giostream.h"
+ #include "gdatainputstream.h"
+@@ -969,9 +970,31 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
+ 
+   g_data_input_stream_set_newline_type (dis, G_DATA_STREAM_NEWLINE_TYPE_CR_LF);
+ 
+-  /* first read the NUL-byte */
++  /* read the NUL-byte, possibly with credentials attached */
+ #ifdef G_OS_UNIX
+-  if (G_IS_UNIX_CONNECTION (auth->priv->stream))
++#ifndef G_CREDENTIALS_PREFER_MESSAGE_PASSING
++  if (G_IS_SOCKET_CONNECTION (auth->priv->stream))
++    {
++      GSocket *sock = g_socket_connection_get_socket (G_SOCKET_CONNECTION (auth->priv->stream));
++
++      local_error = NULL;
++      credentials = g_socket_get_credentials (sock, &local_error);
++
++      if (credentials == NULL && !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
++        {
++          g_propagate_error (error, local_error);
++          goto out;
++        }
++      else
++        {
++          /* Clear the error indicator, so we can retry with
++           * g_unix_connection_receive_credentials() if necessary */
++          g_clear_error (&local_error);
++        }
++    }
++#endif
++
++  if (credentials == NULL && G_IS_UNIX_CONNECTION (auth->priv->stream))
+     {
+       local_error = NULL;
+       credentials = g_unix_connection_receive_credentials (G_UNIX_CONNECTION (auth->priv->stream),
+-- 
+2.20.1
+
diff --git a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch
deleted file mode 100644
index 7615dbb248bd..000000000000
--- a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 69da419c33c24a05126d21fb3098139d30ba9093 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 19 Dec 2018 14:01:43 +0200
-Subject: [PATCH] build: don't build gdbus-codegen and rely on external
- gdbus-codegen for tests
-
----
- configure.ac                                  |  1 -
- docs/reference/gio/Makefile.am                |  1 -
- gio/Makefile.am                               |  2 +-
- gio/tests/Makefile.am                         | 22 ++++++-------------
- .../gdbus-object-manager-example/Makefile.am  |  6 ++---
- 5 files changed, 10 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4b15b69b8..9187a12bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3481,7 +3481,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 08093e8a0..9ce11f824 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -212,7 +212,6 @@ man_MANS +=				\
- 	gsettings.1			\
- 	gresource.1			\
- 	gdbus.1				\
--	gdbus-codegen.1			\
- 	gio.1				\
- 	$(NULL)
- 
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 05b20cdef..ed5d7d4cb 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS = 
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index c4e7a9257..4b538b1e9 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -253,9 +253,7 @@ gdbus-daemon-impl.c: $(top_srcdir)/gio/gdbusdaemon.c
- # These files are only generated on Windows builds inside GIO,
- # but we want them on non-Windows builds for the tests
- gdbus-daemon-generated.h gdbus-daemon-generated.c: $(top_srcdir)/gio/dbus-daemon.xml $(GDBUS_PYTHON_DEPS)
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_srcdir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org. \
- 		--generate-c-code gdbus-daemon-generated \
- 		--c-namespace _G \
-@@ -494,10 +492,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
- 
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.c gdbus-test-codegen-generated-interface-info.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
-@@ -516,10 +512,8 @@ gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gd
- 		$(NULL)
- gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
- 	@: # Generated as side-effect of .h
--gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-info-header \
- 		--annotate "org.project.Bar" Key1 Value1 \
- 		--annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \
-@@ -532,10 +526,8 @@ gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_b
- 		--output $@ \
- 		$(srcdir)/test-codegen.xml \
- 		$(NULL)
--gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-info-body \
- 		--annotate "org.project.Bar" Key1 Value1 \
- 		--annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 1d0464c5c..0603d9b0a 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
- 	$(NULL)
- 
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
--- 
-2.17.0
-
diff --git a/dev-libs/glib/glib-2.58.3-r1.ebuild b/dev-libs/glib/glib-2.58.3-r1.ebuild
deleted file mode 100644
index aba9651c1307..000000000000
--- a/dev-libs/glib/glib-2.58.3-r1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-util/gdbus-codegen-${PV}
-		virtual/libelf:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/gdb
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-"
-# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep
-
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
-# python depending package, which can be buildtime depended in packages that
-# need these tools, without pulling in python at runtime.
-RDEPEND="${RDEPEND}
-	>=dev-util/glib-utils-${PV}"
-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() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# 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/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch
-
-	# gdbus message upper limit check fix from glib-2-58
-	eapply "${FILESDIR}"/${PV}-gdbusmessage-limit-fix.patch
-	# gfile copy fallback security fix (wrong permissions at start)
-	eapply "${FILESDIR}"/${PV}-CVE-2019-12450.patch
-
-	# Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due
-	# to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do
-	# fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is
-	# installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
-	cat > gtk-doc.make << EOF
-EXTRA_DIST =
-CLEANFILES =
-EOF
-
-	gnome2_src_prepare
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
-		export PCRE_LIBS="-lpcre"
-	fi
-
-	# These configure tests don't work when cross-compiling.
-	if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		case ${CHOST} in
-		hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		*)            export glib_cv_stack_grows=no ;;
-		esac
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
-		export glib_cv_uscore=no
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
-		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# libelf used only by the gresource bin
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(multilib_native_use_enable gtk-doc) \
-		$(use_enable kernel_linux libmount) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(multilib_native_use_enable utils libelf) \
-		--with-python=${EPYTHON} \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=system \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-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"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	virtx emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" 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 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
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use pkg-config
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_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() {
-	# force (re)generation of gschemas.compiled
-	GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
-	gnome2_pkg_postinst
-
-	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() {
-	gnome2_pkg_postrm
-
-	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.6.ebuild b/dev-libs/glib/glib-2.60.7-r1.ebuild
index bc7a27071e05..1bb3dbb6dbb5 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_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
 
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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
@@ -79,6 +79,8 @@ 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
diff --git a/dev-libs/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index 752dfbde9ec3..9c72a2a20206 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_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
 
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/gmime/Manifest b/dev-libs/gmime/Manifest
index a64f240a9e39..559cdb84a7a3 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,9 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
-DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
 DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
 EBUILD gmime-2.6.23-r1.ebuild 1497 BLAKE2B 5526b533983b0cc9cfbf6787b8e02652c91abdb3b5403d68dbe01b94f150307e549014f924d430c06eccb3e82ec19ce5e6e4b40a16ed04e4f30f683c31b04924 SHA512 20830a222e7c0ea845168c0a76be0efad72474078f93e65f4025a70b4cfebd9fa2a667c49be7d445b50d342e456b714bf6b78040266fbb80778af93ca99e2a86
-EBUILD gmime-3.2.3.ebuild 1581 BLAKE2B d3b4f70d96de01af0cc7062245b218b246dbf71e21bde1a384f8b05ffd6ca2f71e1628f41ec7ad07188469aa00269cdd0aa3932c97240758c2fae2b3247d15a4 SHA512 33b540735166e91d3f2fbf2cd4bf3e41f700e950295a0d6116f0679e1a94cbdf0705bdd1f973c08258f445d10e4782f022b67ea338c6a1ff8cfd0b309e9adb5e
-EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B 961589b4af1f857d8967ab18eb74795241498ccf7ff47f263454884b5fbcbbacbee6f8bc3f133b75e97f225894cbd3789a70f39bb0656323475f75007d8f2543 SHA512 eb4cacf826c436b4329234327b57f78e9de8c221f5bb9e10745aefe44e0aa097121e6d9c81812f28043611f3f11a2f697191c5988c9f06400e271aca1d46b4d2
+EBUILD gmime-3.2.4.ebuild 1576 BLAKE2B d7c1a9f1a66e37324e2351c0da7477dd03643056b2f7273b6262246d381b9d307a375abf15ed3686d2e54c871b61996d60686e2a3591050173c9b9aa72d43f38 SHA512 0a5e469a40da8d76a574d1109a44a274d23d768ef92c2a2b8554e4ca0375f4d1aff9360aad21de64d01646f2be2272d0a0d62a782f4e7e5f84a4f857223b81fd
 EBUILD gmime-3.2.5.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.3.ebuild b/dev-libs/gmime/gmime-3.2.3.ebuild
deleted file mode 100644
index 124cc35b6ccb..000000000000
--- a/dev-libs/gmime/gmime-3.2.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
-
-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"
-IUSE="crypt doc idn static-libs test vala"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
-	idn? ( net-dns/libidn2:= )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index f5d59010489b..343aa1f57b70 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.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 609ccc3291f8..0c69958615bd 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,7 +1,3 @@
-DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
-DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-common-1.56.1.ebuild 997 BLAKE2B bf4ec76f6cd5d29d97f122a3c3d85a4d120d4825b2e40443e322d79c1000c10628d5ffb9609c4e6b7effe7d0c4de759ed163cb7eab93b509cc5b7be17c47f95f SHA512 dcb5da39162a0d5456970818b00b3bac0ed1577ba6b70c7b15aa55f3184a3e6c8e7eeeec74182fab852f8a86862f871a277281117cfc93292de2850f4b11decb
-EBUILD gobject-introspection-common-1.58.3.ebuild 998 BLAKE2B fd13c13bda5ce03694d2f035bcd6f7d033d79a170e0f65740da671a37fc54adffb2982f64898dd2e24716ab1e9749232bfb8de527d6f72245a5355c25f4475c4 SHA512 9367c044c3b103f8ba66af6ebf874602eda425035696bfe2df9164a85785f268b5ae780b3d516f55903218ab47fde07d3e29f95ab690277399bf619a6fcdf021
-EBUILD gobject-introspection-common-1.60.2.ebuild 998 BLAKE2B fd13c13bda5ce03694d2f035bcd6f7d033d79a170e0f65740da671a37fc54adffb2982f64898dd2e24716ab1e9749232bfb8de527d6f72245a5355c25f4475c4 SHA512 9367c044c3b103f8ba66af6ebf874602eda425035696bfe2df9164a85785f268b5ae780b3d516f55903218ab47fde07d3e29f95ab690277399bf619a6fcdf021
+EBUILD gobject-introspection-common-1.60.2.ebuild 997 BLAKE2B d349d5689ac2cabc2ae8b61c2a475a62edb4ea424146db4056a13694056cfdd2c0e4e1485c98e669f5d699668d71ebf9d8b03a071ec15fb8b0c6d74beede666b SHA512 4d88af9502c49e0826967d3b2f4cdd46bc690af69e71c8bed598c9400934dbf80468eae4f2689b421a6f9798b05f997cdd4aa6f68ee8b6f99eeffd38699e6f20
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
deleted file mode 100644
index 3511e0f42d79..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
deleted file mode 100644
index 9efbf2992a73..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index 9efbf2992a73..8d65b1bbfad5 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 2d5b2b1900dc..59cfd4cf42df 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,7 +1,3 @@
-DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
-DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-1.56.1.ebuild 2128 BLAKE2B 022e97fb86bba4759d526a9618fe9e9cb4a78798c0aa32f3275cb0f946efab379a1fc0f5963af293e29210fe075a4a0827e601f64bcbc716eacaf8d94cef05a3 SHA512 eb8ab69d84e4094f505359f909d9863a37aebadbb3d23b7a73b57e5d26196582968e11f473904e89c2649a20e8ea09159afcd9b481b371c6fc654f6fc3183978
-EBUILD gobject-introspection-1.58.3.ebuild 2205 BLAKE2B c247ce9eaa4bfb27c652410e2b222ec8359306007f521e94a9cb7ede164d6c131bdcfa7d251b001bcc550e09f79d021de8ef349a2bbb579a18a13874e4d33671 SHA512 a6d8b9da2461314cbae5947acad21e78c1d98b633b2f07b64304cd118d71517c61db1dbf1fac8e768ce13c91ba9d53d64d40af760e4691eef0d9068a7b2b5c4b
-EBUILD gobject-introspection-1.60.2.ebuild 2161 BLAKE2B 06f368c9a7d7af7707a7d341005925654f5c4709abf0cfe3f711b2efc7e6783a5ea75dfe2e5c7403c5d42dd0de6e3e9870088adf42a448cd4f273956857d2d82 SHA512 f282869d41287ebc9a5a18bf37f7db8757c32698fc31e9f56a8705ff5e3adef53b1fb29b648dbd8cc0be60ec13c5597d7cbdaad49e130a402c018c4e680259a2
+EBUILD gobject-introspection-1.60.2.ebuild 2158 BLAKE2B d9690af8c4a6a6b2f0d0c9a31ec7158c3e855105baabfcf64aace933f295b1333265dd481df3c467d71c2b88753a663a4c0d0aec0120beab9da37588bad261c5 SHA512 e477db99d94b884a9186374c1c9a02c3092c831c1de2a70a2480dd29201f1d3e36eb2b7df1792543103dfa4c02a9752049f37689631b4b1330931e408b43db7c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
deleted file mode 100644
index f67a001b4c1c..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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
-# We force glib and g-i to be in sync by this way as explained in bug #518424
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.56.1:2
-	doctool? ( dev-python/mako[${PYTHON_USEDEP}] )
-	virtual/libffi:=
-	virtual/pkgconfig
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.19
-	sys-devel/bison
-	sys-devel/flex
-	test? ( x11-libs/cairo[glib] )
-"
-# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-
-	# To prevent crosscompiling problems, bug #414105
-	gnome2_src_configure \
-		--disable-static \
-		CC="$(tc-getCC)" \
-		YACC="$(type -p yacc)" \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
deleted file mode 100644
index a543fde12578..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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
-# We force glib and g-i to be in sync by this way as explained in bug #518424
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	doctool? ( dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}] )
-	virtual/libffi:=
-	virtual/pkgconfig
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.19
-	sys-devel/bison
-	sys-devel/flex
-	test? ( x11-libs/cairo[glib] )
-" # autoreconf needs autoconf-archive
-# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-
-	# To prevent crosscompiling problems, bug #414105
-	gnome2_src_configure \
-		--disable-static \
-		CC="$(tc-getCC)" \
-		YACC="$(type -p yacc)" \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 5f85916a865d..3719359524b7 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 toolchain-funcs
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh 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 a59250117f06..5ef6a86fd885 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,4 +1,4 @@
 AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64512f0abce40e440e9a7fed30b497e1d8d14e267647a0022736befa1880b56b8e1c37a879892bd47381eb9e312f SHA512 5a98cffcff486f485ce9b73ddcee65566689d45df18f86a0a5697df1b2fb4ed3fa1bfe9a915bb8f22c2f3afc4f24da97b739bc1a61310b34fded75bd7a415eb8
 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675
-EBUILD gom-0.3.2-r1.ebuild 1597 BLAKE2B 6fb2e7324f6a5ea072a90f2e699ff0adeda2636005ff5be7b1913fdacd1fb2e465e370e79451a9347002599b313204be1bf79e8ec699bc0b90d7424c0919e91a SHA512 81d86f2c7cbe692c9bc909fbc82a650d32a6789e52d376f526974e20a32f7f83c06584f47671f6c6f097b414f0710d4a76176650653e9ed690c3ec4f86858341
+EBUILD gom-0.3.2-r1.ebuild 1591 BLAKE2B 2c29de492c91663ebc682ecb8baa7d59f0aa62baf913a31d972c4a7450275ff9c2689465eec7bfe21ce91fa2b1c7b273b1832f7799d305d826109f16017316b7 SHA512 c6ea43c72be19c8162a37891b56a2f1563ae2aea5dc076125d5286b577c2a633b54a50863ec5f532190d2772afed82f15db4b0537bdbef075ed18c4bb0a959e1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.3.2-r1.ebuild b/dev-libs/gom/gom-0.3.2-r1.ebuild
index 9f3a26b1dc48..78a1aa3ffe4e 100644
--- a/dev-libs/gom/gom-0.3.2-r1.ebuild
+++ b/dev-libs/gom/gom-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit epatch gnome2 python-r1
 
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 8149bbe8e8e4..74203e5d93e2 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,7 +1,10 @@
-AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d15147c27e9101a824d9518f4d1c0caad03395d96712f66bb2d16581d0e09389e1e15bfaca38c121786614a2f9b5f1b4b5c807f2efe SHA512 1a58a8bc28f4833f0a8562a06e6da4e9e150b3945077223ec4267bbaa5670cedc62d3356e1e61a93f9d60e9e887e99e28c35b13a50d42249a5694cd55c6242de
+AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9
 AUX grantlee-5.1.0-cxx11.patch 670 BLAKE2B 05cc62e9f343ed680583fd2a163910958c8aa96c48375611bf01b9f865ee3d519a961e1a33815cb82460b8915f6502ddb351c4cb3a9db11849ded590d33f28df SHA512 fe1186c9769243e8c670fd8fa7706a94addf17b29358365027c2f4ab6a8839b448118a333a9efdcaf111f818a507210b78ce72bb27e230f4df3fea5e320fd2e6
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
+AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
+DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
 EBUILD grantlee-5.1.0.ebuild 1239 BLAKE2B 10392499200868d40b52d9e0779d07885e56bfa8b4b9530393b515db7d04f65418904eb3b1116c367181b011ee56131d8b793f8d625f17816725089f6a9c74c1 SHA512 7261684b88313f1630213aacb14b42c03ddea49e821f22536a063ea86c1c111ed6542724813e788598e9b7ffb2a225f99543fa2a804d00a076d74d2e6b1a7bdb
+EBUILD grantlee-5.2.0.ebuild 1059 BLAKE2B 6288925c9ecdf515d4e326dfe0437e5034fac3368d4c8cae0590c468db70c1bb094ef17bd4b6d6c91c8bf676c0bc327757b8c124043be29ff173c7ac46de8dbf SHA512 9db22597d43b856ba0234832832b508b0ee5e07716dace1b57b18fafd01bc1d964ee58851955aa199be69e6a1cc56dfe6ad1ab0d6934cfc145dd90853ccf361d
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
index a25f52b3c63d..b35dc46586e5 100644
--- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
+++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
@@ -1,6 +1,9 @@
-diff -ruN grantlee-0.3.0.orig/CMakeLists.txt grantlee-0.3.0/CMakeLists.txt
---- grantlee-0.3.0.orig/CMakeLists.txt	2012-11-01 21:14:18.000000000 +0100
-+++ grantlee-0.3.0/CMakeLists.txt	2013-03-09 12:25:56.498096399 +0100
+Do not make linker warnings fatal.
+
+Gentoo-bug: 430968
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -62,8 +62,8 @@
    endif()
  
diff --git a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
new file mode 100644
index 000000000000..9490df2327ec
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
@@ -0,0 +1,67 @@
+From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 30 Nov 2019 11:55:33 +0100
+Subject: [PATCH] Install headers to a custom location to permit slotting
+
+That was previously necessary with Qt4 version, let's keep it while
+Qt6 is around the corner.
+
+Amended with target_include_directories fix by jospezial.
+
+---
+ templates/lib/CMakeLists.txt    | 5 +++--
+ textdocument/lib/CMakeLists.txt | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
+index 5058481..3ef29a4 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND)
+ 
+   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
+   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
++  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
+   target_link_libraries(Grantlee_Templates
+     PRIVATE Qt5::Qml
+   )
+@@ -152,10 +153,10 @@ install(FILES
+   token.h
+   util.h
+   variable.h
+-  DESTINATION include/grantlee COMPONENT Templates
++  DESTINATION include/grantlee5/grantlee COMPONENT Templates
+ )
+ 
+ install(FILES
+   grantlee_templates.h
+-  DESTINATION include COMPONENT Templates
++  DESTINATION include/grantlee5 COMPONENT Templates
+ )
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
+index 2c5a96f..c42d32a 100644
+--- a/textdocument/lib/CMakeLists.txt
++++ b/textdocument/lib/CMakeLists.txt
+@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
+       )
+   endforeach()
+ endif()
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
+ 
+ target_link_libraries(Grantlee_TextDocument
+   PUBLIC Qt5::Gui
+@@ -59,10 +60,10 @@ install(FILES
+   texthtmlbuilder.h
+   mediawikimarkupbuilder.h
+   ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
+-  DESTINATION include/grantlee COMPONENT TextDocument
++  DESTINATION include/grantlee5/grantlee COMPONENT TextDocument
+ )
+ 
+ install(FILES
+   grantlee_textdocument.h
+-  DESTINATION include COMPONENT TextDocument
++  DESTINATION include/grantlee5 COMPONENT TextDocument
+ )
+-- 
+2.24.0
diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
new file mode 100644
index 000000000000..5f7dff2d6d27
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit cmake virtualx
+
+DESCRIPTION="C++ string template engine based on the Django template system"
+HOMEPAGE="https://github.com/steveire/grantlee"
+SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc test"
+
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
+	"${FILESDIR}/${P}-slot.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/")
+
+	cmake_src_install
+}
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 2ded7500222b..1b4933251881 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,3 +1,3 @@
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
 EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1935 BLAKE2B 8020b2b39d8499899ab0b9f4b6fc6a4d97a0ec97dfc382064e7072972a7479cb38c6ab2e243007378dbeb6111223a489e17b161bc5286fa02bbcf3572cf6aa95 SHA512 193ba3ef31fb1be9895d150cefe0815749bf30ff81a612be64860eee0e4abfd9f7c9224e025b7d4150b65a827ded761858ac2cd361be606a3f9c79451abebcf4
-MISC metadata.xml 659 BLAKE2B cb156ee4a06d9725266e45fca2f085b74d6cf09e8f97a99a59961b2977f44669720ff15213ad84bcba95dd62df0f876d3a2fc75eb4e006e86a1baddd44c5d0c2 SHA512 36bae2c3d3cb19327990c2df04a591d77ee8a8d5f0b269b636902156e2e8315e00fbad6f1f8fac9776598b42423f4ab626ee8b576b897ad5b92ef7d2f3081e58
+MISC metadata.xml 540 BLAKE2B 6396197ca946971d1e954233589189f5e91dd4dc4fd6182f5cdf24890a5601a5e32fa71e2f4b2a676d346cb8feb1232467fa569f9348a5b788f5ee4a6838d7dc SHA512 3e0185fa3a56d0bb18f1256fe9e5c74cb5cdaea91cd24054d12243512012fdead25ac69c84a82d282b070bd73be2a9a7e313e858c05e6c2fe49bd38cba4d28d1
diff --git a/dev-libs/hidapi/metadata.xml b/dev-libs/hidapi/metadata.xml
index d5b410c9655d..81b593d1683a 100644
--- a/dev-libs/hidapi/metadata.xml
+++ b/dev-libs/hidapi/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="person">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index 27f4e2aac961..8aeff7732063 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,5 +1,5 @@
-DIST hsa-ext-rocr-dev_1.1.9-112-g3d9d98f_amd64.deb 1120410 BLAKE2B 653480e4209f7f6a0d8dfe0f8a8948ef44d2aa2a415f33ce9c4ca8ec8dc3b3e0dd78dac9a3d80bb45f5202df49dc2aa5b329e285968853e0bcaf6673f76d714e SHA512 28fb2ecedb2094782376efcab2a5292cb4f3e58dbdd8ba8b520dfca7d230d30326939dc3964f6e1be841e41829bef44b96573ffdbcad187f02adb11ac70401fd
 DIST hsa-ext-rocr-dev_1.1.9-122-ge5c4efb_amd64.deb 1120322 BLAKE2B 40c60058c2b6d6debf80503c36f6b0ddc72747c7327e411121f99fa2e507e5e9414cb91c80be0acf283bff23a6a029b3ef199577846b694b2e2e11696cc7d225 SHA512 60dad492cc66f249d48fb057b2ecec1719525a871d38f39a403a55de98e8cdea5f00f672fa3ea697490c287ba7e5c3be035f1f2861a7fc97d9b949f575e51ad7
-EBUILD hsa-ext-rocr-1.1.9.112.ebuild 1161 BLAKE2B c0892ada0cdcb0bbc511755218382809b3fc266230e4d41a495a4d63ad83bb5d144b67808ca55889fc6b96ca506ce3de56d3505c98e2c28407a91a6d192c66e2 SHA512 347291970514118859262e1b3357bc7b65c9d142e020653a4069a632345efbdd5c93d11459ce07f2f622a667a0147b171a1911bc2e307e2d2ecce0f6535dbeff
+DIST hsa-ext-rocr-dev_1.1.9-139-g0d1ca36_amd64.deb 1166210 BLAKE2B 3edcc938ec92277a163886df4e83f93f6a38b1ec4e95e719265f7a595d291fe4beef68aeca3fb09f8f56a0abf041a987d57e2469310da8cd16f2352b2af5077c SHA512 dbf7991b404cc371575e5d8c40f438bbead8bfef5c73dfd3b7295d64f800892c1f220a6eff8cc67d99ca4bec819bf1b69e37f85873ec372dca9bdd42542fa320
 EBUILD hsa-ext-rocr-1.1.9.122.ebuild 1161 BLAKE2B f80763569f5f6524de62b94e0f1907d38d53592360fd736d9b01c7800dc89cae05b93f522cf853121295f2016743eb1e1f2a810cec170f1b1ddbf57cdbd1f545 SHA512 dcafb018921d836207078d7a61ebe7b8639738bfc916e6a46e471795781e34172bb978c28c89de7e715f787598aa6506d46445ebd5996c9f82fd6d1c1cf383d3
+EBUILD hsa-ext-rocr-1.1.9.139.ebuild 1161 BLAKE2B c33f99d9e43a38637e29028b8b038e69edffcede4aa6693fa0f464bdab3d55c025b3a560fed2494295cb9bc96db27f385bc55db88df3309d3b9c48415f1a0b27 SHA512 1cea196c49e51316da4b3091e795a74f54bae8d88601907509f2b2968fa3a2e796de62ee4d8a6beafc0830157a8d134a4b9f8f67bbba1f2b85638e673c48765a
 MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.112.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
index f423e5899b06..c6e7178bbc10 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.112.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
@@ -9,7 +9,7 @@ MY_PV=$(ver_rs 3 '-')
 
 DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
-SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g3d9d98f_amd64.deb"
+SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g0d1ca36_amd64.deb"
 
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 7f6ac57e3d20..8cad4559a04a 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -4,5 +4,5 @@ AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
 EBUILD icu-layoutex-64.2.ebuild 2557 BLAKE2B bf296e4c6aeb9efa43289ae335dc5a821480694c9ec45f0a5d4241c5611892bf70b7e55982398d6f583a1ac18dafa1d1addc1c8c0b9708f4b629ce5a03793cdd SHA512 0621a4c9e5da886127fad73dddbf6ba5be4eda63069e8287133569c830ba728089c308167042eea20001ecf72c5286caf76cc9d4d62d3d8acc3a7a6b32ade903
-EBUILD icu-layoutex-65.1.ebuild 2584 BLAKE2B 301cc12f7b5c758ab5a85d6748ffa9e94ff699aa33fae6e59f244d2a2782fcb632aa9acb18cee817d4ca3cdc08350d604a399e30d86e271f41eed75c56a75d84 SHA512 e1d903a29915821c1ffab8e4c5070fb161cef4e8ccd6abf797eaef7541aaadb22958f3d0cc1d934f527d102ccb0d831272a810535d4c2cd4b62ce86bcdb3f76f
+EBUILD icu-layoutex-65.1.ebuild 2576 BLAKE2B 5c61418aaa55f4c16fa4548d6ecb8ad90bf9aa82e67f93221f8ab7874f0ce4d78d437461520086abadcc9ddb32777b73fd6585ffd614227b001223a81f57fa9f SHA512 4732ca4b043cf25ea6e6b2cf8e97827d9c01bbe9d4ef271652d68cc9cdd94101ef79aa3e7f417a503b936bbdfc5d23291868a709fd7b678ca71b3f917c7c7067
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
index 39c599c35b15..a517c9eed792 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-65.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 5e746e797d2e..17baaff384ee 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,6 +5,6 @@ AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-64.2.ebuild 3424 BLAKE2B 455ef59b9f573a627eb83438bd98d2f71c82bcb800934373fe5e5ed3005efc05ec650ee699e00fbb4bf85073bdb686c849cbce11fa0b97816db961f4303903c6 SHA512 9f02fe5ddfe77f9dc2528d7aacf4eaed43eb5322396e3a3f7f275e38d90261f2cb77470babad8a205a62ef7cce41aedf1a064ab3e19d5709cacb38d4cbb74794
-EBUILD icu-65.1.ebuild 3402 BLAKE2B 530737cf53623fc9853338799a78520f47f76667da7bbd29e4d21f5cb283b7e2c84b7d18dd83674fe28ace4c47945503c3796fa6b1bfa1ffcf214e4d1a2c3da1 SHA512 9e43b9b81178ca6fd346864981fd3da6f565778d703098312d9c0b325f7efe27c87505efb02966ac266afac551b0ca987c93d19c30058667fb015512be74f539
+EBUILD icu-64.2.ebuild 3422 BLAKE2B a277c1e83caed5e48bd4b3fa78caeec2f29b45c49079f6e77436e2e0772e33bae625aecfa174655baa87c7310541329740193886d2a03e3736417f5c2adb429b SHA512 c832930330efb5ecc013a407a1731f1d0d42a84214a37297812b5637292524126d2f7cac86603f27793fe5f90bfa96e5a5d7eeb61af68947902e77b4585501e0
+EBUILD icu-65.1.ebuild 3389 BLAKE2B c50e11638de130474229373c97ca1cf7bee5188f10bde06a2ac1d857ad01355f11c70fec05d19a873af644e8d3b433a72b273f3bd68b55f698045d70ee6b77c6 SHA512 1a0f39459656e8f6de59182546079be62107e58da641803b7a1217037488020267de1c89cd64d4e5605da8e304b0a505b6d4ed1a12988d02d36c34dede13cab4
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index dcf1aa1467ac..8bf3f21fb54e 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
diff --git a/dev-libs/icu/icu-65.1.ebuild b/dev-libs/icu/icu-65.1.ebuild
index a8993d916efc..06bb127ba757 100644
--- a/dev-libs/icu/icu-65.1.ebuild
+++ b/dev-libs/icu/icu-65.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index c067cda45f6c..cb77ab53e8a9 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,9 +1,11 @@
 AUX isl-0.07-gdb-autoload-dir.patch 871 BLAKE2B c3bbc1db60cbf0c844839f07190e81265e606d7796438be1e7d370f559316f4a0096ce12fc93b583c0663de83592e6f4c50bef838eb42273059ac2cea16e17b5 SHA512 ffe4db1e1bc2199718667d7e3835d5d3fcabfa82402d39ec540fb86641ced3a46d43cd60682188883927c796925679142b4481b231d218bd776cb3c08ef8117e
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.22-bmap-nullderef.patch 1223 BLAKE2B 21af9877b9a6ea9645ad1b86f40dfd6d4a0bf8f68e905c34deb5aff376791de7f363c4086a7fab63fa0aaface5488c58fce25e583558c055502d6437d9230687 SHA512 56cb1c77b16b03e2c6a50a6cc2e6e8480027b4874ebc56660d931c03468c6c8c5f21fbab5f5d27b7b93bbf6d7680b52e52349bcf433456a8cd2ec4a7bb8a0ff7
 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.tar.xz 1676992 BLAKE2B 1cb2125761adec02d9f337e8730faa5bc3a4e63cb7d968f7f4de3a3360b1f9be6caf6a27031f02df1ebe149fb70b6a32bdddbe8ae03032b8ff366f4eac274483 SHA512 7c3c9502ea07e4d47a823841837c3aa0b9d7ba0fe58deaf180734e44c18e53735ec783645da0bdc56b617c9e639b226cc03b40a947f852e1e787166a64f59424
 EBUILD isl-0.12.2.ebuild 1026 BLAKE2B 8757a140cee7104d9907c54bd72836aef56ad58c3b2972f9b130831ca0b2eda1eeee45a896eca8b28b08a22cfc2d11d053ee73d677127fea4450bbde7e6a5390 SHA512 9e40b23cef96116fd7709e8b4e0fe74cf7f54b410bb8676ba95a7d8c87d76e4be5339a68cf7ac036ef3dcbd88a1c711649b0497c015003f78c43fcd9d1e808d8
 EBUILD isl-0.21.ebuild 1237 BLAKE2B 579f3ed0505f6f65bea2de1f430bbd176483601ed209123b1c2f2ea42bc12757fae3f87100b9cc8ad6ffaa52b6bc1e6b3c2e9b2cfc676409c12f95e16238f79b SHA512 875116ea7e07024e08908610c2dcb0bdc8e74c8d55b213c2bd92e897741f72d216e64e5ba0ec5d1dacc6cdb44a47d9594716f9b90f12d6c4677267ae8698a6c4
+EBUILD isl-0.22-r1.ebuild 1391 BLAKE2B b2397fc0584d2e7a45e106ccb2781243ac678c68450c3e0c79681189da90ba911392f41c52128f1f9b2330374e6b80549144c65c1403b8102f6667417bd7d526 SHA512 f6c99d205e9c07b11e3dcaecff783eb017baa4679fece494975dd5c6005280d3bb9bb75e8e3383b838c012013e3c756faf5a54241d05377b0bef6395363f9f5c
 EBUILD isl-0.22.ebuild 1344 BLAKE2B d2cada2dcaa6f46c38ecb0d199d71e0c5456736a17d9acd757aa8fe8c7d9297cfaf0a187d67b2bb0d508ef503020bf164d2b60563dae57a550fb03833d895532 SHA512 16f6e4f0219eeed1108814c6921a4bee91ced76782ecb9dae34423c23b82c3a68246e5955bee6714bb47d8a8b559d940366d427b28da452ebe2f461a09cd2d4f
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
new file mode 100644
index 000000000000..00104f1f4321
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
@@ -0,0 +1,34 @@
+https://groups.google.com/forum/#!original/isl-development/Otz1QKZDpzA/71GkTvqkCAAJ
+https://bugs.gentoo.org/702968
+
+Subject: [MAINT PATCH] isl_basic_map_underlying_set: fix error handling
+Date: Tue,  7 Jan 2020 23:02:42 +0100
+Message-Id: <20200107220242...@kotnet.org>
+X-Mailer: git-send-email 2.24.1.591.g12029dc57d
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+From: Sven Verdoolaege <sven.ve...@gmail.com>
+
+The check for a valid bmap before accessing its n_div field
+was inadvertently removed in isl-0.21-230-g6a4c4bbf31 (isl_map.c:
+extract out shared isl_basic_map_{take,restore}_space,
+Thu Aug 11 10:27:49 2016 +0200).
+
+Reported-by: Richard Biener <rgue...@suse.de>
+Signed-off-by: Sven Verdoolaege <sven.ve...@gmail.com>
+---
+ isl_map.c | 2 ++
+ 1 file changed, 2 insertions(+)
+--- a/isl_map.c
++++ b/isl_map.c
+@@ -5511,6 +5511,8 @@ __isl_give isl_basic_set *isl_basic_map_underlying_set(
+ 	    !isl_space_is_named_or_nested(bmap->dim, isl_dim_out))
+ 		return bset_from_bmap(bmap);
+ 	bmap = isl_basic_map_cow(bmap);
++	if (!bmap)
++		return NULL;
+ 	space = isl_basic_map_take_space(bmap);
+ 	space = isl_space_underlying(space, bmap->n_div);
+ 	bmap = isl_basic_map_restore_space(bmap, space);
+-- 
+2.24.1.591.g12029dc57d
diff --git a/dev-libs/isl/isl-0.22-r1.ebuild b/dev-libs/isl/isl-0.22-r1.ebuild
new file mode 100644
index 000000000000..807d8300e4a9
--- /dev/null
+++ b/dev-libs/isl/isl-0.22-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal preserve-libs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.22-bmap-nullderef.patch
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21)
+}
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 63d2bd7c085a..b8dbe4b76d08 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,6 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 EBUILD jsoncpp-1.9.1.ebuild 1366 BLAKE2B 61aab4ecaf27074ef443ea80b3f49d1c5a7efb5cc8c72534744b83599e0721db7b7b6a836e0241478ea6feb9731799c099e3e39b3b6d5422390dad99a52fd094 SHA512 389464ed9b6b1ae0713673c7937478da5d0dfc896efdbc75df6cbea4a5c5c7c7ff4281adcc8a6f978e4ccf41b9e24dbe75f79b26ad62426eef987323124e3007
-EBUILD jsoncpp-1.9.2-r1.ebuild 1387 BLAKE2B 109c8d5ceac95d04ed3351c7fa45bfe87b1e1547800abbfa0a2ff1df67fdf6616631526344253ca96bbcb438239eda322b90332233e8294cd0f2c2d69e057417 SHA512 5d672540c2438147eeed08539f0a94dd8c4c119b87593521d8bfe32ca32cc9e80b6d6bbdf19aee351d6991d14afc0d126b5b807d9e399cbb3fed1d4c0117ef85
+EBUILD jsoncpp-1.9.2-r1.ebuild 1381 BLAKE2B aacedd97f6918bef77c914ff38fc3a45a62761bdca43f6a6951a77517833dc12cf0b9b1759d0cdbe94f24693fc9610601391a3bcfaaef7e6433e6eb387c988ad SHA512 0e47664c65a7dd9a5e5c9c20272cd7d03a977995767294445fb236eb1d36b93a17a16a890cba24ac92198f8641a5f2de04a8c0ac6af1c3134725b85c52ad03d7
+EBUILD jsoncpp-1.9.2-r2.ebuild 1001 BLAKE2B 6107c074591edc1800dea6e6dfc0d8374e665bbc6e04d9d5c24e85be3934ee45834c3adf5920447d25ee5036ee918c8e5e028eee1e18cba7f64d88831c206ad0 SHA512 96b69f89c2d7c56cad2174029c97de0eef42ef4e48f2032367596c1e3735b928b4e876d7f161a26f3f6bce1564d96ae93895d045e827ebcc2ca97017db49ce1d
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index 5e2237b6f3b2..b4b44e740b14 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit cmake-utils python-any-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
new file mode 100644
index 000000000000..adf6eea6b377
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/22"
+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
+	)
+	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/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index f5edf7854645..bb8d637588cf 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.30.1.tar.xz 41516 BLAKE2B c0b73c06682fd0a1bca2fb000d7909460c496e73364c24905e1a4c88cce64252ac024825ab89650ee0b3b5de1cd1686fc7a231ffb5b0bb7e1c66262eafce026f SHA512 f1ae34faf9b3902b45b01bfafc87fd8d30051bbb11cf247cf8af9dc2bae8b2f3c93564a17a9f047dbb61240662a0ffbc2c2b764f8e254305c7aee1b32fd8a86b
 DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
-EBUILD jsonrpc-glib-3.30.1.ebuild 939 BLAKE2B 5550e20348a0d716bc17e491e179ec0e38c32db28caeee66fc3df930a637fee5f42c7147880ff22f32bda0f590a5cbf2bb6e6e28dfc98b4721e0be6a0dc430e6 SHA512 40f382868affa0c614c5f3f34725f2544416c720a76da60268e9525b2ee3370314dd5883ba17f74f7894d4d0c98ea2e6134dbd76f7396cd67935c8785b17a75b
 EBUILD jsonrpc-glib-3.32.0.ebuild 950 BLAKE2B 1a5f899fcd1aa09f924ced35d237fecc2e83178e2df4149cd6973bbe9f5a26e63f56c388bf8e4dfb98f20f3d22a1c14708e3fb628bc46156bb2fad6273f957e6 SHA512 d18ea1e621e48980411ff2aa284acd7f0913b7ba4ca89f4b46fa030331c73a292e7edbacbb5a401e7be7d4d0b6ce34ee6cc9c932cc40dbcaaa919f4f760aa8d1
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild
deleted file mode 100644
index b2389e9e9c9e..000000000000
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg vala
-
-DESCRIPTION="JSON-RPC library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/kasync/Manifest b/dev-libs/kasync/Manifest
index 50bdb4a84441..2a8fc224f06f 100644
--- a/dev-libs/kasync/Manifest
+++ b/dev-libs/kasync/Manifest
@@ -1,5 +1,3 @@
-DIST kasync-0.2.0.tar.xz 28952 BLAKE2B 1ca17023a9350024195b3a840cbcea8e180fea9ac1a4ea1601c30d70c68a613bb677a65ca8a4c36552bf998a14098342f66855f84a603d2853d4df43f3466e3e SHA512 cf0d59c4ed6978552599a1d36c08df180357e112867f3730f57b13673943eb365acd16892450f100e9e5f122220a06df64ee006a0d3651d0f05d78cb5195094d
 DIST kasync-0.3.0.tar.xz 29060 BLAKE2B 0d2eeeeb296db7162426848c5467ee51e3530f0cef97cc345231fbde3225bc29736458c7e62938c7c9773742a9e4d3ed1f9545ac9d570cc5324321bc4e694e3a SHA512 a521862bafdff2931a3f01ef4393c6ae8f3c4655bb58dc2ddb4fde5f443d67b1a23d0c21491b2099ad6dae53d8894588b49299c45d334956b36ccedf94b17f9d
-EBUILD kasync-0.2.0.ebuild 318 BLAKE2B 16703ac8f943452caf248d651c5a9658c2f6ca047832e8c9f77858d6c3d5fa1badb3175ce7f87c3a43ea495674958cda35124e9fe245679bdd7821e5fc4c709d SHA512 8c7af6d006da084f93d8d48e1062999da82903b62738ef5134c7e17c29ff7b5a88c91f1453ffc4cb5e8fc5aabf54a99208d72af25104102ed10309ac8168531d
-EBUILD kasync-0.3.0.ebuild 318 BLAKE2B 16703ac8f943452caf248d651c5a9658c2f6ca047832e8c9f77858d6c3d5fa1badb3175ce7f87c3a43ea495674958cda35124e9fe245679bdd7821e5fc4c709d SHA512 8c7af6d006da084f93d8d48e1062999da82903b62738ef5134c7e17c29ff7b5a88c91f1453ffc4cb5e8fc5aabf54a99208d72af25104102ed10309ac8168531d
+EBUILD kasync-0.3.0.ebuild 429 BLAKE2B eda08e14d792f8b6f543028cbb4aa66860d276f9f6b8c89576e31114150d2fb69805774bf6627b89c256c82b9dbbd92f53ad438d4716dd01cf48a2ef7c32c016 SHA512 b312f7a35a084a5ab0837dd100f0f633aaefb9e04089b7461905953cbdf36b1d42deccb47925c7af0ab98a2cdc6f76cd3ecade9a59d1f6f02661fd06df2c6c50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kasync/kasync-0.2.0.ebuild b/dev-libs/kasync/kasync-0.2.0.ebuild
deleted file mode 100644
index 2a0fc33b2de3..000000000000
--- a/dev-libs/kasync/kasync-0.2.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="C++ library for controlling asynchronous tasks"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-libs/kasync/kasync-0.3.0.ebuild b/dev-libs/kasync/kasync-0.3.0.ebuild
index 2a0fc33b2de3..d0bffd7cf58e 100644
--- a/dev-libs/kasync/kasync-0.3.0.ebuild
+++ b/dev-libs/kasync/kasync-0.3.0.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+inherit ecm kde.org
 
 DESCRIPTION="C++ library for controlling asynchronous tasks"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://api.kde.org/kasync/html/index.html"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
+SLOT="5"
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index e44bb0f24043..fbc4fff6e066 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD kdiagram-2.6.1-r1.ebuild 779 BLAKE2B a1618d38ddcfa34016846eed0e118ee8d222d26d21a9e51a992c888e0d6acb8f2b80390359df6930fa8784dbb37f2783ffa75679882982fa1ed5aebaa31e4742 SHA512 380d7b1a2c4aed647033fd117ed8340f7fca163b7f06f3fb36f29a3ebfadbb1375c175c3da1a5e7d4b37bbcd214f61114e0720bc4303da8d6e3349850cc1884e
+EBUILD kdiagram-2.6.1-r1.ebuild 919 BLAKE2B 2684c35d2abc74af395572aba4b8fb3f80a2c6b4733896997e11859eca6c606a512a03687ec244cc5f894f51e8c8b3f5cb7c19f41f2079bda93b93d18c734835 SHA512 26e4aad4182a028cc715e62884e4fe14025ca3eccaf6aacad3ece196ebfec7b00b29da56feeb0ade51a0e612eaeb72cef85fc02869bcc9f51ecb2bb9123daa7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
index 2c13e38294a3..9ee52c2d9149 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
@@ -1,33 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_EXAMPLES="true"
-KDE_QTHELP="true"
-KDE_TEST="true"
+ECM_EXAMPLES="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+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
-	KEYWORDS="amd64 arm64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://kde.org/ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
-IUSE=""
+LICENSE="GPL-2" # TODO CHECK
+SLOT="5"
 
 REQUIRED_USE="test? ( examples )"
 
 BDEPEND="
-	$(add_qt_dep linguist-tools)
+	>=dev-qt/linguist-tools-${QTMIN}:5
 "
 DEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=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/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 8e16f0bbd8f2..42a710b487c7 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 1234 BLAKE2B baa985aeabfc98525b72286bc1dd1d444075f18abdc7fa3ab49af13792ecbf3f3fdfdbbc730be4c1663caa1516731b06d582a5806e7f1dcae51e693e32a2ae11 SHA512 d3fecc206ed43d2aeeee105c28f46f26f794d358e84d5fb5ffd34a4081c39888dbecee7aa30d129121dfc2dc0ad300eb1601b039645a60c04599c95222f526a7
-EBUILD keybinder-0.3.2-r300.ebuild 1051 BLAKE2B cb4e876eb83fa674d598dd06045c795d0a562a5c212fc9685af67b74f473399238d213338d6874703092527b6257e0c06be24910833b8c4d8d0d9fdbf7a20069 SHA512 e3938b72869e319c940ed2392d60aeb6b27aeb8344065f845678fc95e80169362de1a3efdbb1264407c26ea55333048298b45e5c283393b0749d56838b748e91
+EBUILD keybinder-0.3.1-r201.ebuild 1252 BLAKE2B 2b00169d7a4c792c6e84e00a6ce043598eabd6014effc7291c454d3f126bcd8efe9560b40b7fa2a57d1872fb87c4c4da3080e2b5a9c4da71c0b27a1964783991 SHA512 a536a4468322f5bd887b2dc03149868e5facd057d618e1770c40d08672dc47a0836c38d71057db89485b93a42c2b069925db6d08a5d63b4715fd03e7750f8d2d
+EBUILD keybinder-0.3.2-r300.ebuild 1066 BLAKE2B 472227c6ceff7f18baa4297e8a8c064ea1f2847f11a1d0a3d373ffd63d0ec0b889ab484afcff67c01c6e0e40a1fa133079e32517a498e003b1f02780e2f3349a SHA512 dc1e86e5938a070eda13798e736846f2dfa792725ea5dcf75a86a8efb897a8d39e37a5bbef075abfdb53095e9a36410965e584bf42655c00cd942632bed64d56
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 9392d4f40614..711dd04ba10d 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
 DESCRIPTION="A library for registering global keyboard shortcuts"
-HOMEPAGE="https://github.com/engla/keybinder"
-SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/kupferlauncher/keybinder"
+SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index de5cd8598a0a..a7830de11260 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}-3.0-${PV}
 DESCRIPTION="A library for registering global keyboard shortcuts"
-HOMEPAGE="https://github.com/engla/keybinder"
-SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/kupferlauncher/keybinder"
+SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="3"
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index c6d178007b15..a2ddcffa1b29 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
-EBUILD keystone-0.9.1.ebuild 1749 BLAKE2B 8cf7bb5945f3e3009db80637d9ab4d4f0ba58f771966fb20c8dc06b3f93da7b26732065e1b9c2c05542eaba7c9f138a0226bd30e8ada714dc7987ff63afe653c SHA512 eb3f249e93cf4d173524c591e5ef23c4f5b2ed08a615e4c9c12da79afb2a1e9107e6e1e45490dbe2c70cff58deda3d33561558dc57150e950f4df5562811d256
-EBUILD keystone-9999.ebuild 1720 BLAKE2B 565f348efacb1d0638b148fdb37f46bfd93abd91c1d1c98a8fdc6629764f1ba8b6f486f95014b4bf1a143428bfc81efba52042df047ef7a758d7c0ab1f3ddb84 SHA512 67ddf41d5fb963b2aa58bfc95534dcb651840242b6df0da9d3272631ed0319d72dbbf9eec928b7eee32ed93f9ac5676d1df6077096999ed8092a57aae3867059
+EBUILD keystone-0.9.1.ebuild 1745 BLAKE2B 32abf1b7e86e6fa29d2ff2e998e5b81bc6562337de7c3925b80ccccff7aeb6bea954f59afbcb48343f5613c7edb0d2feb582ae9814af8d34f0f6300d77ec4e8e SHA512 2be0d58c902d8168c820fc649c03f0df5bb5e845c9b5182f32afd9f7ff5e259ade3976f69968f40044af8284773a5427f579b5375dc401391c1a630548338d82
+EBUILD keystone-9999.ebuild 1716 BLAKE2B caadb252b54c726b83aafcbd162926e21e1ccc861c5ec5c47f72b7f4e82d18e4eeb4f376db9061aa968228631dc773bcee1ee70fc50067549a6aec2d50550c07 SHA512 273ab95ccaa017743b96a2aae0d41f505c9c21cafa83a67db25d4bd60feba84936e1121a6862158f38f84872e91a713bd31ab2f887ef392f9de8037a7dae9af3
 MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild
index 856671cc5809..ef3af7af6a90 100644
--- a/dev-libs/keystone/keystone-0.9.1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
 CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils distutils-r1 llvm
 
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index 74cfb58dfa96..dee4972706b5 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
 CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils distutils-r1
 
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index c51450117b70..d417bb4b9e2e 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,3 +1,3 @@
 DIST kproperty-3.2.0.tar.xz 130208 BLAKE2B 22f5b4aafde41d285968f99579b757b8a88dbb12f7ed5e062e44f74c72765b915195961f5ab20e7ef9735a5f82f6c568fa807aa9bb061bfdf64ecfdfc0775793 SHA512 2d7fe5a18fd3520f0dc146ec844cf284c52eb330404666fa1400342c1489a88e1f72834d813cf52f2fd90c8312b5122f542acad7d86ae10a8d1a023c72c368ee
-EBUILD kproperty-3.2.0.ebuild 734 BLAKE2B 1b1d254772c7e60bcb0cf053b51cd58cff96bbdf7f282a564bec9555232c84a8ed3471478250a90330ae71993171dbf75be63f8492ac7c941c2ecaf0595a80d0 SHA512 7a0570e16f7cd4276195745a21854d343fb11c609146907a9817802b1ebeb53e6df7efeb4c9a2352bbe983228195810e72136ca5318dede157d9e47450df66a5
+EBUILD kproperty-3.2.0.ebuild 856 BLAKE2B aa7f1dd97907f14cb3f013a61c661ff6e66dc98dd0e77f80fc0d7d24422256ae3966ee64bcfa1545a387087e8327c3f290c3f597d700aaac4e4918f20f7c1821 SHA512 d1a2fd2644165d639b52d191a320c58d3de972f97a5789c70aec8e518343009fd184ca92888caed8f282c1f19d763ae2f9107dfe255a512d15afe70a3c48a134
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.2.0.ebuild b/dev-libs/kproperty/kproperty-3.2.0.ebuild
index ed6db995cc72..d0bd58ebea0e 100644
--- a/dev-libs/kproperty/kproperty-3.2.0.ebuild
+++ b/dev-libs/kproperty/kproperty-3.2.0.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
-inherit kde5
+ECM_QTHELP="true"
+ECM_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Property editing framework with editor widget similar to Qt Designer"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+HOMEPAGE="https://community.kde.org/KProperty"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 35c84bffbe78..687421953941 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,3 +1,3 @@
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.2.0.ebuild 1227 BLAKE2B 57b45ea219b137472faf06c84856094b1c4b84ddd4a958fe23386f597b0fe209550e7dfbe34d3f9ba6454ee57c80a6d5dea46480541292967fcac61f4741bd35 SHA512 56d43557e5c30b718804824dac09da423aa95c8897fe090ebd2a3837f9694111075784409c7bcf7a7821606b919d6c24cd4bf128798143a2b0831d8274f1a2e5
+EBUILD kreport-3.2.0.ebuild 1343 BLAKE2B 00a2a331bee70beca3e04b3cc8b55c91f5e4bef86220e0b7bfbaffdb0453a3476c427d6434bc111641997c93acca918c5842aa443f6657b01613a21712c8af9c SHA512 c885b487aba1ba67d553917e9f6b74ca0afbab5a760200abd07c2efa488be5cbca6610cc51f2bdd517b791cd8b014d58ad624895c775f08196d02471946c8ef0
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild
index 97555f856932..b19cd9dcd243 100644
--- a/dev-libs/kreport/kreport-3.2.0.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0.ebuild
@@ -1,34 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="true"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+ECM_QTHELP="true"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5 python-any-r1
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Framework for creation and generation of reports in multiple formats"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+HOMEPAGE="https://community.kde.org/KReport"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="amd64 x86"
 IUSE="marble +scripting webkit"
 
 RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	>=dev-libs/kproperty-3.1.0:5=
-	marble? ( $(add_kdeapps_dep marble '' '' '5=') )
-	scripting? ( $(add_qt_dep qtdeclarative) )
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	marble? ( >=kde-apps/marble-19.04.3:5= )
+	scripting? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 "
 DEPEND="${RDEPEND}
@@ -37,14 +43,14 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package marble Marble)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 		-DKREPORT_SCRIPTING=$(usex scripting)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 4e39b978ac47..c99b75e90abf 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,10 @@
 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.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
 DIST leatherman-1.9.1.tar.gz 815756 BLAKE2B a0c8777531b066e247d8abfefc1b22fec825f7db22ef67cad6a703a7cd168f19349b13b923841e8064eec1e7bc7b755181b58370c7501b37710ac376687c5b43 SHA512 51dc356ec7196c7538fac154a094d3693de5ef89d50a07651753c400daff3ecdfbfe46516ffecfa592484aa1ec8afb891f2f2b6be62c94a8f0ab08a3bba65786
+EBUILD leatherman-1.10.0.ebuild 1179 BLAKE2B 13726a13fe2107141de86745224909019b492fbccf5e83b4e08156b498d80c83d959265dec427bb0c03808759a35e595d633880d6b829b4735393bf13958f786 SHA512 a8d3e0a56969c52486e1255b1245bbb75989c9c509b59c6fe01be8a2d8f4dd777f66cf7294cf28b9ce7c411c7662a8c4397312e1a444200b09cc1f0b773e09c3
 EBUILD leatherman-1.3.0.ebuild 1091 BLAKE2B 53d75a2e93e6eb2bc30446327f70d929b5550e298e1e6d8f9c6396d6bdaa8c5f08cf50b2bfa717f6c7e9a61b72575eb03ce83b8c0846595d25f536685779d8cc SHA512 c51284fd5eb7481623e606e4843595ff52875de13909c2d0e052f563953448444dce71a4a5d2f6aaf481970d3b89fd063e44311edb5be66de2a0522d6a429ff4
 EBUILD leatherman-1.8.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
 EBUILD leatherman-1.9.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
diff --git a/dev-libs/leatherman/leatherman-1.10.0.ebuild b/dev-libs/leatherman/leatherman-1.10.0.ebuild
new file mode 100644
index 000000000000..ac093ea96d57
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.10.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+		-DCMAKE_INSTALL_PREFIX=/usr
+	)
+	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/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 1a00fdfac2b3..289c3437eab7 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,11 +1,9 @@
 AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef31dd01c4813794640ca7f40be8e0c09a084205a6dc954748b2877d8fac1b419ddc9d2461a894bf9de8e53b48852926 SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e
 AUX leveldb-1.18-mips.patch 1399 BLAKE2B ea9bf52ce2c6482c8a43116c5782b2219af3d8a7eafb39a7d0742695b144f50c5f53e33c85ec562c690b78313146eef7a1edf41eb178bb6b9d8e179d87d72576 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54
 AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200
-AUX leveldb-1.9.0-configure.patch 990 BLAKE2B 8e658003078100ee071d79709532e37edec29aca816cd5864faea8f2cbad6d4212da09a268dec767b695823557f0d38744d13932eb0fcb50dee7ad065018ed92 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5
-AUX leveldb-1.9.0-forwardcompat.patch 3464 BLAKE2B 628e0898b9648d14bdd8a043b0646d8af0300310b9b03d7224e52b5be2a2be60d39934b1885bb602334aa64f5f3dbcd7d0ed32e936f3575047005f0d27e03438 SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824
 AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75
 DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
-EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a2d85d2b76188cf1da2b5651933c085eb91439b7385aaca594d3074124fb771bd858725745a0269e8ecd17e2be5cafbaee13cce5ca32550f0d4069fad3994be4 SHA512 f564389eba2fb0d5189c9dff09c85373990efcd412148e6bd53ab715fac22a29a0a405981768b5c40ed487f68d2aa721196dbfd94cb499e27d769126e2938533
-EBUILD leveldb-1.20.ebuild 1756 BLAKE2B 11c82a4377faf026bd0670f46b3348141cb5837e13fd64110bf99bb71813097825be3aba2302284e69053f553de0b8b424cbe9b5551c326f1bfcc8d387bfbfcc SHA512 518acb56db4cbb85fd7e71bfb5d32de33aa08c6a958bab3fefcb30b738f856b39042d3edda04e0ebdcc5a7c15abaef6acbcb9c1bae9d351d74eb93611a603ed1
+EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a1f89384c07ac4ebc92daea56c8d795fe378275bfc72cbaa8e41ee754176113a936f670b570466fa3824c98eac093e25a8fa1d7c0e6cc6499a3ba5ec499fe8d6 SHA512 8ca2b28ef83e6e08ee85b6d055d6cfc09b4e294c2d68e0c06918a10a009492b5a4bc804e1527fd202cf0adf39a0c0d1e6df2dfbff6b353ca43445ae214909917
+EBUILD leveldb-1.20.ebuild 1755 BLAKE2B 0fe19dead939d81398ad0c54874393300221f7b45a1ec24dda1949ff2080d8d6bf5275efa1a51c83c0251b247cf5fcf4328ca26116ae6cd35dd9450411dba8bf SHA512 125ffe35e50299b19f937fdcd5a0876b5e576555b0bed70ed1cb2a29e908ed626a24f4a39ba4173de1cf0db923f9d8359bf068e640e2f9944e66c65229d79492
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
deleted file mode 100644
index d25fe01f6835..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/build_detect_platform b/build_detect_platform
-index 5801d20..4b4bb0d 100755
---- a/build_detect_platform
-+++ b/build_detect_platform
-@@ -169,20 +169,30 @@ EOF
- 
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
-+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
-     $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
-       #include <snappy.h>
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_SNAPPY="yes"
-+    fi
-+fi
-+    if [ "$USE_SNAPPY" = "yes" ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
-         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
-     fi
- 
-     # Test whether tcmalloc is available
-+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
-     $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_TCMALLOC="yes"
-+    fi
-+fi
-+    if [ "$USE_TCMALLOC" = "yes" ]; then
-         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-     fi
- fi
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
deleted file mode 100644
index 1c21dbe09ff5..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur leveldb-1.9.0.orig/db/db_test.cc leveldb-1.9.0/db/db_test.cc
---- leveldb-1.9.0.orig/db/db_test.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/db_test.cc	2014-03-28 22:58:59.000000000 +0000
-@@ -139,7 +139,7 @@
- 
-     Status s = target()->NewWritableFile(f, r);
-     if (s.ok()) {
--      if (strstr(f.c_str(), ".sst") != NULL) {
-+      if (strstr(f.c_str(), ".sst") != NULL || strstr(f.c_str(), ".ldb") != NULL) {
-         *r = new SSTableFile(this, *r);
-       } else if (strstr(f.c_str(), "MANIFEST") != NULL) {
-         *r = new ManifestFile(this, *r);
-diff -ur leveldb-1.9.0.orig/db/filename.cc leveldb-1.9.0/db/filename.cc
---- leveldb-1.9.0.orig/db/filename.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.cc	2014-03-28 23:07:48.000000000 +0000
-@@ -34,6 +34,11 @@
-   return MakeFileName(name, number, "sst");
- }
- 
-+std::string LDBTableFileName(const std::string& name, uint64_t number) {
-+  assert(number > 0);
-+  return MakeFileName(name, number, "ldb");
-+}
-+
- std::string DescriptorFileName(const std::string& dbname, uint64_t number) {
-   assert(number > 0);
-   char buf[100];
-@@ -106,7 +111,7 @@
-     Slice suffix = rest;
-     if (suffix == Slice(".log")) {
-       *type = kLogFile;
--    } else if (suffix == Slice(".sst")) {
-+    } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) {
-       *type = kTableFile;
-     } else if (suffix == Slice(".dbtmp")) {
-       *type = kTempFile;
-diff -ur leveldb-1.9.0.orig/db/filename.h leveldb-1.9.0/db/filename.h
---- leveldb-1.9.0.orig/db/filename.h	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.h	2014-03-28 23:07:43.000000000 +0000
-@@ -36,6 +36,7 @@
- // in the db named by "dbname".  The result will be prefixed with
- // "dbname".
- extern std::string TableFileName(const std::string& dbname, uint64_t number);
-+extern std::string LDBTableFileName(const std::string& dbname, uint64_t number);
- 
- // Return the name of the descriptor file for the db named by
- // "dbname" and the specified incarnation number.  The result will be
-diff -ur leveldb-1.9.0.orig/db/repair.cc leveldb-1.9.0/db/repair.cc
---- leveldb-1.9.0.orig/db/repair.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/repair.cc	2014-03-28 23:13:28.000000000 +0000
-@@ -263,6 +263,14 @@
-     std::string fname = TableFileName(dbname_, t->meta.number);
-     int counter = 0;
-     Status status = env_->GetFileSize(fname, &t->meta.file_size);
-+    if (!status.ok()) {
-+      // Try alternate file name.
-+      fname = LDBTableFileName(dbname_, t->meta.number);
-+      Status s2 = env_->GetFileSize(fname, &t->meta.file_size);
-+      if (s2.ok()) {
-+        status = Status::OK();
-+      }
-+    }
-     if (status.ok()) {
-       Iterator* iter = table_cache_->NewIterator(
-           ReadOptions(), t->meta.number, t->meta.file_size);
-diff -ur leveldb-1.9.0.orig/db/table_cache.cc leveldb-1.9.0/db/table_cache.cc
---- leveldb-1.9.0.orig/db/table_cache.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/table_cache.cc	2014-03-28 23:12:39.000000000 +0000
-@@ -54,6 +54,12 @@
-     RandomAccessFile* file = NULL;
-     Table* table = NULL;
-     s = env_->NewRandomAccessFile(fname, &file);
-+    if (!s.ok()) {
-+      std::string ldb_fname = LDBTableFileName(dbname_, file_number);
-+      if (env_->NewRandomAccessFile(ldb_fname, &file).ok()) {
-+        s = Status::OK();
-+      }
-+    }
-     if (s.ok()) {
-       s = Table::Open(*options_, file, file_size, &table);
-     }
diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
index ddfee8667bc6..0a4ac6bfd31c 100644
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
 DEPEND="tcmalloc? ( dev-util/google-perftools )
 	snappy? (
 		app-arch/snappy:=
-		static-libs? ( app-arch/snappy[static-libs] )
+		static-libs? ( app-arch/snappy[static-libs(-)] )
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index c23b914b691b..432617312207 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index adf034709ac1..58586e4347f8 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -2,8 +2,8 @@ DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb
 DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
 DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
 DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
-EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
-EBUILD libarcus-3.6.0.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
-EBUILD libarcus-4.2.0.ebuild 1000 BLAKE2B 2ad2ccf6a15ca1ee672b35eda65d78cbd86e6688ae936b4b9c12646f82f9e4cf50ae8d1ddd3a33c3a4c5e4ba6e0126072469f12443530bc43060890daaf7f3a6 SHA512 65df9fb5e3d0772c5b71dbf5964de27115d6b692f0db6d6581b414480c6c7186c44121da1c9cd6d02abe1ea87fb0aa8fc56016af7bf5d41483d017e15aa70564
-EBUILD libarcus-4.3.0.ebuild 1375 BLAKE2B 02ba9a2c0faf8f2bb6bbe17ebb7e4d8c950bf18e24bc7db7851072e25f59bc2fc83ffeed9e013017428e9ac7918140bdab6256ce59bfff023a07868b0974eba4 SHA512 4f5a659694a51f5e639141a01002f276d4f2cca280ab54774cc380524b67c71be4b8c924c59e3effbb7b012f40a5c4fc8774a727d2f1ebaeec0dd3eb6f6f208f
+EBUILD libarcus-3.4.1.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
+EBUILD libarcus-3.6.0.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
+EBUILD libarcus-4.2.0.ebuild 984 BLAKE2B e594a58069aa855442fa53ec8f78831e3c22e6d6c10e07221396bba14891e5f453f16768dee72b4753c8f919d35ec50e426a5c97041fd2035ceff9f3cd30376e SHA512 ec724940dff0d8ebd9ffaca81fb48db75570f81066c695954e1571089fc3fe84e28af9fc2ec60092f5c25c226c85c98a31e959a3b2263559a4074a3ae4733a23
+EBUILD libarcus-4.3.0.ebuild 1353 BLAKE2B 957389a5982d129a7e415082ca871cce23fb7a1fc8264bd1dbdf5287d2a1eac2bac6ea809953e4194658497a644b81a44fd25b13670d51df4978bbeb1e27f245 SHA512 d4b63dce7de402181406c798cf959233614d55e524f08c3afb6860ecf828ff0b8eb572f8f75f02bc34d233a7811a98a0e84445a10c6271d00e8987fddb4e72c7
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
index d0e49ef66b98..ced7f6897f9f 100644
--- a/dev-libs/libarcus/libarcus-3.4.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1
 
diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
index 3714aa3353b2..ced7f6897f9f 100644
--- a/dev-libs/libarcus/libarcus-3.6.0.ebuild
+++ b/dev-libs/libarcus/libarcus-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1
 
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
index 1cf2de72fc49..deb2605d5649 100644
--- a/dev-libs/libarcus/libarcus-4.2.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="libArcus"
 
@@ -38,5 +38,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0.ebuild
index d053a69288eb..0869769e8f5b 100644
--- a/dev-libs/libarcus/libarcus-4.3.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="libArcus"
 
@@ -38,7 +38,7 @@ src_prepare() {
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,5 +48,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index c533c2c0b136..986bd7e60591 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,6 @@
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-EBUILD libassuan-2.5.1-r1.ebuild 1255 BLAKE2B f44e065a49a9ac1f9a2ca3c6fba5109c29bb4e8e95bcd75b7c30b798a7b43f7ac932e627d85bc78c8e73ffcc53ccbc3f4ae79c8a0dd9452c7a40f4cf08b1d066 SHA512 d7d0968ef815caa65d8793bcfd9cbce3842a8a2a9303072c245375ebde859205f7257335092dc8c84e7102f6d99216fc338b9a4da319fe7eceec8539fbd33b20
+EBUILD libassuan-2.5.1-r1.ebuild 1262 BLAKE2B 8ceca5ef46b365a25a7b0ecff27e60e9cc6de886d36cad990f9dd2d381f556e6d199d22c8a20d7a4262c2e0917eaaabda1227ccf7fb22654f9452a23adfa181e SHA512 76c40c82283a3eb0da2d8b445b2e8c702552df6618f54e9d656a596baa8785683a5fd721518738a71362eaccdbf3dcd4fac01708698f2ae70280bd5b2842f5c7
 EBUILD libassuan-2.5.1.ebuild 1065 BLAKE2B 15ddd091eb5c4a64f47391ccdf42fc4b07a53e0e11d0ba5874ae0feb3f9b51dd1859e89accf43a198a5e6d3d31c26fe228a098dc240e76f504d7efbf2f105743 SHA512 2e538553eb20f7fc20b8666f7083d647db095df0662ea210392c97dafdab3907df607c59f4589713d4302007cc1592dcce94a73d3090deebcc272f6eabee54ed
-EBUILD libassuan-2.5.3.ebuild 1253 BLAKE2B 99741f29886ad6510a507206597a0c93ebef6a66c1a1e7f547d175fd77f21fd566c590cb5287c3eeec6239ad83d675d4030264a1ad46454011e937115d111ff5 SHA512 b053ad9e7a8a4c737a5b590b9fc1d9091b86a7cdd7db1d621db556775bff6a1bba0211b00c6cdfc1d7c79c77e5511a77e3ad1a6688ab6c779e0c1c73d45ba6d5
-MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
+EBUILD libassuan-2.5.3.ebuild 1260 BLAKE2B b9c33c99830ce6b394f4e6e0ba5e9f3a6a4fa79be69afe2df021e7157a6770b3c96cbeeb71380aa7e79f0e75fc728c1689e9159f1c6ef00b9466d60afa2a46a0 SHA512 85b4d86ff63ea5ffa3251a85f15cdeafcd36382687011e028c69f20715aee61c3910181afa4e630c8ff6e1820518fc677fffb520b73a5abbad24c8e00bfae6a3
+MISC metadata.xml 977 BLAKE2B 25e7724178eab058abfa95fff731f32d04a025cc0882718eb5d02c40dcc7f0ef81185167ed0fa72fe050e9637fbcc456208eff1783f719cc2d153854a472781a SHA512 bbcc73e33204de48ae1001d34e4f07b8df9e1828e515da748bbc7d09e68763b7567cdb939a9298d9939e8b2693570fc898a931d080947fa8cfa2517c2610bc74
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
index 5ad1133fd205..1243768e5c14 100644
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.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
@@ -33,10 +33,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 8a00919e7748..aca104db0f04 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.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
@@ -33,10 +33,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/dev-libs/libassuan/metadata.xml b/dev-libs/libassuan/metadata.xml
index fe0789259056..2152f464ca05 100644
--- a/dev-libs/libassuan/metadata.xml
+++ b/dev-libs/libassuan/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
+<maintainer type="person">
+	<name>Lars Wendler</name>
+	<email>polynomial-c@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+	<email>k_f@gentoo.org</email>
+	<name>Kristian Fiskerstrand</name>
 </maintainer>
 <longdescription>
 In an ideal world, Assuan is irrelevant.  Assuan's primary use is to
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index fc22ebb4862c..c9ea8dcab03c 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +1,7 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
+DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
 DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
 EBUILD libburn-1.5.0.ebuild 837 BLAKE2B 07610778a96cd06a233651aa98cde8e94b058794400b4dcb0d8bc7ce845c42d2702b2eae78a9018900f6b574ef2cfa84feeec70108e0c8cdb1fb6f037310b65f SHA512 6f7964daf2343c017cb88e87b1d9d064fa4e3819e42a3f1fa1d0677926efc0d1ded1d0a53c31fbc515fe82768f82da08824590a71489b56f9ee773d548bcb66e
 EBUILD libburn-1.5.2.ebuild 847 BLAKE2B e53346b68d0581aa21e9baf0481789337029f81b470690b49c91ecec725b98136ca97ae5cca990e000cee1031d3afa52ee37eb53ba1a03d941b82636c8bd83b8 SHA512 e6ff684fa8582d58cd3e0753c2fd6bee3939b75dd6ef413039d6af103f6fa9f93f49c6ef9782db7a3e3a97b8d65067d76d3c0fb830b4a75aa48a09362fd7a639
+EBUILD libburn-1.5.2_p1.ebuild 896 BLAKE2B 0c1200d24e2aba3185f53c548970f24c401079e7220b4f5ac6539acaff9c31330359ab82ce452ee20f27f1fd750066d2f8ee375f96d33fd8918017cb5e6073d1 SHA512 e37fbef828e574b6f4518007b4e21c55359e9a7353ab39abb64fe039ef1afc3c40284004d798ade1aa6580080b195d6b5e4bda94c65a9bb9218529f69d6dc5f0
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.2_p1.ebuild b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
new file mode 100644
index 000000000000..e77f0b1b71a3
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/_p1/.pl01}
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${P/_p1}"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index a475fc3d0a54..bf9252774054 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,5 @@
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
-EBUILD libbytesize-1.4.ebuild 1217 BLAKE2B 68b65c5481fe69757b383184c06b878cbf86ab1f271b188c1bf24ad37dd1104a93ec6e42a2d5e25f4074cb396e201d2640f211dc301de393a2e757a77a628b18 SHA512 7a8fe331b96238be23fd8711fc1270416503b9b9ba30f5a1d06ffb00f84465ff1d75deeb8f3f9309d9b6f08c35ca25b01765b6a171c19a2720edd62a6db6dc18
-EBUILD libbytesize-2.1.ebuild 1473 BLAKE2B 5177c3bb69659bf9b2ac4673621eb1bbeeefee4df33a1a75ea9481cd47424330224fa78a84073222fddc22477926f3e6d3def1f5bb01aeea13f2f0afd058dfc4 SHA512 f590140eae7131451497a219122c7a8fd2c5a14c7ca35c18819eeded7d466aeb97da25569863977e53f84e771542cb039814e4b6e7b245edc5367eefefc448c0
+EBUILD libbytesize-1.4.ebuild 1215 BLAKE2B 40bbbe2518bd33a4c77531a7610ccd63c230afe4273fdfda993f31f8fd01ec1a7ee29b80cb2151a14f91fcd54059c6127e793af016003293bbeced50d89d91d8 SHA512 ae1c0a113baa78f2d08f88f8d690d8f6235b7e32c08a0d8347de0a464489018a01c25e26bdff96ad489512909fce6539c4a2b517170b2e30f71c8bf98c337294
+EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 0a63e8b0b772..4c0f28fc2848 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libbytesize/libbytesize-2.1.ebuild b/dev-libs/libbytesize/libbytesize-2.1.ebuild
index ae527783b027..0d91bc5f9998 100644
--- a/dev-libs/libbytesize/libbytesize-2.1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-r1
 
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 1655092a839a..a145c3c673c7 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,6 +1,6 @@
 AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 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 2156 BLAKE2B 0a245492984af445db8a51798b15b2c1a3df525247489fd404d52e81637cfdd16e734cc7870a40141be2675c164956bb60daa29df2444d718543152df3843565 SHA512 956c302374463bd798916c81ae5bce5adc74fd16fc21bb50272fa5b853aa464eac1657da1049ff0834ba39589e19d43a8b701e6335c6494e4c7c8769e0ccdd65
-EBUILD libcec-4.0.4-r1.ebuild 2039 BLAKE2B 33a7e385a5a123d4c910273f6f7377874dccab0d0714b3e01a161c04ddc3dabdac7eac37d62414a749fa6867680490ad5cbeb3058509fae56455b2eb2fb8eba5 SHA512 f7cb3b763ed3579000e1ae6c968e8f449a28f549aad293f3b7f71e8e2c59c81e81e8e8abd2dc34bb6b2076c923bddb9fa981b30f4e03e010b450eef2a7983250
+EBUILD libcec-4.0.2-r2.ebuild 2152 BLAKE2B d41ee10b9cf58e9b82005df317341473572aa538c55582aec15405b3d73069d12f24612155eef0e5408418f494c86ba40b24958d7ab98b1777606341caabb002 SHA512 a6b6bda653f261d5a15b466c05bf0ea5c895697f9a26debdc288d21c5dc3be1927970435521da5f4674ccb162e1b3e426416272b74f6e7e45285afe764caddef
+EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B ef266ab2d7b28c543818a9c6762f6c1eaed14725eb2702867e59d5d1750256d2e801d893528a0a220918c2b59470e76f58332027bda3e488a6355fd3ffc8c5f5 SHA512 ddb2ae941bc7339a26771f48e889d73e56cdd6c8ddd26385002aa4729938917ad50fed6bb86597ea87f040e99fa597473f33edf75f3498910345f52ea46b4ab6
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
index 560a9443d235..581e64dcf5f8 100644
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 3b6b60f5de21..06c3c9d49603 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index f425af9664cd..2d6287c2f658 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -2,8 +2,8 @@ DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34ab
 DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
 DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
 DIST libcharon-4.3.0.tar.gz 145484 BLAKE2B cbb0edca76921c32b69809dfa8e07c07baedba90ff3c8f2ad5128cc1efa60e34f0f96c1936567825f7e876d298ef1ed4c10d0058f5b3697f87c412891654fabb SHA512 77ed18fbd11c008659a02419250647c9c977a57772d648f4af353c637224ba586006665e60e7fa2394b9f8cf53359a6211b936b5920ccc379754a743dbf2416f
-EBUILD libcharon-3.4.1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
-EBUILD libcharon-3.6.0-r1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
-EBUILD libcharon-4.2.0.ebuild 573 BLAKE2B 7eb27b3193128396696421ef953f0cdabb7d72bb24088e0757eab0c640c95037581bb6782e9e4003cafcdd9d2bf9b2d84dc022f312903b998506231a3bdbd5e4 SHA512 d155e903cbc2a1f1ab0b3b22e181760e69b22763f212fb4ae93d07c6841bf8d514bdb2602f078b35c62712a5ec0d8a060d56bc4df52a09d978dd6d5710ffe3ad
-EBUILD libcharon-4.3.0.ebuild 799 BLAKE2B dddbe5968e56e2d0756c0c9093bb21fdea754d0501a52fc48119f3770f23ba54bc5c1f88f272e80fedd390d0f93685bb6dcbeafb184523396e56900c9767f8c8 SHA512 d1d40b0eced84ee8eeb3b0531f91b3f033c9ac9abd4389f520bf306ffc35cea94518b14cd21e5757ce9d3bac18ee87013cbd47a38e72b31acf837ecaa14ea31f
+EBUILD libcharon-3.4.1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
+EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
+EBUILD libcharon-4.2.0.ebuild 563 BLAKE2B 05d8210539c2251b38bc8314a70aceca0a5355b81c98e444c918d678b719efecceaacdf4e587b4c7da8a855fec1c288084958e155580148db58396d945abb90b SHA512 3fd4727350ed0160d2024e04f29dee04468f93490a81c9c6639bc018f3da8b68743107680222dfd0ecbd8324a7935c148061bf928fcd90a53d07a5760aee9bbd
+EBUILD libcharon-4.3.0.ebuild 783 BLAKE2B 116426e6f5089367803504a211916b3a72f97164ef43526e44e12ce51cc15d3876ecc519d643dc3ac5d37140dbcf7b57e6d8bc1d5d8214848ade6c6d35745c65 SHA512 0d3cdb427aa4f7e375baca1818fc5160cbccd45bfcb1dc03df7f873bef33ffc6584b5627fed840a059a432bf9048b2dad18b6763ec774d5f73e08ddec5f82fc5
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.4.1.ebuild b/dev-libs/libcharon/libcharon-3.4.1.ebuild
index 1edcc8fe92b5..ffdec8a73007 100644
--- a/dev-libs/libcharon/libcharon-3.4.1.ebuild
+++ b/dev-libs/libcharon/libcharon-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_PN="libCharon"
diff --git a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild b/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
index 1edcc8fe92b5..ffdec8a73007 100644
--- a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
+++ b/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_PN="libCharon"
diff --git a/dev-libs/libcharon/libcharon-4.2.0.ebuild b/dev-libs/libcharon/libcharon-4.2.0.ebuild
index b8424b88bd25..f216952ac7f4 100644
--- a/dev-libs/libcharon/libcharon-4.2.0.ebuild
+++ b/dev-libs/libcharon/libcharon-4.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_6 )
+inherit cmake python-single-r1
 
 MY_PN="libCharon"
 
diff --git a/dev-libs/libcharon/libcharon-4.3.0.ebuild b/dev-libs/libcharon/libcharon-4.3.0.ebuild
index 19d4856e4353..cf5a18458b03 100644
--- a/dev-libs/libcharon/libcharon-4.3.0.ebuild
+++ b/dev-libs/libcharon/libcharon-4.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_6 )
+inherit cmake python-single-r1
 
 MY_PN="libCharon"
 
@@ -26,5 +26,5 @@ src_prepare() {
 	# Use current python version, not the latest installed
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 6af04b4f3428..d5c672127b32 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 1581 BLAKE2B 571ebc473a2b34d931438b7b2be3933b3a2c439cdfa954b412ef501c32a1eda306f5bb7d4c28fc388469d8a67895bd4df3b362f6d347b61d00b68a130d3a1341 SHA512 39db0fcd5e42a5fea0d1a51002b0823ad654b144e782e15950dfd663518f40e30939aa40e0469cd92afcd359c16c8411fa4ee77032bbecd5ffe119f2f51ecadb
+EBUILD libclc-0.2.0_pre20191024.ebuild 1579 BLAKE2B 13afe2571643cd69a0a98d9eba3df38a0f00056faa7e822129e5f47dbd77d1d6343e9bc5ff4e094f9a35e31c9edc0262872d422d4c055611bfa76b91a71d77cd SHA512 1c28111a6dffd3d73dbc61fb39e25c7da17265bbda8a58fe050fca40ebc6477d196ccc51a4796748d1837bf8e16a4ae86fdde41059da9de7b4c618cdd8cb702d
 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 7c410b8f787d..569f65967e0e 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit llvm prefix python-any-r1 toolchain-funcs
 
diff --git a/dev-libs/libclthreads/Manifest b/dev-libs/libclthreads/Manifest
new file mode 100644
index 000000000000..00b3c8d35589
--- /dev/null
+++ b/dev-libs/libclthreads/Manifest
@@ -0,0 +1,4 @@
+AUX libclthreads-2.4.2-Makefile.patch 1130 BLAKE2B 485f02a464a367fb32ff6b888beaa7cf293d295ca8ae4b7f8f36b540c1dafba6f2ba09dcead778bac4a69931c63eb4191341399e5042b00518c7422009786444 SHA512 a8a72ee6cb0eea6c37ecd517ad1398255e2c4c107f2d5f22e08cc9fb8b7de01198f8dfe0938024ed6053244bc1968ff369a970d908ac00ba57c10751b3b2e968
+DIST clthreads-2.4.2.tar.bz2 14357 BLAKE2B c73696e816431d70737d0481237efbb7a05d274f9fb0728b2bf2ba748a4a0540672af92ab8d35b6ab331c91841185aeb3705f5a75e3446a0c2c3631a8b331421 SHA512 a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131
+EBUILD libclthreads-2.4.2.ebuild 785 BLAKE2B cc8f17bb5ac2a08c02b654371a23290528ca3416ebe8e4eb721efb0e45c45aacc0f1d96d53a9ecdcf08cc15b0f66e46bb1ffb13d993abd36d7566026b174a3bf SHA512 00af75e98f2fd09b9dcdffaef4bac4236c6c20d5918ef96a3631c9612efdb40a11e84dce96815016306c0b5d894a88737386efbc741b76fc24d1826a8b9d1042
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch b/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
new file mode 100644
index 000000000000..fa386fff7914
--- /dev/null
+++ b/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
@@ -0,0 +1,33 @@
+diff --git a/source/Makefile b/source/Makefile
+index f841f3f..206e607 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ 
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I.  
+-CXXFLAGS += -Wall -O2 -fPIC
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC
+ LDLFAGS += 
+ LDLIBS +=
+ 
+@@ -51,12 +50,12 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
+ 
+ 
+ install:	$(CLTHREADS_MIN)
+-	install -d $(DESTDIR)$(PREFIX)/$(INCDIR)
+-	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
+-	install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR)
+-	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+-	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO)
++	install -d $(DESTDIR)${PREFIX}/$(INCDIR)
++	install -d $(DESTDIR)${PREFIX}/$(LIBDIR)
++	install -m 644 $(CLTHREADS_H) $(DESTDIR)${PREFIX}/$(INCDIR)
++	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)
++	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_SO)
++	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_MAJ)
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(INCDIR)/$(CLTHREADS_H)
diff --git a/dev-libs/libclthreads/libclthreads-2.4.2.ebuild b/dev-libs/libclthreads/libclthreads-2.4.2.ebuild
new file mode 100644
index 000000000000..c67a139ad53f
--- /dev/null
+++ b/dev-libs/libclthreads/libclthreads-2.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="POSIX threads C++ access library"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+S="${WORKDIR}/clthreads-${PV}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+)
+
+src_compile() {
+	cd "${S}"/source || die "Failed to cd to sources"
+	tc-export CXX
+	emake
+}
+
+src_install() {
+	default
+
+	cd "${S}"/source || die "Failed to cd to sources"
+	emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
+}
diff --git a/dev-libs/qof/metadata.xml b/dev-libs/libclthreads/metadata.xml
index 39980802b1da..c870d0eef0ab 100644
--- a/dev-libs/qof/metadata.xml
+++ b/dev-libs/libclthreads/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index b382dcef03cd..5d481bce2f42 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,7 +1,3 @@
-AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
-AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
-DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.12-r1.ebuild 1444 BLAKE2B a0119b88e272fe49732c8c013c438748c1306d76a3b96be15da31ecad575a7cf87d42dee326403c097245a8f2568e986924ebc1647532987b35a7c90d374bedd SHA512 6ed6247270ff00453edaca0ca84ba0eb09949471bcd2f9f2c78e378496532370d94490467711d2f25a5b2f1af85ab5aee6a03466396dcd23ca6ac781c281dc49
-EBUILD libcroco-0.6.13.ebuild 1350 BLAKE2B 4f429789f1c19651005c7dc95bb960babc9686cd53b621444de08847c8fb14f01941d08179416664c0d59055e37c86544222e0be271c340522bd6c7bc331f2a5 SHA512 c953e8ee9df57c38609ed904879f60177d34c7da660500c033efc90b625044ad64b24dbb80ec7f9d7206da24f4e99562edb53ef9c595aa3d90dab17419c6ac0a
+EBUILD libcroco-0.6.13.ebuild 1349 BLAKE2B b1642954a088213c1ed6bbf008ca82653595f9c4dd6153575bccce47bc0f3f5a226f52af772e959f0def42850e9e26802175665ea2a24e87488941fa9b9dd26b SHA512 c3a01abc3cef6f9f38abe2b78079f4438265c949a041fcdc3e339a5eacd155730001ffb022aa89d60cef04c000ddd44f84fe74dfe215dca980991b3d6cda82af
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch b/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch
deleted file mode 100644
index 50095d50b898..000000000000
--- a/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro
-Date: Sun, 16 Apr 2017 13:13:43 +0200
-Subject: [PATCH 1/3] input: check end of input before reading a byte
-
-When reading bytes we weren't check that the index wasn't
-out of bound and this could produce an invalid read which
-could deal to a security bug.
----
-leio: Snipped cosmetic chunks
-
-diff --git a/src/cr-input.c b/src/cr-input.c
-index 49000b1..3b63a88 100644
---- a/src/cr-input.c
-+++ b/src/cr-input.c
-@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this)
- enum CRStatus
- cr_input_read_byte (CRInput * a_this, guchar * a_byte)
- {
-+        gulong nb_bytes_left = 0;
-+
-         g_return_val_if_fail (a_this && PRIVATE (a_this)
-                               && a_byte, CR_BAD_PARAM_ERROR);
- 
-@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte)
-         if (PRIVATE (a_this)->end_of_input == TRUE)
-                 return CR_END_OF_INPUT_ERROR;
- 
-+        nb_bytes_left = cr_input_get_nb_bytes_left (a_this);
-+
-+        if (nb_bytes_left < 1) {
-+                return CR_END_OF_INPUT_ERROR;
-+        }
-+
-         *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index];
- 
-         if (PRIVATE (a_this)->nb_bytes -
--- 
-2.10.1
-
diff --git a/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch b/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch
deleted file mode 100644
index 65a08f4ebabc..000000000000
--- a/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <qignacio@amazon.com>
-Date: Sun, 16 Apr 2017 13:56:09 +0200
-Subject: [PATCH 3/3] tknzr: support only max long rgb values
-
-This fixes a possible out of bound when reading rgbs which
-are longer than the support MAXLONG
----
- src/cr-tknzr.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c
-index 1a7cfeb..1548c35 100644
---- a/src/cr-tknzr.c
-+++ b/src/cr-tknzr.c
-@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
-         status = cr_tknzr_parse_num (a_this, &num);
-         ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
- 
-+        if (num->val > G_MAXLONG) {
-+                status = CR_PARSING_ERROR;
-+                goto error;
-+        }
-+
-         red = num->val;
-         cr_num_destroy (num);
-         num = NULL;
-@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
-                 status = cr_tknzr_parse_num (a_this, &num);
-                 ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
- 
-+                if (num->val > G_MAXLONG) {
-+                        status = CR_PARSING_ERROR;
-+                        goto error;
-+                }
-+
-                 PEEK_BYTE (a_this, 1, &next_bytes[0]);
-                 if (next_bytes[0] == '%') {
-                         SKIP_CHARS (a_this, 1);
--- 
-2.10.1
-
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
deleted file mode 100644
index 9cea2f4ac750..000000000000
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
-HOMEPAGE="https://git.gnome.org/browse/libcroco/"
-
-LICENSE="LGPL-2"
-SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-CVE-2017-7960.patch
-	"${FILESDIR}"/${PV}-CVE-2017-7961.patch
-)
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	einstalldocs
-}
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index d3276daef92e..33978ea9213d 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 45373cb0a00e..f7ede9d96639 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,6 +1,3 @@
-AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b68d7090fe961d36ce9c0ca06f85acad67fef1102952bca991b1f7b5886c1a9a421b4bcc7ce146a74b645f98 SHA512 a8df67b6793cecda6787dcf8023f6cbf50066ebb282c94ff1c22f5e51ed331df841b33627bd0116a73fc38522bda0071a353a2bad807d599acc672e029a499ed
-DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
 DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
-EBUILD libdazzle-3.30.2.ebuild 1418 BLAKE2B 17728c31418560be84d81ad57278bbddeaeec59657956a22c548e70861639eff121d4199fc57d321e88f90dbfbc791fb2f9b51104d09a3a44849d34452e52717 SHA512 e81703274d2f3801069553ebcfe5a77f3c4f096741d9ed44ac2f02ce971b6e54c6561a4a0c6bab3a0ca0a44bbb17fd03c1dfa0522a57b8b6220ca0e17ff0af3c
 EBUILD libdazzle-3.32.3.ebuild 1578 BLAKE2B c6453a3ac2cd5d1041883d333b28c897a7cbcf3098b510ce8727ff9c9eefd109181539bc250c4577477c751321b151ba2c2137028da63f530943cf51c7b162c5 SHA512 fce495a156c818aa470fc3b2bbdb9f2eeb17cadaaf1f8a38f950490b70b68008728406fab78d20fa48d0a66898e3a6c3e824eda10f66c987340aad3d4971b8f4
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/files/3.30.2-leak-fix.patch b/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
deleted file mode 100644
index b3a1debf605e..000000000000
--- a/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6f8436709430fd5ebaebd90dd55885636030940d Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Mon, 19 Nov 2018 17:43:24 -0800
-Subject: [PATCH] three-grid: don't leak values from hashtable
-
-We are responsible for freeing the GList chain, so ensure we do that at
-the end of size-allocate.
----
- src/widgets/dzl-three-grid.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/widgets/dzl-three-grid.c b/src/widgets/dzl-three-grid.c
-index 0de5484..d00d0b1 100644
---- a/src/widgets/dzl-three-grid.c
-+++ b/src/widgets/dzl-three-grid.c
-@@ -569,6 +569,8 @@ dzl_three_grid_size_allocate (GtkWidget     *widget,
-       area.y += child_alloc.height + priv->row_spacing;
-       area.height -= child_alloc.height + priv->row_spacing;
-     }
-+
-+  g_list_free (values);
- }
- 
- static void
--- 
-2.17.0
-
diff --git a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
deleted file mode 100644
index 3fd594c25113..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-leak-fix.patch # from libdazzle-3-30 branch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# -Denable_rdtscp=false # TODO: CPU_FLAGS_X86 for it?
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 5fd68be5fbfe..5365b08e2503 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,4 +1,4 @@
 AUX libdbusmenu-qt-0.9.3_pre20160218-cmake.patch 7959 BLAKE2B feef71cd51c36607b60104d0ca24eadd269e79ad22a633625b1b855137f97b8da645e15b10a374911bb5e9ea33b71e17d9336211233f4f12155f3dfc5f28b685 SHA512 00db7fd1c5d90f03f0963abb413349043ef215cd7a9f41f78e4233ff53590a9b9854ad500b9899f7b344ce9853d8d8200abb31565fda855793e1edd6e76800c0
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 823 BLAKE2B 02c67bdedb7104bce6031bcd2250bab168e142d9f2e3577e8d48ad54ff04c62a1495a291d54124a651d3d046625104e1541dc0a42ddd720b0da6f38862604e44 SHA512 cbc29dbd5748d9e8a6cb4ec991218b650911a06a4a14c3924aba5c64d8908709b6686ddf7167dc06f7706a03bb184400f6581954ae55ebd9a63acb610ba2c440
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 811 BLAKE2B 4aad2a63cecf98d79594f9c483609d88276e37ce773c1caa1b977f4c336f2cec5e6c7efb202b88c525bd95506dee82abc29e583eb55ce121b9772d710299e6b0 SHA512 94e77240998a4fc34d1a96d78fa6a8ea1f28e9d82246dc7c07a1f3cb9f5793189b5a34406b00daabdea55556ea2903c32b9aef8b312ddca154eb2cab71253166
 MISC metadata.xml 323 BLAKE2B 02dce303163a2303c73bb15ae09358e93077a751333d7204c2372ed7cf7667137ea4d633250b39ee5ee032316433cddedca5b80ec01ff8300d8ac221793bddbe SHA512 290f7befe52993609acc464791369b56b20c1584e4266166073d504dd0ea66a2e2f6f786fcc56e1928125b37dd3f7461ab29b00e17e012ef2ea6c34321f643ba
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
index 91e13fae7055..ce7c70567284 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_PV=${PV/_pre/+16.04.}
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
@@ -28,7 +28,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	cmake_comment_add_subdirectory tools
 	# tests fail due to missing connection to dbus
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index df043f92a74b..f82739b9a67c 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,6 @@
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
-EBUILD libdnet-1.12-r1.ebuild 1529 BLAKE2B 9e27c23bc928cd8937e17b212df10bbe3c7371cb018937b44b0e82baaa3654ed1abc242a2fb42fddace2ceaeb8b7336b05a0396f8b3657869af229674514094f SHA512 4defa994ba07f5a41285acb108866c3dd177fb9797bff154bc7311498da33a6737a67c608390c7e79aca5f43b87ad1503ea7b7ad10c5b9e0bd7b6478c8f64712
+EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B e4aeee34c99dfdd55612a982a98026f63f565b48589f63ee62c1db28ae61e4166510a135405e291ca5aed0f03e5ffb434e03d158a1704df1b247aa563cb07ae7 SHA512 52063922be42b93f08eec10fd361cb850f2fc5f5f7aebd3e93ea92f85d5b8173ef92c05c0e9f07e616eb884e9b1172459565d3ea4719f6141427ece602b34417
 EBUILD libdnet-1.12.ebuild 1513 BLAKE2B b362095dea9072d48a29025cd1c6d2b171d66ed0f3e0ce7c13f0e1817f25d7467320fa8f2224f792cf8a9b759e83baf099392ab641c16d08c11f98c33fa27822 SHA512 42aba60863524c059164079a31a6edd8e2942d23a15be57c7e04935480d8fddafd3aea866b3f4017d22607bb8fa4a082ffa97d1af82c44162164217965c0aea2
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.12-r1.ebuild b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
index 1e9db55a13e9..d2b0ca1e6d6e 100644
--- a/dev-libs/libdnet/libdnet-1.12-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
@@ -11,7 +11,7 @@ inherit autotools distutils-r1
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="https://github.com/dugsong/libdnet"
 SRC_URI="
-	${HOMEPAGE}/archive/${P}.tar.gz
+	https://github.com/dugsong/libdnet/archive/${P}.tar.gz
 	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )
 "
 LICENSE="LGPL-2"
diff --git a/dev-libs/libdnsres/Manifest b/dev-libs/libdnsres/Manifest
index 0676d342bc0a..cf076a56ab17 100644
--- a/dev-libs/libdnsres/Manifest
+++ b/dev-libs/libdnsres/Manifest
@@ -1,4 +1,5 @@
-AUX libdnsres-0.1a-autotools.patch 1020 BLAKE2B 456ef2ebd3f4b12181819366503e5297710f12e7cdf7270f5a0df14cea43271bdd499a93c1eb3acda32a094b87c4fec471027b197e34524830f1a6f64640d529 SHA512 12709a918aaaf135f9cdacac52fed2d6ec29a171d2474f375e1a014158c98fbcd2d1b498162e1e1ccd1b78461df796c88c876253c4a0747a9b4ae428634c4708
+AUX libdnsres-0.1a-autotools.patch 887 BLAKE2B 5141d50a6e55f1ed49471dab5ab328352731e271514e37a40d65cffd0e7f1b9024155ff5be1e181950a2b355e618645e041c7c84fd7f574c96d0565f22d101db SHA512 f482017f43bb7bd7050c6246d7d48e4126f33c63fd7b0bf83ba12f9ddbfbdfbdf67d7ac5b6e55668edb462c8af8d5402f4b57cfc1a2aa8e4bb75440d2c02b11d
 DIST libdnsres-0.1a.tar.gz 360583 BLAKE2B b2b3befaf3910b46e826c17ec36bb90271b334a58ef5d02bd69ad0aa8643e2fe8ab4a1f86b59e4fbd1d41ef2c01ea01995b07b68922740fc86bee3d207bcc65d SHA512 d6b1c248a99eeaea3524ee8af01dd31ba507179a69ffb313a167611792084d5efc99fe6462a63480932faa3493b01c3c43fc7575dab6aaade885583bee006f67
 EBUILD libdnsres-0.1a-r2.ebuild 568 BLAKE2B b40135288d0292a597e889576f0a282e58782f5da79b845a618d2710b86ff5c938b51c34d36cce6709fc30c9ad496a89d61efe71eccc1699a9ad41c3843404d9 SHA512 c2148ee736a8dffba14ada064dcc2664f782c201c40f4295c1cbaec9e978218ee5003f6976646755985cf379c1ab6f42f78273cabe90323fd40ae03176097c23
+EBUILD libdnsres-0.1a-r3.ebuild 724 BLAKE2B db22d8f5918385653bc1102ba9af157ad00888535ba30304e33332bed01db78045abb9edfb3ec7072b763230a85b29d9b80156ed2292fe9acf48aa31f2ac8ed5 SHA512 5f9a1c9a1f891dc4afba99314f14fc394962a31fd8e6eff9c2123a0a2076a1b76b2a843ef5ac2db9583fe2852c6734a24050e107f34087d4ce74bfea1d3ce5c0
 MISC metadata.xml 821 BLAKE2B fe11fa4932033b3bdbe6f7b55495aca6a1ff5d745fa65654d42ac0dc3b5992a7cf91cc705113b4a2c3ea04c0384589cd4f75c2c4d496b834db664313be30f711 SHA512 cbb9306da8e15d166cdd09e0bf6e8a07030a12d45bda18d56f45b18e439c6e199963189047fe846dd59b33408de6a101ecb1a7c251cfb5dc5c34cc313a741134
diff --git a/dev-libs/libdnsres/files/libdnsres-0.1a-autotools.patch b/dev-libs/libdnsres/files/libdnsres-0.1a-autotools.patch
index 3e2466af57f7..9f544ca898c6 100644
--- a/dev-libs/libdnsres/files/libdnsres-0.1a-autotools.patch
+++ b/dev-libs/libdnsres/files/libdnsres-0.1a-autotools.patch
@@ -1,7 +1,5 @@
-Index: libdnsres-0.1a/Makefile.am
-===================================================================
---- libdnsres-0.1a.orig/Makefile.am
-+++ libdnsres-0.1a/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -10,12 +10,12 @@ libdnsres_la_SOURCES = res_comp.c res_de
  	res_data.c res_init.c res_query.c res_send.c resolv.h dnsres.h \
  	gethostnamadr.c getaddrinfo.c getservbyname.c getservent.c base64.c \
diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
new file mode 100644
index 000000000000..99fa34502800
--- /dev/null
+++ b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A non-blocking DNS resolver library"
+HOMEPAGE="https://www.monkey.org/~provos/libdnsres/"
+SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-libs/libevent"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+src_prepare() {
+	default
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 2950afd678ec..12f3b93b932c 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,3 +1,3 @@
 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
-EBUILD libebml-1.3.9.ebuild 604 BLAKE2B 450b828a4410444fe20a1ce56ae3bfeeca85572b1f83bd69e67757770df25f6fb890cc4eb47d0fb777227264af599e2b24a197923ec9f0e33a95840c10bd4d10 SHA512 50032a2a3fef703d529440764efba4ea99c73e7d4afaeea3a2a8287966a476cb47a7a6a8a40c6f2a64b180b2d7b6ab790c24da32e1415b39c32c58b4d528af8e
+EBUILD libebml-1.3.9.ebuild 592 BLAKE2B 709c14fdfe3dc18a369b27a374633b7e42b367f725278c8486cfdc9988d43e0e548591d36211071e12d37d8e836b3a8f1c901ba4a09c4fbfde7429d6818d9e9b SHA512 0fcf1ac2460079c288154afdfaf1793a909e63b994eeb21cc7f904a70a3189d198d1fa8f4ebabbc583af9fdda2bf176af166c17349ed287c3e385ce49ab459a9
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.9.ebuild b/dev-libs/libebml/libebml-1.3.9.ebuild
index 95e1aa1e6847..99829f7ce5b2 100644
--- a/dev-libs/libebml/libebml-1.3.9.ebuild
+++ b/dev-libs/libebml/libebml-1.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Extensible binary format library (kinda like XML)"
 HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
@@ -16,5 +16,5 @@ IUSE=""
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 236ef4e49263..9cbaa624b6b1 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,14 +1,10 @@
-AUX libedit-20100424.3.0-bsd.patch 724 BLAKE2B a0129c3f1597dc1f79887b9b13352f0261cd3fc450f7ca617025d7bcc8dac8169285c9b16ce4efdee9f2d5e9d29e3c5bb3a8075564b6ebe3d9143f2c7d0757e5 SHA512 67e0316db39b581b40dcfc15cfc308398d7865d29adc31e43159a30d8b94f50b486aa5da2a9599154138c1c8ae56fa9f6dca663eff174559f8896f50f973eefb
-AUX libedit-20110709.3.0-weak-reference.patch 651 BLAKE2B 87e5bb61e3298a3dfe5553d1ea402eacbf0781c130c44581beeb53c1983e72d5c8ca26549792e6cc6ac357c1731c4cf150d99c6774cc0c71dc810a1c51c75454 SHA512 6f905d4254be6a11a135315346e41579e30c496d7d28caef1daa89079574be081c092d653034fd89a1ce84495f1566ef85d50b274cb87b249b4706e954c40420
-AUX libedit-20120311-3.0-el_fn_sh_complete.patch 7724 BLAKE2B 7edebf657e91334cc71dbeb20bba577f0fc9d65d92cf47de9c070021ad63874c1756508b8d37940d8b50d7e1580616dc9458e1d229b53a3c938e14ecd61558fb SHA512 c62490079ff73a14310c6840d379d950699cd178e5e4a15231a79ea06600ba7bb805630e032d5d49ea5479e4919514ee79b035bf7d00e20b6e8512c84920bba3
 AUX libedit-20170329.3.1-el_fn_sh_complete.patch 6942 BLAKE2B 121f410a3ea6c075873ad303e46bb2086925f4650032a8cb7ab634c77791805666aef344137063cf0f4215c28199181d17c65881dac84fd9e3ca91f7111fb679 SHA512 7715cbaaf38c09f62a885cc66edc416b26ae49cef627a7d22a256b787d7ad3784f90e49e906dead009ad86576894c25a839a96dfe26ab9d2ee5e0a8cba71732d
 AUX libedit-20170329.3.1-ncursesprivate.patch 438 BLAKE2B bbef561b440e323fe5ce96c9f2cfc5183e68839b6911dff251c323b1db32b0fe5fb8ecf64c799ab137f786c5be4570eddac0255aed379a23fffd578020bcf94d SHA512 aa2b52b36050413941892eaf66fe7b66e992c14cda29ee2733e8359b5990eed9537fb0422fd3704b32a70f1b9e350a0b0f06aaff9a55bb89b764d57a6f0dbef1
 AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b50263f297db16bd838dd31b571ee69f0f15056542be533115d92115963e49b357e0caddcb34a0e5a9eb7160fddecb9ca5c SHA512 e03cef80831c8982705e9ba3448a379e48a443b3b09b4c6f6be56ca2d0ac594f4569b76739551cc945bef27fc0fac2ffea3ad532355933a528753338f4094172
-AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893edc8cef17c0825d4aa6046da2456b5429f48de056211d050c77fa40689baa1f0eb56259dfaf2f93a778f10720d7006a SHA512 41175b20f7b925e347db008d5e8a535b8326cd2c010a67b9db3a59131fce77a7791b7940e7eea9d68e82dbd3731efaa503d4bd218d78b29f946152dd56bd9b14
-DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
-EBUILD libedit-20130712.3.1.ebuild 1252 BLAKE2B 688dde4eedbe0e0f5219eeafcdc4db6722659b692878606ce23034c69dc90f436e062707146016aa58c5490d1006cbd0f02151332d0d5a73b3b3d33e32954fb2 SHA512 ed3c7e80bad236fdf7912e701dc39cca8460463c45406f8e04791d465077ee222b59c3cb997d03fca72a92f007b5bc29e2a5c852aafda732457edc3162158f11
+DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
 EBUILD libedit-20170329.3.1.ebuild 1262 BLAKE2B f4e569da5c67c84b3a02d7a840356e63f63bcb55754fd89c5aa5b2c7d355b4ed7698e62800cbe633372ca1f165a4843e84f9d3ae0816619bfbbec8c44696ba0e SHA512 7d9a1c348f1afcef82fd6e28e233eeb84cfe70329b833bb054b67a491799b2c13aa92d3064461cb1d3008b8d80816e42031d0cd8bf18374721cf8d770a1f90db
-EBUILD libedit-20190324.3.1.ebuild 1204 BLAKE2B 9e9eed65d4ce01048ccb2442c69d949ee6e5a0a9fa913adb98ed487485ce36401b7c9d8d50d0274e89ce9eb482b81fab5707a73154f75267b129c2dccf0f72ca SHA512 c6f7716f5d64eb75d5c5a081e6e6a37035b8cc7e8ef06eb1b9b62815821c0569eb67e079ad65a74dcb23e4feda3d8d874baf33ba98b4c78c93b34e190e4cface
+EBUILD libedit-20190324.3.1.ebuild 1193 BLAKE2B 5f413962c34c846e45e50bb1553493553a47089e7b63e3156ee12a61072e810fd5ef6ec493e05d2d479a7b20dd1117b6ba9d4a14d1da0b47ea44e0a28838adf9 SHA512 4c72cb7efbb9cfc3c25371ce84ea3dcfb50d10b0a02a5d92e38031d276f9bccee69f008b761cac68d4b215355a00fe933453d747483347d900c040eeb6f909a0
+EBUILD libedit-20191211.3.1.ebuild 1162 BLAKE2B 571be8db01b101a3110e650c5d1357c2705fb82753ade3c4ff8cedbdd6861aef380aab19240e8c747149b5af505e1c5aab137c9900b4270a4d013bbd262c3311 SHA512 1444594a3cc5157c08ec9e63c4b379bdc289dfbc5df4f86461e421e890213f838b3a9c369fdb5672ff81ce2e4beb379b75d714bdd775e9ddebc375a3423041a1
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch b/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch
deleted file mode 100644
index e230a76d709f..000000000000
--- a/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/chartype.h b/src/chartype.h
-index c35825c..be5aac0 100644
---- a/src/chartype.h
-+++ b/src/chartype.h
-@@ -44,7 +44,7 @@
-  * supports non-BMP code points without requiring UTF-16, but nothing
-  * seems to actually advertise this properly, despite Unicode 3.1 having
-  * been around since 2001... */
--#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
-+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch b/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch
deleted file mode 100644
index a4399593d636..000000000000
--- a/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libedit-20110709-3.0/src/vi.c.old	2011-07-11 18:21:16.000000000 +0000
-+++ libedit-20110709-3.0/src/vi.c	2011-07-11 18:24:29.000000000 +0000
-@@ -918,7 +918,7 @@
-  * NB: posix implies that we should enter insert mode, however
-  * this is against historical precedent...
-  */
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -926,7 +926,7 @@
- /*ARGSUSED*/
- vi_alias(EditLine *el, Int c)
- {
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- 	char alias_name[3];
- 	char *alias_text;
- 
diff --git a/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch b/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch
deleted file mode 100644
index b0b157a24fda..000000000000
--- a/dev-libs/libedit/files/libedit-20120311-3.0-el_fn_sh_complete.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Port the el_fn_sh_complete from FreeBSD.
-This function is required by FreeBSD-9.0's sh.
-So that we can drop the bundled version in FreeBSD-9.0
-
-diff -uNr libedit-20120311-3.0/src/filecomplete.c libedit-20120311-3.0.freebsd/src/filecomplete.c
---- libedit-20120311-3.0/src/filecomplete.c	2012-03-11 09:54:58.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/filecomplete.c	2012-04-23 12:14:25.000000000 +0000
-@@ -56,6 +56,9 @@
- 
- static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
-     '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-+/* Tilde is deliberately omitted here, we treat it specially. */
-+static const Char extra_quote_chars[] = { ')', '}', '*', '?', '[', '$', '\0' };
-+
- 
- 
- /********************************/
-@@ -411,10 +414,14 @@
- 	char **(*attempted_completion_function)(const char *, int, int),
- 	const Char *word_break, const Char *special_prefixes,
- 	const char *(*app_func)(const char *), size_t query_items,
--	int *completion_type, int *over, int *point, int *end)
-+	int *completion_type, int *over, int *point, int *end,
-+	const char *(*find_word_start_func)(const char *, const char *),
-+	char *(*dequoting_func)(const char *),
-+	char *(*quoting_func)(const char *))
- {
- 	const TYPE(LineInfo) *li;
- 	Char *temp;
-+	char *dequoted_temp;
-         char **matches;
- 	const Char *ctemp;
- 	size_t len;
-@@ -435,17 +442,28 @@
- 
- 	/* We now look backwards for the start of a filename/variable word */
- 	li = FUN(el,line)(el);
-+	if (find_word_start_func)
-+		ctemp = ct_decode_string(find_word_start_func(ct_encode_string(li->buffer,&el->el_scratch), ct_encode_string(li->cursor,&el->el_scratch)),&el->el_scratch);
-+	else {
- 	ctemp = li->cursor;
- 	while (ctemp > li->buffer
- 	    && !Strchr(word_break, ctemp[-1])
- 	    && (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
- 		ctemp--;
-+	}
- 
- 	len = (size_t)(li->cursor - ctemp);
- 	temp = el_malloc((len + 1) * sizeof(*temp));
- 	(void)Strncpy(temp, ctemp, len);
- 	temp[len] = '\0';
- 
-+	if (dequoting_func) {
-+		dequoted_temp = dequoting_func(ct_encode_string(temp,&el->el_scratch));
-+		if (dequoted_temp == NULL)
-+			return retval;
-+	} else
-+		dequoted_temp = NULL;
-+
- 	/* these can be used by function called in completion_matches() */
- 	/* or (*attempted_completion_function)() */
- 	if (point != 0)
-@@ -456,14 +474,14 @@
- 	if (attempted_completion_function) {
- 		int cur_off = (int)(li->cursor - li->buffer);
- 		matches = (*attempted_completion_function)(
--		    ct_encode_string(temp, &el->el_scratch),
-+		    dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch),
- 		    cur_off - (int)len, cur_off);
- 	} else
- 		matches = 0;
- 	if (!attempted_completion_function || 
- 	    (over != NULL && !*over && !matches))
- 		matches = completion_matches(
--		    ct_encode_string(temp, &el->el_scratch), complet_func);
-+		    dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch), complet_func);
- 
- 	if (over != NULL)
- 		*over = 0;
-@@ -478,9 +496,19 @@
- 		 * possible matches if there is possible completion.
- 		 */
- 		if (matches[0][0] != '\0') {
-+			char *quoted_match;
-+			if (quoting_func) {
-+				quoted_match = quoting_func(matches[0]);
-+				if (quoted_match == NULL)
-+					goto free_matches;
-+			} else
-+				quoted_match = NULL;
-+
- 			el_deletestr(el, (int) len);
- 			FUN(el,insertstr)(el,
--			    ct_decode_string(matches[0], &el->el_scratch));
-+			    ct_decode_string(quoted_match? quoted_match : matches[0], &el->el_scratch));
-+
-+			free(quoted_match);
- 		}
- 
- 		if (what_to_do == '?')
-@@ -553,12 +581,14 @@
- 			retval = CC_NORM;
- 		}
- 
-+free_matches:
- 		/* free elements of array and the array itself */
- 		for (i = 0; matches[i]; i++)
- 			el_free(matches[i]);
- 		el_free(matches);
- 		matches = NULL;
- 	}
-+	el_free(dequoted_temp);
- 	el_free(temp);
- 	return retval;
- }
-@@ -572,5 +602,102 @@
- {
- 	return (unsigned char)fn_complete(el, NULL, NULL,
- 	    break_chars, NULL, NULL, (size_t)100,
--	    NULL, NULL, NULL, NULL);
-+	    NULL, NULL, NULL, NULL,
-+	    NULL, NULL, NULL);
-+}
-+
-+static const char *
-+sh_find_word_start(const char *buffer, const char *cursor)
-+{
-+	const char *word_start = buffer;
-+
-+	while (buffer < cursor) {
-+		if (*buffer == '\\')
-+			buffer++;
-+		else if (Strchr(break_chars, *buffer))
-+			word_start = buffer + 1;
-+
-+		buffer++;
-+	}
-+
-+	return word_start;
-+}
-+
-+
-+static char *
-+sh_quote(const char *str)
-+{
-+	const char *src;
-+	int extra_len = 0;
-+	char *quoted_str, *dst;
-+
-+	if (*str == '-' || *str == '+')
-+		extra_len += 2;
-+	for (src = str; *src != '\0'; src++)
-+		if (Strchr(break_chars, *src) ||
-+		    Strchr(extra_quote_chars, *src))
-+			extra_len++;
-+
-+	quoted_str = malloc(sizeof(*quoted_str) *
-+	    (strlen(str) + extra_len + 1));
-+	if (quoted_str == NULL)
-+		return NULL;
-+
-+	dst = quoted_str;
-+	if (*str == '-' || *str == '+')
-+		*dst++ = '.', *dst++ = '/';
-+	for (src = str; *src != '\0'; src++) {
-+		if (Strchr(break_chars, *src) ||
-+		    Strchr(extra_quote_chars, *src))
-+			*dst++ = '\\';
-+		*dst++ = *src;
-+	}
-+	*dst = '\0';
-+
-+	return quoted_str;
-+}
-+
-+
-+static char *
-+sh_dequote(const char *str)
-+{
-+	char *dequoted_str, *dst;
-+
-+	/* save extra space to replace \~ with ./~ */
-+	dequoted_str = malloc(sizeof(*dequoted_str) * (strlen(str) + 1 + 1));
-+	if (dequoted_str == NULL)
-+		return NULL;
-+
-+	dst = dequoted_str;
-+
-+	/* dequote \~ at start as ./~ */
-+	if (*str == '\\' && str[1] == '~') {
-+		str++;
-+		*dst++ = '.';
-+		*dst++ = '/';
-+	}
-+
-+	while (*str) {
-+		if (*str == '\\')
-+			str++;
-+		if (*str)
-+			*dst++ = *str++;
-+	}
-+	*dst = '\0';
-+
-+	return dequoted_str;
-+}
-+
-+
-+/*
-+ * completion function using sh quoting rules; for key binding
-+ */
-+/* ARGSUSED */
-+unsigned char
-+_el_fn_sh_complete(EditLine *el, int ch __attribute__((__unused__)))
-+{
-+	return (unsigned char)fn_complete(el, NULL, NULL,
-+	    break_chars, NULL, NULL, 100,
-+	    NULL, NULL, NULL, NULL,
-+	    sh_find_word_start, sh_dequote, sh_quote);
- }
-diff -uNr libedit-20120311-3.0/src/filecomplete.h libedit-20120311-3.0.freebsd/src/filecomplete.h
---- libedit-20120311-3.0/src/filecomplete.h	2010-04-22 19:13:17.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/filecomplete.h	2012-04-23 12:04:12.000000000 +0000
-@@ -35,7 +35,10 @@
-     char *(*)(const char *, int),
-     char **(*)(const char *, int, int),
-     const Char *, const Char *, const char *(*)(const char *), size_t,
--    int *, int *, int *, int *);
-+    int *, int *, int *, int *,
-+    const char *(*)(const char *, const char *),
-+    char *(*)(const char *),
-+    char *(*)(const char *));
- 
- void fn_display_match_list(EditLine *, char **, size_t, size_t);
- char *fn_tilde_expand(const char *);
-Binary files libedit-20120311-3.0/src/filecomplete.o and libedit-20120311-3.0.freebsd/src/filecomplete.o differ
-diff -uNr libedit-20120311-3.0/src/histedit.h libedit-20120311-3.0.freebsd/src/histedit.h
---- libedit-20120311-3.0/src/histedit.h	2011-08-02 06:52:08.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/histedit.h	2012-04-23 11:44:33.000000000 +0000
-@@ -113,6 +113,7 @@
- int		 el_set(EditLine *, int, ...);
- int		 el_get(EditLine *, int, ...);
- unsigned char	_el_fn_complete(EditLine *, int);
-+unsigned char	_el_fn_sh_complete(EditLine *, int);
- 
- /*
-  * el_set/el_get parameters
-diff -ur libedit-20120311-3.0/src/readline.c libedit-20120311-3.0.freebsd/src/readline.c
---- libedit-20120311-3.0/src/readline.c	2012-03-11 09:54:58.000000000 +0000
-+++ libedit-20120311-3.0.freebsd/src/readline.c	2012-04-23 12:20:11.000000000 +0000
-@@ -1773,7 +1773,7 @@
- 	    _rl_completion_append_character_function,
- 	    (size_t)rl_completion_query_items,
- 	    &rl_completion_type, &rl_attempted_completion_over,
--	    &rl_point, &rl_end);
-+	    &rl_point, &rl_end, NULL, NULL, NULL);
- 
- 
- }
diff --git a/dev-libs/libedit/files/libedit-ncursesprivate.patch b/dev-libs/libedit/files/libedit-ncursesprivate.patch
deleted file mode 100644
index 0af9b1b882a3..000000000000
--- a/dev-libs/libedit/files/libedit-ncursesprivate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libedit-20110709-3.0/libedit.pc.in
-===================================================================
---- libedit-20110709-3.0.orig/libedit.pc.in
-+++ libedit-20110709-3.0/libedit.pc.in
-@@ -7,6 +7,7 @@ Name: libedit
- Description: command line editor library provides generic line editing, history, and tokenization functions.
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -ledit @LIBS@
-+Libs: -L${libdir} -ledit
-+Libs.private: @LIBS@
- Cflags: -I${includedir} -I${includedir}/editline
- 
diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
deleted file mode 100644
index 1427ce62fb01..000000000000
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator base multilib-minimal usr-ldscript
-
-MY_PV=$(get_major_version)-$(get_after_major_version)
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="BSD replacement for libreadline"
-HOMEPAGE="https://thrysoee.dk/editline/"
-SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
-	!<=sys-freebsd/freebsd-lib-6.2_rc1"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-ncursesprivate.patch"
-	"${FILESDIR}/${PN}-20100424.3.0-bsd.patch"
-	"${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch"
-	"${FILESDIR}/${PN}-20120311-3.0-el_fn_sh_complete.patch"
-	)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-widec \
-		--enable-fast-install
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	gen_usr_ldscript -a edit
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
index 771faf6ae329..74c4924dd3c5 100644
--- a/dev-libs/libedit/libedit-20190324.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20190324.3.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"
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild
new file mode 100644
index 000000000000..6c39b3fc8d59
--- /dev/null
+++ b/dev-libs/libedit/libedit-20191211.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+
+MY_PV=${PV/./-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline"
+HOMEPAGE="https://thrysoee.dk/editline/"
+SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20170329.3.1-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-widec \
+		--enable-fast-install
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	gen_usr_ldscript -a edit
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	# file collision with sys-libs/readline
+	rm "${ED}/usr/share/man/man3/history.3" || die
+}
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 814a20a80bd3..4081780a421f 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,5 +1,3 @@
-DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd7356e82857afbf9a8d6ff4bee0a0b98f2e39c4adb69a0349c33a29f1cdd90ec901c3501c0fcafb45faecbfea7c SHA512 477b06e2b6ea9b2e34fe0d91328c9191a678b173751e595359c05772db50a4d348ac132bec0c926fba91ceccc013e15cd4cc57a6b734874c06073bf23151bac7
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.10.ebuild 721 BLAKE2B 3d7d14cadc28180c2313dd48034e288197eea03a3e8f42f4b91dc29bf07e634696db51e2679dc5fa5b84dc29ac5feafaab209a22f0c904f1ed4fbc884dcc861a SHA512 1cd9e852123c1b319a83e162df47a50fb60a229dec519d9dcf3b840380f7b227cdbf137a20c5fbe9d6da47a02f43ca3dbe43f478c05b8f009418f28550ff0cd6
-EBUILD libestr-0.1.11.ebuild 727 BLAKE2B 022a13e520df6f8ebf898f3a676c8d2b1b4061512e9d96d3f1fb1e70220e8787bf390019133629a98d1c99b32fed657c115d9211bafc476483f5cae4c17c5b0f SHA512 c8e87d37127221c70c015f31bc84e0e3947ea891977d2c62e65e0e5704e405067ece5a0192d34e7da8527aa7b21aaa9cef861096721fd9736a259693f486b906
+EBUILD libestr-0.1.11.ebuild 726 BLAKE2B e708d7594479d2207467a5cfbdfdbae8cc83bf650c240bf7637e8e57db3c09417bc9207e623cf401f05abcc3bfeb25b61b34d4ff9afbe0c67a1d8f41aebd84e6 SHA512 6f84bdc6d5806f8fc2e32f92c3fbb993b844987fab03dad493657f3c12bc3c93d220e4a4bbea80b3a14a1b3bb13a89e59ae24277df00a37cce89b40c8eb41a03
 MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/libestr-0.1.10.ebuild b/dev-libs/libestr/libestr-0.1.10.ebuild
deleted file mode 100644
index 5f40fae519c7..000000000000
--- a/dev-libs/libestr/libestr-0.1.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for some string essentials"
-HOMEPAGE="https://libestr.adiscon.com/"
-SRC_URI="https://libestr.adiscon.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa x86"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(use_enable test testbench)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 22b6f6f1d57b..885dcf112cf2 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libestr.adiscon.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
+KEYWORDS="amd64 arm arm64 hppa x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 79a3fe782f3a..e70858095259 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,9 +1,8 @@
 AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
-AUX libev-pc.patch 1031 BLAKE2B 395e57ac5b71761c9603bc5355265ac7bc73aac78c2d6e0aaf9a53cc378c4a1ea3d819960d412e3cf0b6081c46fcf2120b6cef0ef9aa8be26d64e1241d090217 SHA512 09905e5bdd28b06e92bf0023b659c339e2dee05c78657f0871275ad3816cd050db346cfa6621d569b3b12977b2f99a63edcb9a5613367167d7187d705ee44fbb
-DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
 DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01104733c2a9478265fa78908ea26b6594c00f210c86eaef936956c16d3a55cb91a834501da0a6db12caf201 SHA512 83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4
 DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
-EBUILD libev-4.23.ebuild 1076 BLAKE2B ccb46133baf1abbfbe8999d6763201819ecd0ba91d2035cd837c059eb2f575d851b1093d83bb951c74f29a50e1c82f563d583f6ff3991a323b6f1e9932602ed8 SHA512 1e001c0b698429b355e0c4e783676edb4a3215a9c184ea423e6d91b637132c42d5839a7422300fa064d4b88f057948937fcf1b65648ba6dc763425505eb2e9f7
+DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
 EBUILD libev-4.25.ebuild 1122 BLAKE2B 72a683a63c004ef07500cf7f1f0a381ac862ae2e36eb459c5da2482ac3b784469745810155f4001acc1c63a51ec241bc3b326066ddf89cb67273ad1e8b9adac3 SHA512 9531e11b30ceb7d8992181b93f28e939735d40ad6c12fec3151ee21683f77b6b4eeb9c0338a2f9216fb2f70580c9689484728d7698a7d96af45b230633ee7dd2
 EBUILD libev-4.27.ebuild 1139 BLAKE2B 0b8c753c1f77f9a3e7b1486efdcd499031a8444d7c41903e5a04fd58fff1160ab8b29640ace1785fe2b7a3c2ab1f9a50ffff682e04702a1b545274551f36e7e7 SHA512 acdc3bd84f41ed391df8e9f6f5d676fe8ff009b0a897820d403714dcf0983caf8d6374897cec644a65b256c946aa4ebb8f7dd488cc063fde470af07725152b80
+EBUILD libev-4.31.ebuild 1139 BLAKE2B 6cd2421f72e2e044df8b7e7e754970d1a8862e93aa6fa455ede39a9b880f5a7d0df14aa3ded2ebb39aa21bb8a1d7d78001e0d9f2adb62924641069f18c7ba3bb SHA512 cd828b26c7b71e7881516899dd1102d475f7ae8a957af3e500390e55d6ac15a46bfdeb676e33eac0fa02ed4171d8a79e89e30627c3d2735c4b28dedce554dcb6
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/files/libev-pc.patch b/dev-libs/libev/files/libev-pc.patch
deleted file mode 100644
index a2a4c62a1ac8..000000000000
--- a/dev-libs/libev/files/libev-pc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- /dev/null
-+++ b/libev.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libev
-+Description: A high-performance event loop/event model with lots of features
-+Version: @VERSION@
-+Libs: -L${libdir} -lev
-+Libs.private:
-+Cflags: -I${includedir}
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
- libev_la_SOURCES = ev.c event.c
- libev_la_LDFLAGS = -version-info $(VERSION_INFO)
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libev.pc
-+
- ev.3: ev.pod
- 	pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,6 +2,7 @@ orig_CFLAGS="$CFLAGS"
- 
- AC_INIT
- AC_CONFIG_SRCDIR([ev_epoll.c])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
- AC_CONFIG_HEADERS([config.h])
-@@ -21,5 +22,5 @@ AC_PROG_LIBTOOL
- 
- m4_include([libev.m4])
- 
--AC_CONFIG_FILES([Makefile])
-+AC_CONFIG_FILES([Makefile libev.pc])
- AC_OUTPUT
diff --git a/dev-libs/libev/libev-4.23.ebuild b/dev-libs/libev/libev-4.31.ebuild
index b2ec1f04ba41..2dbd00f469db 100644
--- a/dev-libs/libev/libev-4.23.ebuild
+++ b/dev-libs/libev/libev-4.31.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools eutils multilib-minimal
 
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
@@ -21,13 +21,13 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changes README )
 
+# bug #411847
+PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" )
+
 src_prepare() {
+	default
 	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
 
-	# bug #411847
-	epatch "${FILESDIR}/${PN}-pc.patch"
-
-	epatch_user
 	eautoreconf
 }
 
@@ -39,6 +39,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
 	einstalldocs
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index bc91e4cec6b5..227abca2e577 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
-EBUILD libevdev-1.8.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
-EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
+EBUILD libevdev-1.8.0.ebuild 1104 BLAKE2B 0dd9e6ee63c0caac95b089e2272392c8f9e9a998041c0f48fe5194fa5c2950f9f6ce4ad6f822de57cf57e79a0caee35a05b1e6586723dc670a0fd09aefdabc5f SHA512 062c886b7a0e812c9aa5c46231f1723a579396131508b5ebebdf250ad1f6975af42c909618b759152599264d37c4c000ddc9fb8577a71da44619a72968361e90
+EBUILD libevdev-9999.ebuild 1115 BLAKE2B 834182fa133843b04d4035a81194397dcb9e6c105c6f4f76abe95cd028d2675d98e5e162a2261d8f284a61f258886d2340fd32a02e6c1b3343f38ef42fa88b54 SHA512 9991ad20557ce739693f16f28bafc0c8e727ead20eebbb01ac225d5e8405bfe626512334e818842e075b69a57cbece0ff9e29497eb891166eedfbf4c59bd7e84
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
index f0285f910878..3964807d08cc 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index c32b139bc873..0921bb7c5582 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index a9fb5fde2151..8e080f088bf5 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,9 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
 DIST libfilezilla-0.18.2.tar.bz2 526968 BLAKE2B 81b27c18e9c04e2277dbe7a2fa2bfe3c1fa7c1f9c27eaf5cc02f309a15e9b61e71e5a67aa359c7bb36b27335f008cfb58641adcb42745ac00b9ac9eb2c649cde SHA512 6f165a008ea8e3090554070685ef042b5304a8e7fdeb9f16c81a01c00b5fcb3d4acd356cfaf3fc1189c04db0b726dd005c592f6c7c6b06a527d8b82e7890257b
 DIST libfilezilla-0.19.1.tar.bz2 539952 BLAKE2B a581964a34c9104543eb06579e1f1b816b0f47e6ef3af0de9aa0b7528665ca0ac17ddf3c5327a434b8e344bdde5602f1b7a71b7cc755367e750c88de06329335 SHA512 1342a199e4bdc211437deaa4ff34fe7f7de476a664b1ea4dc8df0482db98eb6c21e03f9c7b510bc00c81f6dacd7fdec2fa721554fe6e71c5bb2763618759b1a1
+DIST libfilezilla-0.19.3.tar.bz2 541117 BLAKE2B c0015be2fa632cc4bfd44d5e02bdc9e14c5ac0598e4c83fabc95e00dd82669963d02a8e7b3db33e554d86f333eb5a7afdd6235acfa7b336dbd5bbfbf334f4381 SHA512 264a3a110dc4e99f6b993479be9f25cf831297899c699d73e5ad5a403e11ff09fa9ab062a420a0111e78f7d6e68e92fa461c161c8fd7c274cf227ef45f618849
 EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 0f9101255067d3dd17f4048716b25ac12e9270db414208ee23911d644140f0d8a1bf446f07a6b67f3aab679403a87a0a3e7c569922cbe4ffcf7c9c0ef9d846a1 SHA512 5a6b773f29312f2b7557ba02404124040c4272328c51df45a00eef2ba8ec6ec72517116d501ddb7307b30b0216dabb94c42690bbc72fd96ac436c8684e423215
 EBUILD libfilezilla-0.18.2.ebuild 1051 BLAKE2B 06f0455b9a48fd2b1eb8f1a6437260efc74ca81b07f18124db2c99311c5ae3bbe416226f70c72f9732c71ceab52041138dd8a64ef3bd923d07658db409330080 SHA512 428fd7bc6c28d76db19f568edb3cd4f3e6528320e62f6da78408a57d34fdb31d4aad2f91da49f33634e29fbc6f7d443b01998a53d9ee599090094bd7940c5558
 EBUILD libfilezilla-0.19.1.ebuild 1080 BLAKE2B d046a5ab623d32c7dfa351fd168e4041650f9248e1099698dd04b8ddaede2eee71ca34078827b4f723d6b2abc02889985e6759073e054f1470453aa96aaeb736 SHA512 b4d226e728d68cbb97faaf22282869d59d506e91a0014a0164a35f1df394e53f58ed91cfbf0a7595f0c32177d3fd618bb75c1085d9260339df9e1228dc84acaa
+EBUILD libfilezilla-0.19.3.ebuild 1080 BLAKE2B bfd3bb825785609a58635b4876081a4bcebf4b3d8fe480277ecc1441b44f1e0fa46834a5940bcbb02122b32cf20a2b6bd5f4f1fa4a76379fa4a5a85af006e089 SHA512 ac44ffed29f86328844bb633b04d711116836e25c881965d24cc8b8a4b823e309e92dccf437b227868d0bb9f25287d55756357da5f6d1513baf33764a38279ec
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild b/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild
new file mode 100644
index 000000000000..349925b74a35
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/3" # libfilezilla .so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index 216c614209b8..d89f470a1f2c 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -1,5 +1,5 @@
 DIST libflatarray-0.2.0.tar.bz2 34193 BLAKE2B 8f409b097a0dfe037e9fdd1f8ed3b0ba86ef9ab816219b9357d119afa1c7236c0a467d9705fd5050ccbdc54ee40b811d2daee0a697f8ba720f037294d0305d52 SHA512 96050c08479429baf22a9694ca7354e1ab4fa892976d4098419e2863cac8e21aec586116a1702a5050753febd9b9321a14fc4da5d6487cf75a574562ec4d4647
 DIST libflatarray-0.3.0.tar.bz2 104544 BLAKE2B 9ac490a526fbd71478ac569538bad28e01a1a91bd71d37e85bf89181e856e79b2dec6af5415f238e5f72fbbe57cda59ee87ebd79cd273887061e2bbb93a7ce31 SHA512 c58339cdadf98f552d2f1b440a293c48923f32fc43a5a06ee8b8a40835a5f6c21514f7a9efa0ff23930ab9fdda8d4389641ec83c589e1982dbf5a3f75d2ffd37
-EBUILD libflatarray-0.2.0.ebuild 678 BLAKE2B 497a3a6c307e6cdb1430c413eb06f0c7f95ee205d3f7df12df9f331fe974bae9f7643136e70bda9c867ae64c531d265a075e5b412b7f0693c95e4bd97543deef SHA512 c437ed372ce4dedcb3a0584431dc748103c60cd86b239d137bb5fc5770db1e2eb5d25b81f9fdd5a9444c412707d08c9b53bc6b8e7b76afada169e29759191380
-EBUILD libflatarray-0.3.0.ebuild 681 BLAKE2B ee500d048d33d8fe03b0ee118fd433e3ff66258b1ab23951273ba9cd681fa1977b75aa232850be96449e6460486e770e669dd5e555755af8c5f4a8678d305ec1 SHA512 4aadbc44470dc6041c92bd31fe745068456bf61184862ab862f1d28b20671ab9a7727921f24cbe93a494e650d23fe805f8ce6d7d28eedbabf47854c491b5ae75
-MISC metadata.xml 634 BLAKE2B 4c07ba2a9ed94cb524260d400bcf611b723e03e596864c04ee61e5289965e5c3ec738f0b82e911d9c34f9d36d1c12b9918dc0f71e7beecda09fb2beba1f03900 SHA512 85a13fa685b2dc2870705a134b59d66090f19839f645ec4741690bd3e1217a2d2a1d5be816ff6579994010889f8ae0908fb55e8b5339aa70e2ed94f38b607795
+EBUILD libflatarray-0.2.0.ebuild 658 BLAKE2B c8de67ef09735bd3770d7b0e2da4f0fd57792cd84d9695385e25c9b524e84b3c18ae4e445f20d2e22532692da261606512e170a8912b4c6caf23606a10eb7ceb SHA512 2b6a365e688efde4fe01c474392390c6c58941c69041f4909f23c454bb5614a0e992fb01350695c4e29b98d8efe32fa94e4138b45b7ebab42f39fe4b682fb460
+EBUILD libflatarray-0.3.0.ebuild 658 BLAKE2B c8de67ef09735bd3770d7b0e2da4f0fd57792cd84d9695385e25c9b524e84b3c18ae4e445f20d2e22532692da261606512e170a8912b4c6caf23606a10eb7ceb SHA512 2b6a365e688efde4fe01c474392390c6c58941c69041f4909f23c454bb5614a0e992fb01350695c4e29b98d8efe32fa94e4138b45b7ebab42f39fe4b682fb460
+MISC metadata.xml 583 BLAKE2B 4ec277b4e2e93a1cfb155546d4be3b9effdbf2dc6ff1ebb5c6adee9287d2d344537c91f629a0e7b79a12870759cf0c4a959268397db3e3684b5562021d38543f SHA512 0aba9d676149fe1879985c28dcafe1222db2c3d14007bf7add67cbbaaff2462f983f857bd088557aaa7e5edd977a435d8669b1d313924f98e5b528b1fa9a31ad
diff --git a/dev-libs/libflatarray/libflatarray-0.2.0.ebuild b/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
index 35250d070a6f..0f58f1ff81ac 100644
--- a/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
+++ b/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CUDA=$(usex cuda)
-		-DWITH_SILO=false
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libflatarray/libflatarray-0.3.0.ebuild b/dev-libs/libflatarray/libflatarray-0.3.0.ebuild
index 27ca812593b9..0f58f1ff81ac 100644
--- a/dev-libs/libflatarray/libflatarray-0.3.0.ebuild
+++ b/dev-libs/libflatarray/libflatarray-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CUDA=$(usex cuda)
-		-DWITH_SILO=false
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libflatarray/metadata.xml b/dev-libs/libflatarray/metadata.xml
index 48fcf22e57a5..c9292e9b692c 100644
--- a/dev-libs/libflatarray/metadata.xml
+++ b/dev-libs/libflatarray/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     LibFlatArray is a multi-dimensional C++ array class which provides
     an object-oriented view (a.k.a. array of structs, AoS) while
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 010eab1ae7f3..e8ffcc2a6521 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,12 +1,6 @@
 DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B 462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480 SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
-DIST libfmt-6.0.0.tar.gz 708425 BLAKE2B c04fb7f701e98442848a36489b09eca3dd64f736f668f04173db3afe77da6d933f5f13a2fe38489a5880fa1e4d8549dd34acc9fa37fbb0d6cdee3b6598610726 SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
-DIST libfmt-6.1.0.tar.gz 722127 BLAKE2B 2916293ebaff27a06f22e3c99bc1aee835d633a2b2eaa06d50dadff54f7ee20ed32c6e642f607274fdeeaf647a6aef03fde454555fa90c3ad790bb1be9c88a24 SHA512 51ee5fbe0ae7f9427289b7de37192652f16c63dd5fbf2d52dbf34e89d690ccd7ca5fd7962774d27a2d80fb1ccfa6836c171b519cfa0c41367772ebf8ef1fa81f
-DIST libfmt-6.1.1.tar.gz 722236 BLAKE2B 5497a89af4511d4b8356757fed17c5dc8bcc66cb60c85e2dc05db524a5eb5ae0247347bd3c6ca61edd12f0a469c26477de95290f977cf27f2413ba91d39dafdc SHA512 8018bec519ce788331c8be8d51a19d4eaceb6a2f33d6618ebe78d953fbef28a70d5b61f0db1c051cbe1e0ee26f3c09197caac196a4c20d1b6abd7f86619f5fef
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 EBUILD libfmt-5.3.0.ebuild 792 BLAKE2B 2bc5485380c222af65a0948098394feb750838d19340b393bb23b51670a052082a24d8fc48250041f4199e7bc21fe55c2202d029097bb7eaf034d6cd266aae43 SHA512 340b90b24035993670dc769a5a47cc009c8017afbc0ae3e5de4167e4973b267688d40c19c2a4a49c74fd5ff3472203e071522916d523925ccd2a8a492ee8e618
-EBUILD libfmt-6.0.0.ebuild 794 BLAKE2B 2374647258e8637df110fd3e64e0faea4dbac55f86fb87a90ce0c2c17dc528dbf5117556dd57f1c74875d4e366cfdc3d5f5d2db9a826904dc636fcc92c95c22c SHA512 f6f8e396dfe3078ad5162a9ad79c4458056043a898140ea40613493f85e779dc39a98bb1726c798fcc7e1f88d029607be997935326b45cca49681b775ca075d5
-EBUILD libfmt-6.1.0.ebuild 794 BLAKE2B bc77dac18fca1d127abf1c8848f5d7e7b40161d593456dd3ae35081d13dc0c7df559e2209907feb37f1005f94e61f90f36d04654a9e3e21bce15473284eadc87 SHA512 b13417fa0946fa41a0e8f80f5ea30b5b23cd641ef023a72a393c7b07fba9843bff7f445a605665f07f089f8ce912ebaaa6149a93756d1750ea7fce23c18367d2
-EBUILD libfmt-6.1.1.ebuild 794 BLAKE2B bc77dac18fca1d127abf1c8848f5d7e7b40161d593456dd3ae35081d13dc0c7df559e2209907feb37f1005f94e61f90f36d04654a9e3e21bce15473284eadc87 SHA512 b13417fa0946fa41a0e8f80f5ea30b5b23cd641ef023a72a393c7b07fba9843bff7f445a605665f07f089f8ce912ebaaa6149a93756d1750ea7fce23c18367d2
-EBUILD libfmt-6.1.2.ebuild 759 BLAKE2B f76040556b50ffa04e6d4bcac49c91e9d36379da0a46c0c6bcff9d86b46f9f9946cb7be7f85758139b1d4b793d5fb955f50905e05192311fa5060b1f62dd4732 SHA512 063cc13c83c9ac642f6a914a0b58a1624999f18e4c417577301b8bca954b404da41d2e39a512916d1d07e8677614e60915fa978b9e37aa7fc4202b8c5c31adea
-EBUILD libfmt-9999.ebuild 759 BLAKE2B f76040556b50ffa04e6d4bcac49c91e9d36379da0a46c0c6bcff9d86b46f9f9946cb7be7f85758139b1d4b793d5fb955f50905e05192311fa5060b1f62dd4732 SHA512 063cc13c83c9ac642f6a914a0b58a1624999f18e4c417577301b8bca954b404da41d2e39a512916d1d07e8677614e60915fa978b9e37aa7fc4202b8c5c31adea
+EBUILD libfmt-6.1.2.ebuild 768 BLAKE2B 6a0f6e17e16aeb35c62f95d7dcb579dd18bf52e6826fbc669c6bbb6b2db51456fb005b4d54a2c17e8bd5c3d693fdd6dda4ef342ce2a4707bc7b8287184986d28 SHA512 caf0bd12a13b2026fb6bdc4c293d4476d315801c3850abbb85f72a423602106765a2d5ea36494bfc14ec6d530171199c6643b3ca39122f829340e61ce90a6e72
+EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-6.0.0.ebuild b/dev-libs/libfmt/libfmt-6.0.0.ebuild
deleted file mode 100644
index 20f7a7d84f93..000000000000
--- a/dev-libs/libfmt/libfmt-6.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-6.1.0.ebuild b/dev-libs/libfmt/libfmt-6.1.0.ebuild
deleted file mode 100644
index cf60d148a150..000000000000
--- a/dev-libs/libfmt/libfmt-6.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-6.1.1.ebuild b/dev-libs/libfmt/libfmt-6.1.1.ebuild
deleted file mode 100644
index cf60d148a150..000000000000
--- a/dev-libs/libfmt/libfmt-6.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-6.1.2.ebuild b/dev-libs/libfmt/libfmt-6.1.2.ebuild
index fc0c0c0b8bef..41a9ec459559 100644
--- a/dev-libs/libfmt/libfmt-6.1.2.ebuild
+++ b/dev-libs/libfmt/libfmt-6.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
@@ -17,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
@@ -31,5 +32,5 @@ multilib_src_configure() {
 		-DFMT_LIB_DIR="$(get_libdir)"
 		-DFMT_TEST=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index fc0c0c0b8bef..78c2d74959bb 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
@@ -31,5 +32,5 @@ multilib_src_configure() {
 		-DFMT_LIB_DIR="$(get_libdir)"
 		-DFMT_TEST=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 58556ae7511b..1df17a1bb51b 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,5 +1,5 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
 AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.15.1.ebuild 1144 BLAKE2B 9453c0e334dfe1490bb1e7b8c846d8acabc05ca8031e8c074f85d63f27f8e37e2e9619ff936ed2f04a505b0404d198e8fe15249f953d90f36c74dc3320459635 SHA512 58a98f5c998021f966b09718cfdddd2fd9acaea368c51edcc341953eef2f730af2bfa451a896424778396ac81fcc207da3ae4c72d7b7f041d02e4a0706fb9f51
+EBUILD libgaminggear-0.15.1.ebuild 1114 BLAKE2B 762c86812ca10a55c4ce0169e4a19120d2fb6162e759e746c8d5d90eefd30544447c47465a5a4e991619d99b27574d05998fce3cfc00f8c130868708b93a5883 SHA512 3f9d5e33bbcebf744be6662996f8d3bfb906df6d6358da1cb1f6bed8c9e07f05d2c758c7623764d8a06c9a5cc21a384db122df87b78a8593727e45869d5a6aa3
 MISC metadata.xml 334 BLAKE2B 245d055909acec999e4e5e299ed9832df4ea83e59c8b02b464f8bd6da255ad713666d6db088f89014b5d006ca5171723fbef98d5daf19ac34088f2b58f44aa5c SHA512 f820f9ab3cd47f39e43ee66b01244397d9cf8f3da675208e1b26d97e908a037a9ee61a7c25d05b4e071a9a666b04aa46a641e49dbf93b55fe02f7ffe08b033b4
diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
index 5a1347b66e79..40164dbc61bf 100644
--- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Provides functionality for gaming input devices"
 
@@ -39,9 +39,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake-3.13.patch
 )
 
-# Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
+# Required because xdg.eclass overrides src_prepare() from cmake.eclass
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,11 +49,11 @@ src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DWITH_DOC="$(usex doc)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_preinst() {
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 80d9d567182c..8e2975fc2167 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -7,4 +7,4 @@ EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de2
 EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
 EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
 EBUILD libgcrypt-1.8.5.ebuild 2288 BLAKE2B 83716796b83f99fa246e558e71cc8fbc348c71677dfe39446ac23522801929e0b1412d30d2a057d38cf728b1023b1c9ddf6cbd0b593ac170e0ece34fc8d3ed5d SHA512 f87e367bae547419381d7758c000bd5d86dd7add06336f41378b5db920a5923aeb38b07543f4b163c41e7a05fb42c10a20e5328bac72bd19803b1bd7477e016e
-MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
+MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index f983c8bdca42..f034cdf8110f 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -5,10 +5,6 @@
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
 	</upstream>
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 1d7c0173f73a..cbaaeb235ccf 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,9 +1,7 @@
 AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
 AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
-DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.11.ebuild 1770 BLAKE2B cf75a24efc2d0b566be32c8ee8464c6492431056858c855d96c76d7cde875adaa4b783f8f8b0e8453d546574575722b32681731d7a1736aa550e8645f82f1779 SHA512 51b10ac2b62516a13fadee17c248f128fb0c2de8f35eb4541ee38a19f1091a6e4eea81f8c00f440a7705aa5124ca5a090cb3a8c45b64e9c580b4620db7b7b475
-EBUILD libgdata-0.17.8.ebuild 1665 BLAKE2B 2aee51b2982a4fb07ffc40ad745671a845a8f816b3a0e042b4145e4aec7ff5fef0c0321e22557f6dfc535794ebdfaf686514a77412d4248f681c40d3a678c477 SHA512 fc401b1ea9bbd5c5550577b91313d66fd149c5d8f34e85d05e8e69a9b129b8839b493349dacf84e0ef6d9f4426af95b08325ff6a00f02493a34ae7acdf9903ae
 EBUILD libgdata-0.17.9-r1.ebuild 1782 BLAKE2B e8cb72916b5b9b8a229665c7ee2bcac5b3d644c83b1b3db47e894b673131160a1682f24205d923ca5f1d4aa30bc95008ab9239b8b109c77d6394d6383e435635 SHA512 1eb86ce2b416426cb82b564e85151cf02df9a967b6cf1c119d9f25fdef3d80660bb38c23372d3e75dfedf599a339adfe2db8aa2ef9f7c837b9413d2fd4e0701e
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.8.ebuild b/dev-libs/libgdata/libgdata-0.17.8.ebuild
deleted file mode 100644
index bd7a03c2c697..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2
-	>=dev-libs/json-glib-0.15
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.55.90:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.25
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# configure checks for gtk:3, but only uses it for demos which are not installed
-	gnome2_src_configure \
-		$(use_enable crypt gnome) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static) \
-		$(use_enable test always-build-tests) \
-		GTK_CFLAGS= \
-		GTK_LIBS=
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	export GSETTINGS_BACKEND="memory" #486412
-	dbus-launch emake check
-}
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 084f2ac27938..833d06229761 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,7 +1,5 @@
-DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e5ebc3414d904b9c0dc57d3c3fe56ea2194828f9bc1eec57413058cb6866156a5e3da76381cf71fe98102d9c52 SHA512 b991acfea965e0afa007adac0df1763c3b97b31bf2832c0408128d02f4bb237a03c583b4dd107de1ed877ef042614352c845b6ba5f8b6fb535f43e2400746d7f
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
-EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
-EBUILD libgee-0.20.2.ebuild 680 BLAKE2B 4780e9319d6c9d9347ccf5565287874b214b59f46857af7ac2fcd5832ff9b33bb6f52a884b5b8f737b317a4b6e0b2ccd349f5f7a0db5315ad6c096ad23a48e72 SHA512 4c8c85d2549d33b69b22bc208f9d16c87aa977eaeb1a662f667340ae614d8ee7586fe03639b31916b0e165aa76e44c399ff38afb595156eec338c9d96bd63344
+EBUILD libgee-0.20.2.ebuild 679 BLAKE2B 56193e06fa6e3772a033390ba6152deb427a71f7f4b9af152480e4537bdd9d691a569ff480014b361201326f63a7f3131dd725d8d2ea5c70f9c1b0e4945ae6fc SHA512 d51752c3130ba89ddd0ebb29c1eabc2c9aaecd8ac1340071fe296697fd37449af927fe276e0c82a94b175a7497bcd0bb67cf433590e1ece9a29e5282948cc275
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.1.ebuild b/dev-libs/libgee/libgee-0.20.1.ebuild
deleted file mode 100644
index 132fc9e7b59a..000000000000
--- a/dev-libs/libgee/libgee-0.20.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.8/2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
-IUSE="+introspection"
-
-# FIXME: add doc support, requires valadoc
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		VALAC="$(type -P false)"
-}
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index 2471406590e3..cbaadaa2aca1 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index a8d0b2d1dfe8..df98e46470b9 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
-EBUILD libgit2-glib-0.28.0.1.ebuild 1260 BLAKE2B 251e5cc49feaa337f3a851f4c4c7dce3ee836abe851faf923a1cbbfb47a8ff57c74068ddfd19bb63801f2c50988f3dba2ba9fb3ed9ba027246ecdeec89f45cac SHA512 b53647b193d7e24937470fac577fea5ca54fe25d203e0a9e2be14754c71a0de08e4026794b316df2c58fdc6c2a058ba933a06bfbb4267ef0c2f056c9a99a489e
+EBUILD libgit2-glib-0.28.0.1.ebuild 1256 BLAKE2B 7246cecc6ae927178611caab2ade6d38a954b041f55c4486e62b2846ad7978a9ce7ebfac2f6b49feb53f771e48813bef38a3a1bcf7b8b31b28ece90ceceb4019 SHA512 b330da636839cc73691f0a33c778dd37c3d9318e470ce90210333235601c030ccac76b81914c02ea4291649392cd52607003aeae1b4b8dafb1e519cf2e21e600
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
index f0dd27c69742..85e90809073c 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-r1 vala
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index eb6c00fcc1f4..4a8a06c93f9e 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,4 @@
-DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
-EBUILD libgit2-0.28.3.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
-EBUILD libgit2-0.28.4.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
-EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
+EBUILD libgit2-0.28.4.ebuild 1657 BLAKE2B 59e4dc8b77221684bd08cee0123117fc56dc00b25fcf2879e8eebfd49cab36b8b38d56b7045bb0712304b9c518d89fd65af614611f30079386823d56601bc1cf SHA512 184d553f4a849ef06e19e9366a92ea2ccfc5a2322d788202b324abfc62dd5d1101c9305743379b4ace46aa1073339bf35d1c61d6a425fd42b5c7317b117e3f68
+EBUILD libgit2-9999.ebuild 1661 BLAKE2B 58810e5332148cd646da00a829eb7c9668cc7659e28c2927d23e114cafb1c9dd840411f3cfd8e4ec629a185635cac1271890baa46e1a5e0a5ec8a8918c0dd656 SHA512 80813e0018838d4bb581413e7b6b054fb69976474e641c289955ec69dc8a974af01e701e53a9aeede5dd1e4d58af4d03a55813a5f84e101000ba2a500e1b01c6
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.3.ebuild b/dev-libs/libgit2/libgit2-0.28.3.ebuild
deleted file mode 100644
index 84b9ad2b9c54..000000000000
--- a/dev-libs/libgit2/libgit2-0.28.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
index 84b9ad2b9c54..fe94903c855e 100644
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils python-any-r1
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
+HOMEPAGE="https://libgit2.org"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/28"
@@ -46,7 +46,7 @@ src_configure() {
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -56,12 +56,12 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
+		cmake_src_test -R offline
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc docs/*.{md,txt}
 
 	if use examples ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 5da98ce6f13c..0519a2c0e43f 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -11,11 +11,11 @@ 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 ~x86 ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
+HOMEPAGE="https://libgit2.org"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/28"
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 231db7391b3c..b11d386a7db9 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,3 @@
-DIST libgnome-games-support-1.4.3.tar.xz 345824 BLAKE2B 7969d4470b5c7ba266e3d77071ff7b8b02a1bf407ec74bb0ad1cbe81af7e30e54d3af507f206b07ee1352be4e180dfd62ca6411f07bdbffeb5b18e2f921c7666 SHA512 01a2594d9f95987c99db92c8cc8c212b149619618d15f4128df7eb24d68b64e01f2e77c79b7b07cf81581493ae84215a5d4019ae67585188c04d90827381fc33
 DIST libgnome-games-support-1.4.4.tar.xz 336708 BLAKE2B ecd21376ce8d83a0a8c0f65992ba4d39d54b3b97d90df8adab0d5c5714d0c9841711a21dc611c94a8141313ff991c3a8787f7e27492c149a7f76e25d8a2fa8d6 SHA512 2b2c77210103610cb91554f870d634bc8d06f0886eef5166bf9909c1975a87d960005640d48e3e917f74c7553e3ae07d473ba06c6c5d6582313c50a390ec6168
-EBUILD libgnome-games-support-1.4.3.ebuild 533 BLAKE2B 2d5a86bf13e39bf85048fced123ff6aa22007d97c29a32d57c81cb041d479c7a61d652b9835699fac39f6adbdf5d84b589b444f58086d97f0b0f3aee7013b97b SHA512 4c41bc63d3afd03cf1423ee55879da6084514f474009350e6629529958e41181e2909c43fb8560dfd77ecb19cf478255404ec96b3b40fb1d1f4d9fb5a3e7e8ec
 EBUILD libgnome-games-support-1.4.4.ebuild 533 BLAKE2B 2d5a86bf13e39bf85048fced123ff6aa22007d97c29a32d57c81cb041d479c7a61d652b9835699fac39f6adbdf5d84b589b444f58086d97f0b0f3aee7013b97b SHA512 4c41bc63d3afd03cf1423ee55879da6084514f474009350e6629529958e41181e2909c43fb8560dfd77ecb19cf478255404ec96b3b40fb1d1f4d9fb5a3e7e8ec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
deleted file mode 100644
index 0402b206bee2..000000000000
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Library for code common to Gnome games"
-HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
-
-LICENSE="LGPL-3+"
-SLOT="1/3"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgee:0.8=
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.19.2:3
-"
-DEPEND="${DEPEND}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 69c6ea34442f..6e7f8d40daf9 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,11 +1,4 @@
 AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
-DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
-DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
-DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
-EBUILD libgpg-error-1.27-r1.ebuild 1265 BLAKE2B 349a369087dcd5d7ff7612809f2e1b0f20ea3b7acfa888bd8444fdc5ec8c7682dbcb154a46505abf7fbd6b9ea379e510f7d4570993f2deebe03ab78955381106 SHA512 404de903ca1b3baf567a04ae93034bf87cf504d681e3066ce49c9627318734511ad939ab89d9300fc3109289ac22b6e1f5de4ed86eedea44eaa649a6bfe1fb79
-EBUILD libgpg-error-1.29.ebuild 1267 BLAKE2B 3289b5f32041006b5f2ef2a5f415401e796cbffbe1c319400e975046b409ee25940e2788a3edf53be58ded7de0efa59c2faaccac546dd78e7e442abbed4d5dae SHA512 ec87dc4b6fdc15c0e8160afa9e5944597f22b4d2cd412546e77b8db5bf51c3bd560b2025a1b87072d097bcbe360caadeb90990590539a431783ec0e513cc9717
-EBUILD libgpg-error-1.32-r1.ebuild 1387 BLAKE2B 38aa122aa803af7e5ef2279acf67b9e4d28c2e4f424dfaa54b9feec1394d3c693305e64f2b87f82f88e02be92bdd825f1ac3397bbd6e038f1514ddd6eb61c2ae SHA512 1d6b3a31a5f5309d366c7fb926b38728d10f61d03886d78f4b95322a2f997cec9a615e0e2220449b914f256e1a5b69cb242674a69d4982517f0b3977e6729e41
-EBUILD libgpg-error-1.32.ebuild 1278 BLAKE2B 78410d700e760cd3e985fdf44bb343fbd8d23f5f07149a3fe9e284f9461b2bae1a4e3d8f70582e197ddbc0759467a139e10779ad8642444e82c61a54571aef07 SHA512 5d39f96c3259b7905bc7b25ad7894fb30c85151af897cbac7fc59a57a20a886114d69b51e5cad43262a3d704bca9ba4a6f593d73ac6eb799b6b4b7d38bd374ac
-EBUILD libgpg-error-1.36.ebuild 1676 BLAKE2B 69f235bb88b2ddd35307e8884a4ef4c8ff8d70eabe54c3f947309e92aba0a47162f02a5af63a8bfe272b6d448b54b94def6a359983ff5d5a544f60d679687377 SHA512 1bcbfdc8e02aa85e53736d9fd25d6d11f89ed5fbb03a4581af89bec73bd9394ad0819e16e96f7db794e9e40141d02b63b2bbb6939821ee69e91631f0cbd55110
-MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
+EBUILD libgpg-error-1.36.ebuild 1684 BLAKE2B 287b8a3b771b9641836db9a5e3504f4c1bde2a11b0c1df599add83c44a5fadc7da965d8942b7403efc0670ed8ec15f9ce5640084c974ab5d407b0e2ac503585d SHA512 93e3fe36b13f8be8325eafdc01dce35913760f513d8386898ffb7f86bdb2b8ca160f6a312b8f7acce97f3da3bd8e829026c2b01ff9406700cca9c276551ecd47
+MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
deleted file mode 100644
index c5a4e710ba06..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal toolchain-funcs
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--enable-threads \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable common-lisp languages) \
-		$(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
deleted file mode 100644
index 8a3edac23997..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal toolchain-funcs
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--enable-threads \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable common-lisp languages) \
-		$(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
deleted file mode 100644
index 6dc647c6a814..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(multilib_is_native_abi || echo --disable-languages) \
-		$(use_enable common-lisp languages) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--enable-threads \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
deleted file mode 100644
index c8bc57ca5721..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal toolchain-funcs
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--enable-threads \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable common-lisp languages) \
-		$(multilib_is_native_abi || echo --disable-languages)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index 1c2b8171b08f..973e907a96a1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.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
@@ -38,17 +38,19 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(multilib_is_native_abi || echo --disable-languages) \
-		$(use_enable common-lisp languages) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--enable-threads \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	local myeconfargs=(
+		$(multilib_is_native_abi || echo --disable-languages)
+		$(use_enable common-lisp languages)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		--enable-threads
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index 89e984954f11..a07228517f22 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<name>Lars Wendler</name>
+		<email>polynomial-c@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
 	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 023fe39bff48..14d2cc735ae3 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,3 @@
-DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
-EBUILD libgudev-232.ebuild 1116 BLAKE2B dde5fc1388a6ba70b7bcc91963608042a7097305567d74f5a828de04f1e8825ae5d425590a1e3ff1f8cfe3762bff4478a749d4f11c6a45036db46da2e78d90cb SHA512 33b4d6a6bb030640cafadc6aa3a4a3fa8f3c58d754724b48e0ea070e0b31e54093ee1a48b669d3a939317e774cfcf3d0d34df001b83f0ea373c9e7296532992d
-EBUILD libgudev-233-r1.ebuild 1117 BLAKE2B 6ac3e152df633e0dbf31e2ffe8a8608c498b00c3872b17258e8f764bad110906c2f3919bb33834a3e0f3ab5107a69fa78d34ef1ea2a0e30b5eaece874176dcd1 SHA512 cab0e376acd7ad7a030fa2d3619477d7ba0b74a288799675211a215c8d08534d627b4ec3191b5eb4c91f169a118ee023ffd0d51d5fbc575054c6ab7ac978a715
+EBUILD libgudev-233-r1.ebuild 1116 BLAKE2B dee3b4433fc3acf28456465879a354ac9846527570e33b4b60b88ee9654764969746c8382bfa6f3b82e01c3f01833406bf10a9edb924faca368a61698d77eb4d SHA512 8f6d7df7f5af6f7e6db81089df80b9735bb7c486087399cb98748a6ff13a828d910927bc42ed426ab5151637949a832516bb69e3d6ef94071b8968c8752010b6
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
deleted file mode 100644
index 73f6bb32f5b5..000000000000
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GObject bindings for libudev"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="introspection static-libs"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-fs/eudev[gudev(-)]
-	!sys-fs/udev[gudev(-)]
-	!sys-apps/systemd[gudev(-)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-# Needs multilib dev-util/umockdev
-RESTRICT="test"
-
-multilib_src_configure() {
-	local myconf=(
-		$(multilib_native_use_enable introspection)
-		$(use_enable static-libs static)
-		--disable-umockdev
-	)
-	local ECONF_SOURCE="${S}"
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libgudev/libgudev-233-r1.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild
index 0798be876fe9..04a24ddcf3a9 100644
--- a/dev-libs/libgudev/libgudev-233-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-233-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 940bd14596a4..c0bb709ccc93 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,7 @@
 DIST libgusb-0.2.11.tar.xz 291992 BLAKE2B f43065fac0fcfbc3e392b90dc05537746ce1325d623161e93e1a306b87b07012ef4e11242514cd3da0b83a7df6adc052e20fd3336b53d2543ed9e23886a776f5 SHA512 f9c3c204b5f0feaf706b23dd9a174feb36a9f3c8db8ffb5dcdefa66b18ba0ac963c6041d2d91a6a2f6e23036fc6486d142210bd5348e10c026a6defeb0bee096
+DIST libgusb-0.3.1.tar.xz 38568 BLAKE2B d09afae9d210fde1411de5a0b9b8852eef49f88558ff4c434ef5f2ed9c1c6c29600b96dad73f6873027c5ce0987a3fd99691ffd97d90cfba9f63fbb2cc73f8cd SHA512 5c864e35ec64d1e52ec15ab971c75e0ee3e4664223a6b365815a54819f23342889e5f9739b998799a3af3d37ee75f0ae38ee0d8bca4ed1e2d6ff712f65a53b9a
+DIST libgusb-0.3.2.tar.xz 38852 BLAKE2B 72f98e54e9c4716380430103395ad6da830148c7ef4fb3e7e1445fa28c40b6cb1dfc954403896dedcd584d154383c38233abd422e20801a7e2f9165a6b69e4e5 SHA512 db4274b67d775ac0a46df11037dbd4cab84e1128be6d5b579ee5e1f493f3cc9d0950958610207ad5f207423570a86e664a9817885e25f86a858a95f96cfe19c2
 EBUILD libgusb-0.2.11.ebuild 1273 BLAKE2B b974f26b78f2146731af371fc13ae4dda7b7d651aff1174410024ac4dcb554fa2eec7735c6f3156b866a7c218a6e07b77cdfb0c1835dadb15b1713ad0390ff9d SHA512 fab1a7c922c3062e8574a26fa5ac9c7fc430d606f7c0cff684e2fbef33158bc38734c70ddc5f8da016b5bf1940a46722938e9f40dc5433b882647816c68675e3
+EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
+EBUILD libgusb-0.3.2.ebuild 1499 BLAKE2B 2e7e4dbd2d6ed3616f2c4c7fa4fc603bd78294caece4cfa0daa31985f50c5f59de387acaf150bf42303f3dbbf0f5ebab0c59bd3e3542154b5a596ef612b541d9 SHA512 47fd9ba8968f866a828298334d066054d7ce54544408030d899771f59928ee0b355a9202e6be60368cc16b7add69f020f38eedc954f45f20c422488c1083c53c
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.1.ebuild b/dev-libs/libgusb/libgusb-0.3.1.ebuild
new file mode 100644
index 000000000000..b0e759e5f5df
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+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"
+
+IUSE="gtk-doc +introspection static-libs test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/libgusb/libgusb-0.3.2.ebuild b/dev-libs/libgusb/libgusb-0.3.2.ebuild
new file mode 100644
index 000000000000..87219dfe567e
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+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"
+
+IUSE="gtk-doc +introspection static-libs test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 050bfae66672..09abcc7c9855 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,13 +1,4 @@
-AUX 3.28.3-meson-tweaks.patch 3016 BLAKE2B 37c976859e35023f5d9742553199aa2bff79241b20af7ce2b6cddf460f42895c7bb4a7a69c51f11f2364c70111cf576b338765d242b09603618332d1d9fea6d5 SHA512 e8d058ac9616e64ca4db3a015fe6498d4f8bc087d5235eb84bf40b91ecf523932568a9d4f0eb17dad56e835e8657badc75458ce2687d896d83240a719d004646
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
-DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
-DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb06865e70691621bc3a1c0ece2e602862cef9a2a5daa2ebbc5fa7eaefa32bf89507f1eef8fa4eeff294d43132e83fab4 SHA512 75b936f93814005b4317dcb51777036f589f343526428d9a74de96aac1badd4fe81c117184e2bff84a7a3078d6f2a2000e7b63f1e1d80f839b3513cc470fb25b
-DIST libgweather-3.28.3.tar.xz 2711240 BLAKE2B 9e55c32485401fa31e5ca5a824f239c373e41c2ef3a1d4442ba4512f102edadaa3452bdc4f4a445ea34e5e24cda23fbf6e1363da5bd49f70018b387f7450cf15 SHA512 7eb98f15b624090ba0959f4ee47c1a2317504a381829cebb949f4104ea9b5c2847a98f95de60a35c5bf1094e500041c53e1afdb265dd2f237bc49db8acbfd6f2
-DIST libgweather-3.32.1.tar.xz 2713696 BLAKE2B 496aa07c517ad570ebf54041b8ae14ec5eb5a923a113e1adcf23e5ac9a515ccb5c2dbeb29c923f0abcfc213409ddafbb1747c5ed5a6129bd4ac40b4e0fd687d6 SHA512 f5ae94436fa3cceee84ff80f14296f11ab27727e3881689dd71126de158f7d0015b462163cb2b47cf30add5a4c97c89c6473c1ed0515fcaac0dde2daffdf7108
 DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
-EBUILD libgweather-3.24.1.ebuild 1312 BLAKE2B 518c863280f2a52a3bd39f93ba33c439289c8427138e8a82f206f89a211de9cc5b2899db5c498dc5f41d6d3f91f2f863577340255a04fa364f76f9eed505d78b SHA512 aa82ec23295aeb1efda2fcb5e5607af5667f3baaf1c9ae6e55ff63ab455f9d1e2c9bcf95a2eb2c551409c62873de675c19fad56f5be502b6d1b1ee0174f6454a
-EBUILD libgweather-3.26.2.ebuild 1314 BLAKE2B e9b48e125efc1de624e6cb692ab3d0ab29897ade082a56f766e2ac85e86992beb523197d4e5ae86be46651c5507a4229154f24ba0a819eccb0237d1c2dfb6875 SHA512 c68cb64df4776aeec8bb0814911640464b1dfe8f4480e03b57a9ea25b08a744a23989ce8e90522ca1e53679e59d2bc6932b83df2166e0dd9797169d2d0b629e3
-EBUILD libgweather-3.28.3.ebuild 1557 BLAKE2B 64445dc29f35a5671260ca003ed54ea596956d2e8d44fb508e05c21cdc13d183aa7d15cc6a69320f0fc8bb05116336590ffde483d456a3d1a60adc6c97890c91 SHA512 7a72409ee915394ccee78e9893c554d126b060e24998fd160b1eafced936121fa3d82d2b123daf11f066b6316fcb9786ee0e6fd1e6f780cfd97b3c97fc88f4d2
-EBUILD libgweather-3.32.1.ebuild 1570 BLAKE2B 0698db46988d982987d385d88964e04ea8fd341a7c718e9906bb360e6396f35357472b6ef4416521bab7e0f4d5d690dce9e23e5cf8a8af935afe11dab8058b73 SHA512 a450ac12c526ebb6028a9a6c31d365f48996ba9f9ed19526853dc966dda014cde24e4f36fc74964792dbdd2158e2cf041cf3a03fd3edc50b039795b54f46bf61
 EBUILD libgweather-3.32.2-r1.ebuild 1665 BLAKE2B 26223bd855a2e91e1a2f89074bcab4d45929cc72ca8dc31b9c6ebd6d44642612d2aa3893a83726712a61b3800ae9e973de51369de1dbea4a3612ea660ff7cd9d SHA512 2a52ab224d0994413117042f8ca00721343ef5a99f10031336dd90736a1c8efa3b5bee5d55f6c01ecea35cdf9c4b52a587e3442e729c8da246b4f54a3e1d9862
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch b/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch
deleted file mode 100644
index 83880e0398a0..000000000000
--- a/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b7df88319847f3155bd0e2ea994cf66c01fc1732 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 12:21:01 +0200
-Subject: [PATCH] build: Provide introspection option and don't build manual
- tests
-
----
- libgweather/meson.build | 21 ++++++++++++++-------
- meson.build             |  4 ++++
- meson_options.txt       |  2 ++
- 3 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 4d907b9..9ede9d0 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -65,6 +65,15 @@ lib_libgweather = shared_library('gweather-3',
-   install: true,
- )
- 
-+libgweather_dep = declare_dependency(
-+  sources: [gweather_enum_types[1]],
-+  dependencies: deps_libgweather,
-+  link_with: lib_libgweather,
-+  include_directories: root_inc,
-+)
-+
-+if get_option('introspection')
-+
- gweather_gir = gnome.generate_gir(lib_libgweather,
-   sources: introspection_sources,
-   dependencies: deps_libgweather,
-@@ -79,13 +88,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
-   install: true,
- )
- 
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
--
- if enable_vala
-   gnome.generate_vapi('gweather-3.0',
-     sources: gweather_gir[0],
-@@ -94,9 +96,11 @@ if enable_vala
-     install: true
-   )
- endif
-+endif
- 
- test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir())]
- 
-+if false
- executable('test_locations',
-   ['test_locations.c'],
-   c_args: test_cargs,
-@@ -107,6 +111,7 @@ executable('test_locations_utc',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
- 
- exe = executable('test_libgweather',
-   ['test_libgweather.c'],
-@@ -115,6 +120,7 @@ exe = executable('test_libgweather',
-   install: false)
- test('test_named_timezones', exe)
- 
-+if false
- executable('test_metar',
-   ['test_metar.c', gweather_c_sources],
-   c_args: test_cargs,
-@@ -125,3 +131,4 @@ executable('test_sun_moon',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
-diff --git a/meson.build b/meson.build
-index 5b30864..2e9fa08 100644
---- a/meson.build
-+++ b/meson.build
-@@ -108,6 +108,10 @@ else
-   enable_vala = enable_vala != 'false'
- endif
- 
-+if enable_vala and not get_option('introspection')
-+  error('Vala bindings require introspection support')
-+endif
-+
- root_inc = include_directories('.')
- 
- subdir('libgweather')
-diff --git a/meson_options.txt b/meson_options.txt
-index 19b2c6a..bf4c517 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
-        description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
-        description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: true,
-+       description: 'generate GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-libs/libgweather/libgweather-3.24.1.ebuild b/dev-libs/libgweather/libgweather-3.24.1.ebuild
deleted file mode 100644
index 4a662186a25b..000000000000
--- a/dev-libs/libgweather/libgweather-3.24.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgweather/libgweather-3.26.2.ebuild b/dev-libs/libgweather/libgweather-3.26.2.ebuild
deleted file mode 100644
index 43dcd3751e17..000000000000
--- a/dev-libs/libgweather/libgweather-3.26.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgweather/libgweather-3.28.3.ebuild b/dev-libs/libgweather/libgweather-3.28.3.ebuild
deleted file mode 100644
index 75d02795fb38..000000000000
--- a/dev-libs/libgweather/libgweather-3.28.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libgweather/libgweather-3.32.1.ebuild b/dev-libs/libgweather/libgweather-3.32.1.ebuild
deleted file mode 100644
index 8070a129c9e4..000000000000
--- a/dev-libs/libgweather/libgweather-3.32.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 45f7b01d0e61..0da35d38dc41 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,6 +3,8 @@ AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee9317
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
-EBUILD libical-3.0.5.ebuild 2090 BLAKE2B e46681230433e86dca87b9f8d982e05760254d8e8f8684c43e12a43289cd30b63b8d7cccf914d83e79a85047dd3268df5c82922d0659951e9b64956f912404af SHA512 8afc37fdaf16afd9592dd4481887db17593b9835b9125f146abceaffdfc38bc7bdfcfd77ffe51c2dac3081cea23a5439f299391ee1598c8116cc8161efbf55b9
-EBUILD libical-3.0.6.ebuild 2309 BLAKE2B 59c58448424670bb2a191c97fd9436ae0e35e2d1dbacb0364ce8c0f6b9fad42ac4f9a0b16620adac94dfd81f70d45e9149b0a9a84a34debae00411a0f4c8386e SHA512 90b734bd6038fd62b2f26d755c70c3f2066eae5600fe37c9065813c6137965df0ebd79f206e046e6a073219c5529823620c8db7d7626d085a5765339f7b834ad
+DIST libical-3.0.7.tar.gz 881352 BLAKE2B ad256833a69ba2e76301b1d9f732ac22c3d5a0030bb81e2d8ef57471338fc583cf1dd21cccb1301d3fcfbe1905a42bebec7c811e90cc8b10faa6e773fc1366fc SHA512 4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8
+EBUILD libical-3.0.5.ebuild 2040 BLAKE2B e96ad24550d41e7517ebb275851ad22f5f07e70267b4e5162665047c8a1a4b45a9806a58f1120556b1cd3909b92ed1c9389e015c696832f07aab5e436bb54092 SHA512 1ed23ca08758b27a86480f2f8af9b39974a501665d56e06138fcf0edfd4d04a0a45801c29725c0eb1a7f962dfca672c15a71de81d7ed80271314979fa6eeed6e
+EBUILD libical-3.0.6.ebuild 2259 BLAKE2B ded271afe8306f8a3042b3862ceeb27be9cb03b232a4bfa0e86a622ca8a60960014d4de20c97b42ec0af4699cc78fd12c65948f9ef24d63f9b37c6b7f150e8c0 SHA512 2d9cc9caf082b362f2b15250bb2509dbf5c063aa24914d7c69ae82d8c7c55f62715131d077e930fcbbedaa464ec1ae673c7f967527efbf17df39841bfe62d183
+EBUILD libical-3.0.7.ebuild 2270 BLAKE2B 6b44b360c9ee6fcf5d3dbf4d1b91fdafad7bb0e395e78eb9f4fa11e7f90197fad821233f6a6ed97223d70a6b674d73714a34fa935dda6fc688f80df5f56afacc SHA512 ac6f4d8bea556ff9d3f40890260502a6fe509003464b14822d1a1a747c19eaed462bc0210178f164d5a1cb35b8a3bb34509db5bf6541848cd04836d0604158ab
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
index 8db90e5024fb..b977742f2cd4 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils python-any-r1
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake python-any-r1
 
 DESCRIPTION="An implementation of basic iCAL protocols"
 HOMEPAGE="https://github.com/libical/libical"
@@ -52,7 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use examples || cmake_comment_add_subdirectory examples
 }
 
@@ -61,18 +61,18 @@ src_configure() {
 		-DICAL_GLIB=$(usex glib)
 		-DICAL_GLIB_VAPI=OFF
 		-DGOBJECT_INTROSPECTION=OFF
-		$(cmake-utils_use_find_package berkdb BDB)
+		$(cmake_use_find_package berkdb BDB)
 		-DICAL_BUILD_DOCS=$(usex doc)
 		-DSHARED_ONLY=$(usex !static-libs)
 	)
 # 	TODO: disabled until useful
 # 		-DGOBJECT_INTROSPECTION=$(usex introspection)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	use doc && cmake_src_compile docs
 }
 
 src_test() {
@@ -80,13 +80,13 @@ src_test() {
 		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
 	)
 
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
 	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples; then
 		rm examples/CMakeLists.txt || die
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index 7d8dbfd7e5f3..6f7ff1a942ac 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 VALA_USE_DEPEND="vapigen"
-inherit cmake-utils python-any-r1 vala
+inherit cmake python-any-r1 vala
 
 DESCRIPTION="An implementation of basic iCAL protocols"
 HOMEPAGE="https://github.com/libical/libical"
@@ -53,14 +53,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use examples || cmake_comment_add_subdirectory examples
 	use vala && vala_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package berkdb BDB)
+		$(cmake_use_find_package berkdb BDB)
 		-DICAL_BUILD_DOCS=$(usex doc)
 		-DICAL_GLIB=$(usex introspection)
 		-DGOBJECT_INTROSPECTION=$(usex introspection)
@@ -74,12 +74,12 @@ src_configure() {
 			-DVAPIGEN="${VAPIGEN}"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	use doc && cmake_src_compile docs
 }
 
 src_test() {
@@ -87,13 +87,13 @@ src_test() {
 		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
 	)
 
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
 	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples; then
 		rm examples/CMakeLists.txt || die
diff --git a/dev-libs/libical/libical-3.0.7.ebuild b/dev-libs/libical/libical-3.0.7.ebuild
new file mode 100644
index 000000000000..9706f1bd65aa
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+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"
+IUSE="berkdb doc examples introspection static-libs test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	introspection? ( dev-libs/gobject-introspection )
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+	introspection? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	introspection? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex introspection)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ce8021b1c182..9c6f11526bf8 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,5 @@
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
-DIST libinput-1.14.901.tar.xz 573900 BLAKE2B ec2561faa4e83fdbef28802295a7a4b458ce147a05213363f7bfb136ae6f144ac3e49ed012a76a4ac19dc0ae9e51b3ecbe266794b7a2f3862788556ef1394a1b SHA512 93d97cefa49f640b7b29ac3f54497d57cd1499cb0945504d4522ed564b2414fda55ece09d9212ca2cc3c911375ce0b6906ae62912fbc501aea5238afad3ad4bc
-EBUILD libinput-1.14.3.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
-EBUILD libinput-1.14.901.ebuild 2103 BLAKE2B 491f3c74ba09a2d6af72d94e980d2e67a451eac8f332ce1e32383705b6baec26559e34ce9fc022b16dffd4d58a3a07121f5af080601b71c775ad234183f46b8f SHA512 a11df5fe7e09ee1a8bc7c36c7917a7a550169fc4b2c7bb172d7a48eec7f1ddc308321b86ff5e4ec1140f734fe857b4ce470833c4c3d57fd15605a9bc675a6222
+DIST libinput-1.15.0.tar.xz 573364 BLAKE2B 521e5775fb98b1b3a281d1002bd41fb0cd3e7dd3d7c1f11bd32773fb8651cddfa7db1fa2ca686a213ecd726f2f0fb475cd3f40a7a7290101286a334fa7b0086d SHA512 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6
+EBUILD libinput-1.14.3.ebuild 2057 BLAKE2B 8cdfddaafa67ee001601ea54ca6891ea4d9bce388a16b70dfef2d43c8f016e33afe0aa1a13a9a2c88e363212f9ffe9a93db64f0c51bcd06df2b656ef2fa6e8b5 SHA512 006253edb2e05182d036ef2ee9aac7a5686e137b1492bd313aae9749b37d65f6aa95ce9d2cba11e7847b03c1ad09ff4484966a2a38d3683de7ff2f1701ec8ef6
+EBUILD libinput-1.15.0.ebuild 2101 BLAKE2B e3c124b203017e6ce346cd296cde0d3b778afe2ccef17bc47897875232f0689da395387cddb14d0fbff4fbe52bb9e3b14c539b5e4abab8c1f30f445825e65de3 SHA512 985c8758df18a84944a3e3db67f9c23969f2a421426aa494e0e753f8607d3a701a82476d907822e766fe764b47f61a8c58a140646afba9345364602f9ea0397e
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
index 2a1ff8430843..8ffe79d05faa 100644
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.14.901.ebuild b/dev-libs/libinput/libinput-1.15.0.ebuild
index 9e1ab791f12f..b59f509ebfa9 100644
--- a/dev-libs/libinput/libinput-1.14.901.ebuild
+++ b/dev-libs/libinput/libinput-1.15.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 87ec9d8c361b..dd8ad4d97ae6 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -2,6 +2,6 @@ DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a12
 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 2091 BLAKE2B 5e46d533a6d4da1fbb3bb50df802ec2dc5c8dfb42b284dd4c595f5251bfc91137c825e9651e2460f05730425b0be9a3c7291cb57aab6e1944da28f2c196d652f SHA512 09dec6d6e3803bdac6f6ca8d234195ef8a6ed0730c432e7bf93198837ca48e942630db8e6c4b92833da51bfb5d4aa7bdadbc1e8b31756349e98fc9001a033f56
-EBUILD libintl-0.19.8.1.ebuild 2091 BLAKE2B aba2847691012715b822adf210577c214ab7f94d5de42295437f9119bdd3feb8512e8bc21ccb9f5b815007aa5b6b36dd1c23927e99c35032f630043623b73a59 SHA512 5d11fc7d2a28609a754f0246aae194ee3fecdbf22719c6403c4cc5af78b6d2cd878cb76dbaf62c70e06602d94dc0a89de038fd42742a941e6ab1a04eec316a88
+EBUILD libintl-0.19.8.1.ebuild 2090 BLAKE2B 5ce391612348ea51cd407d92f440385b43be99d3014d07ad23dedeb3083ffebaccbae108167ef0f3073d18c27c6ea70ad73eeaedd8c9fd175d4086cbd6d68b02 SHA512 903a9c2ddf3226747ac9aaadf124847f0bbd0fd7f0787edb88953ad9a9eb42435144706ad6107c7ae0562145039343321b02dd575e90c2efc857e04795bcd047
 EBUILD libintl-0.20.1.ebuild 2113 BLAKE2B a3b780f97ae721bfcfb65508051e1f1a21d8a3715e1091a24c5a6ab9f64112a82469a2b1920a92afd1640da6b328bd56295e6d87a6b2530608c16b8afe6633cf SHA512 c785ddb9d4cf4d9ac3e57949a3dc23de0d83c3dc50e8f11f1357e6a78a779ac9702aaad5d2f8809c935d9295e530497b2f5ba9a51cc4997ceaf55fd7936861f5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 600e5dbec942..4aca7480b3ce 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 sh 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 sh 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/libixion/Manifest b/dev-libs/libixion/Manifest
index 22903d25006b..f4a595521517 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,4 +1,4 @@
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.14.1.ebuild 1091 BLAKE2B 606c176845829ab2b0f518e8b1edf3bb5dce629c2cffd71d908618bb68f64245859e6a44d3dc8c6b80ad9cc6ea0e81e5178f7a85dab982bd84199bd4e84043f8 SHA512 1901ccb618f314b81526747f9d7602a24a0bc79c3493c46b2aa9b319875925cfc42dff32286d72ff87b1b659d4e32350301f81914137701991c40f0d273f0747
-EBUILD libixion-9999.ebuild 1113 BLAKE2B 17079093e13a05c2a3bf526fbe7623ca9b28facecaafcf83e87f8e2245a174dcf2cb081d120a7636fdc30846b7a2666e11f385a3b4f76e7dabe551937d6ab3e7 SHA512 5f2cc26fea62255c9ae24d2698d54a32bdb91c440e905515a089e35d97972cecbf518ef76539cd4a56084bad59e9aaf61caf1dd57500334d2ab225ed853771e6
+EBUILD libixion-0.14.1.ebuild 1089 BLAKE2B 54a683f664b55796eb402f4c401e252828efce096da98db70d601f334627969b807ac32d5b64d77f3e4145418c39d778aac1ca28ecf93a46e3a69cf94f12d027 SHA512 0120ffb55e59fccde2354c0d49ea322701df51ed5c60cfe9187c3c3152513cededc25448a010cf7cac604e8670d97ad7ca39b78186670b5b58769e1c2c4a7806
+EBUILD libixion-9999.ebuild 1111 BLAKE2B e308382cc9294ca5a24772cd93dc3e937ee96949d89d9a46bbddc8e61659030c1de537b89ee644585bb0dbfee6bf9b3fb9d9e50559acb9b33039a491797c96c5 SHA512 1290f989d2950630c9569908275da364ae4c030b5f4541b300fb33a95000965926ef5f30431ecb89a01686bf2d891aebfb19a1b4b7cff860f26a64d47c177bc7
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index 7506f2c88e8c..b939aad23939 100644
--- a/dev-libs/libixion/libixion-0.14.1.ebuild
+++ b/dev-libs/libixion/libixion-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index f55c1445135e..f52b1d4a22b5 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 45be71232197..1b452716dfc9 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 EBUILD libksba-1.3.5-r1.ebuild 781 BLAKE2B 4dfb790e19472c505855b8d725ed3c8e7538f232115e4e02703a8504daf2df8cc3c940d98aeeca609d2eb5d736576a3c4ec2aaec671153209d2beabac1a020b6 SHA512 f0c4fa8ba02eb54738a96cebc27c9d8abf30a4c64dc5dd572ba6c082d5c18fb33f08192c81051eb959b9a8c5c41b05ec54acd092d13647c60e4c827a444f5909
-EBUILD libksba-1.3.5-r2.ebuild 1030 BLAKE2B a553d4dfffd37ce638a88fb4621f1abf155ab23f7a658f0bca856291ebc0d560eb137fa0093a8dd895f08df54a5b6a14a4e1cdc588b2c51d43481be0767a1610 SHA512 80e76313d0fad3d27df7f42d141163031e09c1ac8943caf3103e0af049a88be9983ee73ff4ac982cd622578eb72685cabd7aed7b9c672f6b4d8f39116ff4e5a8
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+EBUILD libksba-1.3.5-r2.ebuild 1044 BLAKE2B e86f3050c500aa5b68b5a1c095de9e8ea96095629d728962bb8af31d33e0764f6e7f16174cdee4e65fe09791a45e06fc7de1389dc3d532478bda9680055dfe68 SHA512 a5a820aa03c920579cba25358847cfacd7f4c26c56f62aed71ae7e3a9a479184b2831c58871bd3e6c6875b48a876048326ac43aaecd08e3223c4ebab96481e18
+MISC metadata.xml 363 BLAKE2B 47525d43d5882725cae82a4da39f6a4e3f5dfb9918fbd2cc869af4016a41db7768120db58dd68b2fdf6b433b4f571080c96642af30a3399023bedfda72f3cdf8 SHA512 3bda082ad019aac69218fe9211a5a36a43f9f4db2c0017669fd1a4ce73d24f37798c1f3368562e6bb91417fdfff0ed795e1b2684e05a83100a18cd809cc0e396
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
index 78876e7ec539..fa41b9b66193 100644
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r2.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
@@ -16,15 +16,17 @@ RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 	# ppl need to use lib*-config for --cflags and --libs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libksba/metadata.xml b/dev-libs/libksba/metadata.xml
index f1c3d59fb213..d207d4117cc4 100644
--- a/dev-libs/libksba/metadata.xml
+++ b/dev-libs/libksba/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<maintainer type="person">
+		<name>Lars Wendler</name>
+		<email>polynomial-c@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 403accc7ab23..ecbdc5f70cfa 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1,5 +1,3 @@
-DIST liblogging-1.0.5.tar.gz 571051 BLAKE2B 46959fa20d4cf00dff1eaa099ad69c199b18036cc05a65945c5abefa2462279577de88e5374fe8486770f9437888562f09f63b3e05015f57ea645a54f7c6c56e SHA512 fd0c89b670bdf4d257d6a31b18b44940ba2edae84633ead6577f164e1ded93709445c35027a28f6e7fda4c984964c3446978eaf0abf843e31ecc11b979e2adde
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
-EBUILD liblogging-1.0.5.ebuild 735 BLAKE2B 9c7d51507c6de7ebb7b040b55aa60e7ebb21108b6092813c7119bd91ffcfd74f2c434f53a9d392069165c985f0d942149af8bec11c57bed6aefac1a9af0106d6 SHA512 9cdb8e7a153da3c646ca9fcaa24c928dc5f8eeca715bdfec6168a924d823ce8871140eb6b049aad3869ab4373d02e17785c580ed7a12ab28d8d102790b045b04
 EBUILD liblogging-1.0.6.ebuild 813 BLAKE2B 9f0f75b4d4cc1f28daf26e33982eb6f338e8569905f8a0f8f9f81fa676cb7bb0aee18a120c988ca909aefa5438b5ded2a2590de3dc7bf1c32c55c2155a573f4e SHA512 adc5da8bdb207461fcd51a15953df1ff00d07ea9bc4ea6467ddbd1889a22041b818e183a3ee795cd008cdf53eb0cd79f408c5f6031ad86c6c58d4f38d580f72a
 MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/liblogging-1.0.5.ebuild b/dev-libs/liblogging/liblogging-1.0.5.ebuild
deleted file mode 100644
index b9afb6796d1b..000000000000
--- a/dev-libs/liblogging/liblogging-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Liblogging is an easy to use, portable, open source library for system logging"
-HOMEPAGE="http://www.liblogging.org"
-SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
-IUSE="rfc3195 static-libs +stdlog systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable rfc3195)
-		$(use_enable stdlog)
-		$(use_enable systemd journal)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index bcc0191dbb2a..615b327a73fd 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,3 @@
-DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.5.ebuild 1520 BLAKE2B 4d3848aefddad33d7f0f9cec516e70095a6caf1b15a518385ddc05ca0601b63fa19d6c712e61e710e32e5a5c34eab235753d6bd77a7dde070cef5e3ffce88c53 SHA512 d72bb7296a73416532ddc29698e0522d50eda5d09cc20221986b35f01a1de11a58fe8b4531a4a9fca9d984d8f579af3ea365e18de97c69f004c8f0b3d693c51b
 EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 4d3848aefddad33d7f0f9cec516e70095a6caf1b15a518385ddc05ca0601b63fa19d6c712e61e710e32e5a5c34eab235753d6bd77a7dde070cef5e3ffce88c53 SHA512 d72bb7296a73416532ddc29698e0522d50eda5d09cc20221986b35f01a1de11a58fe8b4531a4a9fca9d984d8f579af3ea365e18de97c69f004c8f0b3d693c51b
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
deleted file mode 100644
index 4454eb1aea10..000000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="https://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.1.0"
-IUSE="debug doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.04
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
-	local myeconfargs=(
-		--enable-compile-warnings=yes
-		--disable-Werror
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		--disable-regexp
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 626d6598c791..3cbbe55300ed 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,3 @@
 DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
-EBUILD liblouis-3.10.0.ebuild 1522 BLAKE2B 4a15773925c9e1c105d9ed44ea8ec5704e4d1a6c3c0f6b6ea79f5ea28c0ceadcff578a21df9391a461da13ea58d60f1e87a1d5d07fd9d1fac1a75a5acc8ee0e7 SHA512 e44c85038780a8b527620f3d9b8399cac1e82832eef546510eba5b253bbbb0e1865c83a393c1f8d8465f26dd096a40f02e3e8af48b768993937c6ef52f5cfcb5
+EBUILD liblouis-3.10.0.ebuild 1518 BLAKE2B 088499489ce96d49e52d363ec4a2a746cb1ef0c7c86223dc6cc041703928ef4c76099af991826ab24e8cbbcf151d22fb11fc5ab9a5e28d7580eb8a00cf9c33a4 SHA512 af44cd1a03adec90d08089e21b4f7a48b67e2365edb1280e754fa425fdb038f63222537fc7acfc3d620d68100e7b1092896550735cef95fdfb519eedd25ceb9f
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild
index 3f716c400def..e414be4e8e05 100644
--- a/dev-libs/liblouis/liblouis-3.10.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='wide-unicode(+)'
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 9806b01c57c8..0b97a27f8b62 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
 DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
-EBUILD libmaxminddb-1.3.2.ebuild 555 BLAKE2B b6e7f21aaa4740b0e98ca26c3aa62ddf2d2a5798f2f28f678a9ec5a9112d9a459bf768f4cb6b0c3facf0a3f8d8dace5d08da3c806b1765e94bd723a7d396bd46 SHA512 239d357145fc988884281371f1dbe5b7b1f82adaaead4b6ab54bbb68225a16d2789881c203aa956cb44aad5bf44a24e8fecc33a7620c4566611e0014dfcc869d
+EBUILD libmaxminddb-1.3.2.ebuild 583 BLAKE2B 1bd9fd65540bbed1bbabaed1ed2ed0c005b57208adf7377ab3459d0aa2b7090dfe26355a6d88aa420b6da6b4ad7ab44dae07b80804a51d403b374726d17c922e SHA512 7fe5e57942dda1e93b86545157c091dd17ae6582e44d881d0ae1a11fb536dd8da14bafb893e7d6595482fd3bfb4ec513513877db97c62ea691c8ce667b23ac0e
 EBUILD libmaxminddb-1.4.2.ebuild 593 BLAKE2B 19a07c359071ecbeadeb97a0129ebb74720ab7622bafc83571beb12dab0ee1326cd0eb78d97e1eae1727d3644c89ef6135bf4b72c2df94a450f74e2e549435cd SHA512 1ea29c3bf96f26d00ba3bbb02469bf4ec812431a1f922e74ee42fe2df880ea94ff233c3a010bb0a804e776e65d410b423c971b4c2cd865434e91745c4c1eade5
 EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 643f0e3bae5a..0383df3f9698 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
diff --git a/dev-libs/libmba/Manifest b/dev-libs/libmba/Manifest
index ee8938e87194..098633cea3a0 100644
--- a/dev-libs/libmba/Manifest
+++ b/dev-libs/libmba/Manifest
@@ -1,5 +1,5 @@
 AUX libmba-0.9.1-glibc-2.20.patch 1039 BLAKE2B 6c458c43a164d2cf438329bbac156d9b41117d1781a2d92b998c0a8d1ac866d7a9a0822b27ffef7610bcc3776c6e054bf333339241ccbd0ca956d373b376bf3a SHA512 b0d0ea1425dd4dbba685eee62609f0627c4d8a579a566d52d1c7f333a92109cf700faaba8ed0f0697d08409feb14ceb5bebf9a799c23e9de1aef388ba1ba4b95
 AUX libmba-0.9.1-qa.patch 2927 BLAKE2B c6b6e364ee2d3eb6026574e2b9a9cb0367da714d06b44a9e0fd8429757d85a42d850634ec3e96d31db47942dd182932d0d5fc6c4b552c552fdc7b3ac11dea984 SHA512 b5886f89c4ea4739e6bfe34e9f8026946ffbbc619922cbd25bab0d7c5df3fefbaf1f198f1321feaf5bbffa79951c58b329cf1d47f4f7ee0f3014de4434c179ea
 DIST libmba-0.9.1.tar.gz 290080 BLAKE2B b46890229c1cb1c0e6a2f7c41234f46fb2e590316182944c0850d0fad098c968a738bec434dd82b3c1d831694ba9fc99719f525d83a2bae645ee0ffecc8619c9 SHA512 28696e6066cb6c54434e1a35576c1e2430e3b83a478fddeabb20ddf1d8b889edac023de15090762fb95a759ebb9d2d8fcf1b0d19ec22f6a98ef2780400456da6
-EBUILD libmba-0.9.1-r3.ebuild 903 BLAKE2B dfdd4985491671d7c7bbff571d56e2b794d8516260368cd6f87aa334219b41e24a2870ba29c956f643a698f7f97dd19a8b5887ac421be10c2707e6441fd9d622 SHA512 aed294ada81eebf9bda981a0b09bf82a1f419f8358d7a299e95d6d0b8f5b52a97ee313e0d85d978b535dec10e40a484a610055be475638a55ad51dbdcd29ba6c
+EBUILD libmba-0.9.1-r3.ebuild 930 BLAKE2B 904773c4a0792d62d69ae12dcec9cfa278b34bf7901838204ceb04a794c5da6c42da697fbcfeb54568abc9598a4bb72cf5771224d507acc451793e562901a228 SHA512 c5406edffdb4c72595d81bae453efab925105ec9b9214b8d4f5a450324c0ef87ce8cee2fef440b86f6492e506fd1fa7bebd5889af78ab72a2af28bfd47ee52d6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
index 9f66be909a62..ea329ddd19e0 100644
--- a/dev-libs/libmba/libmba-0.9.1-r3.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs
 DESCRIPTION="A library of generic C modules"
 LICENSE="MIT"
 HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
-SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
+SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs"
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 9ada7032d07f..cbdd41e9fe1c 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
 EBUILD libmcrypt-2.5.8-r4.ebuild 961 BLAKE2B 6545ced5e7c5b68510cb6d97a80a4382933ff67d0f818db9ba1c485fd63697b6e10c11cd23193052ac3432bf8fdfbcf68924b9d59b2fb43e489969ef25792c57 SHA512 59a3b4aa4bc4debe6126ee436507cb19de4e34882207707387c18914309112fefe9d892d3c869cf0812ed217df07042598109f9428d6f6aaf83a874c2ad04dd4
-MISC metadata.xml 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
+MISC metadata.xml 248 BLAKE2B d2f70b047cdeba6294940f0b4f8c4426c9b7eda93baa14e9bee35b9807c8b7ebd991c7aa726bcfeb17cc68960d335145e857f49d83d1db265935d81e9c5b07e5 SHA512 03ae18ecf8f19984fc4398e0e972bd2a52c033d7d94970d661015c76ede0c81191d9a297dfc7a04a58c1c4bf1cdd0b158236a1255c17232c58b234aeb26653a0
diff --git a/dev-libs/libmcrypt/metadata.xml b/dev-libs/libmcrypt/metadata.xml
index a07f7533cf4a..44f754152100 100644
--- a/dev-libs/libmcrypt/metadata.xml
+++ b/dev-libs/libmcrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">mcrypt</remote-id>
   </upstream>
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 1f9f6e6de1bb..b4ac61c68b52 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,3 +1,5 @@
 DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
+DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
 EBUILD libmirage-3.2.3.ebuild 1160 BLAKE2B e5a33aa6a2d9c3827a7b49b0de806072c291ee8a16f5448542508ad3a5d03edbfe2e3f479eec61e9a40f24d3ca1001b244486e04cdd44a2debe26d81ed3b0b91 SHA512 bfcaabfab5dc6b9f265cbfddef81c61ac975d0e1ace22fa300943cda0ecc1c28c984b4719e8fe88bc2a6e07ab6f24ce457a7480db730d8f210cbf46aef5ee309
+EBUILD libmirage-3.2.4.ebuild 1181 BLAKE2B dfa9f16aa884135ed844f155cf8a98d21e25345374dc778bb973ca370c607cb241466c1d8d7b0e866cdb69d18514dab307b5776e00431303fe441a6f05044c2d SHA512 d09e3af93d0695badf3486c1470ba050f0924c341c06a0f5f0bf32b8359383bbb1e6e88dfd3a98ead306da045a06ee65763819925e4adc38c4e99aebf48a92fa
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild
new file mode 100644
index 000000000000..d7e0e688065d
--- /dev/null
+++ b/dev-libs/libmirage/libmirage-3.2.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="CD and DVD image access library"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/11" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection"
+
+RDEPEND=">=app-arch/bzip2-1:=
+	>=app-arch/xz-utils-5:=
+	>=dev-libs/glib-2.38:2
+	>=media-libs/libsamplerate-0.1:=
+	>=media-libs/libsndfile-1.0:=
+	sys-libs/zlib:=
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DGTKDOC_ENABLED="$(usex doc)"
+		-DINTROSPECTION_ENABLED="$(usex introspection)"
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 87190c6e09e1..c0a69f5e4eb8 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -6,7 +6,8 @@ DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 EBUILD libnl-1.1.4-r1.ebuild 1158 BLAKE2B fc2e62c2286a6c5d5ea686ef638a6f29b458f8fc7806ebb29679da77fbc660c086d7122d8e02d732f1f5bd1e5cf073f817d8148c5e0f58abdee8cf35b0b96ee6 SHA512 3213fbca3c960b4d5088f2cc8fba234a1d49a3da4ce617aff11c9ea0207776dc2744143e1989ceb0368c2925318fdee16b9e191183be6ab212cc19ad854f83ae
 EBUILD libnl-1.1.4.ebuild 1134 BLAKE2B b65fee4f8cf8cdce4b923b1b8e0eabfe722e0ccf8fa856fb737a236bab8041c4cf5d3a05213a5c4264d9c1b432584121730cf8d55bbc3486255dd99d0a048b5d SHA512 95ef3ec713c5a739dec59512c597ce983c85db0535075db0245084a33a66ceb59867dc8b935e941a952d581c3b6396bdb11f211f42c45ba277c41710539c2bb5
-EBUILD libnl-3.4.0.ebuild 2407 BLAKE2B 7bb952c54ccaa828e964afae46e02aeafaaef93eb357c09b70f5c56966a11d261f40a402f41668adcd781d5b006e2d971b2325aff594024e71da6d9dacd92677 SHA512 a2a65e942a7f2dd0209a2afae4964af96d0133fe73cb76b8cbc9131e9b8b246b74f05a1869a10c25f0ce539bc7c7bae4bca7ff6639ade62a031245356a1db05c
-EBUILD libnl-3.5.0.ebuild 2415 BLAKE2B 265d1301c9ab6b1b7f2520a73362e47f4c3807de40753e23fe267d940c5afd03da297aeb8111e621cdb1d63e91ba9d62f691bdc88f8d9116a8a98c3685308a0f SHA512 f06ae6288052c8f418057f099f06c6f61e2c34f83f1cd553dbb485c940d623f5846aa66faefc2282bd5ec754aac9ca434926517e60d72d585abe6caf52f8fd63
-EBUILD libnl-99999999.ebuild 2178 BLAKE2B 34f58a37452e3e5d9c9d521fe588419205738df9624770b7d52907a6cb090e97fa035114f578ff4dc162f91584c6bfed20b533c5ae01c283e7af5435acd54a52 SHA512 7466acda717417aac17fd817ddaab417342e2fe24e29f85aeabeb2b2bc4020da15f6876f359a78989baecfac5b8ee8621d25f42adfd1cce3419d85c089e09945
+EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
+EBUILD libnl-3.4.0.ebuild 2405 BLAKE2B 78a44c2f938c8b3e59320044dbc3ec0b14215a0a13158d0b0125a30015bdcc7b68b7de9227b9ba90f01bec65064dbc1b25e50b8204bc8fdc7847d15c46be4369 SHA512 db5970c37b389479a9f378e3cad23bcd306cccf64af9f082a03ab347ebe1b3e9343712ddbfd26939f64da83a1f13b061d87598820ac588554d7f89d1ff2ccfc8
+EBUILD libnl-3.5.0.ebuild 2413 BLAKE2B d9fde7267cb94fac78a9de3191535f54883a97c43bc7f6f7935be1ff2d1442da4ec2df801d1ef8ef35de34e38b23cd760f65961fd62e801703b530b4f8693da1 SHA512 97834e8ff162145949046177b2d64bb65c4eb6579f6fb4027acf952b9d912497f58afd6d4e3ec2525188f7e4f70698031fc5f52485654b3447675ed96722eb2c
+EBUILD libnl-99999999.ebuild 2169 BLAKE2B ef7568eb493af030d4bc1d9bd2433a618b10ee3c41a9dd7600a02d7ca98d969a877dc5755abc427ca13b996747121ada7393bbbb520c7d614e0613dd51dea0a3 SHA512 c2cc7ce9a2a57722a2076e879e5852b500ca0340ed71c197bfa129f3b51e00f8a91883f8297ad90c58e009aae80a389305ed5bff68bf8524bf39da4d46a0d724
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
new file mode 100644
index 000000000000..e9ef685bf116
--- /dev/null
+++ b/dev-libs/libnl/libnl-1.1.9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 multilib toolchain-funcs
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS=""
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+DOCS=( ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
+	"${FILESDIR}"/${PN}-1.1-flags.patch
+	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/@echo/d' \
+		Makefile.rules {lib,src,tests}/Makefile || die
+	sed -i \
+		-e 's|-g ||g' \
+		Makefile.opts.in || die
+
+	if ! use static-libs; then
+		sed -i lib/Makefile -e '/OUT_AR/d' || die
+	fi
+
+	rm -f lib/libnl.a
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+
+	if use doc ; then
+		cd "${S}/doc"
+		emake gendoc
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		docinto html
+		dodoc -r html/*
+	fi
+}
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 6c2881430a66..2f3f38680b69 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils libtool multilib multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index ae230e8101ea..b4d5471529ec 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 libtool multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 96cee7696c84..619ab299650d 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 git-r3 libtool multilib multilib-minimal
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-EGIT_REPO_URI="
-	https://github.com/thom311/libnl.git
-"
+EGIT_REPO_URI="https://github.com/thom311/libnl"
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 100963f2358a..d1948515bf4c 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,6 +1,6 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
 DIST libnsfb-0.2.1-src.tar.gz 82357 BLAKE2B 2904b8890fd1ce3f6eb8d327db09c7b38146d5d16499beecbe56efd762e33d6ee9da3394ed7923ad43a89fa41e45602ea4af2710dbf2f232b42a038ee90abdcc SHA512 f8965aeaab0d8e7c2676bac56ae67bdf6ef651ae84c62e01aeee888807f1edd7d65542cb14027a8f1a207155a1cc54ded9112a42bf9e7a8836956bba38d365ed
-EBUILD libnsfb-0.2.0-r1.ebuild 1200 BLAKE2B d20cdbd2c4557fd6ee74b4b60e6726360a1a880e18397f383ddf09183fc219828dac79ef072d8be3993ff821285687eff58aa82d866203cddaab07de98e58b54 SHA512 286c61ac9f6b183a18b6a889c069b3e6c4efa56c05b8b7f5b4ee05733408852e35f37e10d4fcbd5c001b304b3ea39a8b8b95ec603c07dc0a42489a85c4c55334
-EBUILD libnsfb-0.2.1.ebuild 1192 BLAKE2B 979d8a75d13b92f6aa60894d880b35150be247660372c7cb9c6f964d034de2adb78bcf53af9581e8799786e6d7ef5ea2e4289b1220338dd613150db1779ced02 SHA512 959a10d04baa87295e90b75ef786982dddf4ed5b802fc6a59e2f05418b4c195b2ebd8f154ba9974187843440be8615131e24ccd1ca4954ed310f3625e2478ced
+EBUILD libnsfb-0.2.0-r1.ebuild 1194 BLAKE2B 4ff98972a7656c1a7f8d509dab122dc67abb1faaa48a27f8ca345e5d3deb44529961fcc21ff30a62ce0a6f908fbf3d445dd60c9053e4336625286e6efd9851a1 SHA512 615a07fb9b36574e81576432ba0e6b055cd42c2c686fcfc938c11ff3d7ac89ff756f8f7a0d1088ff202d7178434b62b240a311fc45a1add03b1b7453b4f1ad58
+EBUILD libnsfb-0.2.1.ebuild 1186 BLAKE2B 388c468fcd64a47133a07ab0717494c008a6586e9f6dcd946a94b8c5fc1bb7f4dae5d6d0e0e29bfe1bcdab27a450f7babfa827b11b14ead14af1b075ea97775e SHA512 77a23779d55dce8493e4d6732cfd2e0dcc5188704d9ff52b353ff57f03813cf4b48815bde170fedb6712abbaba9d71400f970f5836d6bce01f7f255690d4e4fd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
index 8fa09879cae0..a24ef2db8b71 100644
--- a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
@@ -12,13 +12,13 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="sdl test vnc wayland xcb"
+IUSE="sdl test vnc wayland X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
 	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
 	wayland? ( >=dev-libs/wayland-1.0.6 )
-	xcb? (
+	X? (
 		>=x11-libs/libxcb-1.9.1
 		>=x11-libs/xcb-util-0.3.9-r1
 		>=x11-libs/xcb-util-image-0.3.9-r1
@@ -37,7 +37,7 @@ _emake() {
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_VNC=$(usex vnc) \
 		WITH_SDL=$(usex sdl) \
-		WITH_XCB=$(usex xcb) \
+		WITH_XCB=$(usex X) \
 		WITH_WLD=$(usex wayland) \
 		$@
 }
diff --git a/dev-libs/libnsfb/libnsfb-0.2.1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.1.ebuild
index 9c7ec5bfe438..707e62543f42 100644
--- a/dev-libs/libnsfb/libnsfb-0.2.1.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.1.ebuild
@@ -12,14 +12,14 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="sdl test vnc wayland xcb"
+IUSE="sdl test vnc wayland X"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
 	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
 	wayland? ( >=dev-libs/wayland-1.0.6 )
-	xcb? (
+	X? (
 		>=x11-libs/libxcb-1.9.1
 		>=x11-libs/xcb-util-0.3.9-r1
 		>=x11-libs/xcb-util-image-0.3.9-r1
@@ -38,7 +38,7 @@ _emake() {
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_VNC=$(usex vnc) \
 		WITH_SDL=$(usex sdl) \
-		WITH_XCB=$(usex xcb) \
+		WITH_XCB=$(usex X) \
 		WITH_WLD=$(usex wayland) \
 		$@
 }
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 403f9046b36c..55ec6c4ea009 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,4 +1,4 @@
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.14.1-r1.ebuild 1251 BLAKE2B dacc22dfabd0b60082fac1a0f2d3e3befd7069221ea13a5480db30c159712b1ec448562b10700295713fe3804bc94012aa91691139077feb9b06741b2004b198 SHA512 62dd07df4e38d7b4cc53f7652f2414b871b1c8c3241d10efd3cd84a1f08e48d9baeaecc7651173d5b83839ad0dbb5532d34c75c63abb6567ce23b6a73f740b48
-EBUILD liborcus-9999.ebuild 1254 BLAKE2B bc159c5877c0ca9f8e894f5012a1c633646b11945b2f4d55d0decf11d7546d5b62425c0c12254b6c503b8d748e45de9a3b1feec37f33e0b5bb4969283db4ad83 SHA512 fd18b355a545bdf3c6f8ca11c9368b7c45ca8c1a5e676dc635a79c5770e9878228cd3754133eedcac802fe0053274c9c90990982a82008fccbe50a392edd8f5b
+EBUILD liborcus-0.14.1-r1.ebuild 1249 BLAKE2B c53b34be85f3765936656b1d464980db12ec87b80771f2c90700a96a85ef11f6057603402755e330fd1a370f02734af508a8f2ba555fecfef9561466adcb609d SHA512 954f8742258006b9ecbfc9d77679631c139d53024aa8e5e30e520313484d478877b99d5767f25b0d632df450ee24992c07065b2774cf5cd78388741bd764127b
+EBUILD liborcus-9999.ebuild 1252 BLAKE2B b022130d1d5d70cddba6124eafc124cae6d54a8483104f6dc9692c2b90e1b4d8d1a9165f8cf4ddc98cd907a8f04756897037ad9fc77829ca60029f9cee6624d5 SHA512 855eb4a67bbc1818fd73c9714238eec01d930c1e38b39cabd1ae650c11a07b02812d27940aa142c19fa4af3d898b9e92e6f8505b0ca6db5b2acdabdf9ee66943
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
index aeecd518100d..e196b90a10d2 100644
--- a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index d6dee020e344..f5373a258060 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index c6cb7fd30ed0..38a82b8934d1 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 EBUILD libp11-0.4.10.ebuild 786 BLAKE2B 9a8f418682368369a9db4a8e98f51f28a4034d2ca4c9e7d5f431fc966390f99c9a5c2678b9f30b27c2bdb0b1111a6b3661d229366ba20951ca26d8a9e2ab1863 SHA512 9ab3cd1b4ec99218d14d6e8af3ccbec6fce882bf8eebc84b4440f55d9e27b2137197ea94904e0ae17fc15dcab8bb015fe9bb6371ce0c3ffb5c594adc64af7ad1
-MISC metadata.xml 677 BLAKE2B 1978fa530cb22a95932fe30b3a4a317aa5be5ec105b2202d06d4076a5f7c320c261f1ba40363651c35eb0aa67511ab93f73656821657edce4df3dd2214b15d81 SHA512 735a547360535a34ad22c4bc81aa4d2d20c5717b33c6e1fe89cb8da17810e1226d7990141c1cc3c195e1e2ac8dbc3c52d78d50161241e8f65ea1406336269905
+MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index 831b8dce3afa..aa000f76c124 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<name>Lars Wendler</name>
+		<email>polynomial-c@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		Library implementing a small layer on top of PKCS#11 API to make
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 621e5ba21d3e..ad5342564372 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0.ebuild 2200 BLAKE2B a6948a043fae943595a0dfb4dc92130f7f4bf971d818c6e054cd9f4526038ca75f16aeadee17d0881dad898f2cf9395b2497bc163914fb647b3dcb34bd1a5d45 SHA512 97b14c09f1c08b6e8df051fa9a1527d21d3cb5444b5cb1826e4caae21de8e6962639c4422f3e1ef269998aee6dddd9738c214e80104963be981b6dcf6c9b9163
+EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 05cffe6a03650ba0fb57f52721d2edf1a6a7f8fdf8197c729a11f7894ae7c357cc80f6b26786a5c07a1ec33e8618634bb09d227af4367f4bb13a4e2378f68bca SHA512 9681bcade2c2148f21364184ff36eb5592726cffc4ecb9464a83cb3ab52dcfee13320fa2837f6bcd8c5aa9749acda4e40b93dc4e89ee716f31d06771c07d891a
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index d9d5ac17988e..c4cdb1939630 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
 
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index e64f09979ff7..ba4f3032ad9a 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -6,4 +6,4 @@ EBUILD libpfm-4.10.1.ebuild 912 BLAKE2B 2a333e5c700cb45d9e662e27716f6a90a1aabb07
 EBUILD libpfm-4.4.0.ebuild 887 BLAKE2B 6e3b57d6d5bb98aee5f3072020306b329e0e2b8979d8b81d889c81ab1823c9388f8f22034ff5c501fb349266ca53b3c708619d58ace567e1b25435a9578dcf11 SHA512 3db81f6920687de1f1fe33c6eaa3c5129b2ce1c6191c68be789035799099124cd34f49010f019f637fd867cf47c759ae75d7c17ed0abfdfc2674f633d2d217d5
 EBUILD libpfm-4.6.0.ebuild 893 BLAKE2B 17221f8f7813320e8a99bdd01b9e2694ff425ef1496c74668fb04fa315236fce95ff1745df357f46b1d9f959097cd808aa47d99b0de000d5d56c363723005aeb SHA512 60e921666e7a19741cb764126f608944ce197c426e401d11d42f60a4f4950b16b6a8b5d0ac27ad3fd91ce7d0650cdb05f9538e10be770610c66639b3ce097bf0
 EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
-MISC metadata.xml 293 BLAKE2B 20f01d36bbc220393d8a0e310655f60faac94a4080c46c700c60d713befaa80ab12e8b7791c5737b519c5f3e7d5255d69385f4550c9be7e2e24ce2cd033475e1 SHA512 e604cc185018211df6e9072ac3bff2effaab07189f11ebf5292df2f9e5645d9ca7bcadeeaeeaa8c3bcbef333ff6bc5a65f79caa6414e786826ff91409db05782
+MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/metadata.xml b/dev-libs/libpfm/metadata.xml
index a835c64f5c8b..30c490882aba 100644
--- a/dev-libs/libpfm/metadata.xml
+++ b/dev-libs/libpfm/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">perfmon2</remote-id>
 	</upstream>
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 9c42f88a62e4..03c82f8863fe 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,9 +1,9 @@
 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.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 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 680 BLAKE2B abae079904818fd5839482e328afdd876e41864fffe23746286f82fd8f8c812b1f17e6f33bf47b407b565faff62ce9afb1756cde81648aee7746bf1f04924b21 SHA512 403051d510032f9dec461cffc71cfe1b67d83fa9da2664582434e3c7797d6bafbe8c2e7080a3313802484552c2aae1f2d60f5270fd6ec0eed360f750812cdf65
-EBUILD libpipeline-1.5.0.ebuild 795 BLAKE2B 5b0010f661c26e2662f7c69ae91bf2f2d655d923aaef0ea9e8012714fae485dd274e5d472c53962fa0ab4b1ec94ce089ba543d8bdf28e330e2f684d6a9eb70fe SHA512 63084dd69d9d69aecd3c8433ac235178db022732a7eabf86e43fd303bed92dbc2c452305f161eb39251b3e55889a82190d972eda1444e72760f87653045fd023
 EBUILD libpipeline-1.5.1.ebuild 666 BLAKE2B dc816140ab676a875944fe36051d9b02e1b8c7815392b44c5ac1a7caebabba1e38cde6e0482138c0f93ee16944cbb3085770103c73705c8c55ca931d1691b938 SHA512 dccc099da343be2639cb409c5bba5ce1a920092a7e44fdd302ec0202b910e077d8a221fe4806199431ab108befc2d140798fcc2424d297530fdd8c73052fc4b1
+EBUILD libpipeline-1.5.2.ebuild 683 BLAKE2B 1821048d7a209acd10e0f14449d3d0769d54691164a6a750ba327e899dc84df3df34ef63ce632e8b4f93760083a168b5d8da9fbc613bba0c19d8fe8cb183c1d7 SHA512 9d1bc1a889109b68908dcb21880b60da4c7e6e9f87747e29d1172e8775425f5c3be5f1ac58c540dc0aea721bf739733ade9ca8f2c10556d064aa20d0af598928
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
index b67f1720e463..23c2772e42ce 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="a pipeline manipulation library"
 HOMEPAGE="http://libpipeline.nongnu.org/"
@@ -15,13 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 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
-)
+BDEPEND="virtual/pkgconfig"
+DEPEND="test? ( dev-libs/check )"
 
 src_configure() {
 	econf $(use_enable static-libs static)
@@ -29,5 +22,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 4ea7e5500ea5..bce39c2a80c8 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,13 +1,11 @@
-AUX libprelude-3.0.0-perl-hardening.patch 1019 BLAKE2B 5e59c001ef66a1a24193b2f83e15527caec44154730ed4e02846b367c98fc25e2fcc073fbaad4cd1a35a689c2f57391fd932330182d5614511aef329f6b31f34 SHA512 0e6b08eb4e3a00ad3f78afb0ea6360bb82cbc21a2a5f419629d865a0c5598450f6923327c160b15a2874c98bc313e185d5a1f0379b55366b50a2fe6dd15ab7cb
-AUX libprelude-3.0.0-ruby-configure.patch 619 BLAKE2B 8c1d0c21ffd0de7defb87becb0f0e56b234e1512cc1b01df3928e30006ee20bd58bfa6e5005d9faac246b8277cadf9b1a8ca204f1ed5f52a709a026e84f6d93c SHA512 a268dd1ca72ff8295bc8cb9fd037c8bdfcdcacf68122cefdf17b056c8828770be205853aaf7a7ad18f0e6369bc325703583405f5372ed8c731f2591f1da5d09d
-AUX libprelude-3.0.0-ruby-m4.patch 1539 BLAKE2B 26934566408e3271c25f30902bfbb86a68cfa80e4bd174f21eda92e3cafd5394da1e34709beef1c706383df77d4779335a34232276beb841c8d447748aa332c4 SHA512 cd98e208260e497b46a56a4ca0430f0650282de949259caedfb06ce1d348af52a630def53c39c812d08247c289e551e9b6f70d8da17fb9b9627fb773af4e55a2
 AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54932f968f1973aebe0541e50403e4154512772e9d625324e879a06ff4c5810bb90f3d2c968c09fa361067435e7e4bc6131ea78f6ad794 SHA512 6990cd9e79d6e9e42c9f377f1c9a9f48920310aaf47d9bc731fc133c743256874a613ad5740eb4bc25825b341e313f79c8cfa1160a58e6eda228b9ca6bfef2b2
-DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe1e3a61a79c92ce04ed6fefac804983ba03e39928038a67768d9e5e0542d74703c07254c0112d5a6906a7c37ae4403 SHA512 a1fd51aa3bb1b68759a00dd1636cb96379f0e954a66f4e39887ab20a5b4c191a0455dd6bd5f41b20ad94d06fff59af7f89b258f42e1c0dd4cfc99185a77d1797
-DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
+AUX libprelude-5.1.0-fix_awk_error.patch 3243 BLAKE2B 2be6fe51c2edfd85b851f7080cc6b205703ba8ff25752392f1bd1a6a33c9101e45c937160cc593b66d851aa010723cefaa50577e6760d421139d321e421fedd9 SHA512 be78d258e81ae010301ce29f5de5cadc44bca50a1f20a7de85e1f2dfdcda22acaa11d0a497f440a3aeea3bb1e34b74ce238af2da0d6854059c67c76b2bfaa90f
+AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
+AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634228898a951c2ea629c07a5df087f8998df27f532ea9d893df2b233ebb0dde094f1acd6c5bb7b95a6688fdcb5e805c449 SHA512 b35c74578a2e00358a7da8f7301f9c4d1055e53c99bea71cc3ef90020a93ff7d0d41f1cf6d3ea3a5c6fc18a3ca1bcc9ed0baafdd8110c1fa51db34e005a1c874
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
-EBUILD libprelude-3.0.0.ebuild 1788 BLAKE2B c135c5b3528ed6805cbde9aeebf426cdf0c35a850c3b9a58a8cfcc5f07c39f6aee8d7dd77393f951f572ece49437d97ef1761cbe8b40c236898ca6d094a5a538 SHA512 e8b250f83bcce7d4ca0463eb6004a3d7ac82c99bf497118100eec955bc62ef40fbabbf308e91756a462481fc2f7550ea6c71bda2b12ff09a26bfb08b436dec6b
-EBUILD libprelude-3.1.0-r1.ebuild 1623 BLAKE2B 3c24cf9b7246d2fb0285b0e97c9eb3b40a39dd04024c03ffbca276ab6ab9b37e6e6205196b3e15ccf9ce5b63e31908eacfb565ef9c7ccf3d20bd740a7129596a SHA512 1eefd4d9e6f9f8092e9f4b3341931eb58e874d6022f1f24b4f166c43f5b437d59496772f362fb5b6bf051a84433b59959df1ee594ecc9d74e73aeb3bb552870b
-EBUILD libprelude-4.0.0.ebuild 1838 BLAKE2B b298fcf4173d95a799ae4fec465836f0592745c6df4516b316d92cf02d90851899e33cdf9f8530c02eaaf5bb8cc7ceb79e475c632d69550bdfb0da85006f05d5 SHA512 de3bd2334e7c0cba003fc6f1a297a2870ab9fb0d9ae47bf4607b4e311ed1865c81c83bf7cfefb0fbc78da3a81930eff0b623e387f335ad092877b477d5b40cf8
-EBUILD libprelude-4.1.0.ebuild 1846 BLAKE2B 2c777e1e285d4804121cb3b6e9d08f7128ed154dba97c274d035e5739a4f676a322db4c6a9ac390a17430d41e979153f486f376f52214252c6d0f7d71b1858c3 SHA512 509b976333c3ea2b1e40d66b1e2e6b8fee12f5b176bfa375376d0e643b8cdecd0a72cd60a52dda183cea4a9661c8cbf353fdbab1cb6a23b581a5a4ea85e5ca39
+DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
+EBUILD libprelude-4.0.0.ebuild 1834 BLAKE2B 4373a22bd28a75b4bc031015970e93d953c6df7c6fa2206e137e0197139d8c176becb86112feab203658080ee6f2197151b3f003d59847b7d6a6e783d0e775d4 SHA512 61e037b6d2e16867a4ce4428a4450720519dece5a5f53db9eec16ff80151096e05c0f733e963befcbc15403440337868a4a2b099c865a151c6ccf9f9b0681ac6
+EBUILD libprelude-4.1.0.ebuild 1842 BLAKE2B 04e53934e8cf0f4b9233c1d5e8a6fe9bf70c5d6551578d50e5c9534fbc8f0024996666b057da4b5db6de7942e81b9c9cd2765a4edd8813e0c6953de93004095b SHA512 4ab4b569668de03614b9176e6a98818efb327a6bd1bcbc00db6f023cf111dc262320da3e0dd00d10cda208bd4f351c736a6e01338b946b9cf0c83999a68e825b
+EBUILD libprelude-5.1.1.ebuild 2086 BLAKE2B 4410015a5e2f086979c4996ecfd607c306a718b104ed65950b6cb4bbdaf19332968fba82104b98be1b767fe5716f19737ecfa32432522ebd39ee12c598b57f80 SHA512 fea178f6e2be8e773dafb15d338e219843add4147907192a4e54370c993f9727cc174892ba2a662ed4705a2729963c697eadbc8fc161040470560165364f5d08
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch b/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch
deleted file mode 100644
index df77899c82fa..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-When : when building perl bindings. Without this patch, it does not take care of LDFLAGS.
-Why : It is required if you want to customize your own LDFLAGS, example : for hardening
-Upstream : https://www.prelude-siem.org/issues/761 It should be added in the next version of Prelude.
---- a/bindings/perl/Makefile.PL.in
-+++ b/bindings/perl/Makefile.PL.in
-@@ -27,7 +27,7 @@
- my %attributs = (NAME => 'Prelude',
- 		 INC => '-I@top_builddir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include',
- 		 LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
--		 LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags}");
-+		 LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@,-rpath");
- 
- if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
-     foreach my $filename ( qw/Prelude.cxx Prelude.pm/ ) {
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch b/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch
deleted file mode 100644
index fc09beace223..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -525,9 +525,9 @@
- dnl * Ruby support                                   *
- dnl **************************************************
- 
--
--AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
-+AC_ARG_WITH(ruby, AC_HELP_STRING(--with-ruby@<:@=PATH@:>@, Enable support for ruby binding @<:@default=auto@:>@),,with_ruby=no)
- if test x$with_ruby != xno; then
-+    AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
-     RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(archdir)")'`
-     RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(LIBRUBYARG)")'`
- 
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch b/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch
deleted file mode 100644
index b02555afb65f..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-When : when building ruby bindings, it can not find ruby versin so configure will never enable ruby support
-Why : It is required if you want to use libprelude with ruby
-Upstream : https://www.prelude-siem.org/issues/759 It should be added in the next version of Prelude.
---- a/m4/am_path_ruby.m4
-+++ b/m4/am_path_ruby.m4
-@@ -96,11 +96,11 @@
-   dnl   (shared libraries)
-   AC_CACHE_CHECK([for $am_display_RUBY extension module directory],
-     [am_cv_ruby_rbexecdir],
--    [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG[['sitearchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`])
-+    [am_cv_ruby_rbexecdir=`$RUBY -r rbconfig -e "print RbConfig::CONFIG[['vendorarchdir']]"`])
-   AC_SUBST([rbexecdir], [$am_cv_ruby_rbexecdir])
- 
--  RUBY_INCLUDES=`$RUBY -r rbconfig -e 'if RbConfig::CONFIG[["archdir"]] then print " -I" + RbConfig::CONFIG[["archdir"]] end
--                                       if RbConfig::CONFIG[["rubyhdrdir"]] then print " -I" + RbConfig::CONFIG[["rubyhdrdir"]] end'`
-+  RUBY_VER=`$RUBY -rrbconfig -e "print RbConfig::CONFIG[['ruby_pc']]" | sed 's/.pc//g'`
-+  RUBY_INCLUDES=`pkg-config $RUBY_VER --cflags`
-   AC_SUBST([RUBY_INCLUDES])
- 
-   dnl pkgrbexecdir -- $(rbexecdir)/$(PACKAGE)
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
new file mode 100644
index 000000000000..c3dca1b93d1c
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
@@ -0,0 +1,112 @@
+--+ a/src/libprelude-error/Makefile.am
++++ b/src/libprelude-error/Makefile.am
+@@ -53,7 +53,7 @@
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+ 
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--+ a/src/libprelude-error/Makefile.in
++++ b/src/libprelude-error/Makefile.in
+@@ -1834,7 +1834,7 @@
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+ 
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--+ a/src/libprelude-error/mkerrcodes.awk
++++ b/src/libprelude-error/mkerrcodes.awk
+@@ -78,7 +78,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrcodes1.awk
++++ b/src/libprelude-error/mkerrcodes1.awk
+@@ -78,7 +78,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrcodes2.awk
++++ b/src/libprelude-error/mkerrcodes2.awk
+@@ -91,7 +91,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrnos.awk
++++ b/src/libprelude-error/mkerrnos.awk
+@@ -80,7 +80,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkstrtable.awk
++++ b/src/libprelude-error/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -110,7 +110,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,14 +150,14 @@
+   else
+     print "  gettext_noop (\"" prefix last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+   print "    " pos[coded_msgs];
+   print "  };";
+   print "";
+-  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
++  print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
+ 
+ # Gather the ranges.
+   skip = code[0];
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
new file mode 100644
index 000000000000..3495ebf62ccb
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
@@ -0,0 +1,13 @@
+--- a/docs/api/libprelude-docs.xml
++++ b/docs/api/libprelude-docs.xml
+@@ -51,10 +51,6 @@
+     <xi:include href="xml/idmef-value.xml"/>
+ 
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
new file mode 100644
index 000000000000..079a90125df3
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
@@ -0,0 +1,11 @@
+--- a/bindings/python/_prelude.cxx
++++ b/bindings/python/_prelude.cxx
+@@ -3132,7 +3132,7 @@
+ 
+ SWIGINTERN void
+ SwigPyStaticVar_dealloc(PyDescrObject *descr) {
+-  _PyObject_GC_UNTRACK(descr);
++  PyObject_GC_UnTrack(descr);
+   Py_XDECREF(PyDescr_TYPE(descr));
+   Py_XDECREF(PyDescr_NAME(descr));
+   PyObject_GC_Del(descr);
diff --git a/dev-libs/libprelude/libprelude-3.0.0.ebuild b/dev-libs/libprelude/libprelude-3.0.0.ebuild
deleted file mode 100644
index 8c39b4b52446..000000000000
--- a/dev-libs/libprelude/libprelude-3.0.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-USE_RUBY="ruby23 ruby24"
-
-inherit autotools eutils python-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lua python ruby perl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls
-	perl? ( dev-lang/perl virtual/perl-ExtUtils-MakeMaker )
-	lua? ( dev-lang/lua:* )
-	ruby? ( ${RUBY_DEPS} )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-perl-hardening.patch"
-	"${FILESDIR}/${P}-ruby-m4.patch"
-	"${FILESDIR}/${P}-ruby-configure.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_with perl) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lua) \
-		$(use_with ruby) \
-		${python2_configure} \
-		${python3_configure}
-}
-
-src_install() {
-	default_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild b/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
deleted file mode 100644
index 3ba688728c3a..000000000000
--- a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-USE_RUBY="ruby23 ruby24"
-
-inherit autotools python-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lua python ruby perl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	lua? ( dev-lang/lua:* )
-	ruby? ( ${RUBY_DEPS} )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_with perl) \
-		$(use_with perl perl-installdirs vendor) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lua) \
-		$(use_with ruby) \
-		${python2_configure} \
-		${python3_configure}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
index 74235ac17716..73fdf8a867d4 100644
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
index 121297dc39d5..78593bbffa9a 100644
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
new file mode 100644
index 000000000000..4f71c7c6adaf
--- /dev/null
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Prelude-SIEM Framework Library"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua perl python ruby"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="net-libs/gnutls:=
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_awk_error.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
+)
+
+src_prepare() {
+	default
+
+	# Avoid null runpaths in Perl bindings.
+	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with lua)
+		$(use_with perl)
+		$(usex perl '--with-perl-installdirs=vendor' '')
+		$(use_with ruby)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index ec779853062e..d0287a1fbfa6 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,10 +1,11 @@
 AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e
-DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9e806ff82960d1c2e336ebc5c345353a3b63224e0ea84407f159443b6ec53c1cb6bba8009d48dfb53a26bab96960467e SHA512 9d80e01be8cf028b8a843e68e45eeb84c561ff37e688fe5b8156e717f337b1db4d3de983f37a0544bf018238bec07580dce0c7208df005113efbba0aab34b981
-DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c
+AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688
+AUX libpreludedb-5.1.0-fix_py38.patch 326 BLAKE2B 1d568b80b66dd919d990233fdb2602a5de9f68055524c0b20adad82c6b0844bcb9a62af55d4ae538b8e3fb63f3d56c7948e164cec21f5eb9a0e135897a666709 SHA512 7068f2aed2eb79186dc3eb77845fb828d3b6e5d7ae8bc809352c83f0e19d342b77459d495cd568d022df34299c43082fa23b7e49754a17207d63b3a2326ca301
+AUX libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
 DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
-EBUILD libpreludedb-3.0.0-r1.ebuild 1569 BLAKE2B 09f528561880901c210847920fc2b1243b60141ca36f25e3f07158fef17bf029d4f2850f61db982b6bbe61a2f3a9ca488809d41132477ac4835568c8b2afa164 SHA512 a9e9f519c6ff194194a40f8a1073290c03ad1d3ca3829123524fde910d2c04343d0b0ff7ebb92e421438184511a3a4c4f326adc8cf734724419e9fbd22b1cb75
-EBUILD libpreludedb-3.1.0-r1.ebuild 1493 BLAKE2B ac1a9350ef9f151861afb2c228091ef128ed6e8a2ae3111268014aeec900a728c561799830a5694798a8b1c4b54b36920351a759306c0ea5a5555b6059eda928 SHA512 462da351b9cf2653d621a0284dedb52f26ceb9f64185d5cc70099bd80af6d79108baa3d2a1c7edc2c2cc1c90dee2289e611837c8f8bab8ca72ec87d0f0a0f2a4
-EBUILD libpreludedb-4.0.0-r1.ebuild 1740 BLAKE2B 2b8401a5fd6e7392b911a4772d108736f07fcde60a023eff9c4af1a5008723c86897a9359f0dc5582774b02f500edf8e0f309376c7dfe65312fa0379e13d904e SHA512 61ebcdb2fdb231a01f5e8d592958f31fe2d6c7723617bf35b44f4101ed80e1cb5a155efde9c561d2ceb7ce9f7f93d040cd892dec759685cc3469392f57e12f49
-EBUILD libpreludedb-4.1.0-r1.ebuild 1748 BLAKE2B 25b78382047147f273b9a3e2d8a267dddf3f45453bbc0cd5cb66a0e9fef0d7449ceaac1b687862ff49ea4301d6e94373cbe17b5830fc161cfddce51803ef8ec3 SHA512 bd14c7edb767f805a19fcec51491a52020e4548d8a0d93020cb59a60c4e29708a353474c465106dfd923c9ed7f2310992a0c4f23bfc75b44cc303b56b909a722
+DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
+EBUILD libpreludedb-4.0.0-r1.ebuild 1736 BLAKE2B 7c96b0c0b81e152b8a64c429d60b86dc9bec0c7921e2ddee3e983dc04bb12f24b8250ecb1ea19fa9662aa06bcf6199a28bde15e0421e2bc5d6468cfc4132dfac SHA512 7a6594fbc278948ec3508c7bd855f7505402178c3344963940e009dfcc8c4e2d7e63b1323093a4055d4b59bd11feba7a45bbc94cf05aade39c5a8a1f726d651a
+EBUILD libpreludedb-4.1.0-r1.ebuild 1744 BLAKE2B 626c2bc74f9a02d8bf33d42240a045032ecb2dd15b56e13ad4bf1b210e12f409b6de6dd16fa9e3706ef3ba98816194a0cb4c4b5bed31c68add081e4157be4ca8 SHA512 74b2a854a741cb2b5febc3817da2eb41503b64d2e2a022dee99d569fd794b4f010d1c38896531eb81ea25697acde9dfca4b7efa960b4bb33f0b38e0ae0f2747b
+EBUILD libpreludedb-5.1.0.ebuild 1900 BLAKE2B 170d1cb68ab1306895badc7938d714c58fbcd8cbe0777d2de66f6a9e537e3d4c3a7d719f481e6bd489a105896658f7578467ae3741f647cb88555ba9c0d93e7c SHA512 ff9bf092b649467f5aa033a35cd72df8d5e9f9a7b190fea1426e9aa79d5f3c72e7b6e2efa3ad991868a3f8ecc04c1470bdc5dd3194f0cfe3a99efb03fe4741da
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch
new file mode 100644
index 000000000000..ecc6d5dc4e02
--- /dev/null
+++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch
@@ -0,0 +1,13 @@
+--- a/docs/api/libpreludedb-docs.xml
++++ b/docs/api/libpreludedb-docs.xml
+@@ -26,10 +26,6 @@
+     <xi:include href="xml/preludedb-sql-settings.xml"/>
+ 
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch
new file mode 100644
index 000000000000..a2a6a0a8be04
--- /dev/null
+++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch
@@ -0,0 +1,11 @@
+--- a/bindings/python/_preludedb.cxx
++++ b/bindings/python/_preludedb.cxx
+@@ -3133,7 +3133,7 @@
+ 
+ SWIGINTERN void
+ SwigPyStaticVar_dealloc(PyDescrObject *descr) {
+-  _PyObject_GC_UNTRACK(descr);
++  PyObject_GC_UnTrack(descr);
+   Py_XDECREF(PyDescr_TYPE(descr));
+   Py_XDECREF(PyDescr_NAME(descr));
+   PyObject_GC_Del(descr);
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch
new file mode 100644
index 000000000000..5bd38a6f4c16
--- /dev/null
+++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch
@@ -0,0 +1,544 @@
+--- a/m4/ax_lib_postgresql.m4
++++ b/m4/ax_lib_postgresql.m4
+@@ -1,10 +1,10 @@
+ # ===========================================================================
+-#     http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
++#    https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+ #
+-#   AX_LIB_POSTGRESQL([MINIMUM-VERSION])
++#   AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+ #
+ # DESCRIPTION
+ #
+@@ -23,133 +23,225 @@
+ #   should be in the PATH)
+ #
+ #   path - complete path to pg_config utility, use this option if pg_config
+-#   can't be found in the PATH
++#   can't be found in the PATH (You could set also PG_CONFIG variable)
+ #
+ #   This macro calls:
+ #
+-#     AC_SUBST(POSTGRESQL_CFLAGS)
++#     AC_SUBST(POSTGRESQL_CPPFLAGS)
+ #     AC_SUBST(POSTGRESQL_LDFLAGS)
++#     AC_SUBST(POSTGRESQL_LIBS)
+ #     AC_SUBST(POSTGRESQL_VERSION)
+ #
+ #   And sets:
+ #
+ #     HAVE_POSTGRESQL
+ #
++#   It execute if found ACTION-IF-FOUND (empty by default) and
++#   ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found.
++#
+ # LICENSE
+ #
+ #   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
++#   Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
++#   Copyright (c) 2018 Bastien Roucaries <rouca@debian.org>
+ #
+ #   Copying and distribution of this file, with or without modification, are
+ #   permitted in any medium without royalty provided the copyright notice
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 9
++#serial 22
++
++AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
++	found_postgresql="no"
++	_AX_LIB_POSTGRESQL_OLD_fail="no"
++	while true; do
++	  AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
++	    [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
++	      [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
++		&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
++	      [ac_cv_path_PG_CONFIG=""])])
++	  PG_CONFIG=$ac_cv_path_PG_CONFIG
++	  AS_IF([test "X$PG_CONFIG" = "X"],[break])
++
++	  AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
++		       [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
++	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
++	  POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
++
++	  AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
++		       [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
++	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
++	  POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
++
++	  AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
++		       [ac_cv_POSTGRESQL_LIBS="-lpq"])
++	  POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
++
++	  AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
++		       [
++			ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
++			      || _AX_LIB_POSTGRESQL_OLD_fail=yes
++		       ])
++	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
++	  POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
++
++
++	  dnl
++	  dnl Check if required version of PostgreSQL is available
++	  dnl
++	  AS_IF([test X"$postgresql_version_req" != "X"],[
++	     AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req])
++	     AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req],
++				[found_postgresql_req_version=yes],[found_postgresql_req_version=no])
++	     AC_MSG_RESULT([$found_postgresql_req_version])
++	  ])
++	  AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
++
++	  found_postgresql="yes"
++	  break
++	done
++])
++
++AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG],
++[
++  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++  found_postgresql=no
++
++  while true; do
++    PKG_PROG_PKG_CONFIG
++    AS_IF([test X$PKG_CONFIG = X],[break])
++
++    _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no;
++    AS_IF([test "X$postgresql_version_req" = "X"],
++	  [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])],
++	  [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"],
++			   [found_postgresql=yes],[found_postgresql=no])])
++    AS_IF([test "X$found_postgresql" = "no"],[break])
++
++    AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
++		   [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
++    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
++    POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
++
++
++    AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
++		   [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
++    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
++    POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
++
++
++    AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
++		   [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye])
++    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
++    POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
++
++    dnl already checked by exist but need to be recovered
++    AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
++		   [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
++    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
++    POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
++
++    found_postgresql=yes
++    break;
++  done
++
++])
++
++
+ 
+ AC_DEFUN([AX_LIB_POSTGRESQL],
+ [
+     AC_ARG_WITH([postgresql],
+-        AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
+-            [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
+-        ),
+-        [
+-        if test "$withval" = "no"; then
+-            want_postgresql="no"
+-        elif test "$withval" = "yes"; then
+-            want_postgresql="yes"
+-        else
+-            want_postgresql="yes"
+-            PG_CONFIG="$withval"
+-        fi
+-        ],
+-        [want_postgresql="yes"]
++	AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
++	    [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
++	),
++	[
++	AS_CASE([$withval],
++		[[[nN]][[oO]]],[want_postgresql="no"],
++		[[[yY]][[eE]][[sS]]],[want_postgresql="yes"],
++		[
++			want_postgresql="yes"
++			PG_CONFIG="$withval"
++		])
++	],
++	[want_postgresql="yes"]
+     )
+ 
+-    POSTGRESQL_CFLAGS=""
+-    POSTGRESQL_LDFLAGS=""
+-    POSTGRESQL_VERSION=""
++    AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags])
++    AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags])
++    AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags])
++
++    # populate cache
++    AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"])
++    AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"])
++    AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"])
+ 
+-    dnl
+-    dnl Check PostgreSQL libraries (libpq)
+-    dnl
++    postgresql_version_req=ifelse([$1], [], [], [$1])
++    found_postgresql="no"
+ 
+-    if test "$want_postgresql" = "yes"; then
+-        AC_MSG_CHECKING([for $PG_CONFIG])
+-        if test -z "$PG_CONFIG" -o test; then
+-            AC_PATH_PROG([PG_CONFIG], [pg_config], [])
+-        fi
+-
+-        if test ! -x "$PG_CONFIG"; then
+-            AC_MSG_RESULT([$PG_CONFIG does not exist or it is not an exectuable file])
+-            PG_CONFIG="no"
+-            found_postgresql="no"
+-        fi
+-
+-        if test "$PG_CONFIG" != "no"; then
+-            AC_MSG_CHECKING([for PostgreSQL libraries])
+-
+-            POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
+-            POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
+-
+-            POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+-
+-            AC_DEFINE([HAVE_POSTGRESQL], [1],
+-                [Define to 1 if PostgreSQL libraries are available])
+-
+-            found_postgresql="yes"
+-            AC_MSG_RESULT([yes])
+-        else
+-            found_postgresql="no"
+-            AC_MSG_RESULT([no])
+-        fi
+-    fi
++    POSTGRESQL_VERSION=""
+ 
+     dnl
+-    dnl Check if required version of PostgreSQL is available
++    dnl Check PostgreSQL libraries (libpq)
+     dnl
++    AS_IF([test X"$want_postgresql" = "Xyes"],[
++      _AX_LIB_POSTGRESQL_PKG_CONFIG
+ 
+ 
+-    postgresql_version_req=ifelse([$1], [], [], [$1])
+-
+-    if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
+-
+-        AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
++      AS_IF([test X"$found_postgresql" = "Xno"],
++	    [_AX_LIB_POSTGRESQL_OLD])
+ 
+-        dnl Decompose required version string of PostgreSQL
+-        dnl and calculate its number representation
+-        postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
+-        postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+-        postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+-        if test "x$postgresql_version_req_micro" = "x"; then
+-            postgresql_version_req_micro="0"
+-        fi
+-
+-        postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
+-                                   \+ $postgresql_version_req_minor \* 1000 \
+-                                   \+ $postgresql_version_req_micro`
+-
+-        dnl Decompose version string of installed PostgreSQL
+-        dnl and calculate its number representation
+-        postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
+-        postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
+-        postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+-        if test "x$postgresql_version_micro" = "x"; then
+-            postgresql_version_micro="0"
+-        fi
+-
+-        postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
+-                                   \+ $postgresql_version_minor \* 1000 \
+-                                   \+ $postgresql_version_micro`
+-
+-        postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
+-        if test "$postgresql_version_check" = "1"; then
+-            AC_MSG_RESULT([yes])
+-        else
+-            AC_MSG_RESULT([no])
+-        fi
+-    fi
++      AS_IF([test X"$found_postgresql" = Xyes],[
++	  _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS"
++	  CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
++	  _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS"
++	  LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
++	  _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
++	  LIBS="$LIBS $POSTGRESQL_LIBS"
++	  while true; do
++	    dnl try to compile
++	    AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
++	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
++	    dnl try now to link
++	    AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
++	    [
++	      AC_LINK_IFELSE([
++		AC_LANG_PROGRAM(
++		  [
++		   #include <libpq-fe.h>
++		  ],
++		  [[
++		    char conninfo[]="dbname = postgres";
++		    PGconn     *conn;
++		    conn = PQconnectdb(conninfo);
++		  ]]
++		 )
++		],[ac_cv_postgresql_found=yes],
++		  [ac_cv_postgresql_found=no])
++	     ])
++	    found_postgresql="$ac_cv_postgresql_found"
++	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
++	    break
++	done
++	CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS"
++	LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS"
++	LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS"
++	])
++
++
++      AS_IF([test "x$found_postgresql" = "xyes"],[
++		AC_DEFINE([HAVE_POSTGRESQL], [1],
++			  [Define to 1 if PostgreSQL libraries are available])])
++    ])
+ 
+     AC_SUBST([POSTGRESQL_VERSION])
+-    AC_SUBST([POSTGRESQL_CFLAGS])
++    AC_SUBST([POSTGRESQL_CPPFLAGS])
+     AC_SUBST([POSTGRESQL_LDFLAGS])
++    AC_SUBST([POSTGRESQL_LIBS])
++
++    AS_IF([test "x$found_postgresql" = "xyes"],
++     [ifelse([$2], , :, [$2])],
++     [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])])
++
+ ])
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,7 +158,7 @@
+ dnl ********************************************************
+ dnl * Check for the PostgreSQL library (PostgreSQL plugin) *
+ dnl ********************************************************
+-AX_LIB_POSTGRESQL()
++AX_LIB_POSTGRESQL([9.0])
+ 
+ with_pgsql="no"
+ if test x$POSTGRESQL_VERSION != x; then
+--- /dev/null
++++ b/m4/ax_compare_version.m4
+@@ -0,0 +1,177 @@
++# ===========================================================================
++#    https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
++#
++# DESCRIPTION
++#
++#   This macro compares two version strings. Due to the various number of
++#   minor-version numbers that can exist, and the fact that string
++#   comparisons are not compatible with numeric comparisons, this is not
++#   necessarily trivial to do in a autoconf script. This macro makes doing
++#   these comparisons easy.
++#
++#   The six basic comparisons are available, as well as checking equality
++#   limited to a certain number of minor-version levels.
++#
++#   The operator OP determines what type of comparison to do, and can be one
++#   of:
++#
++#    eq  - equal (test A == B)
++#    ne  - not equal (test A != B)
++#    le  - less than or equal (test A <= B)
++#    ge  - greater than or equal (test A >= B)
++#    lt  - less than (test A < B)
++#    gt  - greater than (test A > B)
++#
++#   Additionally, the eq and ne operator can have a number after it to limit
++#   the test to that number of minor versions.
++#
++#    eq0 - equal up to the length of the shorter version
++#    ne0 - not equal up to the length of the shorter version
++#    eqN - equal up to N sub-version levels
++#    neN - not equal up to N sub-version levels
++#
++#   When the condition is true, shell commands ACTION-IF-TRUE are run,
++#   otherwise shell commands ACTION-IF-FALSE are run. The environment
++#   variable 'ax_compare_version' is always set to either 'true' or 'false'
++#   as well.
++#
++#   Examples:
++#
++#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
++#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
++#
++#   would both be true.
++#
++#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
++#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
++#
++#   would both be false.
++#
++#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
++#
++#   would be true because it is only comparing two minor versions.
++#
++#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
++#
++#   would be true because it is only comparing the lesser number of minor
++#   versions of the two values.
++#
++#   Note: The characters that separate the version numbers do not matter. An
++#   empty string is the same as version 0. OP is evaluated by autoconf, not
++#   configure, so must be a string, not a variable.
++#
++#   The author would like to acknowledge Guido Draheim whose advice about
++#   the m4_case and m4_ifvaln functions make this macro only include the
++#   portions necessary to perform the specific comparison specified by the
++#   OP argument in the final configure script.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 13
++
++dnl #########################################################################
++AC_DEFUN([AX_COMPARE_VERSION], [
++  AC_REQUIRE([AC_PROG_AWK])
++
++  # Used to indicate true or false condition
++  ax_compare_version=false
++
++  # Convert the two version strings to be compared into a format that
++  # allows a simple string comparison.  The end result is that a version
++  # string of the form 1.12.5-r617 will be converted to the form
++  # 0001001200050617.  In other words, each number is zero padded to four
++  # digits, and non digits are removed.
++  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
++  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
++                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/[[^0-9]]//g'`
++
++  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
++  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
++                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
++                     -e 's/[[^0-9]]//g'`
++
++  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
++  dnl # then the first line is used to determine if the condition is true.
++  dnl # The sed right after the echo is to remove any indented white space.
++  m4_case(m4_tolower($2),
++  [lt],[
++    ax_compare_version=`echo "x$A
++x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
++  ],
++  [gt],[
++    ax_compare_version=`echo "x$A
++x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
++  ],
++  [le],[
++    ax_compare_version=`echo "x$A
++x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
++  ],
++  [ge],[
++    ax_compare_version=`echo "x$A
++x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
++  ],[
++    dnl Split the operator from the subversion count if present.
++    m4_bmatch(m4_substr($2,2),
++    [0],[
++      # A count of zero means use the length of the shorter version.
++      # Determine the number of characters in A and B.
++      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
++      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
++
++      # Set A to no more than B's length and B to no more than A's length.
++      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
++      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
++    ],
++    [[0-9]+],[
++      # A count greater than zero means use only that many subversions
++      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
++      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
++    ],
++    [.+],[
++      AC_WARNING(
++        [invalid OP numeric parameter: $2])
++    ],[])
++
++    # Pad zeros at end of numbers to make same length.
++    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
++    B="$B`echo $A | sed 's/./0/g'`"
++    A="$ax_compare_version_tmp_A"
++
++    # Check for equality or inequality as necessary.
++    m4_case(m4_tolower(m4_substr($2,0,2)),
++    [eq],[
++      test "x$A" = "x$B" && ax_compare_version=true
++    ],
++    [ne],[
++      test "x$A" != "x$B" && ax_compare_version=true
++    ],[
++      AC_WARNING([invalid OP parameter: $2])
++    ])
++  ])
++
++  AS_VAR_POPDEF([A])dnl
++  AS_VAR_POPDEF([B])dnl
++
++  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
++  if test "$ax_compare_version" = "true" ; then
++    m4_ifvaln([$4],[$4],[:])dnl
++    m4_ifvaln([$5],[else $5])dnl
++  fi
++]) dnl AX_COMPARE_VERSION
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,7 +170,7 @@
+         LIBS=$LIBS_bkp;
+ 
+         CPPFLAGS_bkp=$CPPFLAGS
+-        CPPFLAGS="$POSTGRESQL_CFLAGS"
++        CPPFLAGS="$POSTGRESQL_CPPFLAGS"
+         AC_CHECK_HEADER(libpq-fe.h, with_pgsql=yes, with_pgsql=no)
+         CPPFLAGS=$CPPFLAGS_bkp;
+ fi
+--- a/plugins/sql/pgsql/Makefile.am
++++ b/plugins/sql/pgsql/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@
++AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CPPFLAGS@
+ pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ 
+ 
+ if HAVE_PGSQL
diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
deleted file mode 100644
index 4e7679606af1..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc python mysql postgres sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls
-	dev-libs/libprelude
-	python? ( ${PYTHON_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default_src_prepare
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_enable doc gtk-doc) \
-		${python2_configure} \
-		${python3_configure} \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with sqlite sqlite3)
-}
-
-src_install() {
-	default_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild
deleted file mode 100644
index 2fedf289e705..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc python mysql postgres sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	~dev-libs/libprelude-${PV}
-	python? ( ${PYTHON_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_enable doc gtk-doc) \
-		${python2_configure} \
-		${python3_configure} \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with sqlite sqlite3)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
index 54bb58c0faac..6445bc84d8a9 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
index 3c44652a69d1..1ae5c7d228b7 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
new file mode 100644
index 000000000000..dd429b891a4f
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/libprelude-5.1.0
+	<dev-libs/libprelude-6
+	net-libs/gnutls:=
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	python? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
+	"${FILESDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 21a18c39dd4c..27f6508bfac0 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,7 +1,5 @@
-DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9
 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.0.ebuild 2013 BLAKE2B e02c0b8cdbf67f824252221bf8068598512989c31d3b40466f9f078c056d539a73e79ecc10976e07f8270217af9918e3694bc7836e8bd436aaf537c0985b66b4 SHA512 33485f5ef2564b490372a6a6ecee65b08ed40079658ddeed9481707d7d496870f74e05e1c8bb52e4ff13b1a0b9e21d730aeaca05324ec1978621ae488b0fa876
-EBUILD libpwquality-1.4.1.ebuild 2012 BLAKE2B c2e9d210c8f61b4afc05eb7869d5f16a1cde6cfad4aa2a6f95fd46b6e87bd7726a648b0f7de27a9fdb0d38eef9a85fea63e71247a6130132d3111cf8aea2f0a0 SHA512 35fe8a6a7df9a79580ca374d39a78cb66d1376c91eec698351e74bb05dffa3fb3389235a377ea5eef61155844efb7eefe737fde271b88599397b3f8ce04e9c6e
-EBUILD libpwquality-1.4.2.ebuild 2029 BLAKE2B 701d8bfac112b7f19f7511516bae9d0f3f832ec661b0234ca02ad46e4827542945a5f8813b99f5e9c1702073f1f9d1313995809219d681ee85217972c576995c SHA512 287996e5e2770c9b75afb94472f418855c72f70f28638b51029b9ea11a81f28e8f5af231ae55a81685425db06fd62d85957ab7ee83e2960f64131adbf567c1b3
+EBUILD libpwquality-1.4.1.ebuild 2007 BLAKE2B ae4222f4d3d4bb1f9af95caed3308210b4032f88bafeadcd287b75efd21e11ba493d8cb340107eb2caafab36f57ffb260b2b6e71294078509b790dca90d8e31e SHA512 01781514a50d9296c2de51b88a87fea379dbfa4190160fe603f52db90762dbcd78f15861e70e5d888f295a9dda06ff0504b88ce630040a5f7796fe9d7fdd83a9
+EBUILD libpwquality-1.4.2.ebuild 2027 BLAKE2B b9c0a7598f7f6f1deae68bcaa371ce45183273eef9786b7c51f8fb4211f092a3fccbcc30c2c281322bf9f2eda9d1dd3a475abfb356226b6009f7136cc4dbd03b SHA512 b042bf39c6da73bc622d1ad59f28f23c82e45bdcaf1a8e5f7c5991f232fdd7f50ed0eb38cd4e7d9550685a714b60a52016f7f3c3ba090b5f293bd981bb3f2701
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
deleted file mode 100644
index 0bb5bb2eb52c..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit eutils multilib pam python-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-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 ~s390 ~sh sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
-		-i src/Makefile.{am,in} || die "sed failed"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}usr/$(get_libdir)"
-		mv "${ED}$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	prune_libtool_files --modules
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index 78dc44265604..b636c419f030 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils multilib pam python-r1 toolchain-funcs usr-ldscript
 
@@ -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 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index f14269767cb8..c0df7acab5f3 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit pam python-r1 toolchain-funcs usr-ldscript
 
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 73f1c87c0de0..60ad7719ff9a 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
 DIST libqtxdg-3.4.0.tar.xz 73060 BLAKE2B db23fe8bfb6e8b73a76b710f121464e3a8f5b60f1019705bb6a234eb4c0a9a5ad9469ab95eeac8f392ca10a86343f9d0b3040eae4131d1d421800b8054247d6d SHA512 9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6
-EBUILD libqtxdg-3.3.1.ebuild 979 BLAKE2B a99984fbe6ad54829cbfce3fdc6690ea64344acf149a55c521c6484bcc552509aadc3fced9eca9b95c0e92d3fe1fdac7e3505b720df1579726a86736df470f2a SHA512 15422916021f869df5d3bb6b30490fb11a23d8e67096de8b5978ae0488dbdf67c135b8bd43c5016be44b1a3348b95b946abc500449671ee24fc639d1f5f1a40a
-EBUILD libqtxdg-3.4.0.ebuild 982 BLAKE2B ff40efecb82167b4972868994d45e109b52cd4002c9171f2784ae0a1a9c0926b2a1306e1a9437c9fdc7357b4bcfb59a17659802152407919d899ac2776e3447b SHA512 2378ce8cbf8a5b7ba1b616d5c26d26b834fd2ae37671504eb9d92515bff6fe9cd9831da24bfaaa45496d4e5ecbd220f60ba8660826a19ef5650fee1e99fcb416
+EBUILD libqtxdg-3.3.1.ebuild 961 BLAKE2B 17dbcba235fe1b37bbe16ebc22791b040001d5dfcfb60526b164b3be76da036261ec611bd672c51e7869e33a35ea82f3fd9c5fe3dcb1e4218e82d9e783f1d3da SHA512 d770af95050773034ecbbd3890b1e32265c51a62f63316ce0211f22770fc9a0683648da5ad48c0ddda04404c56c70032a0bbf4e0ba1e81a4a0d4aea80ea3fcf4
+EBUILD libqtxdg-3.4.0.ebuild 964 BLAKE2B d12b6eef146f418081fff2d2ba545a5b22697e9bbfe52830b5e5762dec87ac1d2df694f401a800f816a4aea6b7171fbff24bc002f1d2eff68640076947618028 SHA512 513f46bc917f79448127f870a0d6bd10a9b0323b409e4374801040473313eea25c12e2ec80a6b69e66a31ec2464ef5fe452801c363cf15c818e8af5568309873
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index 8b3ad4f6fb44..d865124a86d7 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
 HOMEPAGE="https://lxqt.org/"
@@ -42,10 +42,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# Tests don't work with C
-	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
+	LC_ALL=en_US.utf8 virtx cmake_src_test
 }
diff --git a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
index 98438d2a03ea..aa1e840900b4 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
 HOMEPAGE="https://lxqt.org/"
@@ -43,10 +43,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# Tests don't work with C
-	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
+	LC_ALL=en_US.utf8 virtx cmake_src_test
 }
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index f4da4fc1a1d7..dd7101127f24 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -6,5 +6,5 @@ DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B bee04707047142833c6c27ec25b81678be9
 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 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
+EBUILD librdkafka-1.3.0.ebuild 1470 BLAKE2B e535184622dd91d7b4a652657a8cff72338253f51cc7c8129cf619dc9d74e2f9b74d02febf29bc8027d12500357e3ab58ff7bcde3506831385cf5d2f3371502b SHA512 4de59ee2c4094259678ef54025e0f9bc2740dc956ade0d1824fe1c71f14c35a595bd61c02535af05a55095bc126b2220d7046df6c5ff5fa4fb22869bcc06da41
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild b/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
index 6d51d76e53fb..e446aa6623f8 100644
--- a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.3.0.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"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 70278578e620..b8935eed7110 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,8 +1,3 @@
-AUX librelp-1.3.0-dummyclient.py-Py3-compatibility.patch 857 BLAKE2B 7729a27955c40dccf7f86c426e8bcb28ff00b65dd35c0be6100c48c42308e6948d3f9cc2d52915d462829abb42a7df60c88d29cca978904c3743f93951a91cc8 SHA512 a7d855f97c271ea324a10f3dae5251d1c74d91c9685e5dbb1b55a4895b260151326dcc42400d63949a3fc4e14e82dbdf43a9b4efefe18afaba4415964c45e72b
-DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
-DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
-EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
-EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
-EBUILD librelp-1.4.0.ebuild 1412 BLAKE2B 58cffd61d12097598bf49ba1289e43167cf5ea8c6327381e011b6f4f71ed7976c42e2f2a6304aa2b71d3ca01f872bd1964d9ced27532f037ab8530ee6528fce5 SHA512 fa257b87409fc6159bd349d9400df7c8181acb617ebd86d3298647f8230f3235b4c50448cefd06d0dc233f2699f58c26ac0d40dc1dc87b44f7bc1c72db1844f0
+EBUILD librelp-1.4.0.ebuild 1409 BLAKE2B 56e8e417025698416c1c04d3a1bb99d3a588483d7256b66ffee11d999dbe90e7d6a86d14afab952877e8ff2135a11ce68db4bcf30180df75b902df903ebca327 SHA512 9b69b3b1a806a6e407ef2bc92a725617aa02b4ef8914418ac7b730c732fbf0fbddaa6c95fa22ee82447e8a587924a3542b0859e9891692cc0183b72e2c2e6d86
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
deleted file mode 100644
index 99ac9887f739..000000000000
--- a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Tue, 11 Dec 2018 16:50:12 +0100
-Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
- Python3
-
-Closes: https://github.com/rsyslog/librelp/issues/163
----
- tests/dummyclient.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dummyclient.py b/tests/dummyclient.py
-index 6f99c79..8b0041e 100755
---- a/tests/dummyclient.py
-+++ b/tests/dummyclient.py
-@@ -4,7 +4,7 @@
- import os
- 
- port = int(os.environ['TESTPORT'])
--print "dummyclient info: opening and closing port " + str(port) + " without sending data"
-+print("dummyclient info: opening and closing port " + str(port) + " without sending data")
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect(("127.0.0.1", port))
- s.close()
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
deleted file mode 100644
index fd69546976e4..000000000000
--- a/dev-libs/librelp/librelp-1.2.18.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 autotools
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.4.0"
-
-KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
deleted file mode 100644
index 9ce8c653d49f..000000000000
--- a/dev-libs/librelp/librelp-1.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.4.0"
-
-KEYWORDS="amd64 arm ~arm64 hppa ~sparc x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-dummyclient.py-Py3-compatibility.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 0df8b6e02be9..3bfd7307720d 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools python-any-r1
 
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="amd64 arm ~arm64 hppa ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index 81be9e22b6b3..cfffddc17860 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,5 +1,5 @@
 AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71
 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126
 DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d
-EBUILD librep-0.92.6.ebuild 1486 BLAKE2B 1c1e59e0da56e06c0dc8eb9e67a08fbdfa64d3505035f75c210f10a8f2caff732864059f171663c5d06e0a054a4a6768cbbcd1d23742954330489832c99479c4 SHA512 ab36e1c220f6e1c7160c15c1b549fdb2974cabe0829da22455cd7af5dd3dcac39b1af75d22bd05083e26608474a8610ab0ed07663c97616d23102721e62648fc
+EBUILD librep-0.92.6.ebuild 1496 BLAKE2B 62fb6bab1f1b8177c5d4ffc9bda898c235bf9927b5cf131389a0c4cb84bce5cc1d175a48dfe74a94bdaf3572876defb594325c6bd200af3dc2f6461658025c42 SHA512 a2578c98f57c289c8d9d7f749e640fc53cfdf8ffd5c507b8fe0c6fa80a41fe8c4bc9ab3c90481a13d182fa3e84ef88bdcbd83a95d053178f9ac155c82a0aa62b
 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411
diff --git a/dev-libs/librep/librep-0.92.6.ebuild b/dev-libs/librep/librep-0.92.6.ebuild
index 2f401bc59246..dc666e5c3538 100644
--- a/dev-libs/librep/librep-0.92.6.ebuild
+++ b/dev-libs/librep/librep-0.92.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="emacs readline"
 
 RDEPEND="
 	>=sys-libs/gdbm-1.8.0
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 85229f31596c..14343898097c 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,5 @@
 DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
 DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
-EBUILD libreport-2.10.0.ebuild 1944 BLAKE2B 5fa85fcf2ffe31a78cf4839456a22d40acdd83e1944520c26883a34e12b09adf11e8adc874cd7b369307c1a56d14ebd72a8dc4dad5db92275aebaaf33031c501 SHA512 519480eedf933657622cfeb0852458a15bd5046c07477be73f231297abb7333d00725ebd8b8c6f7ea545fe8e26c69b7f79e0bc2423e43fd1036e170a417045ad
-EBUILD libreport-2.9.5.ebuild 1935 BLAKE2B 90a23feca95ca1e9554ac3a27ff29806b22022dcecfc5151ba536e8743b52e34aa0b37f2d3b408a44fc4fad5af78dc54098229c9c5ef318ea4c41cdda4bea6c8 SHA512 c56d82d090b3a0385c0abc5b6758f55cf386af34b6e1f02d77f13f7035831f75b5831627db4e6373e7eb0ed2b47f646b836a1087d4b61766730f88542f534b5d
+EBUILD libreport-2.10.0.ebuild 1942 BLAKE2B adf7184972a3a926adcb01d0633a9aebe2f0c2fbfffaf4aa06861a6f1a6c0bf908d1b01fe1f19ff0367dce54058be4edb10fffd25af388f6b58da8d1b765c6a9 SHA512 56f4d0d8a655beb8cf349ed95ae34161e43d15f058ce7f89eb0ded399f087ec3fae4d641f4b4ac3e65fd800630f6c3875c3034c5c9a33e9f1e6298f0f84b5064
+EBUILD libreport-2.9.5.ebuild 1931 BLAKE2B 3af1a4379d0b69953827807f5c2670b9fe85fb052fcf6780c0b4d3194af4856c05a400151de09acfbef550b91776a16c0280d0b484a57d8df4106519555600e8 SHA512 cac7b2de2722064f6ce08e8e79b2a24464a9c82abfb1e8bccdadf084b1645718571cf94409d114781db6642ba3c50183c93916fecbf3bfab1102a2eb0391149e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.10.0.ebuild b/dev-libs/libreport/libreport-2.10.0.ebuild
index d287b1c9a7c9..f44fc8f3ffbb 100644
--- a/dev-libs/libreport/libreport-2.10.0.ebuild
+++ b/dev-libs/libreport/libreport-2.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-r1 user
 
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
index 5c1ecfad27b4..ff234bf99f20 100644
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ b/dev-libs/libreport/libreport-2.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools python-r1 user
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index a391edd81266..0508455ac617 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,5 +14,5 @@ EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea
 EBUILD libressl-2.9.2.ebuild 1740 BLAKE2B 92a1dac4b986486784683a9ad72f7278631610dafb59199b6418c816a9edecb1449e0c6b89c9a9c026e9e42a61b78a1b94ad838e8d8b4831f4ac65daf4880e16 SHA512 09d0a042a062a6ab8bc163fca7e9961861c33b485d0cf0ba2231ca05fc5ef3b87ad9785b7707c96cb3589dbb9f9a44adc0418c07b2a1784ef51e9393d216178a
 EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
-EBUILD libressl-3.0.2.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
+EBUILD libressl-3.0.2.ebuild 1703 BLAKE2B 660f735da20592dfe2e70a73f2f4042fe9e8f58cdd592e5dae76c6306b2bbf4f798c818999082e59b3536d7bd0e010d77bd89228ef7708c005dbecc54e1d42cc SHA512 988560b349052c7aa145cdd70d929ae46865d9ce25e8dc032ed48fb228cf79bec8edfa7fb1251e75314e9055a9627be66893f5604a6e7b66e79537beadb173c3
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
index 9a52b9353853..72024dfe0f6a 100644
--- a/dev-libs/libressl/libressl-3.0.2.ebuild
+++ b/dev-libs/libressl/libressl-3.0.2.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
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 89cb1b27691e..201f9244a03c 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,8 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
+DIST libsass-3.6.3.tar.gz 331301 BLAKE2B 9e25994d19bd93fb53be32f69cafa40204d5892bd676fd7e9a3fcfe4cb6e84d21e9c53043b4766b602f811617f4eeb8bc5719dd7977657ccefff088d418c4e5c SHA512 e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-3.6.1.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
-MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
+EBUILD libsass-3.6.3.ebuild 1133 BLAKE2B 7e4ad9c7f8ea73ca19d241f5bc52fa17d85ae2238aeb95cac73f637c82afc665291ac0c104bd8b5c9591d38806006857b78b7b78be988943f14e82ae30354fdf SHA512 396978da337c973d6ce96c5b913e2542243b2f75c7167bfe2bf40031861a22d1b76b559de80e9bddf99ca9365f2650ae94d79df0e593403813d1f44fdb41f38a
+EBUILD libsass-9999.ebuild 1133 BLAKE2B 7e4ad9c7f8ea73ca19d241f5bc52fa17d85ae2238aeb95cac73f637c82afc665291ac0c104bd8b5c9591d38806006857b78b7b78be988943f14e82ae30354fdf SHA512 396978da337c973d6ce96c5b913e2542243b2f75c7167bfe2bf40031861a22d1b76b559de80e9bddf99ca9365f2650ae94d79df0e593403813d1f44fdb41f38a
+MISC metadata.xml 763 BLAKE2B cd9a87ffa0ec968701b492d614a2183df763b8bc36ef0b4851d72ea8c162d6c1dec3d0fce2e8bd95e38d606b6cd3fc958a25e91d5fac69d11a680fa75ff2523a SHA512 be3333cf53d2704b1959fe6012837d9220a8d076a5287795a802961b044dfed989b337014b938b96755a89b23e9c66b5f760f97f31d1a54c144cc34cdf19a94b
diff --git a/dev-libs/libsass/libsass-3.6.3.ebuild b/dev-libs/libsass/libsass-3.6.3.ebuild
new file mode 100644
index 000000000000..206e7040d5f7
--- /dev/null
+++ b/dev-libs/libsass/libsass-3.6.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/1" # libsass soname
+IUSE="static-libs"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-shared
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
index 7bb47a910936..206e7040d5f7 100644
--- a/dev-libs/libsass/libsass-9999.ebuild
+++ b/dev-libs/libsass/libsass-9999.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
@@ -20,9 +20,6 @@ LICENSE="MIT"
 SLOT="0/1" # libsass soname
 IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
 DOCS=( Readme.md SECURITY.md )
 
 src_prepare() {
@@ -38,9 +35,12 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		--enable-shared
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index 191514e58505..47eda06e2ced 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
 		API. It is coded with portability and efficiency in mind. You can
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 94bd75151684..78eea66321da 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -4,8 +4,8 @@ DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
 DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
-EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
-EBUILD libsavitar-3.6.0.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
-EBUILD libsavitar-4.2.0.ebuild 954 BLAKE2B b3ff29fa31144f53b361f8353d46dcada694f20e2f629905d4557e607e12fa5b0df5a855943d7b9c8d3f0174c85b03e9470adc36530352f03fdbe21bc25da39a SHA512 4b0e25439a97dfde13afe91b7a9898d6559b5c5b1ef206b3497f85b7a0562763430bd845d07068a9a42011ad927d78f93c3d7ca6d89acaa205e565a3f5731dbf
-EBUILD libsavitar-4.3.0.ebuild 1319 BLAKE2B 2239449007a33f630dc114e61b4e5d6c15f36c6a9e098a15ce67a3316eb209b24b0a35226a019a6a51fe36bfa7181d55ff53799ee965f008a35e40616433a009 SHA512 e4b98654c45af5f6e3fd6173f0a322f4e5cb789774018932525d749ced0a99d7383de24dc9352b48bd2d28096e7976c9b9dadef9503936b35dda7813e27628ca
+EBUILD libsavitar-3.4.1.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
+EBUILD libsavitar-3.6.0.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
+EBUILD libsavitar-4.2.0.ebuild 938 BLAKE2B 6e0b3cee2d6a4a3cfdad5081446dc6294c6ebb6b675cd9e70ea19b811a39d941398f386ac44aa3b1be26c11e7d80ee2ae77d6de70d3717a33bfbc109eb99cc1b SHA512 8348a643cce7914d325004e40d94654b64abd1cb2d3b04c13cd48b9b05469e6a93b738b7694e28222adf5107d7f8042bb90ee3928882a5936b176362e1624b97
+EBUILD libsavitar-4.3.0.ebuild 1297 BLAKE2B 88b6c910fa8363f373c11aac2cab5b0a44589cd6d737c346f22c0a030a471294e717747cf6b38861da72b5b8a559575d470fa513992bc70acbc7ee7f66039e89 SHA512 e384f0e18573609feb3fe494c93f662a81ae00edaf2bdbbbf21fa8fd844161815ac0527bdf635d68e8a6f049dcc6e24c58f054880c00093f580058048b92b798
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
index 19171d1a74ed..d9ecc72540b0 100644
--- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_PN="libSavitar"
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
index 939a582d09b2..d9ecc72540b0 100644
--- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_PN="libSavitar"
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
index d29e528448ea..26c10c69fca2 100644
--- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_6 )
+inherit cmake python-single-r1
 
 MY_PN="libSavitar"
 
@@ -38,5 +38,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
index 7673c5d7e059..1b2ed0ae3c2b 100644
--- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_6 )
+inherit cmake python-single-r1
 
 MY_PN="libSavitar"
 
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -46,5 +46,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 541006d6e09c..34619ed890a1 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -5,4 +5,4 @@ DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0f
 EBUILD libtasn1-4.13.ebuild 1175 BLAKE2B 7915a9b1316db2bbf9ce6a618d9bedbe5b677c64119fbd73066149ee50d26512ce56adf8fe976d496cd7ecff6225678ac82a67e166395c897668435c8cb3c676 SHA512 a680eb1537c92555aac3b00add8d6fe65014906d357ddaf1596aeca9e7b0288df06f8c0908e03b4e4ae2287946cc3020d467545135ba26f7153c2ce189ff79c0
 EBUILD libtasn1-4.14.ebuild 1198 BLAKE2B 79f5f4e71758e7e019a8342e0a2e78ae8862d17b2cfaac1b508e09ba00c2379ff611bc6738293fad2c2194a08b42be1ac0a464f44671f705ed535c9938c4ada8 SHA512 a1b4f3a55a866fe4fb5f87b4567d4be7c5779c560ca7a925b4b44ea17e3ee964d2108a41c909f603a46971d025bc4b5fc2fe354adbe818aad30348f73f236de8
 EBUILD libtasn1-4.15.0-r1.ebuild 1296 BLAKE2B de75957eec71b3b4955c1b7109372f4b59c57a000923ca57327891f3573edaa037765e19dd43de13b927010b9eb6ffa4a843fe8f7e279838bd7d9eca97799868 SHA512 a2d407306a86b1562c89c489bc72690c0c2d1514591f725e64a67d0c919738bf78eccf6bceab0d6cb964ffe3166b2a3a41d5e2f4a62df949c77c77fd772cadd6
-MISC metadata.xml 428 BLAKE2B 85413f31c74675764c652ce8bec334384a0696c3eefdb517cde5f73c6385e9f52bad2087613b9fc4f37074fbcbdd6953dd25f87ba6095d13cf08a1aadde1488c SHA512 172d1c137ea4190da305ca987dfecf1db73e4e222cae61e8f7830a539a87ed3e919af93f0415563a9be2f65dd7b8787c22e8494e134c42e701ce1559a66cf5a3
+MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index 6b44d2e7957e..727bab423164 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+		<name>Gentoo Base System</name>
+		<email>base-system@gentoo.org</email>
 	</maintainer>
 	<use>
 		<flag name="valgrind">
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 3f2052ea214e..76473c323a07 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,8 +1,8 @@
-DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4e00a747cf23e7b9dbc2e4663ca71be2eef601b18c58e39f64cb3ad348684db4c683bcdd85a3fea4c28a578417 SHA512 0200aae2d38c26f537658955479cbc54fb69d5d8cbbccf3016cea319b2c46b1f311ca7a8fc289f14532acbbf2905cf96b17353b8b92bf09802424c372701d1d5
 DIST libuv-1.34.0.tar.gz 1253950 BLAKE2B 3317709603409e009e24b5ff419bbac03927e75f0c0a37f0c6d8f558d027a25e883eec60a46928bb3533308a6f77a9834841e62ad9162df3c8cca1c3ae24a75e SHA512 30811311268179984fdc44209eb0e9ac4c6df08fa30790b75916ae838b23c2578a8a043340fbde86bcd5a373dcc335dec5fe88209560613876ca3272fd99c9e8
-EBUILD libuv-1.28.0.ebuild 1217 BLAKE2B 33a21622a237229685e37b2ded511f89b9adbd0fa3d1a8c22279b7401b54b73937d5e15e90f535469a58a5d77e83d85a28ff0387d6a53fa002c94d4e09a8a201 SHA512 538967ab753779c9e0a3856ba6a6e89004304e67a5836035ac70cd829e134d527f0dc39556cde9414e4b69bfd613ad7a8736e5239719b7e9f498e72625409b6c
-EBUILD libuv-1.33.1.ebuild 1231 BLAKE2B 0942b8674e167bed40a5eeead29cda417d2cc51a98b017e6f9934bcbf565643da714c1844f2710a94c2ea4ce38ca7792e06b8f46ff1b4f31b738d01a5dffec97 SHA512 7c668d0521d1258e380571b711e59411d9844c2eced1cee414d215bf11e1be09db0faf63ba0d2726a4b3190ff6bd571ab870367651d7aea194bf8beb83e1dd29
+DIST libuv-1.34.1.tar.gz 1243096 BLAKE2B c6c786ceacbe3387a27455a413507cfe69511f88cddf150e98b21520e247a6825ff23506dc7fe1aa8c830772db23085d1b2c496ace11cde8405e4e204ce93f57 SHA512 95212bdba326a22edb2663982a4abb95c420d287c67b20e57d6acdd4c40d40956ad28c599beaf10fbc941c6e50df94261d84abf8ac25abceb10f67d9de5ef3d3
+EBUILD libuv-1.33.1.ebuild 1236 BLAKE2B ba46888b2a06bb73d4fc16c5489251bb799f62cd4ef099bb809d8060d39ed9c8ba17ec576ed7c3cbd53fda04bbeb1ed3a7fbce50d27edd757275156c990ce801 SHA512 37c1075d5257d67260aa6ffdc9680a7896e90470c6a30d57953a638c4ee691586630d985e4bd3a648c31e3eb66b78f7aef3d5773a9f0b433e8ca9062fe64ad17
 EBUILD libuv-1.34.0.ebuild 1241 BLAKE2B bb32340e87699031eefa1a9363a49a32c578298e8571e2deb903cc8dc9a191d217abbe562613cee6d2c930afa556af7be028c4f5364b641a612ea7d6e3d11d0c SHA512 320cf98aa1af1b7f945f5032a251914a7e6a11e93c6c4a66983a2b43584b64f9342cc8aa1b747cd6f980f2528f819b1a5c856e1b9b7badec31645a28b4d91c3c
-EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
+EBUILD libuv-1.34.1.ebuild 1241 BLAKE2B 43f659acccd55da78b53643b5fb0fdf67a9b44f9a11f9ab36c0ee9196be737b5fb6e4ba9577b18d5830e7f3b8165a02a76ea026c0d7da0f44e58bda3ae9b59c3 SHA512 32bbf78f0f34df62b609bc244072b18fd54fe4d2debff3b597596cabc0c3be129daf705a7029479e53693e3ecb054cd6a30fdae2a0d1c95a4dd30578d3f2e7fd
+EBUILD libuv-9999.ebuild 1016 BLAKE2B b2b9eb79846ffb2c7b6efe91e5db04a4542b04145b837c76469ad8cff6e990d11b21c4d69a0cc09fd173f146b37a2f4b87a8775f17626a3de759f3c39b776df7 SHA512 2346f29a9c1cce6931d9d776ab1097a45fbb7346054b7fb0c555f9daf41d4e2444de8cadee489254e80c3d2bf27abd5413f227af1503794faadb0c36681a77ab
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.33.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index 853f23e72a23..17dca8f7cccf 100644
--- a/dev-libs/libuv/libuv-1.33.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.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
@@ -10,7 +10,7 @@ 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 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 ~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"
 
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.34.1.ebuild
index 6d82973a2d0a..062b57ada6f1 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.34.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
@@ -10,7 +10,7 @@ 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 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 ~riscv ~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"
 
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 5e8f4c3920c3..7db52df307d0 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3 multilib-minimal
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/libuv/libuv"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 32db22f21bcc..db8d2a573bd6 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,3 +1,3 @@
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
-EBUILD libvoikko-4.3.ebuild 885 BLAKE2B 7a346fb4e06715451befd89cf19b9232990e54c6e64fc5bbf4014a73e436b156397a539f9f563a6befb80b9a4fc28a3d61f78578be3d817c8ea5f4495592f90f SHA512 3c616e9890f26e33ec797ec1412d4630c8bbe805c3630beeea896b4587f35acb2db2c34f6da68cdd0bffb96141969fcd82548adcff2db3395d47a78a6ab335c5
+EBUILD libvoikko-4.3.ebuild 885 BLAKE2B bdea3305986e4b0b69621048ab75e49fb75e2e7a8ae5c4cbb1be2f5afee7e5a6beade238853e9f3a9bbf7da74dce3fe9db43adba4618b0c88f25329557ebb8fb SHA512 112a49d21f6547cb398675edc8e308e7db2a048ebe00997860dd2e507f65e56ba34dcfb032f9dbc91f23e649c7f6b9734c3648276ffeacb1f7110ec5e09d04d1
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
index 4adf075a908a..288e363b496e 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5..7}} )
+PYTHON_COMPAT=( python{2_7,3_{6..7}} )
 
 inherit python-r1
 
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 5f7b7a341996..edd32ded8d92 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -3,5 +3,5 @@ DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877
 DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
 EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
-EBUILD libvterm-0.1.2.ebuild 834 BLAKE2B 0b35141c8d19f46f68c963aff5f39c5ee922f272b066f470ca5027d8f07d31294c558fb708335c9be961faf69fc7dac4fac444a58cfc85b24cfe9b78a29f1909 SHA512 ea88f4bae314b19452b0e127d68eb7560df1401372b198400da72c81001faff0fb4694264a09693880af95cf943c449bd8c44b94dbea226ca07f5d93371d974d
+EBUILD libvterm-0.1.2.ebuild 832 BLAKE2B f037c535ecca36cc4140cd9bb2d46883526e252ba477189c283deadd8068cbd41e95fc775ea24e145d8b7ef581b6927f0e4f67b251fc6f50c9b2fd906550e89a SHA512 7d72d2bd2335e516dfed729797c57a1f4119f8c9e656f2c1d20333997dd1406efee3c699330007a46ab29c7e1a31d2c503d5fad3b1f2dbbeec793c756f82fb90
 MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
index ab5807585319..6802cf9d98af 100644
--- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index 3289a48b00fa..8acb4cb19687 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 937 BLAKE2B 4ef0e2da08f6b0b097d1853242d1acc2a20a87fa90ddc4b18c45d4b3b72f708663d7142e088c07232113e9f8ee0c9a15d1d96668b182eecfb8efedbacd6f3853 SHA512 3e4b6651e3311157e3d9a4ab558bcd3bcb2574c0b5b8dd09d7051e05df4455645c44eafc4094be29b6ab89e51929443fba64da630d6dd500e9ae5e30ebf7529e
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 966 BLAKE2B d46b1973f0621fb1b6da4272abc1285665c93a0c749b1f5b1a43747e0b938249152971cc04e373443e0e64d95d4687a256a1bf1ab17f99189528d88ea3a8c05c SHA512 83917729675821dcb4eb63741ac83a3f5fdb79c61c1e27f2133a162ecaf70c1037b2d662c946978ccd64b6451b42006cd4ff1ec0f6cb9d8b9104d9ba7913de2b
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 4d8ca2a7e832..e4b82be5bb59 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="Small library to access XDG Base Directories Specification paths"
 HOMEPAGE="https://github.com/devnev/libxdg-basedir"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index d704d839ae8c..638cb0cc903d 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -3,5 +3,5 @@ AUX libxls-1.4.0-infinite.patch 583 BLAKE2B 2d3dbe60123e6005d6c71fd24e0fee43f821
 DIST libxls-1.4.0.zip 428782 BLAKE2B 52b67eff4ae315dfde42abd276ace7adaecdd4d88d971a97f9aca1f0cce0c874cbcfa6a060880f1101e4fa685fa566475e753eb34ee621e509fbee8c427e6d52 SHA512 e55c0faa25b17a42d53ca939c80e1d3fd0c0e91de7f73d3d10d1fb6658e58e8f38f4e6288a3e3ecb9ae53ea681629ee66ec173229325eea69e01cbd038e68c95
 DIST libxls-1.5.2.tar.gz 443227 BLAKE2B 3d12357e3c476b203ce7be76cfb828a0353732135303301f26880ca1607e9cf4a6781fafe7ebf4dae0914678de30168d80230dc0d83d189dca63c98d0cd54384 SHA512 83e443713944648d6bb5db03a03b3addff1d925a1c83c49e6bb9b29245da76ff351e6a76239e62c92400e5d513394a33366fb979d2bc0b0d8ed0cc7f024c5fc1
 EBUILD libxls-1.4.0-r1.ebuild 680 BLAKE2B 1f7ca33de37e6ff3e1c5531c9c6ea457ea7bc317cb2e5c1e642e1a184ea3270b05b71000dae6a5af92596503309833ba97e768a782eaf3e9b436939ed8beaad4 SHA512 82929d5fd4bc84f1b5af04a58d3bbca4a51accacdcbc17ea393260eca6cfc43d0c80253c859613e2cad98065b391d86ce14501176d2fdb783fcac6c4d3076cb9
-EBUILD libxls-1.5.2.ebuild 652 BLAKE2B fd9c577331cd1c82ce9a4b2508cba6da24016e78f0af5945a835962463bd27ee17f2c8e257fe07997311bb8ec2d2c91b2d3533c55e3d5e63ea4c6ddbeec5285c SHA512 158ba69edacec3d9d20e1b0d91fd43e8c795ab1df26f566fe8a66abfe7e49a196feddce1c75ad27a8088bbf504aa129df0631295bd447c3ac894afa88b042d96
+EBUILD libxls-1.5.2-r1.ebuild 680 BLAKE2B 5c9105d0bced1a49c2335b3184ad71750c043807520495d985f893f006f39fa422198b2e55832e21fb9c55645bf3dc5fe5120fb1ad5681cc6e65cdf7c0192244 SHA512 0e93b2d2042401430b03a186aa29e259dd8166f7d6b7449acbcb4a7c96587342186cbf62b6bc2d35e5589e3696f0411563f42be2d9bc03cc09f1bf9cd3e9ba89
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.5.2.ebuild b/dev-libs/libxls/libxls-1.5.2-r1.ebuild
index 9fd4b6191e56..2272ad0499ea 100644
--- a/dev-libs/libxls/libxls-1.5.2.ebuild
+++ b/dev-libs/libxls/libxls-1.5.2-r1.ebuild
@@ -35,5 +35,5 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index bb9f7a130ef9..2814192dfbe0 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,3 +1,4 @@
+AUX 2.9.9-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba02468c01b9b87fe21dc6e2488d56f599573bc442f78386f64477a89c3332cd25f9b5ef3b4fedc47b51915c727a1b8eba06e7776d SHA512 a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
@@ -6,6 +7,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.9-r2.ebuild 6828 BLAKE2B 0e86045699772ec70c467f468c82f4152730a4975da522be8beeb22c4cb49706652e29c4547c064cfc136bd2946501d3854b69947bce6fce016d14ae39ab2f6f SHA512 7194336835ca5e3ebd5081e7ac05fd3ac3311d4aaa05382145e7f481240dea9e288a57aa77c093c2966f006fa66762598b8379bc72072639f246da679a49e085
-EBUILD libxml2-2.9.9.ebuild 6536 BLAKE2B 322138626ab312a18d53c0e6d397cfc7302ad1a667b270ff02ca2189d143f94f1409b994a61c207df44a0b2cca0c0b57d83b1de8ad2a4b94e11c13832e02ce81 SHA512 c7ebe0fe143cb43e12f4f1230ec7f4082660b6d9d119b70818a0d7058e81938bd9e3a895829b525cb556eef1eeec3d3a34832409919458ce2467d0bd54771c99
+EBUILD libxml2-2.9.9-r2.ebuild 6826 BLAKE2B 0b9bc73d12ae358bfe6208f141c0106f300f60f0c6d7bb4e4922cc58bcda7512dd2d7f6646c63e3e510d8dc0beaba2f2b0f733422eae92c8e9ff93ab93c355ba SHA512 51490a2ccfdf5c7a4369b01da082998f833c2fdfbdef87507826a7647109c08f7b473e082cea7582f05639b018fa3a3c2e024edde5ed21d09fc52b16482af2af
+EBUILD libxml2-2.9.9-r3.ebuild 6946 BLAKE2B 73191057fbef2bfd6372d91ddfae8cf6a692c7822358c97dc3ee9d0846e6ec147b325f58ba423489ed4cebf60a47152b37565585214c2eb7e45be2c75a8facc9 SHA512 16e04e2d22ca6edb0e4ca634a8ffdf4708029260f7eff0f02817dc130d47db291b30ea047cb01655e704cd78d2fbcffbc45d3a0c16c86a320e12425e8effc21f
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch b/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch
new file mode 100644
index 000000000000..e87dcdedf88c
--- /dev/null
+++ b/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+     PyObject *message;
+     PyObject *result;
+     char str[1000];
++    unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ 	    str[999] = 0;
+         va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++        /* Ensure the error string doesn't start at UTF8 continuation. */
++        while (*ptr && (*ptr & 0xc0) == 0x80)
++            ptr++;
++#endif
++
+         list = PyTuple_New(2);
+         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-        message = libxml_charPtrConstWrap(str);
++        message = libxml_charPtrConstWrap(ptr);
+         PyTuple_SetItem(list, 1, message);
+         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++        /* Forget any errors caused in the error handler. */
++        PyErr_Clear();
+         Py_XDECREF(list);
+         Py_XDECREF(result);
+     }
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
index 4181f92e6dae..6e94ccde699b 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
index 494a0644ac79..c6bf71a36b0d 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
 
 DESCRIPTION="XML C parser and toolkit"
 HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -25,6 +26,7 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
 XMLCONF_TARBALL="xmlts20080827.tar.gz"
 
 SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
 	test? (
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
@@ -53,6 +55,7 @@ src_unpack() {
 	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
 	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
 	unpack ${P/_rc/-rc}.tar.gz
+	unpack ${P}-patchset.tar.xz
 	cd "${S}" || die
 
 	if use test; then
@@ -69,6 +72,9 @@ src_prepare() {
 
 	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
 
+	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
+	eapply "${WORKDIR}"/patches
+
 	# Patches needed for prefix support
 	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
 
@@ -85,6 +91,9 @@ src_prepare() {
 	# Fix python tests when building out of tree #565576
 	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
 
+	# Workaround python3 itstool potential problems, bug 701020
+	eapply "${FILESDIR}"/${PV}-python3-unicode-errors.patch
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
@@ -129,7 +138,10 @@ multilib_src_configure() {
 
 	libxml2_py_configure() {
 		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+			# odd build system, also see bug #582130
 	}
 
 	libxml2_configure --without-python # build python bindings separately
@@ -148,6 +160,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
 	emake check
 	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
 }
@@ -184,7 +197,7 @@ multilib_src_install_all() {
 		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
 	fi
 
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 0bfb0444006d..934a03ec8d0a 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,7 @@
 DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f1be57b08ccb1864587b7bf47f892a39d1f4f0df226d3fe7ca03ffcec471a4f28afb8e64ae841d6898a337b60f SHA512 aebd9f41421bb0d78954038b3221bed879d296ec2d3061e7e7747980974e01081e51ea36d4e94545af5006b3dc4714d535aeea1943e42a7f1661ba1177979b31
 DIST libxmlb-0.1.13.tar.gz 91597 BLAKE2B f5b1cffba36f25260df44b85109df22aca9f76a47a71c82b99504ce6f072b5b01c32aa26ae36ee37ff717a25dcbf094def8c3b65c7e53883aad726d919181db1 SHA512 ae2c043db0c3a9719c1527933e087825068f970bde28bc7b507a6535b51133d463b1dce6c8b02148a555bb28868ab563f7bb01e6324661dac92fab556c9a39b0
 DIST libxmlb-0.1.14.tar.gz 92388 BLAKE2B cf3057fadf87c866f456bb2eac773e056adba56e0912c249cd89acff2e9a722414876717c6b2065d836fee66032a3d55d9fd2a824ef1fe480604c36887b47c44 SHA512 906340212ce4a515bec81a1b7a5f04539712a48322d7fcff0992f82e5676cdf15c38b0340c28c9eed65a58321e3e17bac641f05bd403504c87599327ba6d4e49
-EBUILD libxmlb-0.1.12.ebuild 1228 BLAKE2B 79656eb009af08ad79182f359f4152734b9a29f3b379e0db28a6182abb59008697f48f899a65569bd7038d0f0993a7b3eccfbe830130d296a6761a197744a02b SHA512 2346e225eabcbac23d68650400d925879d9e141a60a6be9f43e3fd4f8cc3b5f6e235f4f01f3820852816ce21c393e8eae5f4a0cf4ac0c405fc4d8a7266e672f5
-EBUILD libxmlb-0.1.13.ebuild 1230 BLAKE2B 8a7aefdd921ebb68a43b3239da6142cca3e3e86eb1a5803b41e08d686f16e7aa49e93348b98df600056b7268797fde9713844804179b3bfc9db432fda02e5b2a SHA512 b0291feaa632b54e524dda6eab1ab97e8c53d34428ab159ed73ae566057216523bedba398b35f32f985aca84d401ab21e97b51e7d492de085d3eb05aa505db3a
-EBUILD libxmlb-0.1.14.ebuild 1232 BLAKE2B b16a202cbe6056cc82c2a37c7f8e575573fdc13eceddb7db91d7bf974dff8dee3d6b8e240d4ba384cb0645505cb532df3424083905ec34da36fad71702d37d8f SHA512 54b2934c67743edd812d8eeb86893f08af25b56a95d70b673947fdcf5a02ea60dcb42f7a45127bf22e14d076341a90b7d295f71721dd8532eb79230029cd488a
+EBUILD libxmlb-0.1.12.ebuild 1226 BLAKE2B 2da2eb59aafd834aee0a69f64c1f9401d069b967554341158bd9af540f0c8c216bf2b2c4c0cabec3bb1936b21885d7444fe67509a8035bf313bb5b7efac0e013 SHA512 1507484678dc19da96ec68de1961075d0576b3d4c8d61dc5b913f1bdf0f836bac3185d029c36fa3c7deff9fc5a555a47d66ed95fe72d4bef8ebd2ab2bef4f87e
+EBUILD libxmlb-0.1.13.ebuild 1228 BLAKE2B 869f9640f797105c376013dd313b293ac3840e86d36ad7350eaa6b679ae00b7d715ebf6fb59e7bcba31dd96b0331bd165c64cff46f27be2008a6a84cbf8a0f49 SHA512 85ec8d55482c4a820aebc5fe5873f964fe6bcace55e20b8f2568813595cbc01ddde7ecd606507edd1e29a6e0f73aa9269162fa92907f94e6223c228db95e30b7
+EBUILD libxmlb-0.1.14.ebuild 1230 BLAKE2B fb853faad52a0fc56df9a1c29b9b7ca927fb2d5e58a4706d0c1828582ae948f6e94b94a9d2258e49828aaed1c1147ab326e90b99373f7b1fee95ea804609ac48 SHA512 61592c1d5a9a6244f83351ff73197ac5860d989abc9472f6eb90661be8083f6a5d4c917bfabf49b98f1fb4686a94227b2da63100ec3f8b34fcd1c381b7e14add
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
index 6f05d7a416a9..39773118f0a0 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/libxmlb/libxmlb-0.1.13.ebuild b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
index 6b3e18f22835..36fbd3fd48d9 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/libxmlb/libxmlb-0.1.14.ebuild b/dev-libs/libxmlb/libxmlb-0.1.14.ebuild
index 9e600b3420f7..8ceaed57364c 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.14.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 3160c6daf2bb..bea6197c213d 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -3,5 +3,5 @@ DIST libzia-4.17.tar.gz 626840 BLAKE2B f63ba0712dedd53736ae297f253fa6fcb3ed5afe8
 DIST libzia-4.18.tar.gz 623928 BLAKE2B ff7f4873f77c1782bc704ff11f0fcdc2a479404cf0719d9156fad2ad01634241f7f556699d778fbd6e3f4bfe108b1735c65def859d56cefcedd6a3c760200a14 SHA512 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489
 EBUILD libzia-4.16.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
 EBUILD libzia-4.17.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
-EBUILD libzia-4.18.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
+EBUILD libzia-4.18.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.18.ebuild b/dev-libs/libzia/libzia-4.18.ebuild
index 89fcf6a119f7..88159bfcae8d 100644
--- a/dev-libs/libzia/libzia-4.18.ebuild
+++ b/dev-libs/libzia/libzia-4.18.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/libzip/Manifest b/dev-libs/libzip/Manifest
index 4af002f0e5d4..1c39105423d2 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -4,5 +4,5 @@ AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc9
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
 EBUILD libzip-1.5.1.ebuild 1906 BLAKE2B 1fa9eb69305913a45f96969003a415bab5c74a3abd515930e681fd16d5597ff378c55207182170e153f5d49b7d82e24b35f147b752fb21ad978d82eb796368c0 SHA512 f01ffc83940b6f3e9d3eeb96a21a83eec834c518d7da80c631a63673169683472c0e48432dce759fbb6ec17e3fee25e52bc9af94d787806a74fc14f83c96a04b
-EBUILD libzip-1.5.2-r2.ebuild 2319 BLAKE2B 9b45623fc32b7edd54a2998c4a9ae8b11b31af4f4daf767248a6fb780aa5c9f45f5757143b474b92410ab0c75d088ba032a95df6d645a49d1e88adac13e6ad4c SHA512 1c01b3687909a116d21cf39bd24f3a90348cc40854c60207d241d3d024ef2bd6d28c78486e23b30962b07ac28b4bea4ef189ff1407235c4c8d7cc75cffc6ab45
+EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817
 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
index 4c386426e347..bb7b5e5421b6 100644
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multibuild
+inherit cmake multibuild
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="https://nih.at/libzip/"
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -90,20 +90,20 @@ src_configure() {
 				-DENABLE_OPENSSL=OFF
 			)
 		fi
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	multibuild_foreach_variant cmake_src_compile
 }
 
 src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
 }
 
 src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	multibuild_foreach_variant cmake_src_install
 }
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index bf430df6efa8..66bd0a6a2625 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,4 +1,4 @@
 AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6
 DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
-EBUILD link-grammar-5.3.11.ebuild 4017 BLAKE2B 7c1fdd869ed0fbe64866945229e9851e4366d71c41ea10bfc2d788854099b1d5e924f599dfeacb9d33337f518a8650ac841726d53d94541fb795db236b2e67e7 SHA512 17ccb7c93be00003c5a0586dd8df907c112bacaa201e1391e5c2e81b6f3201c3b9dd39ebf74d2e26e35c05e77b1a42de1cff1dbd4e31a40d25b2c360a5610cce
+EBUILD link-grammar-5.3.11.ebuild 4013 BLAKE2B 516f92a9c7d23b172687f2321b7b6569215fcf4730057def58f3ced443ebb5f9c87ae92e0b6923f272196eeb1834767b865ab935db5f5dc52b3267704ff8fd4e SHA512 b44d9c1916a2b5f0eb97e61b8e8e6398f9cfb310fe2a158b48142602ba44f8b98ca1b88baeefe595afb7c5993062e4abd4f92e542b8c4de2b7dcc059f2d484f3
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
index 56368f232027..f92ed22b1fd5 100644
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 0c0daf9e2173..222683d1b122 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1021 BLAKE2B 5ecc16a4bb8395fb31494379100ec766824b00c7d5fbda69a6b16cadf88662e2905267825448573c3d0b4e2534941851845f2439814ca03d221ded95be57ec6f SHA512 c034df9905a5c8427a9f10ecb8681d0e7149116ab890569b3645282173b7e100567ab60daa950d18fef9f27cc16f23307ee57f357c0d85456d8d87636c16496e
+EBUILD lzo-2.10.ebuild 1021 BLAKE2B 7faeb906973067f3f3b1993f70ed287d04e580ae63cefef6483a4a6f282902ff470c9b02e3763f1467e6b9178f553dd87992d6f088ff540e19320679b8afad78 SHA512 b18f7aae9a630e37a689e1f17f5d28aefefd0ea08b4f3a85067844350847d38fd3d15ef367e2229f533564331d2bc1e529905ca7898bf0ff9b781b978330c1b0
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 16a90667e881..ae3087068d05 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,10 @@ EAPI=6
 inherit multilib-minimal toolchain-funcs usr-ldscript
 
 DESCRIPTION="An extremely fast compression and decompression library"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
+HOMEPAGE="https://www.oberhumer.com/opensource/lzo/"
+SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index aefdc16fe0fb..21378a470c88 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -2,7 +2,7 @@ AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.4.ebuild 2308 BLAKE2B 2ccaed107affdf89a08c081c28d2b8a97c5cedf77662a6149b68cabc0446fe9540d0552cc4e2acc54a9b10ae1e22d3cf3863c6350a0b13645b4155cfcb8a4ad6 SHA512 9040d446400807133f61b1884a52d203c64c7fb81e6533cacd1a096ebbf7b2c50f371abebb62cb239eabac6bcc476944f2f8e56907a66f5b96995ae9dfccfe9d
-EBUILD marisa-0.2.5.ebuild 2232 BLAKE2B 0f59ef1f29419c73e5ef31e5fd00978e6c9f952856e11a3a4a84abe5f1a6c19ee11c30912c35622497c2179afb131d8a5be3b542fce649ea2c815628e8683a58 SHA512 fbb2a8f0a42076460c8cdb9b83587b4252fd44449281cd96ea11ab621bc854ca8ce87ef858e5891923c26ac7883450252cf0bc4ad22e89035f13b379cb624d40
+EBUILD marisa-0.2.4.ebuild 2304 BLAKE2B d6a532c61ce90997b21f0fe4ba78921cfed56a0cb37fd581104a4f5ad4dfc0d344fffea0e06522ef95c2dfb9a1ba61587521da0ea5b93d7fd79c67bb526f06e2 SHA512 36954927ec4154e43b01f7498dcc25ad5d6f46e463af3bd82275a3bd3adc1a010f783a05881537de801582df5d8795c53c627016cb77620d0741edeab47f9a8e
+EBUILD marisa-0.2.5.ebuild 2229 BLAKE2B 892624c70436db9f826a843def566b081a5062ceee70f59d59fd5f2c63944c1fe05d8cef3c0da48cbd259f6c42e07815042d06eace22cd81820a8ec192887db6 SHA512 07e5e79b72d0d8b0a6b77c39741fcfb58dc9b03b5bf6493005a060ff0e28e26f4ecfdf3e490fdfd0d67dbed90fa86d5afdf4f70bafb3bf13970b19221875c337
 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index e9dfa471d310..94066df3c186 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 eutils
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index df3af8c34a44..3379c58070f1 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 35df4e665c28..ba3ecc593068 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,5 +1,7 @@
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
 DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
+DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
 EBUILD mathjax-2.7.0.ebuild 1219 BLAKE2B d6a55b0baf2dece7e35e043db8be4f41cc3705b9a032ae18537e6d1a5abd21c179d428b7c6defb809de30505aefc62a04b60db93655fadea15cbe01f4371be68 SHA512 41c37e0d36ecc2ef1eff3936bd6b47d90644e6ad31f54d3276acde4a0bb15f8b1c169bdd749c59c8e0f1ae7f92681a5b68463a6b1a40d12dec1dab7b9f9df1a8
 EBUILD mathjax-2.7.4.ebuild 1216 BLAKE2B 0ccca9312eb6aaaf82c31387f9fbc67a160a2620af79dc0f20e8bc246920da424a1c837a4d14678252427d8a06120d2e50767bb25b8d4325f7b8d90783fc2ea9 SHA512 b1d85236a3348c80835a81a6b2d30727e0ab7eea24d813862f38d70f7b6c2e82852048dd93e649ad5412c3680e26d650ceec8636e9f9c8aab987c215b1641130
+EBUILD mathjax-2.7.7.ebuild 1342 BLAKE2B 9a1e6be03d053eaf6268911209571661a4804d08c20c7bab93869c07a690add946dcd785e0c18c13d5a6babf2f82d3077829d31fb61acb53a9b7aa1c3b2f9b18 SHA512 4bc6cc9a93c369b4685d746c9e2765e2aeaa1173e6f163ea2fdf9eda3a250bcb00772d056b30a65871f76b951fafd5fec71bad633d977877647964678f096b1d
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
new file mode 100644
index 000000000000..85f1f957063e
--- /dev/null
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vcs-clean
+
+DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
+HOMEPAGE="http://www.mathjax.org/"
+SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
+
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}/MathJax-${PV}
+
+make_webconf() {
+	# web server config file - should we really do this?
+	cat > $1 <<-EOF
+		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
+		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
+
+		<Directory ${EPREFIX}${webinstalldir}>
+			Options None
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+	EOF
+}
+
+src_prepare() {
+	default
+	egit_clean
+}
+
+src_install() {
+	local DOCS=( README.md )
+	if use doc; then
+		dodir /usr/share/doc/${P}
+		dosym ../${PN}-docs-${SLOT}/html /usr/share/doc/${P}/html
+	fi
+
+	default
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins -r test/*
+	fi
+	rm -r test docs LICENSE README.md || die
+
+	webinstalldir=/usr/share/${PN}
+	insinto ${webinstalldir}
+	doins -r *
+
+	make_webconf MathJax.conf
+	insinto /etc/httpd/conf.d
+	doins MathJax.conf
+}
diff --git a/dev-libs/mps/Manifest b/dev-libs/mps/Manifest
deleted file mode 100644
index f958faa591f7..000000000000
--- a/dev-libs/mps/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST mps-kit-1.106.2.tar.gz 1303450 BLAKE2B 15de3706adbe05e195342b4bc72f3bbeef7df1c288eea7c4e25ee95bd64a45a83604379c2c20be44d2fdfcc23894ff210637d5ea8040922462d2126292ea29a1 SHA512 6d4a6441c4b0afd9daa0ef20a962fd9a5cd120ed324bfb7ece95ec7570f2907853ff4843fcb71537910d81339bb92cd612fa67ad0beb0ad89382339f39760a34
-DIST mps-kit-1.110.0.tar.gz 1920116 BLAKE2B e77c08ee59b879c47046eee40c833d733da924e2088297fc3f762eb64237744fd924be3d226b1a14c10ae0d1becf6c2ade77c5e38c198b3a5c799d5e48c000ca SHA512 b613833a9b9a79547639337e4cda897b939c45cb84579521ec63b5560ad94cb7a8b4885b51eace119fc7c3ebf725433dfca41d96c8a773df94b37abb605bb07f
-DIST mps-kit-1.111.0.tar.gz 3197286 BLAKE2B 464fdd2144da219e0407875c1295a3c923dc4c7529146706e5d43b232d8fe5939ac4a1b7fc658cd7cbc2496fcdafaca9065c7515815ae85df109e85bc99df9c8 SHA512 628ad619dbce1460265ffbfc76adb4a88a2168b80bd1d8de10509d7025e7f9cd240ccc7dda044119863d0f2db95792ca9c94a35271dac5a995e8609221d7e67b
-DIST mps-kit-1.114.0.tar.gz 2461796 BLAKE2B bc065708f8b4df6a4d7dcf415efd120ecb18461949a000430731ae34cd25bdf90f857bc711b6cc05c7ddd9a50ff8660ddbda146ce2175116d4fc6a8098d8bdc1 SHA512 78ec4f470a1c7e1aa377a61a6ccefbc77fa6e84de73b209cc3544452843ecb09a0d889121e51cfbe64d788c658c68b12a4ed150b7f82df78d4416987ded21fc9
-EBUILD mps-1.106.2.ebuild 741 BLAKE2B 7c93ebeaa6e6131649256864acd3cab8b9130d6762ba12d46f2f92b79c6f230adf01ee3f7374a590648c00deb7016fb8b3de3f27ee03db193afc640006475f11 SHA512 9e239ec00c697a6836a19b09bb1e080f251e06a4199f0533f6ffbbfa69899b1291e2ed9c1bbbcb98609f4c1bf88e4850904faa1d7203e9038190b7efc7489dbf
-EBUILD mps-1.110.0.ebuild 573 BLAKE2B 5dd9a54c038d7b16d691625aef7c9bde772314e27e9a2ca7fa98e32f4062b84733e4d792c95150209d94dec31ffa1bee66d9be4677a8ab8c9d7bc03836ac7fb3 SHA512 09374dab57283ee8e3deda4319e2acd86a33148d88a20c242066dd33e3b6a59a91305486dfdc0c264b2f0623f1205a76bc7543d5aaf54f425f501be13080d8aa
-EBUILD mps-1.111.0.ebuild 622 BLAKE2B a3bb1864a41d50cfe1ecbc280e533c4af86d5b2e41e47a22722437cf40837a9d1b3dc0945515478b1d7e52e40479a47fef5f3542efec12b9efde01d421530fd8 SHA512 d7185abd95d870f08b161c566a1cfd33a896af4e5fec6c9b569bff7f2836a4bd65e82bc2c965fb7966e1ae0af842ce5476398bdbbb348389c42ade9b47dce057
-EBUILD mps-1.114.0.ebuild 622 BLAKE2B 0a1b13a527f97a31cffad4956688a8b351a49aa4f18915d83378012dd50b96a08a5d824e6458e3c4666a7099da8ee0c68e852ee0f5f099f349e6865a68fce3a2 SHA512 c08dfdd54b791e727879332b8ef6509554349ce00cd2244bfefa1613512b68c4752ccc92bf63d5fde1b8fd1765154ce90bc39a2f9e9f0417806b4d5524179e6a
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/mps/metadata.xml b/dev-libs/mps/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-libs/mps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/mps/mps-1.106.2.ebuild b/dev-libs/mps/mps-1.106.2.ebuild
deleted file mode 100644
index 962588d710c0..000000000000
--- a/dev-libs/mps/mps-1.106.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Ravenbrook Memory Pool System"
-
-MY_P="${PN}-kit-${PV}"
-HOMEPAGE="http://www.ravenbrook.com/project/mps/"
-SRC_URI="http://www.ravenbrook.com/project/${PN}/release/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/code
-
-src_prepare() {
-	# need to fix CFLAGS, it's still being silly
-	sed -i -e 's/-Werror//' gc.gmk
-}
-
-src_compile() {
-	emake -f lii4gc.gmk
-	emake -f lii4gc.gmk mpsplan.a
-	emake -f lii4gc.gmk mmdw.a
-}
-
-src_install() {
-	mkdir -p "${D}"/usr/include/mps
-	cp "${S}"/*.h "${D}"/usr/include/mps
-	dolib.a "${S}"/lii4gc/ci/*.a
-}
diff --git a/dev-libs/mps/mps-1.110.0.ebuild b/dev-libs/mps/mps-1.110.0.ebuild
deleted file mode 100644
index da17850546fa..000000000000
--- a/dev-libs/mps/mps-1.110.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Ravenbrook Memory Pool System"
-
-MY_P="${PN}-kit-${PV}"
-HOMEPAGE="http://www.ravenbrook.com/project/mps/"
-SRC_URI="http://www.ravenbrook.com/project/${PN}/release/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/
-
-src_prepare() {
-	# need to fix CFLAGS, it's still being silly
-	sed -i -e 's/-Werror//' code/g{c,p}.gmk || die "Failed to fix CFLAGS"
-}
diff --git a/dev-libs/mps/mps-1.111.0.ebuild b/dev-libs/mps/mps-1.111.0.ebuild
deleted file mode 100644
index 685b7aef5c9e..000000000000
--- a/dev-libs/mps/mps-1.111.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Ravenbrook Memory Pool System"
-
-MY_P="${PN}-kit-${PV}"
-HOMEPAGE="http://www.ravenbrook.com/project/mps/"
-SRC_URI="http://www.ravenbrook.com/project/${PN}/release/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/
-
-src_prepare() {
-	# need to fix CFLAGS, it's still being silly
-	sed -i -e 's/-Werror//' code/g{c,p}.gmk || die "Failed to fix CFLAGS"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/mps/mps-1.114.0.ebuild b/dev-libs/mps/mps-1.114.0.ebuild
deleted file mode 100644
index 767c250c487b..000000000000
--- a/dev-libs/mps/mps-1.114.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Ravenbrook Memory Pool System"
-
-MY_P="${PN}-kit-${PV}"
-HOMEPAGE="http://www.ravenbrook.com/project/mps/"
-SRC_URI="http://www.ravenbrook.com/project/${PN}/release/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/
-
-src_prepare() {
-	# need to fix CFLAGS, it's still being silly
-	sed -i -e 's/-Werror//' code/g{c,p}.gmk || die "Failed to fix CFLAGS"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index ab9bee3bc634..2d58d4a6f407 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -6,5 +6,5 @@ DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e3404
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
 EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef
 EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
-EBUILD msgpack-3.2.0.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
+EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild
index 9f05ddf33b7d..2857a09fb022 100644
--- a/dev-libs/msgpack/msgpack-3.2.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index c4094cdee95e..415f6d30e4f0 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,3 @@
-DIST mxml-3.0.tar.gz 9266886 BLAKE2B d5d3481cfd1d015c620ef897bfc21e839ad2a70f5ffd58973f8435e0e6a66abd477f8fcaacfab05ce608314fed27241702becb60b49b8492560bcc9418b317f5 SHA512 3c540348022226b122ce014f183368cda6631600a11d8f4d43c99c62fba2f3ca4b23dff4122082f63915b59a46a5475d1d12d0081f9315c65f5c044ac3c751d6
 DIST mxml-3.1.tar.gz 9267206 BLAKE2B d5cee24804978b474bf5b58c7a5932b50d7197a35e65da20c2517ce7db01d22027449348d6b15ddf0d186219ac81993055deaa4af9f48439273f8d2d74b27edd SHA512 8f8923b394093db5c471c52c17185916bc3c91f66c97de66919bfef2a09f271879a52f285e5fc4ded03484a3f83ba8fdb588d985b06e0c25ee001f1a80ffa586
-EBUILD mxml-3.0.ebuild 1402 BLAKE2B 5ab3a112c010bd0a9a16ddc35c702138b22b88f4fc44dd0caa0f6227247ab19476978a81faf632753fba510e82fe2aa441e7e1ed81f041627c69dc9fb43d585b SHA512 1dbcf5b958c0e952d80c56079f0d3e21f91ab8a5b4e55dde68c71f152a0f4ea208f97b7f9fadd11178ef7379466c27df43674bac5e5f5cdaa08cc5645e2b0dad
-EBUILD mxml-3.1.ebuild 1405 BLAKE2B 286c0a7a0d1f27c33fb2ce3e36c2035902c646df96d91855a902e99611f9296b32efcc0c114ebf27a9eef25191aa34e26e57f7918494fd253ec6eadcac61c8cc SHA512 46a932b365de48e6f646797a7abea283b390ea7f922fd6e2ad91f575fc41f084976b9a55c6db1e75f23f650d0139898aa85ae8e4147331408db85a84e74957e3
+EBUILD mxml-3.1.ebuild 1402 BLAKE2B f97955c73de42b8fcb7675c84ec741b53ac46d3a6001e59c9bd8cdab0dbaf62474c338e43f748e7281f58e3edc52c1cd9a3833964af859e6194623e1f1d11894 SHA512 e9d28e45c82f56fe3e619cff830242350bcd1f689aecce628ac6fa6d111a16bed95bfd1a36f7de1abb32fa9f284c92fd1519421332ba5a5f0f2b341ed6f5ac03
 MISC metadata.xml 1379 BLAKE2B 9980eb701a13296c1f307c52427336ae892bd9905d86619bea889b3e4ad9fd3cd8dfbe23454c8a562a512628e83fd9cbd2100a2036e607bdf27585599481a9ec SHA512 d3a3de9e7b8ad130622bfa2e689bb1a944e1fb344961fda5ea39ad9fdba754e44bcb225a753834387e7bc490f25667a28422c79ef78ce4324ffb8706d0a71108
diff --git a/dev-libs/mxml/mxml-3.0.ebuild b/dev-libs/mxml/mxml-3.0.ebuild
deleted file mode 100644
index 11e653135297..000000000000
--- a/dev-libs/mxml/mxml-3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="
-	https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/
-"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfopts=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/"${PF}"
-	)
-
-	econf "${myeconfopts[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.1.ebuild b/dev-libs/mxml/mxml-3.1.ebuild
index 72c732d5c059..588f6e63e67c 100644
--- a/dev-libs/mxml/mxml-3.1.ebuild
+++ b/dev-libs/mxml/mxml-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 90649742772f..217231135ff6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -3,4 +3,4 @@ DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff7
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
 EBUILD nettle-3.4.1.ebuild 1792 BLAKE2B 5b861f64d91824bc3e4e6529b8b590fee0d60369db9e65b098bbdfab5d059552026d42fb0794ff827c60e2b5aad1e7f78176b5bc8a84f2d90e22f0923a911a38 SHA512 263df01a86b7dfac2bc7f02a2782acfa502c785923060bb252f184cc6a68e68eb600265dc72c0241cd66168168581e4b065a3db91f35e2d4c5e8621ae3a86027
 EBUILD nettle-3.5.1.ebuild 1699 BLAKE2B 7e15bb54acf48b15dba1fe06ccf58f02ac6aacab97623ed301c9bb15cb7485978da589c9a9fbb3c465e40d1d9d317ab6e99d7679edeba8724ab37f6f161c0579 SHA512 892f4a42faf586b7f171f05434aa90c9607ea4bb0057d72b7ba3a852093bb4d2ebd783822eea3cd5237e20eeb0d72f4ae1aa296ff7dc34cf51218e102585f290
-MISC metadata.xml 330 BLAKE2B 5133c1f98f3dadfef214d46f49e17ea1de8164d9dbe1d334fb2f8009bd40e302db7c1286a3a1cc184fd5240724a63410764addc3a2a4eb65964fcd22f2a7e082 SHA512 e872c0c186725e35f84b691049f8689d5bfcc24da81a2e29719509933f3a1019427b84da86c1dea634b6c05890663c712dd2d66b4513d72642c3037ec38e338d
+MISC metadata.xml 347 BLAKE2B 0a9102d605396d04414dc017572cee25f9088959b268f0181c09f345e0b0c835242c64ecbd83cbdacc3c6014ed7de418ee486c1f22a59a4a698216c3a364bb5e SHA512 c4f9b5c16edb448e4e9ebf49bbe89d1f84afad45b68d19b3d5339aa11ac118f508c62c7fc7cb264868be28a3ce2f3785423b4a52b526d8dd20f2fdb9ab93617c
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 213251be9d00..d67991097866 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+		<name>Gentoo Base System</name>
+		<email>base-system@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 8183deb8ea47..be58181d46ea 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -4,7 +4,7 @@ AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efb
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.20.ebuild 2012 BLAKE2B fdfa42cba47f46dfde39eff8f47083438b358fc9b37bfc7dffd72307418b8610ef7b00e981a5be495197706b6310e469612ed9c96415103c6deb3f7e06400344 SHA512 69b3ecdba8e9f64bf0aab827f4a63d60b599cc800f64050375c809026d8d3e40f32fbd878f8da713326b746e974a8d4a191c460ba5637c3ea96d371e767abf42
-EBUILD newt-0.52.21-r1.ebuild 2246 BLAKE2B 51502c4f84dbd7aee54fa55a96c1ebe615e6e18e053ef23267d5121bc40a4763fe595de39caf5a046cb1fe666a144b55916296c9aa4e6aff7a4031cad1e90bb9 SHA512 2f5c90bb90d4fe1711f04005101224c9ac8936097b86389b3e31bce4d3cae3570492b5e8cafd3c3a0c75baeaa42b294a23aef770cef6106b1a516e6c613d4389
-EBUILD newt-0.52.21.ebuild 1968 BLAKE2B f09fa26936070237a972abef0cf2da4752a9bda24d3918a23ea91f7fa43bd10950ee8acac48ce9ccc097fe0aed965ef82571a382ba49c4098b5816c808229533 SHA512 8bf8de94b631a99279042692b2efc08ef0e2f34dff4c242ad63f21cbc1e64b06e00c10b3d8cc5f17c3cc5a9cebf4e609834e5adf40c2b175db20e9a6582ab284
+EBUILD newt-0.52.20.ebuild 2008 BLAKE2B 8beccc0ed4c3b556355510661a11ed726fd992ab9cb2bf4375f1bdd69d1a98bb3251c7423604ea69df1617c7d69617fc89c70e7cd7ca0a963e8ad8b336cf390b SHA512 d63ca6a5279d5e0d42d5023070bc9dc7d886585d51b0290db94205a47e49e76a4ac6108aaaf7b3180e2ca2eb4a8e0539e0ee9ac72f77cb57b8d03d46717a91aa
+EBUILD newt-0.52.21-r1.ebuild 2251 BLAKE2B 014fcf469062678e8b364689f068815f0860f239c75b5f8406c1c7db53cf46946ba87181e035f90b2fdba1be57c392feb50954571d1b89cbde462dbbb00dc0fc SHA512 e43837b60e366651dcea78df2fba74a0cdd6111dd22d30bc842521829330826648bd87a9c183724b08c8a7010e9e17b270040e86917233c99a50dbdc3b3ef0ee
+EBUILD newt-0.52.21.ebuild 1961 BLAKE2B bd72e5e906fb39ed64fc5fc78da6f52f0e363a02e7475ef27a4000ba1de75b33c8a5e5e71ed45ad51986ac8966c051a2a3b61d79e30e03e411f983474c1b099c SHA512 fba77c10680efd0886c040576659288a2eaec89ff2ae8d34c2e28a616e8a5343c03e7988ef7154033904a01e897f142eb21a0b896c0b3a34afd0038a16af9e76
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index ca6eb6863a01..ba389c9404bd 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1 multilib autotools toolchain-funcs
 
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index a7c6a11c04da..4ddbf1775084 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools python-r1 toolchain-funcs
 
@@ -15,6 +15,8 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gpm nls tcl"
+RESTRICT="test"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 15d258b1bf05..d5e46133364e 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1 multilib autotools toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 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="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 48da16abe744..7388dc954264 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -7,4 +7,4 @@ EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10
 EBUILD npth-1.5.ebuild 744 BLAKE2B b295e9fab3993c50016fc78ae09f6305e834f63eef5dd7daa03f0bbfed990047be2608863396d710f2dd4386cca395d78dc7b7732fac6789ac59ff06b4946484 SHA512 8bf30e3270ea4ea618fd194154a9b37736badab99a7d90c203e0b2ee1622dce399dbd906edd55894e91d8132311c4dac4d9e69276060a325280bf2612a84b989
 EBUILD npth-1.6-r1.ebuild 767 BLAKE2B 992634d18793140c4d9a8eca7d971db7c49f23d6c3f6235b4aeb504544e5a68f52a04937e5dd9b59127acab9ca6deac4a123a62bac59911ea1758e806bde4ebb SHA512 f1d11f181710ed1522ef7fe3e14f2c998143dce46a2aa303f1583f3357012d92e16471cac7de53ddadd7d1211c35348c07e7c368c69a006137eb8807c6272277
 EBUILD npth-1.6.ebuild 756 BLAKE2B b812b2ead7a9981319bed556254f47c49d2a93898d026cc5e939961782082c48684b2f18d1658701e284da9948f7a75ad6acdb1ed93fa2e6c127aa5edb4b8244 SHA512 6ffe0c3c020b4f575048257b4bd596a9b3b89e02241c9823e4ada346beb795e05024b9298253107f0f189617319e1e7f4d414799d5e140a78c1fe5897adcd25f
-MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
+MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 4f6e28828f65..91439c59951d 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index acaba2be79d4..5ef7a1372d9a 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,14 +1,15 @@
-AUX nss-3.21-enable-pem.patch 172 BLAKE2B dbb07fc3122ec7b108ba9cbfaa78870a3690a626fd37d4de065ef03e4cdbe27cd2a816af067678d9b9af55836e3caed291e8de7ca1835ab64b2e802752c132b8 SHA512 fd40fd3b5724f01dd94c2dcf1311d6ab207e59869e5b531fddf35c716bfb1b5cb95c8869fc4ad365b676667598319460de99bf314f529e90415096437f3e610f
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
-AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
-AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
 AUX nss-3.47-enable-pem.patch 167 BLAKE2B 2b0b5e93ef43303008786280fe3b31d4ea5d92385134bf5574eef7a6fc3fb3e93b94b3a39857dd7ff5cb0f788af6b3c23a77164046b30a349666d0b050c715b2 SHA512 0fbcb0d2f0bce5fad6dadfe3d63288db98394384b901fbcabe98e86765bf029fac26eef96be5858113dd916fcf57595a3890904fe99573a652cfab4c13a112b7
 AUX nss-3.47-gentoo-fixups.patch 5365 BLAKE2B e439dbf10b560369fda15ce21ede20d243373f1d93e111af75ebec029816c2ddd1c41f209bfa9f86e9272ef3ec5116530a7653e774fc8a16906adf0c57d22daa SHA512 b9a984697f71cb263eb6955e20584689325f1eb99ca124494944194bb0a57f20184a4c11ea862edaf564930ecb2e0f2f9317245e1c782d88b598a5a0587cd66d
 DIST nss-3.47.1.tar.gz 76462846 BLAKE2B a26e858e06c494adb4059f8cc73993b0f3cff90a0785ed7eed3760931aa6b4ae5706cf7994c6c1421d9ed8bc36d1a4c199988bd9c59c06bb95fd03521c20f141 SHA512 ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
 DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7d87b3f95e86ba10717d30da25632e60753b5cf7a24fbfef8fab6529ae373eea25d633d8164164bac97357c SHA512 71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a
+DIST nss-3.49.1.tar.gz 76489134 BLAKE2B 4b1ceb6e1a366f506d13ceaa88663fba400318bff872305993369c2caa1e1aef654fa02308957bc2a2774b7e0b4bafd097ad16831d38d7da53753991419839b7 SHA512 e463c9d71537ac30dbd2998cbdbc0cadc734768a6f3a316c57b6a6d01ad6d26ca732dff65e9c88555a834ae7d71fc857e4cbc1799438069f544a1e27f75985e8
+DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.47.1-r1.ebuild 9421 BLAKE2B c68d6f35beafa76d0a661d05d3f2588f42749d8ebd66611330763a1e3d6877dc7ddef88177cd6449c1dc7317ff37f1b5ab4c085eda7c5ba79f655998c5bef78b SHA512 3f501ecda5ee130a4f26eee0dee1c00e951892e9bf20b09908e1684d823eb47d8779957afd2bea6deaf5f75c8c6a3aaa0638c4786edd883179a6e3c35edbfc8b
 EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41f975d5562a166c69d30cda9d4f15a2f1e8e85533faa4b511186670138e63356b93ef34fc13df7ac58955534 SHA512 32a79a4bb10a5b60ff8fbedb541e72ac248b0b5cdbcb98b6a7371b984420e735838ac86495e058c937a593870b0f49053033dc999d1ac3879504433ed5885b64
+EBUILD nss-3.49.1.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
+EBUILD nss-3.49.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.21-enable-pem.patch
deleted file mode 100644
index e6de275787dc..000000000000
--- a/dev-libs/nss/files/nss-3.21-enable-pem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss/lib/ckfw/manifest.mn
-+++ nss/lib/ckfw/manifest.mn
-@@ -5,7 +5,7 @@
- 
- CORE_DEPTH = ../..
- 
--DIRS = builtins 
-+DIRS = builtins pem
- 
- PRIVATE_EXPORTS = \
- 	ck.h		  \
diff --git a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
deleted file mode 100644
index 1773da98819c..000000000000
--- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Fri, 28 Jul 2017 14:00:41 -0500
-Subject: [PATCH] add pkg-config file
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- Makefile             |  11 +---
- config/Makefile      |  40 ++++++++++++++
- config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
- config/nss.pc.in     |  12 +++++
- manifest.mn          |   2 +-
- 5 files changed, 199 insertions(+), 11 deletions(-)
- create mode 100644 config/Makefile
- create mode 100644 config/nss-config.in
- create mode 100644 config/nss.pc.in
-
-diff --git a/Makefile b/Makefile
-index 48bae37..9850883 100644
---- a/Makefile
-+++ b/Makefile
-@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
- 
- nss_clean_all: clobber_nspr clobber
- 
-@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
- 	--prefix='$(NSS_GYP_PREFIX)'
- endif
- 
--build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--install_nspr: build_nspr
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- 	$(MAKE) -C $(CORE_DEPTH)/doc
- 
-diff --git a/config/Makefile b/config/Makefile
-new file mode 100644
-index 0000000..600fe48
---- /dev/null
-+++ b/config/Makefile
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH      = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+	# Create the nss.pc file
-+	mkdir -p $(DIST)/lib/pkgconfig
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/lib64," \
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss.pc.in > nss.pc
-+	chmod 0644 nss.pc
-+	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
-+
-+	# Create the nss-config script
-+	mkdir -p $(DIST)/bin
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss-config.in > nss-config
-+	chmod 0755 nss-config
-+	ln -sf ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff --git a/config/nss-config.in b/config/nss-config.in
-new file mode 100644
-index 0000000..1d7c444
---- /dev/null
-+++ b/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+	cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+	[--prefix[=DIR]]
-+	[--exec-prefix[=DIR]]
-+	[--includedir[=DIR]]
-+	[--libdir[=DIR]]
-+	[--version]
-+	[--libs]
-+	[--cflags]
-+Dynamic Libraries:
-+	nss
-+	ssl
-+	smime
-+	nssutil
-+EOF
-+	exit $1
-+}
-+
-+if test $# -eq 0; then
-+	usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+  case "$1" in
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  case $1 in
-+    --prefix=*)
-+      prefix=$optarg
-+      ;;
-+    --prefix)
-+      echo_prefix=yes
-+      ;;
-+    --exec-prefix=*)
-+      exec_prefix=$optarg
-+      ;;
-+    --exec-prefix)
-+      echo_exec_prefix=yes
-+      ;;
-+    --includedir=*)
-+      includedir=$optarg
-+      ;;
-+    --includedir)
-+      echo_includedir=yes
-+      ;;
-+    --libdir=*)
-+      libdir=$optarg
-+      ;;
-+    --libdir)
-+      echo_libdir=yes
-+      ;;
-+    --version)
-+      echo ${major_version}.${minor_version}.${patch_version}
-+      ;;
-+    --cflags)
-+      echo_cflags=yes
-+      ;;
-+    --libs)
-+      echo_libs=yes
-+      ;;
-+    ssl)
-+      lib_ssl=yes
-+      ;;
-+    smime)
-+      lib_smime=yes
-+      ;;
-+    nss)
-+      lib_nss=yes
-+      ;;
-+    nssutil)                                                      
-+      lib_nssutil=yes                                             
-+      ;;
-+    *)
-+      usage 1 1>&2
-+      ;;
-+  esac
-+  shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+    includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+    libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+    echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+    echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+    echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+    echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+    echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+      libdirs=""
-+      if test -n "$lib_ssl"; then
-+	libdirs="$libdirs -lssl${major_version}"
-+      fi
-+      if test -n "$lib_smime"; then
-+	libdirs="$libdirs -lsmime${major_version}"
-+      fi
-+      if test -n "$lib_nss"; then
-+	libdirs="$libdirs -lnss${major_version}"
-+      fi
-+      if test -n "$lib_nssutil"; then
-+       libdirs="$libdirs -lnssutil${major_version}"
-+      fi
-+      echo $libdirs
-+fi      
-+
-diff --git a/config/nss.pc.in b/config/nss.pc.in
-new file mode 100644
-index 0000000..df9e2cf
---- /dev/null
-+++ b/config/nss.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
-diff --git a/manifest.mn b/manifest.mn
-index 500a5ad..87c905e 100644
---- a/manifest.mn
-+++ b/manifest.mn
-@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
- 
- RELEASE = nss
- 
--DIRS = coreconf lib cmd cpputil gtests
-+DIRS = coreconf lib cmd cpputil config
--- 
-2.13.3
-
diff --git a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch
deleted file mode 100644
index 57b4cdaf5a5d..000000000000
--- a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-From d54a1f812ae23ec11d2af6ed93ba1a11609421a8 Mon Sep 17 00:00:00 2001
-From: "J.C. Jones" <jjones@mozilla.com>
-Date: Mon, 14 Jan 2019 10:35:25 -0700
-Subject: [PATCH] Bug 1507135 - Add additional null checks to CMS message
- functions r=mt
-
-Differential review: https://phabricator.services.mozilla.com//D16488
-
---HG--
-branch : NSS_3_36_BRANCH
-extra : transplant_source : 1%02%80%21%BE%C8B%D5%21%D7%0CR%00%ED%B6%EA%84a%FA%23
----
- lib/smime/cmsmessage.c | 69 ++++++++++++++++++++++++++++++++++++------
- 1 file changed, 59 insertions(+), 10 deletions(-)
-
-diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
-index 27d1256ec..f41a432b1 100644
---- a/lib/smime/cmsmessage.c
-+++ b/lib/smime/cmsmessage.c
-@@ -29,8 +29,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
- 
-     if (poolp == NULL) {
-         poolp = PORT_NewArena(1024); /* XXX what is right value? */
--        if (poolp == NULL)
-+        if (poolp == NULL) {
-             return NULL;
-+        }
-         poolp_is_ours = PR_TRUE;
-     }
- 
-@@ -44,8 +45,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
-             if (mark) {
-                 PORT_ArenaRelease(poolp, mark);
-             }
--        } else
-+        } else {
-             PORT_FreeArena(poolp, PR_FALSE);
-+        }
-         return NULL;
-     }
- 
-@@ -53,8 +55,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
-     cmsg->poolp_is_ours = poolp_is_ours;
-     cmsg->refCount = 1;
- 
--    if (mark)
-+    if (mark) {
-         PORT_ArenaUnmark(poolp, mark);
-+    }
- 
-     return cmsg;
- }
-@@ -73,8 +76,13 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
-                                  NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg,
-                                  SECAlgorithmID **detached_digestalgs, SECItem **detached_digests)
- {
--    if (pwfn)
-+    if (cmsg == NULL) {
-+        return;
-+    }
-+    if (pwfn) {
-         PK11_SetPasswordFunc(pwfn);
-+    }
-+
-     cmsg->pwfn_arg = pwfn_arg;
-     cmsg->decrypt_key_cb = decrypt_key_cb;
-     cmsg->decrypt_key_cb_arg = decrypt_key_cb_arg;
-@@ -89,18 +97,21 @@ void
- NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- {
-     PORT_Assert(cmsg->refCount > 0);
--    if (cmsg->refCount <= 0) /* oops */
-+    if (cmsg->refCount <= 0) { /* oops */
-         return;
-+    }
- 
-     cmsg->refCount--; /* thread safety? */
--    if (cmsg->refCount > 0)
-+    if (cmsg->refCount > 0) {
-         return;
-+    }
- 
-     NSS_CMSContentInfo_Destroy(&(cmsg->contentInfo));
- 
-     /* if poolp is not NULL, cmsg is the owner of its arena */
--    if (cmsg->poolp_is_ours)
-+    if (cmsg->poolp_is_ours) {
-         PORT_FreeArena(cmsg->poolp, PR_FALSE); /* XXX clear it? */
-+    }
- }
- 
- /*
-@@ -112,8 +123,9 @@ NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- NSSCMSMessage *
- NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
- {
--    if (cmsg == NULL)
-+    if (cmsg == NULL) {
-         return NULL;
-+    }
- 
-     PORT_Assert(cmsg->refCount > 0);
- 
-@@ -127,6 +139,10 @@ NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
- PLArenaPool *
- NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
- {
-+    if (cmsg == NULL) {
-+        return NULL;
-+    }
-+
-     return cmsg->poolp;
- }
- 
-@@ -136,6 +152,10 @@ NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
- NSSCMSContentInfo *
- NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
- {
-+    if (cmsg == NULL) {
-+        return NULL;
-+    }
-+
-     return &(cmsg->contentInfo);
- }
- 
-@@ -147,6 +167,10 @@ NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
- SECItem *
- NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg)
- {
-+    if (cmsg == NULL) {
-+        return NULL;
-+    }
-+
-     /* this is a shortcut */
-     NSSCMSContentInfo *cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
-     SECItem *pItem = NSS_CMSContentInfo_GetInnerContent(cinfo);
-@@ -164,6 +188,10 @@ NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg)
-     int count = 0;
-     NSSCMSContentInfo *cinfo;
- 
-+    if (cmsg == NULL) {
-+        return 0;
-+    }
-+
-     /* walk down the chain of contentinfos */
-     for (cinfo = &(cmsg->contentInfo); cinfo != NULL;) {
-         count++;
-@@ -183,6 +211,10 @@ NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n)
-     int count = 0;
-     NSSCMSContentInfo *cinfo;
- 
-+    if (cmsg == NULL) {
-+        return NULL;
-+    }
-+
-     /* walk down the chain of contentinfos */
-     for (cinfo = &(cmsg->contentInfo); cinfo != NULL && count < n;
-          cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -200,6 +232,10 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
- {
-     NSSCMSContentInfo *cinfo;
- 
-+    if (cmsg == NULL) {
-+        return PR_FALSE;
-+    }
-+
-     /* descend into CMS message */
-     for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
-          cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -221,6 +257,10 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
- {
-     NSSCMSContentInfo *cinfo;
- 
-+    if (cmsg == NULL) {
-+        return PR_FALSE;
-+    }
-+
-     /* walk down the chain of contentinfos */
-     for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
-          cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-@@ -251,13 +291,21 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
- {
-     NSSCMSContentInfo *cinfo;
- 
-+    if (cmsg == NULL) {
-+        return PR_FALSE;
-+    }
-+
-     /* walk down the chain of contentinfos */
-     for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
-          cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-         switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
-             case SEC_OID_PKCS7_SIGNED_DATA:
--                if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos))
-+                if (cinfo->content.signedData == NULL) {
-+                    return PR_FALSE;
-+                }
-+                if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) {
-                     return PR_TRUE;
-+                }
-                 break;
-             default:
-                 /* callback here for generic wrappers? */
-@@ -278,8 +326,9 @@ NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen)
- {
-     SECItem *item = NULL;
- 
--    if (cmsg == NULL)
-+    if (cmsg == NULL) {
-         return PR_TRUE;
-+    }
- 
-     item = NSS_CMSContentInfo_GetContent(NSS_CMSMessage_GetContentInfo(cmsg));
- 
-From fa26771e9515cc82c941fcef689dd797a3e308c3 Mon Sep 17 00:00:00 2001
-From: "J.C. Jones" <jjones@mozilla.com>
-Date: Fri, 11 Jan 2019 22:33:16 -0700
-Subject: [PATCH] Bug 1507174 - Add additional null checks to other CMS
- functions r=mt
-
-Differential review: https://phabricator.services.mozilla.com//D16383
-
---HG--
-branch : NSS_3_36_BRANCH
-extra : transplant_source : %B5%A8su%96%5B%BE%F9%CD%93%E0%EE%93a4c%1BYp%09
----
- lib/smime/cmscinfo.c   | 92 ++++++++++++++++++++++++++++++++++++------
- lib/smime/cmsdigdata.c |  4 +-
- lib/smime/cmsencdata.c |  4 +-
- lib/smime/cmsenvdata.c |  5 +++
- lib/smime/cmsmessage.c |  3 ++
- lib/smime/cmsudf.c     |  2 +-
- 6 files changed, 95 insertions(+), 15 deletions(-)
-
-diff --git a/lib/smime/cmscinfo.c b/lib/smime/cmscinfo.c
-index 08db662f8..453ccaada 100644
---- a/lib/smime/cmscinfo.c
-+++ b/lib/smime/cmscinfo.c
-@@ -51,6 +51,10 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
- {
-     SECOidTag kind;
- 
-+    if (cinfo == NULL) {
-+        return;
-+    }
-+
-     kind = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-     switch (kind) {
-         case SEC_OID_PKCS7_ENVELOPED_DATA:
-@@ -86,6 +90,11 @@ NSSCMSContentInfo *
- NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
- {
-     NSSCMSContentInfo *ccinfo = NULL;
-+
-+    if (cinfo == NULL) {
-+        return NULL;
-+    }
-+
-     SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-     switch (tag) {
-         case SEC_OID_PKCS7_SIGNED_DATA:
-@@ -127,6 +136,9 @@ SECStatus
- NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
- {
-     SECStatus rv;
-+    if (cinfo == NULL) {
-+        return SECFailure;
-+    }
- 
-     rv = NSS_CMSContentInfo_Private_Init(cinfo);
-     if (rv != SECSuccess) {
-@@ -145,15 +157,20 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
-                               SECOidTag type, void *ptr)
- {
-     SECStatus rv;
-+    if (cinfo == NULL || cmsg == NULL) {
-+        return SECFailure;
-+    }
- 
-     cinfo->contentTypeTag = SECOID_FindOIDByTag(type);
--    if (cinfo->contentTypeTag == NULL)
-+    if (cinfo->contentTypeTag == NULL) {
-         return SECFailure;
-+    }
- 
-     /* do not copy the oid, just create a reference */
-     rv = SECITEM_CopyItem(cmsg->poolp, &(cinfo->contentType), &(cinfo->contentTypeTag->oid));
--    if (rv != SECSuccess)
-+    if (rv != SECSuccess) {
-         return SECFailure;
-+    }
- 
-     cinfo->content.pointer = ptr;
- 
-@@ -185,8 +202,9 @@ SECStatus
- NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
-                                    SECItem *data, PRBool detached)
- {
--    if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
-+    if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) {
-         return SECFailure;
-+    }
-     if (detached) {
-         cinfo->rawContent = NULL;
-     }
-@@ -230,6 +248,10 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
- void *
- NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
- {
-+    if (cinfo == NULL) {
-+        return NULL;
-+    }
-+
-     SECOidTag tag = cinfo->contentTypeTag
-                         ? cinfo->contentTypeTag->offset
-                         : SEC_OID_UNKNOWN;
-@@ -260,6 +282,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
-     SECOidTag tag;
-     SECItem *pItem = NULL;
- 
-+    if (cinfo == NULL) {
-+        return NULL;
-+    }
-+
-     tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-     if (NSS_CMSType_IsData(tag)) {
-         pItem = cinfo->content.data;
-@@ -282,6 +308,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
- SECOidTag
- NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
- {
-+    if (cinfo == NULL) {
-+        return SEC_OID_UNKNOWN;
-+    }
-+
-     if (cinfo->contentTypeTag == NULL)
-         cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
- 
-@@ -294,11 +324,17 @@ NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
- SECItem *
- NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
- {
--    if (cinfo->contentTypeTag == NULL)
-+    if (cinfo == NULL) {
-+        return NULL;
-+    }
-+
-+    if (cinfo->contentTypeTag == NULL) {
-         cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
-+    }
- 
--    if (cinfo->contentTypeTag == NULL)
-+    if (cinfo->contentTypeTag == NULL) {
-         return NULL;
-+    }
- 
-     return &(cinfo->contentTypeTag->oid);
- }
-@@ -310,8 +346,13 @@ NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
- SECOidTag
- NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
- {
--    if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN)
-+    if (cinfo == NULL) {
-+        return SEC_OID_UNKNOWN;
-+    }
-+
-+    if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) {
-         cinfo->contentEncAlgTag = SECOID_GetAlgorithmTag(&(cinfo->contentEncAlg));
-+    }
- 
-     return cinfo->contentEncAlgTag;
- }
-@@ -322,6 +363,10 @@ NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
- SECAlgorithmID *
- NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo)
- {
-+    if (cinfo == NULL) {
-+        return NULL;
-+    }
-+
-     return &(cinfo->contentEncAlg);
- }
- 
-@@ -330,10 +375,14 @@ NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo
-                                     SECOidTag bulkalgtag, SECItem *parameters, int keysize)
- {
-     SECStatus rv;
-+    if (cinfo == NULL) {
-+        return SECFailure;
-+    }
- 
-     rv = SECOID_SetAlgorithmID(poolp, &(cinfo->contentEncAlg), bulkalgtag, parameters);
--    if (rv != SECSuccess)
-+    if (rv != SECSuccess) {
-         return SECFailure;
-+    }
-     cinfo->keysize = keysize;
-     return SECSuccess;
- }
-@@ -343,27 +392,42 @@ NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cin
-                                       SECAlgorithmID *algid, int keysize)
- {
-     SECStatus rv;
-+    if (cinfo == NULL) {
-+        return SECFailure;
-+    }
- 
-     rv = SECOID_CopyAlgorithmID(poolp, &(cinfo->contentEncAlg), algid);
--    if (rv != SECSuccess)
-+    if (rv != SECSuccess) {
-         return SECFailure;
--    if (keysize >= 0)
-+    }
-+    if (keysize >= 0) {
-         cinfo->keysize = keysize;
-+    }
-     return SECSuccess;
- }
- 
- void
- NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey)
- {
--    cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
--    cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
-+    if (cinfo == NULL) {
-+        return;
-+    }
-+
-+    if (bulkkey == NULL) {
-+        cinfo->bulkkey = NULL;
-+        cinfo->keysize = 0;
-+    } else {
-+        cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
-+        cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
-+    }
- }
- 
- PK11SymKey *
- NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
- {
--    if (cinfo->bulkkey == NULL)
-+    if (cinfo == NULL || cinfo->bulkkey == NULL) {
-         return NULL;
-+    }
- 
-     return PK11_ReferenceSymKey(cinfo->bulkkey);
- }
-@@ -371,5 +435,9 @@ NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
- int
- NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo)
- {
-+    if (cinfo == NULL) {
-+        return 0;
-+    }
-+
-     return cinfo->keysize;
- }
-diff --git a/lib/smime/cmsdigdata.c b/lib/smime/cmsdigdata.c
-index 9ea22702e..a249686bb 100644
---- a/lib/smime/cmsdigdata.c
-+++ b/lib/smime/cmsdigdata.c
-@@ -56,7 +56,9 @@ void
- NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd)
- {
-     /* everything's in a pool, so don't worry about the storage */
--    NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
-+    if (digd != NULL) {
-+        NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
-+    }
-     return;
- }
- 
-diff --git a/lib/smime/cmsencdata.c b/lib/smime/cmsencdata.c
-index c3a4549ad..8b520b439 100644
---- a/lib/smime/cmsencdata.c
-+++ b/lib/smime/cmsencdata.c
-@@ -87,7 +87,9 @@ void
- NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd)
- {
-     /* everything's in a pool, so don't worry about the storage */
--    NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
-+    if (encd != NULL) {
-+        NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
-+    }
-     return;
- }
- 
-diff --git a/lib/smime/cmsenvdata.c b/lib/smime/cmsenvdata.c
-index f2c8e171d..9bc77be8b 100644
---- a/lib/smime/cmsenvdata.c
-+++ b/lib/smime/cmsenvdata.c
-@@ -144,6 +144,11 @@ NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd)
-     poolp = envd->cmsg->poolp;
-     cinfo = &(envd->contentInfo);
- 
-+    if (cinfo == NULL) {
-+        PORT_SetError(SEC_ERROR_BAD_DATA);
-+        goto loser;
-+    }
-+
-     recipientinfos = envd->recipientInfos;
-     if (recipientinfos == NULL) {
-         PORT_SetError(SEC_ERROR_BAD_DATA);
-diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
-index f41a432b1..366b71aba 100644
---- a/lib/smime/cmsmessage.c
-+++ b/lib/smime/cmsmessage.c
-@@ -96,6 +96,9 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
- void
- NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
- {
-+    if (cmsg == NULL)
-+        return;
-+
-     PORT_Assert(cmsg->refCount > 0);
-     if (cmsg->refCount <= 0) { /* oops */
-         return;
-diff --git a/lib/smime/cmsudf.c b/lib/smime/cmsudf.c
-index 3ef4268d4..5c8a81e6d 100644
---- a/lib/smime/cmsudf.c
-+++ b/lib/smime/cmsudf.c
-@@ -239,7 +239,7 @@ NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
- {
-     const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
- 
--    if (typeInfo && typeInfo->destroy) {
-+    if (typeInfo && (typeInfo->destroy) && (gd != NULL)) {
-         (*typeInfo->destroy)(gd);
-     }
- }
diff --git a/dev-libs/nss/nss-3.49.1.ebuild b/dev-libs/nss/nss-3.49.1.ebuild
new file mode 100644
index 000000000000..bec0e4b6e2f6
--- /dev/null
+++ b/dev-libs/nss/nss-3.49.1.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.24"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem 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}]
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/nss/nss-3.49.ebuild b/dev-libs/nss/nss-3.49.ebuild
new file mode 100644
index 000000000000..bec0e4b6e2f6
--- /dev/null
+++ b/dev-libs/nss/nss-3.49.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.24"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem 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}]
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 061f4dd83eab..3d668ce4ec40 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,4 @@
-DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
-EBUILD ocl-icd-2.2.11.ebuild 801 BLAKE2B 34e88e64693625630d301237d243f1a8f2e59db4a5797a116993286e3efb843ef058a15121d28e4d19fa33c60b1fcbc5123fdbef0596703bb57b2a91e7e7f0e8 SHA512 63fe2318b11c70188abc8d22c13db5bf55acf6bbba71eedb527390bad7785d1d2bd3d3143674c1201c0af82ae25b9b45f1e92affecee223834949b439174d7fa
-EBUILD ocl-icd-2.2.12-r1.ebuild 1210 BLAKE2B 3856f7d812263286c5ab7d9cee2e7af13493827b528b91ee83d337b5f34f821526be463924c4f5dc5b7c75b9b0c47e6cb5d7f4ca9f9919f202fdd281212074bc SHA512 297dae8d9483b961e926b14a437391191d2f91afa1df571ee6107eaab947ec6df6f06f8716a1221809ec6eb93da15d840cc016542ee290138134cf1d608d3bba
+EBUILD ocl-icd-2.2.12-r1.ebuild 1217 BLAKE2B d9dd84a5913a41d4995838ee1becf2b16f87a574efbc282716d7cba300e3df095649fe8b40ffc99a4556daa217e09d854c8994e17e5f05f7deebe39b193b027d SHA512 01763dfd367317f53867729f6fb43791ae407e1a5d5465f5f94a241e9f5586db2ad8b7898ef9d66aa4257a3bd68b54f0f9f9672d5a2bb4a6fd54aadcb4a62da5
 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.11.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
deleted file mode 100644
index 6815b304b061..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
index c9d2704ee26a..aebd6ac1e7e9 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 53ae41379ec5..6136ced7be6e 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -3,6 +3,6 @@ AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch 777 BLAKE2B 06d47037
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
 EBUILD oniguruma-6.9.3-r2.ebuild 1112 BLAKE2B fde34ed55491542010421c2b6510edb7ae7d00d88234202cc527de6ce8b73926d979a049577215f63975a7c02da48bea7fb832ba8d5821a9f23664ab21374c13 SHA512 ec78dc10570e912890d4cd08efa9adbf1e4a1586a005930d536faa71db67adad17621770c073c925594d70b6bc7b0e2c9a4435ea0b224b62d581fdde961bf193
-EBUILD oniguruma-6.9.4.ebuild 1510 BLAKE2B 434495ce5b418821952baedfd610c70ba79375547284c636b9f1f0150f5838ba39675ddc0e16b3a528999bfbc9761dabe83707a8380a67fb1c6af766296cc0ba SHA512 2a593008b0e0798ad8d590f706816940e975b1b4aa62b9b05412a802820c12e0e6c0b4e5a7dab9084c108221c436c6e8f0017ee015764d4349de2d5833996677
+EBUILD oniguruma-6.9.4.ebuild 1509 BLAKE2B f21a70eafd15561a3226c866647213ca704c3c8d9d9a041f34b4cd5c81b4b1fc691b05442043bae85500ea32f079e13f6e0935ae29582776639640c5665a414c SHA512 1a5a515e58ee041fda0748e1aa844f970dbf625da5023a2226cc0a2ac69bfdb24426ca296ef29679cf56b7e2267d3c3e37c845c3c759c813a54a0ea7ecdb4146
 EBUILD oniguruma-9999.ebuild 1103 BLAKE2B 82646a83124feadc0ff37f9cec6f9664ca188814596bd2c4b739abf7055a133be7025710fcc195b4940d9637a552f75516f84a4054fe058b2af0bbaca982dd00 SHA512 65e62e9721012a8c8f582f90680246bbaa9050767a085ff0a87c809f818f2f5e7f501ae6e48a19129feb9279b884ce5bbebe9d9f691229ae8c655f66a9d908b0
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
index 68920df164bb..1e0acc682983 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index d63df53fb2a9..f7066b10e591 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -3,4 +3,4 @@ DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a69
 DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
 EBUILD opencryptoki-3.4.1.ebuild 3122 BLAKE2B 002036c45163500bf76e52b67e1178f55b22795e0490ceb955aef751874b19c2262f81e25b370b826e3e892de85c94fdb38afb6a4fd33a4dedefaf6fd2311935 SHA512 4aa6b7c580ccccd8e60f7a6c9510eeb86d8c33b6b79375dbb2fcb9f1711036ab014cd0f5e6419a6e37fc13e1a5d2a54bd6e2018f4deb553d4fde65c1949b6127
 EBUILD opencryptoki-3.6.1.ebuild 3134 BLAKE2B 3b8a0ba2d3988fab6c212b8620ca28934c39a5db333c77f3ffcffb44eb768734363358abd909e2e54eee18b0ee0e60d3cd89b1f8ddef4620a749d52925f21d11 SHA512 97d822d8019a30293218f69c1ca5740f78ca31a1f980318030aded7eacbd2a4bc67bd14b12429ae07964d5e56097721e5ae91fe658d07eff2ae343a84a8b9a6a
-MISC metadata.xml 448 BLAKE2B c471621f15b751b55dd75e9b62d961bcb52df94359ae901119be884dbec71e41ced8bc3ddf9af33b70a78aa0c0ef6927a92d44e9901124ad5811b6fc38aa9fc0 SHA512 a325026f45754e53ae94b7a8d9f5836ab4974a4535a5492727062ee449ecb9d542e04f103662111b9eb3956be7fcad32189f4470b3d8e8c110e0023ae93318d2
+MISC metadata.xml 375 BLAKE2B e00a1038bf53c0b8a93ee545e4674dcd7081a70874f5a3fe94794cf65b47d34cd94ccf512c8340b8b84170205840afbdc785dcd49b8391cdfdb655830a483c6b SHA512 fb29b7702172d4e47fe7cb29ec502f9ff0e1f713181ea5af7834a776b2844f4f5d51972764d4bf62088325c498d48a17479856ba5d24ef050af3d3f835c58352
diff --git a/dev-libs/opencryptoki/metadata.xml b/dev-libs/opencryptoki/metadata.xml
index 6a481bee9cb4..2d3050d78a7c 100644
--- a/dev-libs/opencryptoki/metadata.xml
+++ b/dev-libs/opencryptoki/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="tpm">Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg></flag>
 	</use>
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 94284a823361..0bdd220b2c37 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 1805 BLAKE2B 6faebe36e660b15fd98c49cb2e1b5a3b423278e205f84b652747b62ba89a1f2b49f3172f9a365a442233677324ca3e183038d25b7a4f453ece26d8e04600ce1d SHA512 9886983cab35370185aad4560a66000a15277bd47961692870e8aece959133e1a869f825f01a6f72b898e59d3607703940930ec5564ac4c329ad907296f7647f
-MISC metadata.xml 632 BLAKE2B 4f55695056c4bf2b65a264e6fe4e97619e7c033c21cb2d0f7fe9220cc329650f2bf7031ba0d592be18726d1cfc5c78d8ad153678b6a5a401b34e9e746eb07fcb SHA512 8366cc1730d888c16122a3e3a12514e5953b6470c8968b9119e3c987dc8538073e6bf6167fd179077d74332494f06e8652fc055a450651c984a62bc34f94ce06
+MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml
index 769c5bd3d17e..2b86f28e8113 100644
--- a/dev-libs/openct/metadata.xml
+++ b/dev-libs/openct/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="pcsc-lite">
 			Build a driver library for <pkg>sys-apps/pcsc-lite</pkg>,
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 209534e10c7a..be33a7c055ad 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,4 +1,6 @@
 AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
+DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
 EBUILD opensc-0.19.0-r2.ebuild 1677 BLAKE2B 979c4377b0c7ad3e53315b39200a35d52b3dab90f1e5ee399103730f142110b3958904042147cf07825bd45c2b8b94d51a9ef92d14608b30585f9c5217f8472e SHA512 606d3341d01f6c471cc4e8f979ec5a9811ee245ff8996bfbab96925ddf857bfbcd69de9eec91968503307ac75557b28f1dccfa067ee74b6f39ce5b79b84426aa
-MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e
+EBUILD opensc-0.20.0.ebuild 1604 BLAKE2B 9ef9ab943e90ed8b14b62ea79fa2d7399167b67b13ff4cc728acbc79dec18affc208ece35033f656edb0531b43d692d297dbb2b7f79e300261c5aa9a6dabad9c SHA512 c248df1729c8fb31481b77487f9109f592e7f53138db7381cd939522a907445f476942c7ad606ea1cde56733f7e4ed37c488829b7b5891b7ae79e346b92e02d6
+MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 7c8bf05b0e80..6495f8bcc641 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<longdescription>
 		OpenSC is a library for accessing SmartCard devices. It is also
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
new file mode 100644
index 000000000000..7dd7147094b2
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-2.7.0:0= )
+	)
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_configure() {
+	econf \
+		--with-completiondir="$(get_bashcompdir)" \
+		--disable-openpace \
+		--disable-static \
+		--disable-strict \
+		--enable-man \
+		$(use_enable ctapi) \
+		$(use_enable doc) \
+		$(use_enable notify ) \
+		$(use_enable openct) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable readline) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable test cmocka) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index bcab3e705f22..cd745d412303 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -7,7 +7,7 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
-DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
+DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4965 BLAKE2B 30513357640938bdc57ce4ee1325989e9d712fc58428aef000aa260c664996fc9229c8c090d192fd86d90341933fc96d840d0b30917c7ae650fdd4be0ae66ca9 SHA512 01c486f72f8ef9d41849066d25b7b7662745767330ef1a57908a0398ab67641f02a719ae162741493072c8f744d242ea039bae6e56e35c7cd707f0ee72b90da5
-EBUILD openssl-compat-1.0.2t-r1.ebuild 7585 BLAKE2B 8e9b712a582e98f2f1bd03d503cb7c9d1b9658c5a2d4112c0c5ffb41838e77f94dc51d3cdc752b843eb09d0572f7d28c356fb7d17d3faf4c3702a455acbd4d00 SHA512 34058ec84602f4556a1a944eb59b87a2994de73c5c35b915c4923db38e9d1b9bb040f1c4a25e05bc7b271395da699a6dce8d081e0fccd97f8e6319b70ac07369
+EBUILD openssl-compat-1.0.2u.ebuild 7585 BLAKE2B 4518cbd54c075f4f167053a62c5f7b12d43ccc7ce02484b96e255c5de3632c5a98a544347d739422ec95939190957f3260efdcb588678843471213b0f306194b SHA512 b8df9fa461fd5d75e420e99af6415011ab81043edda5e5a031270aaf6c8b496b47da7ad3612713d4b8a95f430b5d399a143013e4f8abbcc9854b98b0e55b65a0
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
index b157a2495fce..7e0327f824c7 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u.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"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 8e0a79928788..61cca03655a9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -8,12 +8,12 @@ AUX openssl-1.1.1d-fix-zlib.patch 1567 BLAKE2B c83a3016caa8ae6f3588a6649929d32ba
 AUX openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch 2434 BLAKE2B ffe10db9977e70379d957df117f9e73469279673c531dd70fa78d84299efed1cc30402ca0bb5ae944b2aea649a1da1d3fa47e6b747b0f488a84f5eec2cfc10f2 SHA512 ac800f2ae4a88fcd51b61f5de5e77765b18f4a997dc334541dce995e6d3e04784752ef273fef033cde21c3d6aaf379751715b98cbce491bfd31ea4770fe78f63
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
-DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
+DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28462c0851757a20d59b4b751220ab307324d5778252df112ad74fd319407cc75fdd1cd507d48058dd0234dc8c03020c882ed42 SHA512 39720ecee3ec6080c1416f2fb7c9246b89ee55b21be2baabad51eb6823dbe1559450b1ae92fa61ac1cf5ba04ac8c02438aa469bc65eae6905cf1ea486f270793
 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9718b74b30afa9be2397ad80f88031920806b6603b6469beede02b6e7a742abf5f82ebdd7c9b8e69c1ffe223e4860dc9581128 SHA512 9e4296326852010d5cebc204d1a34a34198d8d65460bc91a2bd37c80be892a5ae519513e4b0109e6b51b6faab0e171ef6cdae868868c158711558d147083c06f
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
-EBUILD openssl-1.0.2t-r1.ebuild 9865 BLAKE2B fb3ded9fcca4a9fc97ab578747f107e1dea4ed17edaa2b0cf8b787035af9637bd1a78318f1aaedc9336686800cc6e9a564ba7fec09476bda842eaeccd946a5d1 SHA512 33be79f564388c1aa6aa093877d6012d93782257271320282377b93e4cb0e890377f24a4ff5ef0452c25c1e621c7c7880452496d0e07ece1bcdd5433e2c50c4c
+EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B 9ad826e8194143ac02469b02b35e8f4a7cc49b65b3159947b85bc74395ae0ded9a2f2a4677e98af87408f42b7b859a67ab914e442e11086c36ef42465194509c SHA512 65a56030a42e4f9c64fd1425a1690234dd2b49b3821208793bf1da4e7506fa62bea0a106a99ab1b643ba0471b47ff4e3d9b8f64e68b34300fa41d1df56ff0cab
 EBUILD openssl-1.1.0l.ebuild 9596 BLAKE2B b90dab20cb55693a944efa1cd6a2e9422fd7f01e618d50ba74f7f2c46c7fdf6d91621d1380e000ea9e531997dc43c38324965d1abb3c4f668cfcf0986e599c8d SHA512 699210aeaeb1796c2cabd33c917a9dec91f1d0ae7a6fd8ed3ce62f90b02e9001722615eaa767d4d479df1c3e79e6c69025f65a4353a5800a0003f36a886d9f89
 EBUILD openssl-1.1.1d-r3.ebuild 10378 BLAKE2B 43732766ccd06933805c3b5133f0a606a57340e975b10768ae044beeeaee67ecf4e4ad469364a9257b05d0dd567f602abc1b703862b74b656811ce33b20dfe75 SHA512 5caba682680e1c877c1fbfbcfdb1a8513167aacde4b2be1c96ee1026b82178d4685d1f8208616aa15c30e5b65437f294d28cb22d326e3a8adab25f3a3d43cf83
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index 37ad94c9f5d1..11e934c1f7a0 100644
--- a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.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"
diff --git a/dev-libs/pakchois/Manifest b/dev-libs/pakchois/Manifest
index 77307046179e..eaefca91d569 100644
--- a/dev-libs/pakchois/Manifest
+++ b/dev-libs/pakchois/Manifest
@@ -1,3 +1,3 @@
 DIST pakchois-0.4.tar.gz 371126 BLAKE2B 41195807192f077039d7397bcaced2f3def57170135cf53f9addf23bae8f742ce76689fc5c4fa7a49ebbf182a38036dc0f7012e676d7c4906e8cdc7af664a501 SHA512 b4322cf58124aa05b6f34155a4eea753c6eae2fbbe57436491caf0549d79598c95f4d4fefa4a823ead341ab66a9e1a3f437d5278e449ca0d088a4a971d244160
 EBUILD pakchois-0.4-r2.ebuild 489 BLAKE2B 66041d61616f7b9986068b1aaa5f1211762630720d5ef33f8eed32b0d129df8bbd7b356ed766cf80a71c8150de34fd35d22da7d2609828989580b20d66036f6c SHA512 b251cf56c2c677d6dfc12391e35721b4280f3d9929616c36a521f1b2fe1767de20ef0a5415390a05690f0c9e0098fe0e275209424f8e9db8b64d574d4d9f3d73
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pakchois/metadata.xml b/dev-libs/pakchois/metadata.xml
index 040cba5f7c5b..7a38bb900964 100644
--- a/dev-libs/pakchois/metadata.xml
+++ b/dev-libs/pakchois/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 2ab7f26c53e1..4d850364f09a 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -4,4 +4,4 @@ DIST papi-5.5.1.tar.gz 4233127 BLAKE2B e065bed5a5607bf5ce3459ea84e1dabd6a60cd1f7
 EBUILD papi-5.3.0.ebuild 772 BLAKE2B 9db4730a4a95a941529ffaf3e5489d780fe5c511d8c603fc9b03bb3194a9781e0410d9005b21b3bf3ccdb04e6d85e8b110dda405baeba88c48f0034638d08429 SHA512 f5e657cebfee7ee195c79d6a0ed4accbd23b9eab00dc4ec180c3462bfb294ff0fd4e79c68fb657df0d2312ff37b5c48a0f95d5d71f1e4c385cb367adce9a383d
 EBUILD papi-5.4.0.ebuild 772 BLAKE2B 06032f873fc2d668356e642b3dafa34a7c49b4e0ee4fa8872aa48c0ca129206d32ff3c90768d6592dc82f72973c7d094648401a29a8ab5986d49ddd64ce5ddbf SHA512 60b7c896577c5de092f3d9ca0212c7ed14c0cbbdf348b653625c02613d6a588aca59fbc912fa858cbce9c6fb173cbc1fbe0a457579dc8579f65f948645853717
 EBUILD papi-5.5.1.ebuild 772 BLAKE2B 2be068a30e34f1689019be6bb30e331b207ed0b2b85e2b632a14973f72c863fd3484e62fe8bd31cb17e2e9d41511d45497e32582e94ca146d60f7da082b804c1 SHA512 1f5a94fb7299e179bc2c479fc891ea63e65788ca5f55272c4faa1246770aff9480cb9a067726c78640d72b7f68c68e1535df19aaa138d2b092449da5ef0f3c79
-MISC metadata.xml 219 BLAKE2B 7897f49c5b7e807a5e1afe99c3a3335de47d1713e53f9f099d48d8a318655ae3547a562e3b6a74bd92e49b6bd9aae104d41c7cea808c95085dbea379b0a50156 SHA512 b6db740071cb706a6dd7ce9e21ec09a11c9d63752f87e700a5cb58fc100befdfc3c6b16b3065e8a8cb9a8cd3bcae6bd162f3bcd3dfcc592e27b5f738adc71007
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-libs/papi/metadata.xml b/dev-libs/papi/metadata.xml
index 9c43c5cbc14e..1b2becffa26c 100644
--- a/dev-libs/papi/metadata.xml
+++ b/dev-libs/papi/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 34666a64384b..1d9d8db85658 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -2,8 +2,8 @@ DIST pegtl-1.3.1.tar.gz 67183 BLAKE2B 1aef425e5777c44e30068d7b0f5bac813ef9af8e61
 DIST pegtl-2.0.0.tar.gz 154718 BLAKE2B 775eccb11a44eca30ebf72cfa4dcb27e0f46c741efc8071d77232104cb7f6841da847b37b8dab19efcc07aac175558eca949d4c2d4d5d66fcf89793ae3cf7db2 SHA512 30d48bd4a02b7d089c09a6265cd52442d5d9812cf24ae992ea3f264ef8ea27b605771675558f5510e96aec425577beebeb150361001bbce58bd06217ee587f58
 DIST pegtl-2.0_pre1.tar.gz 146966 BLAKE2B e6894dce0df7d41126619523aae866b1335afaac70d0cce2852674e691c93d7f16b550fbc7bf626602a46e044a33f41e9d2e2aa24361088ba99111f23c8bf617 SHA512 180bd8b44ccfe406c818af6b3f5f22eb4cfc7bea6043af5141c6c5ed9b2770624326e67d6dfc47a22aaee3697e5cf1d2744d0a3d3d01a4ce47457189f2b19839
 DIST pegtl-2.1.4.tar.gz 157890 BLAKE2B 5d999b2d5471ff115a0ba38b0b874a031f875ae24b54c25d985bd8bdfd815f6b35b825a0ac5a183e3f87f90445fb98a4b8d7dbc4e8a79e2f6332daf57b6f89d9 SHA512 b4c227e795ab29221bce91b520c5965d48fec85ba53bb070b93e966dc20792189682850b106585ad8bd3e4f34ce8bdb72b576f5f329b2f160f9034b412c93768
-EBUILD pegtl-1.3.1-r1.ebuild 655 BLAKE2B 0be049ce58b29f0a381cc75c0b738360c3abdc2522ef00c0db54902c407a93cc9d04ce9a6514e35aa5d94703a1f8367492e3817dadcaf74082257e00dfa25b9c SHA512 4bf7168ba0cdab9248112ae8fe97a26b003447e9be5d2e9e893802e0fe9f4fe5ec3c19875d7f99c7dbbcc37128e2b0ccbc9a53db266e932337d53a8d96fd184c
-EBUILD pegtl-2.0.0.ebuild 475 BLAKE2B c71abaabebbedf52f3c4069b53786ea20c45ba5a8705fc370eb84242094dc0d99e5994b3098f2f913b4f5e0e0934b70ead88da553a9ba326a649092edea8b945 SHA512 0982b2a5591eba5880cfc632302de047ed2d0a649d2163a97443438ee2ecf266a3923f9d39f00d50afc0af8f123aba19c17ea32e58c2db262a19c6ddeffd4d35
-EBUILD pegtl-2.0_pre1.ebuild 514 BLAKE2B 1f69cdb687a0be6850303bea98b028e16b2403058727bf3e766851588cb97d0360dfaf91a2e2a71978df13fcdc96d9228f7f96e2a020b301d125cf24a69afb45 SHA512 3e0898e3756f52ad993554b146f9ca5ab77fd642c4398d3223db38099a05c9739673193103ef9f7f4f704514cc7c9a64d1bcce335f76afc904ec7aa512a43cc2
-EBUILD pegtl-2.1.4.ebuild 475 BLAKE2B c71abaabebbedf52f3c4069b53786ea20c45ba5a8705fc370eb84242094dc0d99e5994b3098f2f913b4f5e0e0934b70ead88da553a9ba326a649092edea8b945 SHA512 0982b2a5591eba5880cfc632302de047ed2d0a649d2163a97443438ee2ecf266a3923f9d39f00d50afc0af8f123aba19c17ea32e58c2db262a19c6ddeffd4d35
+EBUILD pegtl-1.3.1-r1.ebuild 675 BLAKE2B 8571db1824195cf4de8ff28c1781e021f5c6be7130fc33e34771480b6c8c529db9626655acbe398ceee179957b26db2ad7e2f6827ecfb17fdbdd5a0216a226e4 SHA512 9e4b90f9d4b5a90b121462db9139e7dfb01c85b75daf7eefe3010e16c3cd3a107c1e7f49ff1f34f3d52401232aaa9d9ab63d7297f707f0e29aaaca0c870772d0
+EBUILD pegtl-2.0.0.ebuild 495 BLAKE2B a28fa0a944a1ff99c04752d25ef5bb8aa8ea5109847a1628b8c933ba4846dbe85d668c83203316ea7d4d5fb66a1d58f068e47631137bc4151c08a80fcf9c2a13 SHA512 852020e09aaa4c5cd7b71b1bc7b3a89a66aae424f7cdcbf72c7c60724919edf649c9c6731f2cc774ac9366742f01dd764f231e5bda91ab41c8af643c588571d5
+EBUILD pegtl-2.0_pre1.ebuild 534 BLAKE2B 77244523610c23d3ff28666a1a6981d7d3490dcdd86f77f71e608da2a04230dc247b5c84b57af979b591aa1f6760cfb348d0517aa936b93cfde0813bef3f5d92 SHA512 1c95766126cea927c32ca9cce8ac3759c3972d9d1f16672521b10b3caaf33e3f7a97d230a63255ca7b76b71076e571dac5de637e5a6be2bd5194f3fd39f462de
+EBUILD pegtl-2.1.4.ebuild 495 BLAKE2B a28fa0a944a1ff99c04752d25ef5bb8aa8ea5109847a1628b8c933ba4846dbe85d668c83203316ea7d4d5fb66a1d58f068e47631137bc4151c08a80fcf9c2a13 SHA512 852020e09aaa4c5cd7b71b1bc7b3a89a66aae424f7cdcbf72c7c60724919edf649c9c6731f2cc774ac9366742f01dd764f231e5bda91ab41c8af643c588571d5
 MISC metadata.xml 444 BLAKE2B 1d99f8967121f36fd6f54ed70c698d28419eac7dc88cc58183bb7ad3248481c404f4b55419eb42492ae81389c694df86e39ec4fcecf3284680f32411ab8f69db SHA512 5a412986a17cc8d2cc16eba8e20c269d60b75d53db2bf04fb87b8a0c2dfffe6d30108c9390af7565d5442bc513b302f26dfe970c9c3149fe999cad90ef4c5410
diff --git a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild b/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
index 7ea2419da502..152b86bde603 100644
--- a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
+++ b/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
 HOMEPAGE="https://github.com/ColinH/PEGTL"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ColinH/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/pegtl/pegtl-2.0.0.ebuild b/dev-libs/pegtl/pegtl-2.0.0.ebuild
index e597fab28ed1..1cfcb8a40992 100644
--- a/dev-libs/pegtl/pegtl-2.0.0.ebuild
+++ b/dev-libs/pegtl/pegtl-2.0.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
 HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild b/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
index 1290e13ad05b..3e95af308c20 100644
--- a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
+++ b/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils vcs-snapshot
 COMMIT="bce83a6c7928c4cc8f9a5e18efbca40d18394d32"
 DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
 HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/pegtl/pegtl-2.1.4.ebuild b/dev-libs/pegtl/pegtl-2.1.4.ebuild
index e597fab28ed1..1cfcb8a40992 100644
--- a/dev-libs/pegtl/pegtl-2.1.4.ebuild
+++ b/dev-libs/pegtl/pegtl-2.1.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
 HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index f1177048fb0d..8f3367816233 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -8,9 +8,9 @@ DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72c
 DIST pigpio-70.tar.gz 374569 BLAKE2B a2caadf0e1307c8c3ce936d5fd4d31e18185aa53900f6b2cf8b92a31f423b9a82bf4d2b7212fa8cd5b2d26773598a138ef8331884410f3f418542f43ca1fe2d4 SHA512 00db37b9c0f9751e6179b19e7018583abd9e11d78d01ff9f99b713004cf4e6a224e93644206599378a34dd46fd75c08557021b706015b0bc2bd8b34e363691db
 DIST pigpio-71.tar.gz 374952 BLAKE2B a79a408915285674211e50e30d3cafa433a9ee364cacced501e109d6c31a3a03c14f9d25c3c18e3df252801de65c60ca67cd5f1a8e08f05be8098ad591a14fee SHA512 c3bf029bebff9a7ee02b48597f624a5dcdf277c5c1a7ffa2f6cb83885a93cd6713935d9502127d11c4e9c11e7f6f6be49c8af367707eca2fff469728b5248e2f
 DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
-EBUILD pigpio-67.ebuild 1086 BLAKE2B ead6c79ddc9eb0132ed8a8829c882b6eb7e52e62d754f5368cefd3c06d1beb44703aa19936fd6f1a0ca6cc165e575a786ad83c85d28cec5cf62007a2591336f2 SHA512 835c65eb698fc746181a5062a433a0eaef7e3ad5e86017863ed62ce5d8feb903e77ac6dddfcc27cbfba1ed3f823ac20c3d4bc3a381bab35425368010b13899fe
-EBUILD pigpio-68.ebuild 1099 BLAKE2B 90b8f83e25a1146557411ec07a09f82dc3dbe2ecc9df3fcd60ed4265bc6f18301ba743364144174e9feb0a69ed5705f54ac89ba5daeeae2231b43270a2bf69f7 SHA512 b1eaa643b9bc949664c417efcef64317359b58898e7df9810ff0d7d01f884151a531a10d66dbc68f9a3e45abcf8485fd6051a9053bf26316af07dd538ec875de
-EBUILD pigpio-70.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
-EBUILD pigpio-71.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
-EBUILD pigpio-72.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
+EBUILD pigpio-67.ebuild 1082 BLAKE2B aba391ac188117d9e95c2223446bac6fcd3797cbea50868e890e19c9cfe4533171804fbaa8132e7dc794ccd7203b6c0d899c7d6477876ff10c9c47d585e3abd8 SHA512 59d02a031c667ed37af7621527384a2210f8b5502c49596c696d22412b32e9a454d3a3e1e7f6c7dd964f1e1c3aa93b98ecc3b0037cd64bb591b7772b16b1b245
+EBUILD pigpio-68.ebuild 1097 BLAKE2B 6fad414ce0285932dd875fca1e232f954b69ca916554439b242fcb7a0686156386fbe13f75a6eb9ba3e631999993f62da4d4048c23dd801a9283f224a4d13a71 SHA512 0db21328f2e896d04db86f4e64e262311400647b997b3287fd7c4b36e862051ac4beaf1c79eb4a1233c5c09d628198f57100bd9d6cffc1a656855710575aa8e3
+EBUILD pigpio-70.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
+EBUILD pigpio-71.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
+EBUILD pigpio-72.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-67.ebuild b/dev-libs/pigpio/pigpio-67.ebuild
index 56f692b26a27..f948a8845cd9 100644
--- a/dev-libs/pigpio/pigpio-67.ebuild
+++ b/dev-libs/pigpio/pigpio-67.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/pigpio/pigpio-68.ebuild b/dev-libs/pigpio/pigpio-68.ebuild
index 6ca0daa626e3..7829fd488067 100644
--- a/dev-libs/pigpio/pigpio-68.ebuild
+++ b/dev-libs/pigpio/pigpio-68.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/pigpio/pigpio-70.ebuild b/dev-libs/pigpio/pigpio-70.ebuild
index f4a86cfd1b13..a8d29809f882 100644
--- a/dev-libs/pigpio/pigpio-70.ebuild
+++ b/dev-libs/pigpio/pigpio-70.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/pigpio/pigpio-71.ebuild b/dev-libs/pigpio/pigpio-71.ebuild
index f4a86cfd1b13..a8d29809f882 100644
--- a/dev-libs/pigpio/pigpio-71.ebuild
+++ b/dev-libs/pigpio/pigpio-71.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/pigpio/pigpio-72.ebuild b/dev-libs/pigpio/pigpio-72.ebuild
index f4a86cfd1b13..a8d29809f882 100644
--- a/dev-libs/pigpio/pigpio-72.ebuild
+++ b/dev-libs/pigpio/pigpio-72.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index cfffaed09e63..9a0cde04d251 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.25.1.ebuild 1055 BLAKE2B 5e83f9c42dbffa5885adc476992aad7b54c061c029a4c97e1c5af9bbceb6d58a4b3469168e03e222ac144017cea5d7baa739cd5f876d5325f26dac4038a36c0e SHA512 0214f6b86769f6de54ee219dcb211ef6adfc4b681bd907400d253e642c98dba21f94a32cc3700089b3b80cf34a40e3e6343e8dc7a267f4ceb8476f36ebb60e35
-MISC metadata.xml 507 BLAKE2B 0931fc75f319958ede51838e6e22cc9eb99871b3bf3e1bebe2d635d6e1ce585f4fa723afd0b3a21c33e9545543e7d7d6b8b6f9e27e929b01d2c77b59ce2e41f6 SHA512 440b311a012774466333018e7000dc220fa8a0bba83bf7f8c54f2acd5d50939c827a5fc8105542da9c0a6087599387f3fefbb1458b31382127e597823c698428
+MISC metadata.xml 434 BLAKE2B ae95013cf35b04c9c254de1637b1de3b755bfb57a053f789e5ff8875412a5be2db2e348471ba938a9752c3fccce023a86cc0e8c13a8f485a0f3717defb81c1fc SHA512 1699017823c013e6b053b316ee538de24a498aa790da27fec0181b05c4ace43569ba90a2d210e433f3ec9bc8f260f921adf609647fcd8e12ec58d084accdf2b6
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 5ee8a8c1f2a5..10e458aff011 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="nss">Enable NSS crypto engine</flag>
 	</use>
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index c2d66ebfa9c4..c81d77041ca4 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,4 +1,4 @@
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.9.0-r2.ebuild 3875 BLAKE2B 1167b9fcb6eb6c92fd2637074688b0119485982e7c0c2be05add52ad959db0b391f428d7262dbf2d4da0dca5f28c82fa9e5ecaf39276baf934df405d27b15b5a SHA512 63bd64a13e8f200ebbed2440edba4f3724245243a11b74dcc004768b42bb708fa9e560e6b1e82a53d11ea63dce5f1b85779d2fa58dd15b158980a84d6161e8c4
+EBUILD poco-1.9.0-r2.ebuild 3845 BLAKE2B 1d06222c3278929079a32b454a0d255b54ada8fde93a9460fc6842b382132ac5e3ed297875743e588e3961e0a4d84762a13df05e6dcfbf30798d1cf2b6867175 SHA512 cd162bdfe7437e104a2ea0e81115119672efc55398aa905fc5cdee1e45aebe0ab8ecf41776c942005ea2c6cd5aff2d5bd9fa03d3ad6f2d5b1887c9a2d665192e
 MISC metadata.xml 2354 BLAKE2B c376c105867c39c9bd2fbeb553f40acd95d71307b5c89b0e2d685862fa901b06c3056ff7996b4a1bce8b70f70bad45678c6a0d41567564dc009841f520fe8b3e SHA512 9263939c5e0120e2687446859db4fbfd84072f1d1ae37cb993b1eb69c39dddc828aadf95ef9fed86f8bea65ce24e041740dd48523ad68756b45ef47454c64a8c
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index c122dc9b1642..a0c09ae84691 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ libraries for building network-based applications"
 HOMEPAGE="https://pocoproject.org/"
@@ -52,7 +52,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use test ; then
 		# ignore missing tests on experimental library
@@ -115,15 +115,15 @@ src_configure() {
 		-DENABLE_ZIP="$(usex zip)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	POCO_BASE="${S}" cmake-utils_src_test
+	POCO_BASE="${S}" cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples ; then
 		for sd in */samples ; do
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 1fafe461c84f..537efe9f9356 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,20 +1,20 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.7.0-disable_no-warning-test.patch 965 BLAKE2B 25bd6deb1ed863826b6e940af58b8cfdae6259ef49172cdbc9bdd9625098401680329e07c53c50f1f777b496415face4c69cf4dacc908fabeb0e10d268f96800 SHA512 195edc8144ef7bc53c00d3327c56b3e6e389ea9a79f5059d15e1d1d78ca5ccdbd0567f32a0226047eb9e93eea1dc6cb36fc210833cf99415a698d4cfbaba23e8
-AUX protobuf-3.7.0-protoc_input_output_files.patch 9901 BLAKE2B ea663e63bee282e33066c03b1e73222eccc7cc20afea62ebe9745f67fcbee44a41ec750f1db7a822c65a62fcf1b454a3ade625ad56ec0241f499c7314f8575b3 SHA512 bbe6562afc1bbdb9cd641cc25a00092ac53734c194a32d21a974084af01f0836c515f6e00e730c307491b5ffa31b872154c50e67cfe16f0caecbc707d8d87527
-AUX protobuf-3.7.1-system_libraries.patch 6352 BLAKE2B a5c09076c28aefd951847da75dc280c05f7da9c408ea3c1da9b2f08a2ce92a6cd57e684dc0b516b31283619399c96d288bdf3a44e126a45113fd695af4122a51 SHA512 0633a1ad4dfb5be879e11abe4ed769e9d6c08a505f45c6d302f80a4706b0234e0e11d90d77356f09a640657eed353c48e0ce4ba0816cda84c3ab3f21c8252245
+AUX protobuf-3.11.0-disable_no-warning-test.patch 965 BLAKE2B 81f55d1dcfeb8035e3af2a5d818c4d252953bf6845209ee7a6811c91a528731e01e94f0783934c5b079edffbfa5c08af9e6dff17dea13a0ad0e74b30efc670fe SHA512 49dda9e67f8ba8bab932278b265970c3ddb1aabef6ddc9d690908fe7068e72ba9092d97efe4d72c22f7fbaeb51ae3b23b9bb52acb2f2e4bd6fb4a0bfc7c7dfd4
+AUX protobuf-3.11.0-protoc_input_output_files.patch 10318 BLAKE2B 4abd17ab2d2da06b57b14ef8d120195370032c4c3906fff97a6dcedd7dfd67b15e4350576e496da180fb15244d62b4288872c15f9df04d406130bac972e1b33a SHA512 496e7b200ede27b761c7c4ffb740174c7f0271acc19ba39ca1962d981d1177536d8934f9d726124c90bc3bc437d00499458d845ffb88dc449466116e53065fec
+AUX protobuf-3.11.0-system_libraries.patch 6352 BLAKE2B dd224c42e13c08b3bec554b23548e515b33dc411bccb61cf8ed7835808fe6632daadbfbf136661f805aea8409a6cfee3c38f375bcb05385d015abdac70e597a9 SHA512 a0c2873930ffdeb219b7679edef49e903516ebf0e00708e71d14eccded4c2d2fcc2284c7a67813d6a2d5b5914ca17f5065ec3b72e4649ca2acf8c60b8ab871ae
 AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a
 AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
 AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
-DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
+DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-3.10.1.ebuild 2896 BLAKE2B bface58b3d583644626356a47d4b7769674cd6613a7b7a7a5dddd281193a38d2f521f69edf8383940237a67fae802e07c915848c295a3c98541711afe14732d3 SHA512 09e72d8095e13ab78a54f458545fe6cc53688fd3b10939a5593e480dd984999ff981eaee2a9609cf288618e619ae4a7f50010c354edce5650c483bfce3c908cb
-EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365c387b42a9880af6b6ff4ffb8a8a585a80db1833ea1b215830e0fbf8eb7b915bea3b1b13db8fb68ffe98153cc1e SHA512 f0c19b39ecc5c9ef7e2fc0fd5bb5479f6d467c82cf260d943aadfe5e8c7616b9a9e2753213e2d88c1b6cd77bbe5d9253dafee65ab892e88d2e6b36285e8f3faa
-EBUILD protobuf-3.8.0.ebuild 2885 BLAKE2B 22e6ab723460715b5869c2fcc63cb99940c2eb816e0abe9211669cbe7513b667e95bf2c7c1ba160506ef84719ce4aead47713d879d0acc2092c509e2f49a46c5 SHA512 becedb4a1b364bff5ad47430dcd688342c4fb5094f0e54cf0d9579fea5631789b3bf68400db6254f21e072b8bda9f8fc95c43efd279403fd2696d519ae62e2fb
-EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
-EBUILD protobuf-3.9.2.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
-EBUILD protobuf-9999.ebuild 2664 BLAKE2B ce3271e6b62debde93d811843966654eee37cad6b7f2be149e519b3c5647ae64703415327862456d5a194ea2922f6cde80af54515a6a65f71258789dbdbec3f5 SHA512 97590b5caab8d9815753ecee8f7cff8ec8c737700e5a0555769a36c1a663e26816bf9e4c72616d8b740724753f230bc20cc5d5684fc9440494a0a4a6f038a419
+EBUILD protobuf-3.10.1.ebuild 2912 BLAKE2B f03633d4aa609b62100785e666d39f6fae99ebc14ee3d3232b9de70fb8ef87f11d1192d7484b76680e7572c9d3a0f396fe14d9a81d1322fb46e74144068a4bc9 SHA512 3764390c03ec926610c81df59aab2a9a640be538efca7d37c9d525ff434b4dfb9ff384b7896f7d16e2930cd3d0721b195616a7b8759349ba77f0bd06a94b1c98
+EBUILD protobuf-3.11.2.ebuild 2911 BLAKE2B 164600f1f1a218734f12a8b3c80e320504354621c35d16e3cb6542851a56ba5dba7d07c36b29ecb3ea745708ca237bdab5fe45dbfa353c257cf281387fbe66d7 SHA512 a7e1ce67a99f373c15f62b221fe1b3c97b829d172bb207e53b1fd4e6c4306c70ac8d974689bf539af87acaae5f5b8342cc01e7445964df80b5799d0339542f9e
+EBUILD protobuf-3.8.0.ebuild 2911 BLAKE2B 0d5303acbdc4e3a7c2b70fc559854fddbd9d106cf326a5d66492b288286abb364c210804e34cb07f2b0ffe3575fd4ebf349e687aa573afbe5191cd59d2498bca SHA512 e4099152559f5807c33834e0368d1e61270bb5c654c7346d7863a9d23d141aa57f3d88a8a25012105683ac33b7e751ea50129ec2c09b7d52cfba2e8865be62a0
+EBUILD protobuf-3.9.1.ebuild 2922 BLAKE2B cc0cf2c4dc486249651fc3fb86e9fcf446932938cdd601d19b7cfebacbbb8117ec2809beefc0f8c374ecf08e5023442aa69aedfdabe833ea3fd495795ea9e709 SHA512 2b20b6c8ca86d51635f324c34c395c32041278a63fa260591e3a833b96223ca36121b366e46ae16c874ab6a2328e1883092f0ea2ccb3af935283e44676e42a6e
+EBUILD protobuf-3.9.2.ebuild 2922 BLAKE2B cc0cf2c4dc486249651fc3fb86e9fcf446932938cdd601d19b7cfebacbbb8117ec2809beefc0f8c374ecf08e5023442aa69aedfdabe833ea3fd495795ea9e709 SHA512 2b20b6c8ca86d51635f324c34c395c32041278a63fa260591e3a833b96223ca36121b366e46ae16c874ab6a2328e1883092f0ea2ccb3af935283e44676e42a6e
+EBUILD protobuf-9999.ebuild 2679 BLAKE2B 86ff0785f236a285bd2f01a95546791a05528a8e45612a76c149f90a807ba292211bd5950b5f97530f14dffc69a78b17fd7657b9f2dd2c5270bf78a5f0ec71e7 SHA512 8f50fce8cca5c71acfb026c50c561de922c9f4bcdeee6559f1d01ed840c80d4922a777e854871501006cc743928f563b26e8b0c73691318a7a097cd6f615b5a0
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
index eadde9c04dc7..ec043e3865c1 100644
--- a/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
+++ b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
@@ -2,7 +2,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
 
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -709,7 +709,7 @@
+@@ -714,7 +714,7 @@
  GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
  check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
@@ -11,7 +11,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                        $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
                        $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -893,4 +893,4 @@
+@@ -901,4 +901,4 @@
  
  TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
          google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
diff --git a/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
index 54daa6de4ed2..0e22b34efc3e 100644
--- a/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
@@ -2,7 +2,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -951,6 +951,28 @@
+@@ -938,6 +938,28 @@
    }
  
    if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
@@ -31,7 +31,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      if (codec_type_.empty()) {
        // HACK:  Define an EmptyMessage type to use for decoding.
        DescriptorPool pool;
-@@ -959,13 +981,20 @@
+@@ -946,13 +968,20 @@
        file.add_message_type()->set_name("EmptyMessage");
        GOOGLE_CHECK(pool.BuildFile(file) != NULL);
        codec_type_ = "EmptyMessage";
@@ -58,7 +58,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      }
    }
  
-@@ -1003,6 +1032,11 @@
+@@ -990,6 +1019,11 @@
    for (int i = 0; i < proto_path_.size(); i++) {
      source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
    }
@@ -70,7 +70,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Map input files to virtual paths if possible.
    if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1622,6 +1656,12 @@
+@@ -1650,6 +1684,12 @@
  
      codec_type_ = value;
  
@@ -83,49 +83,75 @@ https://github.com/protocolbuffers/protobuf/pull/235
    } else if (name == "--error_format") {
      if (value == "gcc") {
        error_format_ = ERROR_FORMAT_GCC;
-@@ -1749,18 +1789,31 @@
- "  --version                   Show version info and exit.\n"
- "  -h, --help                  Show this text and exit.\n"
- "  --encode=MESSAGE_TYPE       Read a text-format message of the given type\n"
--"                              from standard input and write it in binary\n"
--"                              to standard output.  The message type must\n"
--"                              be defined in PROTO_FILES or their imports.\n"
--"  --decode=MESSAGE_TYPE       Read a binary message of the given type from\n"
--"                              standard input and write it in text format\n"
--"                              to standard output.  The message type must\n"
-+"                              and write it in binary.  The message type must\n"
- "                              be defined in PROTO_FILES or their imports.\n"
--"  --decode_raw                Read an arbitrary protocol message from\n"
--"                              standard input and write the raw tag/value\n"
--"                              pairs in text format to standard output.  No\n"
-+"                              The input/output protobuf files are specified\n"
-+"                              using the --protobuf_in and --protobuf_out\n"
-+"                              command line flags.\n"
-+"  --decode=MESSAGE_TYPE       Read a binary message of the given type and\n"
-+"                              write it in text format.  The message type\n"
-+"                              must be defined in PROTO_FILES or their imports.\n"
-+"                              The input/output protobuf files are specified\n"
-+"                              using the --protobuf_in and --protobuf_out\n"
-+"                              command line flags.\n"
-+"  --decode_raw                Read an arbitrary protocol message and write\n"
-+"                              the raw tag/value pairs in text format.  No\n"
- "                              PROTO_FILES should be given when using this\n"
--"                              flag.\n"
-+"                              flag.  The input/output protobuf files are\n"
-+"                              specified using the --protobuf_in and\n"
-+"                              --protobuf_out command line flags.\n"
-+"  --protobuf_in=FILE          Absolute path to the protobuf file from which\n"
-+"                              input of encoding/decoding operation will be\n"
-+"                              read.  If omitted, input will be read from\n"
-+"                              standard input.\n"
-+"  --protobuf_out=FILE         Absolute path to the protobuf file to which\n"
-+"                              output of encoding/decoding operation will be\n"
-+"                              written.  If omitted, output will be written to\n"
-+"                              standard output.\n"
- "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
- "                              each containing a FileDescriptorSet (a\n"
- "                              protocol buffer defined in descriptor.proto).\n"
-@@ -2039,7 +2092,9 @@
+@@ -1786,29 +1826,50 @@
+          "  -h, --help                  Show this text and exit.\n"
+          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
+          "given type\n"
+-         "                              from standard input and write it in "
+-         "binary\n"
+-         "                              to standard output.  The message type "
+-         "must\n"
++         "                              and write it in binary.  The message "
++         "type must\n"
+          "                              be defined in PROTO_FILES or their "
+          "imports.\n"
++         "                              The input/output protobuf files are "
++         "specified\n"
++         "                              using the --protobuf_in and "
++         "--protobuf_out\n"
++         "                              command line flags.\n"
+          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
+-         "type from\n"
+-         "                              standard input and write it in text "
+-         "format\n"
+-         "                              to standard output.  The message type "
+-         "must\n"
+-         "                              be defined in PROTO_FILES or their "
+-         "imports.\n"
++         "type and\n"
++         "                              write it in text format.  The message "
++         "type\n"
++         "                              must be defined in PROTO_FILES or "
++         "their imports.\n"
++         "                              The input/output protobuf files are "
++         "specified\n"
++         "                              using the --protobuf_in and "
++         "--protobuf_out\n"
++         "                              command line flags.\n"
+          "  --decode_raw                Read an arbitrary protocol message "
+-         "from\n"
+-         "                              standard input and write the raw "
+-         "tag/value\n"
+-         "                              pairs in text format to standard "
+-         "output.  No\n"
++         "and write\n"
++         "                              the raw tag/value pairs in text format."
++         "  No\n"
+          "                              PROTO_FILES should be given when using "
+          "this\n"
+-         "                              flag.\n"
++         "                              flag.  The input/output protobuf files "
++         "are\n"
++         "                              specified using the --protobuf_in and\n"
++         "                              --protobuf_out command line flags.\n"
++         "  --protobuf_in=FILE          Absolute path to the protobuf file "
++         "from which\n"
++         "                              input of encoding/decoding operation "
++         "will be\n"
++         "                              read.  If omitted, input will be read "
++         "from\n"
++         "                              standard input.\n"
++         "  --protobuf_out=FILE         Absolute path to the protobuf file "
++         "to which\n"
++         "                              output of encoding/decoding operation "
++         "will be\n"
++         "                              written.  If omitted, output will be "
++         "written to\n"
++         "                              standard output.\n"
+          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
+          "                              each containing a FileDescriptorSet "
+          "(a\n"
+@@ -2123,7 +2184,9 @@
    return true;
  }
  
@@ -136,7 +162,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // Look up the type.
    const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
    if (type == NULL) {
-@@ -2051,15 +2106,15 @@
+@@ -2135,15 +2198,15 @@
    std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
  
    if (mode_ == MODE_ENCODE) {
@@ -160,7 +186,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      // Input is text.
 --- /src/google/protobuf/compiler/command_line_interface.h
 +++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -285,7 +285,9 @@
+@@ -288,7 +288,9 @@
        GeneratorContext* generator_context, std::string* error);
  
    // Implements --encode and --decode.
@@ -171,7 +197,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Implements the --descriptor_set_out option.
    bool WriteDescriptorSet(
-@@ -418,6 +420,13 @@
+@@ -420,6 +422,13 @@
    // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
    std::vector<std::string> descriptor_set_in_names_;
  
@@ -195,9 +221,9 @@ https://github.com/protocolbuffers/protobuf/pull/235
 +  // Run the CommandLineInterface with the given command line.  The
    // command is automatically split on spaces, and the string "$tmpdir"
    // is replaced with TestTempDir().
-   void Run(const string& command);
-@@ -2367,6 +2367,17 @@
-     EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
+   void Run(const std::string& command);
+@@ -2491,6 +2491,17 @@
+               std::string::npos);
    }
  
 +  void ExpectBinaryFilesMatch(const string &expected_file,
@@ -214,7 +240,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
   private:
    void WriteUnittestProtoDescriptorSet() {
      unittest_proto_descriptor_set_filename_ =
-@@ -2463,6 +2474,19 @@
+@@ -2585,6 +2596,19 @@
        "net/proto2/internal/no_such_file.proto: No such file or directory\n");
  }
  
@@ -231,6 +257,6 @@ https://github.com/protocolbuffers/protobuf/pull/235
 +      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
 +}
 +
- INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource,
-                         EncodeDecodeTest,
-                         testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch
index 3ae92e2b87a5..8311ce8b22e9 100644
--- a/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch
@@ -32,7 +32,7 @@
  	fi; \
 --- /configure.ac
 +++ /configure.ac
-@@ -218,12 +218,5 @@
+@@ -223,12 +223,5 @@
  esac
  AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
  
@@ -47,7 +47,7 @@
  AC_OUTPUT
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -703,19 +703,11 @@
+@@ -708,19 +708,11 @@
    google/protobuf/testing/file.cc                              \
    google/protobuf/testing/file.h
  
@@ -68,7 +68,7 @@
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -804,12 +796,8 @@
+@@ -812,12 +804,8 @@
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
@@ -83,7 +83,7 @@
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -830,11 +818,7 @@
+@@ -838,11 +826,7 @@
  # full runtime and we want to make sure this test builds without full
  # runtime.
  protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
@@ -96,7 +96,7 @@
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -846,11 +830,7 @@
+@@ -854,11 +838,7 @@
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
@@ -109,7 +109,7 @@
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -860,8 +840,7 @@
+@@ -868,8 +848,7 @@
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
index 52c0b29c2cc4..d6dc5a9ed602 100644
--- a/dev-libs/protobuf/protobuf-3.10.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,14 +22,14 @@ fi
 
 LICENSE="BSD"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
diff --git a/dev-libs/protobuf/protobuf-3.7.1.ebuild b/dev-libs/protobuf/protobuf-3.11.2.ebuild
index c9fe2ba4ebde..d8d5e5fa70a0 100644
--- a/dev-libs/protobuf/protobuf-3.7.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.11.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
 EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
@@ -23,21 +21,21 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/18"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.7.1-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.7.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.11.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -97,7 +95,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
 
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
diff --git a/dev-libs/protobuf/protobuf-3.8.0.ebuild b/dev-libs/protobuf/protobuf-3.8.0.ebuild
index 1535904f56b1..9174c0aebabf 100644
--- a/dev-libs/protobuf/protobuf-3.8.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.8.0.ebuild
@@ -26,10 +26,10 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
diff --git a/dev-libs/protobuf/protobuf-3.9.1.ebuild b/dev-libs/protobuf/protobuf-3.9.1.ebuild
index 39e484b64e65..e1e7dcab429f 100644
--- a/dev-libs/protobuf/protobuf-3.9.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.9.1.ebuild
@@ -26,10 +26,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
diff --git a/dev-libs/protobuf/protobuf-3.9.2.ebuild b/dev-libs/protobuf/protobuf-3.9.2.ebuild
index 39e484b64e65..e1e7dcab429f 100644
--- a/dev-libs/protobuf/protobuf-3.9.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.9.2.ebuild
@@ -26,10 +26,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 1ab97b0ea66b..eebedecd5f12 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -26,16 +26,16 @@ KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( app-editors/emacs:* )"
 DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.8.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.8.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.11.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index bcb14118caac..e503bf300eda 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -2,7 +2,7 @@ AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e44
 AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
-EBUILD pugixml-1.9-r1.ebuild 878 BLAKE2B c2416091370f25dff0a15565a5f755137c0e2d635b3876b9096fe4ee247114fc4e8e4912b985f34aba607c911a4af3c0be8bfe25bc218538a3dd55c2efc5f342 SHA512 5dda6fe0c537d7ab21ecd61446866606567f4b7cd1c6b9e6324c92e74b74e3f8b5024b9a540b41cf1a4d0287dc0b48459f3c83560b945870a86566104ac9fb70
+EBUILD pugixml-1.9-r1.ebuild 775 BLAKE2B ca17f0fc74d4eb47c0b67f61442acc64a8ea1b7176ec411ae5b5a8ba7a9eac443fca99ce27427691eadb1b793c96e6e777c1957b5f69ec87ae05af671571c1af SHA512 0f32da89b78cf48f7b0ca2d6e745892c9ab449d22052f64eeafd5e0018aec0faffc88f9769494bb0adff7b7cb734cef19245b42f1b8c5126f038edcd089989d5
 EBUILD pugixml-1.9.ebuild 585 BLAKE2B 131575f7432ca4a912b7b45006c35d2fffe8e54f3a6b63def1d723fd587c20e58c88ec8ab9a31664732370e9771e427b30d02e0fde9082689693b7010cddf3bc SHA512 5d62f6ec363f503debb8082c699c21744e9a59a3419d10a88dd51c57425f4ce0944b86ce8836efb6be228822a341799015410934fd139b274bc2b2114ae4f90b
-EBUILD pugixml-9999.ebuild 672 BLAKE2B 69e7a66288ebe03c3238c1c75b1ed1a61ac79229c3c4f326bfda4a0ef1d7d388aa5adb13ce4071613eb4d418171ab6b1a41741d7d0e71e69ab251607217b364e SHA512 d4670cb89e776c585e1dd66653476e46d8c5006f1021f278af038b330a2a31ea04908e407582bfee7d33fcca20e2b519645b0f4ba6ee6f6f542cf1e24196c9ae
+EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
index a828ba74f2e3..98f20245f463 100644
--- a/dev-libs/pugixml/pugixml-1.9-r1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
@@ -24,10 +24,3 @@ PATCHES=(
 	"${FILESDIR}/${P}-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch"
 	"${FILESDIR}/${P}-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch"
 )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
index bd5bdeffb3ad..13e703458881 100644
--- a/dev-libs/pugixml/pugixml-9999.ebuild
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
@@ -18,10 +18,3 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
 
 LICENSE="MIT"
 SLOT="0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest
deleted file mode 100644
index ba485a0a742b..000000000000
--- a/dev-libs/qof/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX qof-0.8.8-cflags.patch 1349 BLAKE2B c0a10a55634b2aabbba1d0086befa2c921072f63f417b8e424660955f1462ba4ce4873db4698570df2ab35c42dfdda548afaf584a97206c141a44216ae261715 SHA512 30b3fe8f7845f4b04e893c1b3ef94cce7c5aae7654632683db9fabfb5a61a4e7def9267fcf2475000238393fc872316e1ae7453aea7384d122222035e978019f
-AUX qof-0.8.8-unistd-define.patch 1570 BLAKE2B af9198533bb3017a537c7339f8c1166d5c65cab15d1b5385aa1e47bb8e5f591f349c494b976befaba4dde9cfac8f8f3a627f48d4cebe9a3d7244d75f1a482054 SHA512 be05119e2fde0ee3c464007a7e49171de3ab934505a7318ca037650f9e9a2b54d48ba1033578ce1085cdaa2f9bc08d13f69b8bd564d16dcd7936f0f9e6936729
-AUX qof-0.8.8-unittest.patch 1223 BLAKE2B b5fdca146663e9204b183f42473bef0f507d55ef4b543154224877ba5e904eb0fd33ff185cf346e2694aee6f3b205bab3ee76a0d960791f3863cbf1ae0138879 SHA512 a37959a50d7684d073c88ca465960c9bb920e614d6015a8870db54983222318f8b1b34d7b9cc26e5bf4a860876216b6781b45b2d40ee9d7fe04ada09185c143c
-AUX qof-0.8.8-yacc-build.patch 1667 BLAKE2B 372ebea03a5967718305ae6de2ccf12fbc288cc2135b7c67acbfee4b1b7dc64f73f93f0198d9f4910218b3869dbdb01cc2ee7ef6ccf4b5416278f240a35b2a25 SHA512 225deb1652de4e2383599454bd765a3feea2169d4a7fc4b80538ab68d3984a6ff9da66938e97727ff6a64995c4780c3c21b91de35f3cc3ec2f4591f8a0b92af3
-DIST qof_0.8.8.orig.tar.gz 962548 BLAKE2B 0d380dd1363ec9b47e48a7dc1e296f4d09ed6e91243857c6f34828816291c42010119a14c554d9ddccc1a8a2ef638989ca6e94801422fda3e1b52508c4a651ae SHA512 f62597180f614067d72b5c6dcf4175aa9241e33d2437d6f18215a8c7389c67dd25ccd48dcdfd4c31794e0273e979e72aa0d4e66bb6d832c6f2da644889f848c4
-EBUILD qof-0.8.8-r1.ebuild 1309 BLAKE2B 33d915bf5dbd57764058a718fe40398c7cb09857a814f13344f7e5a05a44b1e6681782c2131f84ee4be2d6c68dfe2a949b6867ee22a56890625d47659deb9c62 SHA512 e9920e8ad856a0e5db857e1847d43e570a8054b62523cb7cc7ba9a45c76aa11268faad114eb9caceca84caa2b385f35c760010a78a4916902b0fc65700680dbf
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/qof/files/qof-0.8.8-cflags.patch b/dev-libs/qof/files/qof-0.8.8-cflags.patch
deleted file mode 100644
index 27d2172c7616..000000000000
--- a/dev-libs/qof/files/qof-0.8.8-cflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1c56fc78f2a04625ae8c3aebd55236556ce28a90 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 2 Nov 2014 12:04:24 +0100
-Subject: [PATCH 1/2] Remove some CFLAGS
-
-* Debugging level is only useful for debugging.
-* Werror is taken care of in error-on-warning configure switch.
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b38da9b..d80e7e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -393,7 +393,7 @@ dnl # *************************************
- AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
- if test ${GCC}x = yesx; then
-   warnFLAGS=
--  CFLAGS="${CFLAGS} -g2 -Wall"
-+  CFLAGS="${CFLAGS} -Wall"
-   AC_ARG_ENABLE(error-on-warning,
-         [  --disable-error-on-warning
-                           disable treating compile warnings as errors],
-@@ -431,7 +431,7 @@ AC_ARG_ENABLE(compile-warnings,
- 
- if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then
-         warnFLAGS="$warnFLAGS -Wcast-align -Wsign-compare \
-- -Wmissing-prototypes -Wmissing-declarations -Werror -Wmissing-include-dirs \
-+ -Wmissing-prototypes -Wmissing-declarations -Wmissing-include-dirs \
-  -Wstrict-prototypes -Winline -Wnested-externs -Wpointer-arith \
-  -Wmissing-field-initializers"
- # LDFLAGS="$LDFLAGS -Wl,-z,defs"
--- 
-2.1.2
-
diff --git a/dev-libs/qof/files/qof-0.8.8-unistd-define.patch b/dev-libs/qof/files/qof-0.8.8-unistd-define.patch
deleted file mode 100644
index c76afadb6584..000000000000
--- a/dev-libs/qof/files/qof-0.8.8-unistd-define.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f2504eacb6d5e42b28df77041ff659fded3fd1a4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 2 Nov 2014 12:43:31 +0100
-Subject: [PATCH 3/5] Leave yacc defines to configure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Resulted in:
-* QA Notice: Package triggers severe warnings which indicate that it
-*            may exhibit random runtime failures.
-* lexer.c:1942:9: warning: implicit declaration of function ‘isatty’
-* [-Wimplicit-function-declaration]
----
- configure.ac            | 2 ++
- lib/libsql/lexer.l      | 2 ++
- lib/libsql/sql_parser.h | 1 -
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d80e7e5..30ea37a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,6 +52,8 @@ AC_PROG_MAKE_SET
- AC_FUNC_MKTIME
- AC_FUNC_STRTOD
- 
-+AC_CHECK_HEADERS_ONCE([unistd.h])
-+
- dnl # *****************************************
- dnl # pkg-config check time
- dnl # *****************************************
-diff --git a/lib/libsql/lexer.l b/lib/libsql/lexer.l
-index fa8c5d1..44d65e8 100644
---- a/lib/libsql/lexer.l
-+++ b/lib/libsql/lexer.l
-@@ -1,4 +1,6 @@
- %{
-+#include <config.h>
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/lib/libsql/sql_parser.h b/lib/libsql/sql_parser.h
-index 2157e5c..0eba93f 100644
---- a/lib/libsql/sql_parser.h
-+++ b/lib/libsql/sql_parser.h
-@@ -2,7 +2,6 @@
- #define SQL_PARSER_H
- 
- #include <glib.h>
--#define YY_NO_UNISTD_H
- 
- 
- typedef struct sql_statement        sql_statement;
--- 
-2.1.2
-
diff --git a/dev-libs/qof/files/qof-0.8.8-unittest.patch b/dev-libs/qof/files/qof-0.8.8-unittest.patch
deleted file mode 100644
index 070c37ead255..000000000000
--- a/dev-libs/qof/files/qof-0.8.8-unittest.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 21315eb014eb908ce3472fa75917412e21fcea29 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 2 Nov 2014 12:06:39 +0100
-Subject: [PATCH 2/2] Make unittest build on demand
-
-Unittests need not be built when not run.
-Also, solves a dependency problem where libqofsql would not be built
-before sql_backend_test is linked.
-
-https://bugs.gentoo.org/show_bug.cgi?id=197999
----
- lib/libsql/Makefile.am | 2 +-
- qof/test/Makefile.am   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/libsql/Makefile.am b/lib/libsql/Makefile.am
-index b410689..c9534fb 100644
---- a/lib/libsql/Makefile.am
-+++ b/lib/libsql/Makefile.am
-@@ -21,7 +21,7 @@ libqofsql_la_LIBADD = ${GLIB_LIBS}
- qofsqlincludedir = ${pkgincludedir}
- qofsqlinclude_HEADERS = sql_parser.h
- 
--noinst_PROGRAMS = sql_parse_test
-+check_PROGRAMS = sql_parse_test
- 
- EXTRA_DIST =       \
- 	README          \
-diff --git a/qof/test/Makefile.am b/qof/test/Makefile.am
-index da7f28f..0760f45 100644
---- a/qof/test/Makefile.am
-+++ b/qof/test/Makefile.am
-@@ -65,7 +65,7 @@ test_sql_SOURCES = \
-   test-stuff.c \
-   test-sql.c
- 
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
-   test-book-merge \
-   test-date \
-   test-guid \
--- 
-2.1.2
-
diff --git a/dev-libs/qof/files/qof-0.8.8-yacc-build.patch b/dev-libs/qof/files/qof-0.8.8-yacc-build.patch
deleted file mode 100644
index cb4f9a9c0d07..000000000000
--- a/dev-libs/qof/files/qof-0.8.8-yacc-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 118b7287f776b789a7c122f7c7e8a1cc1084e15e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 2 Nov 2014 13:01:36 +0100
-Subject: [PATCH 4/5] Fix use of lex/yacc
-
-http://www.gnu.org/software/automake/manual/html_node/Yacc-and-Lex.html
----
- configure.ac           |  1 +
- lib/libsql/Makefile.am | 17 +++++++----------
- 2 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30ea37a..23865ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,6 +45,7 @@ AC_PROG_CXX
- AC_PROG_CC
- AC_PROG_CPP
- AC_HEADER_STDC
-+AM_PROG_LEX
- AC_PROG_YACC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-diff --git a/lib/libsql/Makefile.am b/lib/libsql/Makefile.am
-index c9534fb..78f26cc 100644
---- a/lib/libsql/Makefile.am
-+++ b/lib/libsql/Makefile.am
-@@ -5,9 +5,8 @@ lib_LTLIBRARIES = libqofsql.la
- libqofsql_la_LDFLAGS= -version-info $(LIBQOFSQL_LIBRARY_VERSION) 
- 
- libqofsql_la_SOURCES = \
--	parser.c \
--	parser.h \
--	lexer.c \
-+    parser.y \
-+	lexer.l \
- 	sql_parser.c \
- 	sql_parser.h \
- 	mem.c \
-@@ -24,9 +23,7 @@ qofsqlinclude_HEADERS = sql_parser.h
- check_PROGRAMS = sql_parse_test
- 
- EXTRA_DIST =       \
--	README          \
--	lexer.l         \
--	parser.y  
-+	README
- 
- AM_CFLAGS = -g     \
- 	${CFLAGS}        \
-@@ -35,11 +32,11 @@ AM_CFLAGS = -g     \
- #INCLUDES = \
- #	-I$(includedir) 
- 
--parser.c: parser.y
--	$(YACC) -v -d -o parser.c -p sql parser.y
-+AM_YFLAGS = -v -d -p sql
-+AM_LFLAGS = -Psql -o$@
- 
--lexer.c: lexer.l parser.c
--	$(LEX) -olexer.c -Psql lexer.l
-+BUILT_SOURCES = parser.h
-+CLEANFILES = $(BUILT_SOURCES)
- 
- sql_parse_test_SOURCES=sql_parse_test.c
- # sql_parse_test_LDFLAGS = $(LIBGDA_LIBS)
--- 
-2.1.2
-
diff --git a/dev-libs/qof/qof-0.8.8-r1.ebuild b/dev-libs/qof/qof-0.8.8-r1.ebuild
deleted file mode 100644
index 0b5e1d2d5ac4..000000000000
--- a/dev-libs/qof/qof-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A Query Object Framework"
-HOMEPAGE="https://alioth.debian.org/projects/qof/"
-SRC_URI="mirror://debian//pool/main/q/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc nls"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	virtual/yacc
-	>=sys-devel/gettext-0.19.2
-	!dev-libs/qof:0
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex )
-"
-
-src_prepare() {
-	# Remove some CFLAGS
-	epatch "${FILESDIR}"/${PN}-0.8.8-cflags.patch
-
-	# Delay build of unittests, bug #197999
-	epatch "${FILESDIR}"/${PN}-0.8.8-unittest.patch
-
-	# Fix use and build with yacc
-	epatch "${FILESDIR}"/${PN}-0.8.8-unistd-define.patch
-	epatch "${FILESDIR}"/${PN}-0.8.8-yacc-build.patch
-	rm lib/libsql/{lexer.c,parser.c,parser.h} || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-error-on-warning \
-		--disable-static \
-		--disable-gdasql \
-		--disable-gdabackend \
-		--disable-sqlite \
-		$(use_enable nls) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc latex-docs) \
-		$(use_enable doc html-docs)
-}
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index fe43e4fe79c1..b52908184fbe 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,3 +1,5 @@
+DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
 DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
-EBUILD qtkeychain-0.9.0.ebuild 898 BLAKE2B ebc33253cd15e667f49e9fcb25743fa7578ea4a46512a41d992ff6ef14803e37aa58393377b66785e59e4990436b25d5b9ef5c1e3429bfdced8d3789dc6bf739 SHA512 01084d23b92c7da46a44bb2b16cd4eca4f82750c23c962306dc7ba3ed3dded92215bd16d6e933257106694cef594ed67fabdb97040ddd48fd5b52ad7e4a3d4cb
+EBUILD qtkeychain-0.10.0.ebuild 933 BLAKE2B 51da5aeb5775a9685341685268ad2c87f17e456833e79b7eb6a461f68da14902aeb9ea8d88d1cd4d15d8a7575f0327478a76c502829e86b23c9f8beb39250982 SHA512 63b2af9085c4f315ececca9c451cd58be4f712839825fa6d504e74113c6e9e3d56f675d24faec9d390583df965a6f50ce8c36836fd1017697b54c6c5f1a5e886
+EBUILD qtkeychain-0.9.0.ebuild 931 BLAKE2B 1f474cbb462ca859cecd2ea916fe6f701e189d8261aa8955f6af644b450fa8371c8875e7fe223bad760b0f674a04c6d679c49003e932cd3483dd73d19fe8945a SHA512 227b0b3d20de80a1ad2268c64ccdb1e1625b716e757f7c6dbc42fa6d1b6df67730bfcb12348012b33b8a6e4c5f79a8c04e0ba21bdd58abec72b0f35ce7893b7b
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
new file mode 100644
index 000000000000..9e1534baeb1f
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.10.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 cmake
+
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+DESCRIPTION="Qt API for storing passwords securely"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+IUSE="gnome-keyring"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	gnome-keyring? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+"
+
+DOCS=( ChangeLog ReadMe.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TEST_APPLICATION=OFF
+		-DBUILD_TRANSLATIONS=ON
+		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
index 78480512c988..3272ffda360c 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
 DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index e8e841cd7ec9..e8184909325b 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,7 +1,7 @@
 AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71
-EBUILD rapidjson-1.1.0-r2.ebuild 1206 BLAKE2B 1afe1024b8864b3c30acc101db869749ee1fa29cd5fee471dba6a8d4cbd83fc743baa25e2a6ee2bc62fee02f62abe63ababa4e24939ae2a9cd1890ce1bdc57f3 SHA512 e18cd1b1e12461cc6a26dcfcd5c77c0c6afd2b2e53d57039513ee5f545f0fe12d3bfbc9e3703139f4e54da3e430471f6f931ddabd72fc5dcad5a79ff857f0e1c
+EBUILD rapidjson-1.1.0-r2.ebuild 1188 BLAKE2B b0e81c560dfe52dfa9367f2d69a9405bc14fdcab44f11ba0a20992e06fb84fc98fb4d7302bc01717bbb4c8baac86faaac592c94a56590fa49bf9dae7e441c6c2 SHA512 78ac0b105dba734d76e40d1116924f6059cfd776d4b95fafbbcd1cb9d8067555c070d149e0f2550ca67e09731c6c31c026b01d6a2d438fd128db2d23a1a9993c
 EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee
-EBUILD rapidjson-9999.ebuild 1181 BLAKE2B 189daab019fe8cc7bdf60b5896e4a11ff6198c23d9c1fe4783df17762e0576b53e1577f0c1cb69d3795f8b406059eac8b0ecc05d6ab4cfeee2eef24fc9dba11e SHA512 86d3e5ea07141c328a85797a22d42d84ec5a51e2436a7a3223b928d26d2a902858c4f6a66bd9dbba72cc04b198797552741ef618b934c37dbd4e29be455d8574
+EBUILD rapidjson-9999.ebuild 1163 BLAKE2B b9a0a5b4907aeaaad646a225fd3ab54ea0574cbd02407213b996c5b8b1d0b93ca741aba0278adde818df045f1e8303739f8b1310a79cccf2ba10e90645cb2704 SHA512 6be35bdacb45ae287ad100418224f0474bdab9d1b71735c5a3631ed7556d8d79c6499249c68a2a68e8fbb71b5dff86b168b2d6e01a4b1698001c56fffcfcef65
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
index f2c70a5e3612..d777625e0367 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
 HOMEPAGE="https://rapidjson.org/"
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's|-Werror||g' CMakeLists.txt || die
 	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
@@ -50,5 +50,5 @@ src_configure() {
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 34b5854db22c..c8f3d6d0ff7d 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
 HOMEPAGE="https://rapidjson.org/"
@@ -32,7 +32,7 @@ DEPEND="
 RDEPEND=""
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's|-Werror||g' CMakeLists.txt || die
 	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
@@ -47,5 +47,5 @@ src_configure() {
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 69fcd29d558d..4a50bbfe326b 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -6,6 +6,7 @@ DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba630
 DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
 DIST re2-2019-08-01.tar.gz 390891 BLAKE2B c663efc729e8cec6f40a29c1c0ca2eeb59e3323ae1adb60b55d017d15d048ac1e329990bf33fac56037b2b03cbe710ec95073a4adc93300a8ae282d4f7e970d8 SHA512 e2b8f121f29b9afa5ae3c8f29811a010289279a9edb3761e27b44d903a85b80720a3a59388a4ad75fb687ee1343d25b5a59cdee42282eed30f5fc48b59c70c97
 DIST re2-2019-09-01.tar.gz 391069 BLAKE2B 79c6985996286bb615079352d4ceb9a10a8fc5a13b496afed8ec6f9cb1b016106bec1ef379789be6bcbee13cc252ae88c301735c4152efe234ed30d88336dccc SHA512 df446a7a00f3e8cd3f09c746ad41a6f58af3da88ab31cf8e2498d26e240bbe1f557f462fb6b10a818c3e00e02ec19dc60ce29eb6c4d61781aeb9b96b4c4e5af9
+DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
 EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
@@ -13,4 +14,5 @@ EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff81593
 EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
 EBUILD re2-0.2019.08.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
 EBUILD re2-0.2019.09.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
-MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
+EBUILD re2-0.2019.12.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
+MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index 3f5b8c87fb5d..97fe53eb4350 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chromium@gentoo.org</email>
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">google/re2</remote-id>
 	</upstream>
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
new file mode 100644
index 000000000000..697b91bfc42a
--- /dev/null
+++ b/dev-libs/re2/re2-0.2019.12.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="gentoo-2019-01-01"
+SLOT="0/${SONAME}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="icu? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}"
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 890fe9855efa..3ea42bd21975 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,18 +1,6 @@
-AUX rocm-comgr-2.6.0-correctly-install.patch 1397 BLAKE2B 99558ad6f8e7908efe33ae215e1645ab733966d778753a25714a1fb0880db9bf3df43c108c0b200d1bf54475b928607d4e99a7a7a97464863cb5a6ea0cac53e9 SHA512 3dddf76dde36118aa8808178ca6bb6c7653148b83d1d2f3c66d18d6c5421ae7ad438b1467af6e842aa4c24a3256c4ef95717ed46feedba07f965828f47bdedcb
-AUX rocm-comgr-2.6.0-dependencies.patch 713 BLAKE2B 2a4a642044d243d5da9084e8d0dc37b7b230ade108a547a3c46a41f7fe456804288b69a67a8f378032d1ca3d6c0f6416ce711ed9ddb6e5cacfaea166f2313610 SHA512 435d7488516551e7345acb4a645f8ea040d461bec1b6dafdc832c692038061459be4c615b1d42292cd22daa7c88e26cc4b8df41ff4e0f65ede0e23c098223cd8
 AUX rocm-comgr-2.6.0-find-clang.patch 982 BLAKE2B 7284604ac25dbbd292050d35952db0b42fada73465f86bba34a40941c28c38709b6cc5006ba40357dcccece60662d12abde68d3cacc46b138325851f975a63e2 SHA512 74d4042c1c4ddaab22b0708a317db0d3c4e7045dfd36b03b94a10fd8f7c40a3442c5016e20067e59ca2266e1563fd33fc378053ce917c2a161cfc4b71425b33d
 AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e17091fa6060518b11bf2dfce700fedc780189f9db4da57aa4290183e743a08bfe4502be9079895690085a89788b1ba56bf4e9f8aa3062 SHA512 211b274280734b7f2478ecb094a36f303f7849cfede46709714a5171d07f2521959c216564623d119a14064d762fa752de4b745cee340480210eea4b757c7e3f
-AUX rocm-comgr-2.6.0-unbundle-yaml-cpp.patch 1082 BLAKE2B 0b44c1731884d225056a18b81c52c99f59a9a3e9d16e06cbe77e683b10703cd83cb96446ff138d6c4c14c48f931a1df0f37699153e0b6f253f89d42f93feebbf SHA512 74190c23d86792bac64b09f3724ad98a3c7b89dd0bbfcbc051d7821222a97e37de9138eee32abb8982ce78982dbddbe640c3f05ad560ef29c287c9196afdef89
-AUX rocm-comgr-2.7.0-llvm-interface-change.patch 6792 BLAKE2B 67977f845b35d5c26da13b123cc2e273161e1614b353a5acfad7cb6b3cb606d0abd55989c4e615b8addc98326d8fa225c949cacec93132d94a2e3af776b88a8f SHA512 df455a07bf3e168be3c18bc9033b984eba8046dc6bdad02e8ebe4cb9b05728e889156e1ad5cfd858ee59e22a07ff224437b96b10e6958b298ab13a2d1d9e51b1
 AUX rocm-comgr-2.8.0-dependencies.patch 2120 BLAKE2B 4c5b50d122b2f92ea35419111e9eece967c09e4b1014639c8f81b5df8a674ff0758ecc8a8b7b1984a6d27b4581704d9b8f494089abc477b221effb2d3652308a SHA512 791d36e56e50c2734529d3bfe286219c6ab8b5769f65c7e993a8c7ab961e52f90239871b31fe63ffbcdc5f2e0c06bf60e33943cf68d797ecdebd37d237849777
-DIST rocm-comgr-2.10.0.tar.gz 87111 BLAKE2B efc9d395f6c0445e3f0af847edb66094905b38a8134d05b938a5bc48f1d71d37db664afc8e6125f82a6618cd4657d4316105f6587937010cd120f68c01172cac SHA512 ce7e698c042291910a27bf261e52ac420dd5f9f676bb86e72b903e8a751753b9b0d2d15fb3dfabafdaef75a94844541b37df81e70db28496545348e93cd4018c
-DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
-DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
-DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B 14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9 SHA512 516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e
-DIST rocm-comgr-2.9.0.tar.gz 85505 BLAKE2B 5e69bcd2fb6769cd315a18eb626d00161acb4a2f9922eb67dba6cee081c236ec25798011d4112c37d5e6fba06531e5e7b4f42659080a8dd23d9a8579b71bf2c0 SHA512 8e66c01eee71154d261a8f2a8651f90dc7e60b6d74625aab3f3a0b51226c69059cde66d7a1eab8aacee7d0653cc881ec442849483f21616ee4cd27d4ddad7345
-EBUILD rocm-comgr-2.10.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
-EBUILD rocm-comgr-2.6.0.ebuild 1189 BLAKE2B 29d9b7ad1e3dca202024101223422b667c82d58eed20da01492e955c39e768f85b677d9fbbedcb7b22aa41855dd68acf11562f7083303f9d00749fbfd5af9c84 SHA512 ab54afa2597fc0133db00c42fec5226da8118b4d79eb67c6d6af1bf3c111296b9b72c5675469594c403021a00446e68b8ab5ab51b678dec0958ca21e9bcc83c4
-EBUILD rocm-comgr-2.7.0.ebuild 1295 BLAKE2B c6f40531be4c82d2d3c82967bb9f890e8af1f95125857d2cc1d0b9a2c29ddca5574f34abbe42daf78df8b4cf74244478e6afea69a77661a6a65e44442205304b SHA512 7835addd86dfd1878993c5bc0cb9728123623815e678b90008953cd4258abc8ca7e227fd43d26fd2959ed2d5d1cd448ae61c525527c9d56742c3b009b288c509
-EBUILD rocm-comgr-2.8.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
-EBUILD rocm-comgr-2.9.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
+DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940 SHA512 ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc
+EBUILD rocm-comgr-3.0.0.ebuild 1033 BLAKE2B d360d157bc06201fdb7533aa2f561b60868212834c659cae28c06540b9777e260845aa85292a2ec5eadeb651360dbc81b200c47b55b4327241a91e51e7f75b83 SHA512 afe248d5df0361f37ae4c38189ad279e023d77e793b3d53de1c3f3297f0130da998a54c934093f2c65fa23cf695a7a7dc54ee1418f16d106ffec32a017b739e5
 MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
deleted file mode 100644
index 74206760f39a..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:04:11 -0400
-Subject: [PATCH] Install to standard locations using GNUInstallDirs
-
-Some distributions require 64 bit libraries to be installed to lib64, for example.
-Using GNUInstallDirs ensures that files are installed to the expected locations.
----
- CMakeLists.txt | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..a89af16 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 3.2.0)
- 
-+include (GNUInstallDirs)
-+
- # Build ROCM-Compiler-Support with ccache if the package is present.
- set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
- if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
-@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
- 
- install(TARGETS amd_comgr
-   EXPORT amd_comgr_export
--  DESTINATION lib)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- install(FILES
-   "include/amd_comgr.h"
--  DESTINATION include)
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- install(FILES
-   "README.md"
-   "LICENSE.txt"
-   "NOTICES.txt"
--  DESTINATION share/amd_comgr)
-+  DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
- 
- # Generate the install-tree package.
- set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
deleted file mode 100644
index bce19d168b0a..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
---- comgr/CMakeLists.old	2019-07-19 17:19:26.080276421 +0200
-+++ comgr/CMakeLists.txt	2019-07-19 18:17:25.780163592 +0200
-@@ -185,7 +185,11 @@
- include_directories(./yaml-cpp/include)
- 
- set(CLANG_LIBS
--  clangFrontendTool)
-+  clangFrontendTool
-+  clangFrontend
-+  clangBasic
-+  clangDriver
-+  clangSerialization)
- 
- set(LLD_LIBS
-   lldELF
-@@ -193,8 +197,19 @@
- 
- llvm_map_components_to_libnames(LLVM_LIBS
-   ${LLVM_TARGETS_TO_BUILD}
-+  Option
-   DebugInfoDWARF
--  Symbolize)
-+  Symbolize
-+  Support
-+  Object
-+  BitWriter
-+  MC
-+  MCParser
-+  MCDisassembler
-+  Core
-+  IRReader
-+  CodeGen
-+  Linker)
- 
- target_link_libraries(amd_comgr
-   PUBLIC
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
deleted file mode 100644
index d61f4c2a2003..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
-index 454b830..70e2526 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,12 +90,8 @@ if (UNIX)
-         -Wl,--no-undefined)
-     endif()
-   endif()
--  # FIXME: Remove when yaml-cpp is removed from the build.
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- else()
-   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
--  # FIXME: Make this private once yaml-cpp is removed from the build.
--  add_definitions(-D_HAS_EXCEPTIONS=0)
- endif()
- 
- # Windows is strict about visibility of exports in shared libraries, so we ask
-@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
-   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
-   FILE "${AMD_COMGR_TARGETS_NAME}")
- 
--set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
--set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
--add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
--include_directories(./yaml-cpp/include)
-+find_package(yaml-cpp REQUIRED)
-+include_directories(${YAML_CPP_INCLUDE_DIR})
- 
- set(CLANG_LIBS
-   clangFrontendTool)
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
deleted file mode 100644
index dc8ed42fc466..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From a73e4ce7c686787840454e206a17973685b03e62 Mon Sep 17 00:00:00 2001
-From: Michael LIAO <michaelhongbin.liao@amd.com>
-Date: Thu, 15 Aug 2019 13:25:58 -0400
-Subject: [PATCH] Fix comgr build due to LLVM interface change.
-
-Change-Id: I66c2203f09b683dd06807860eeb5f517cd200f0e
----
- src/comgr-objdump.cpp | 68 +++++++++++++++++++++++----------
- 1 file changed, 47 insertions(+), 21 deletions(-)
-
-diff --git a/src/comgr-objdump.cpp b/src/comgr-objdump.cpp
-index bf490b6..59a9d05 100644
---- a/src/comgr-objdump.cpp
-+++ b/src/comgr-objdump.cpp
-@@ -307,15 +307,18 @@ class SectionFilter {
-   FilterPredicate Predicate;
-   llvm::object::ObjectFile const &Object;
- };
-+
- SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O) {
-   return SectionFilter(
-       [](llvm::object::SectionRef const &S) {
-         if (FilterSections.empty())
-           return true;
--        llvm::StringRef String;
--        std::error_code error = S.getName(String);
--        if (error)
-+        Expected<StringRef> SecNameOrErr = S.getName();
-+        if (!SecNameOrErr) {
-+          consumeError(SecNameOrErr.takeError());
-           return false;
-+        }
-+        StringRef String = *SecNameOrErr;
-         return is_contained(FilterSections, String);
-       },
-       O);
-@@ -394,6 +397,18 @@ report_error(StringRef ArchiveName, const object::Archive::Child &C,
-     report_error(ArchiveName, NameOrErr.get(), std::move(E), ArchitectureName);
- }
- 
-+static LLVM_ATTRIBUTE_NORETURN void report_error(llvm::Error E,
-+                                                 StringRef File) {
-+  report_error(File, std::move(E));
-+}
-+
-+template <typename T, typename... Ts>
-+T unwrapOrError(Expected<T> EO, Ts &&... Args) {
-+  if (EO)
-+    return std::move(*EO);
-+  report_error(EO.takeError(), std::forward<Ts>(Args)...);
-+}
-+
- static const Target *getTarget(const ObjectFile *Obj = nullptr) {
-   // Figure out the target triple.
-   llvm::Triple TheTriple("unknown-unknown-unknown");
-@@ -822,13 +837,13 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     for (const SectionRef &Section : ToolSectionFilter(*O)) {
-       std::error_code ec;
- 
--      StringRef Name;
-       uint64_t Addr = Section.getAddress();
-       if (Addr != Val)
-         continue;
--      if ((ec = Section.getName(Name)))
--        report_error(O->getFileName(), ec);
--      fmt << Name;
-+      Expected<StringRef> NameOrErr = Section.getName();
-+      if (!NameOrErr)
-+        report_error(O->getFileName(), NameOrErr.takeError());
-+      fmt << *NameOrErr;
-       return;
-     }
- 
-@@ -854,7 +869,11 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     section_iterator SI = O->section_begin();
-     // Adjust for the fact that sections are 1-indexed.
-     advance(SI, Val - 1);
--    SI->getName(S);
-+    Expected<StringRef> SOrErr = SI->getName();
-+    if (!SOrErr)
-+      consumeError(SOrErr.takeError());
-+    else
-+      S = *SOrErr;
-   }
- 
-   fmt << S;
-@@ -1362,8 +1381,7 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj,
-       DataRefImpl DR = Section.getRawDataRefImpl();
-       SegmentName = MachO->getSectionFinalSegmentName(DR);
-     }
--    StringRef name;
--    error(Section.getName(name));
-+    StringRef name = unwrapOrError(Section.getName(), Obj->getFileName());
- 
-     if ((SectionAddr <= StopAddress) &&
-         (SectionAddr + SectSize) >= StartAddress) {
-@@ -1675,8 +1693,7 @@ void llvm::DisassemHelper::PrintRelocations(const ObjectFile *Obj) {
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-     if (Section.relocation_begin() == Section.relocation_end())
-       continue;
--    StringRef secname;
--    error(Section.getName(secname));
-+    StringRef secname = unwrapOrError(Section.getName(), Obj->getFileName());
-     OutS << "RELOCATION RECORDS FOR [" << secname << "]:\n";
-     for (const RelocationRef &Reloc : Section.relocations()) {
-       bool hidden = getHidden(Reloc);
-@@ -1699,8 +1716,7 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
-           "Idx Name          Size      Address          Type\n";
-   unsigned i = 0;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t Address = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     bool Text = Section.isText();
-@@ -1717,9 +1733,8 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
- void llvm::DisassemHelper::PrintSectionContents(const ObjectFile *Obj) {
-   std::error_code EC;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
-     StringRef Contents;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t BaseAddr = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     if (!Size)
-@@ -1797,7 +1812,11 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-     section_iterator Section = *SectionOrErr;
-     StringRef Name;
-     if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
--      Section->getName(Name);
-+      Expected<StringRef> NameOrErr = Section->getName();
-+      if (!NameOrErr)
-+        consumeError(NameOrErr.takeError());
-+      else
-+        Name = *NameOrErr;
-     } else {
-       Expected<StringRef> NameOrErr = Symbol.getName();
-       if (!NameOrErr)
-@@ -1846,8 +1865,7 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-         StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
-         OutS << SegmentName << ",";
-       }
--      StringRef SectionName;
--      error(Section->getName(SectionName));
-+      StringRef SectionName = unwrapOrError(Section->getName(), o->getFileName());
-       OutS << SectionName;
-     }
- 
-@@ -1978,7 +1996,11 @@ void llvm::DisassemHelper::printRawClangAST(const ObjectFile *Obj) {
-   Optional<object::SectionRef> ClangASTSection;
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == ClangASTSectionName) {
-       ClangASTSection = Sec;
-       break;
-@@ -2015,7 +2037,11 @@ void llvm::DisassemHelper::printFaultMaps(const ObjectFile *Obj) {
- 
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == FaultMapSectionName) {
-       FaultMapSection = Sec;
-       break;
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
deleted file mode 100644
index ff0ede91ae21..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
deleted file mode 100644
index c000ce55ab71..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${P}-correctly-install.patch"
-	"${FILESDIR}/${P}-find-clang.patch"
-	"${FILESDIR}/${P}-find-lld-includes.patch"
-	"${FILESDIR}/${P}-dependencies.patch"
-	"${FILESDIR}/${P}-unbundle-yaml-cpp.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-libs/rocm-device-libs
-	dev-cpp/yaml-cpp:=
-	sys-devel/llvm-roc:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rm -rf yaml-cpp || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
deleted file mode 100644
index e357310f2535..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.6.0-dependencies.patch"
-	"${FILESDIR}/${PN}-2.6.0-unbundle-yaml-cpp.patch"
-	"${FILESDIR}/${PN}-2.7.0-llvm-interface-change.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	dev-cpp/yaml-cpp:=
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rm -rf yaml-cpp || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild
deleted file mode 100644
index ff0ede91ae21..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
index ff0ede91ae21..ca7dc037fe3d 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
@@ -30,13 +30,12 @@ RDEPEND=">=dev-libs/rocm-device-libs-${PV}
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 9c4df52b5531..1bd7ba7dcd5c 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,12 +1,4 @@
-DIST rocm-device-libs-2.10.0.tar.gz 227626 BLAKE2B a5a17f1ed4699f613523bc39bd25a566bafe53865025ccdf84cca1210d26da1f97e989d8acc35626cb21296b3c004adc6e1a985c8096c4de88c4f42b6abbb9a3 SHA512 1863f797c369b6f4097e3c966ce4f371da5f87893ffeb2d596dbb0b31aa3f6142e7359bcaf6e884754bf7a5ae246df674cd1020ca8c8e9114605ac7300715641
-DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40 SHA512 4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
-DIST rocm-device-libs-2.7.0.tar.gz 226395 BLAKE2B 85c5b7ebfca1570d9653428d4aa7052f784443c774b224b563471638caac01f9d800d0bb5d52dace2b54a447cfc00c0f39ed87ab1612f1e382fbba10c5e30e80 SHA512 2277ff4037b25d32b473b3b046708b2ce4aeb28c1df7ed4ce51893c204e5409c931083b3ecc38c6796581c1233e0d25dd0f0c5710961be8d1d60118e9a1de88a
-DIST rocm-device-libs-2.8.0.tar.gz 227320 BLAKE2B 5263acd01cd9e1002a3991232b704bfa0675d8a825b47ae9a09e1b0acadbebaeb0a61fe3df1880027a65006d4065e6d75de093c0516d41e6fd78618b08b1d258 SHA512 8c3b16096e325c9f4bc74bbd189f73c178b93b011492a9c0c38017cd53b4afef55e8f55a36c596272b7dda91811ef83ed4e1d0cbb0a623eb5647012e72a64524
-DIST rocm-device-libs-2.9.0.tar.gz 227785 BLAKE2B 903e1139d0813aaef298911a7e3c9c63c3141355c404a282ec0c1eb2532ded0d303f0550cfd142d8fc9a6219160755e658efd0d7d69302ecb23997314e502873 SHA512 d68820a6450d9b402a427df365dbd6be32e711f24256b68b887df8c78cb774c85b0a55f6033afbb7e97c951ad9cd83637194fbf5f575c2a9c8a68ea20e0bd046
-EBUILD rocm-device-libs-2.10.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
-EBUILD rocm-device-libs-2.6.0.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
-EBUILD rocm-device-libs-2.7.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
-EBUILD rocm-device-libs-2.8.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
-EBUILD rocm-device-libs-2.9.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
-EBUILD rocm-device-libs-9999.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
+DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B 8fb866611e82126b5909b75282081371ddeea58a34d732586e43dcf23d512fb8f2ad259f2c9227e35730af0d0d2b235895aa5396a7d19c2987754162d2ed6f49 SHA512 257f8990d93bf8cb0438fa15d7ca91a7f38082c90f0bb96b0691196ec78f16e790142ecef0089bc765edf80c1f0b644210e991a7e6f7e8dfab33cedad6465fa3
+EBUILD rocm-device-libs-3.0.0.ebuild 812 BLAKE2B 5989396a924acf948f4ad7f7811dbfc9ec8a58975bb8f372cfad2dbab85f255a62c20f7997626e596f601753019c7c92b9fa4fab33118934603c8b530391e075 SHA512 aec7844becdb5cd3eb7c824558d53050eb1cde213302d25a393d392fb96d7d287dffdeb8e43f4926f006d5602c501c395d0171d927b9083b0929740a5a691c89
+EBUILD rocm-device-libs-9999.ebuild 796 BLAKE2B ccab5652c04e6e30d66de263cc1354a145eb86a59d736da39adf51c6bfe1d009632f18d357765bf12f108c69e984497177606575e4bc81507029259e470aa892 SHA512 3b075f69e9aec03652a850207a5511306ffc4c947e331c3f42f13764dba875f4442d19753a9c7d483359c523ccb0ded3b3537649a0266ef0f306617d65230c28
 MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
deleted file mode 100644
index e0264de7479c..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
deleted file mode 100644
index 91d53a41976d..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-libs/rocr-runtime
-	sys-devel/llvm-roc:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild
deleted file mode 100644
index e0264de7479c..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.8.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.8.0.ebuild
deleted file mode 100644
index e0264de7479c..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.9.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
index e0264de7479c..92ef9a203b00 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.9.0.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
index 91d53a41976d..6a15eba4feea 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-hostcall/Manifest b/dev-libs/rocm-hostcall/Manifest
index f2afbc63ea07..51a8ad39dbd7 100644
--- a/dev-libs/rocm-hostcall/Manifest
+++ b/dev-libs/rocm-hostcall/Manifest
@@ -1,4 +1,4 @@
 AUX rocm-hostcall-2.7.0-install-correctly.patch 1460 BLAKE2B a635eb5e841db218d48fd70fe68956e13f496cc6beb33f37ad1cdc237fd9168f2f48fcec951b0904016b114008f6270bf2df3f91e2269e2db3055b9ecdc7726f SHA512 faa49431ca93dc446deed02706aac06ff7ed7f7877a9c5e4611e7b653feaf3eedaa9d1300c328f54663c082dd033a464aa90ce46b30b733573763c5f30245ced
 DIST rocm-hostcall-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
-EBUILD rocm-hostcall-2.7.0.ebuild 866 BLAKE2B b49f21e9d48418cbb7831f41a340fc36301083589e28cef71e52a49abc7a1e2771d69507cc2b5f4c62914b5ca62efd40f9c5a7ff1530b842838f742c12d32d31 SHA512 8ca7162104c4045b2591f41c9b1d936d47f5ce7949458c68831cafe5e1d716aaf23fc3c2935f71303ac75d682576213bc629537ab9124217492c512aee54974e
+EBUILD rocm-hostcall-2.7.0.ebuild 745 BLAKE2B 94df0bde86f5bb30e9a0398d6957234f2255e985129c731343050a424f52f28f7e826dfd01477915d1d852aa39c65b77ac55a000be6fdb53f7bad43059d41e42 SHA512 b292806f98599ac03df344714c73f78084864bba20f42878e09812b99aa1d201b4821cabe5e6871f8f02408121f9a73ac66e58928cc00f9f5398bb7da7cb9ace
 MISC metadata.xml 477 BLAKE2B ec5920ba7f035d1122905dc096529265b11b9c6f9bc5b65552d528891f76334b4f105b7339a3180760c31e10ccbca5a2454018d4ebd10d1884e27c742c6b59f6 SHA512 738e3d6ecfdae4b69714187789223b16a8483bd4e93d830af0898b5f536312011efb74f7af1f046a76dcd6169181b67dcf00a9188959551c865aabbb8e1ec259
diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
index 848a8f3a5408..d758811b4785 100644
--- a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
+++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
@@ -25,10 +25,3 @@ SLOT="0/$(ver_cut 1-2)"
 
 RDEPEND="dev-libs/rocr-runtime"
 DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest
index 0ddd0885ad77..60e2e4872b75 100644
--- a/dev-libs/rocm-opencl-driver/Manifest
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -1,14 +1,3 @@
-AUX rocm-opencl-driver-2.6.0-install-correctly.patch 1931 BLAKE2B a0bb45e0bf08b777e88804cfe77eadebe1181aa4488885333c9996bbaa0177f7211b16f1fac30e743d53efaa63f59c28b2e928eb2ed6e5396ee2fa6862782caa SHA512 547bf0901a7ef8ac3ae3822dff77ab3409f39c6038c906acfa49579c7652dcd44d235331bd44cab2e5abb9ce1adcc75320f7476cc88666a45d303352e09ef20c
-AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552edf7fc89608dc7ff3d7ebe353c88759707e37ec9597a2b6a4cd982a17bf87e30f8f6def80a3a1fd866769b3f2d2572dd8506804ce7e3143 SHA512 f8569519b47f194f58fcb3a2b54f51157be792200004c7bebfde6fb7fea574eac3bec69ab0ea73ff4ef030a9335fdaa21ae22e8655661fab65e11a1a0492395f
-AUX rocm-opencl-driver-2.7.0-libraries.patch 1062 BLAKE2B 9c95bf1928542e0eccaec1927ed6bfb3d81624e29c4bc1873ade263312f5f97c896d6d19922d471c99fbb7eef3e5e7aca2f06a73ac0ed1b475386e5807f9c893 SHA512 3f490d80d08e8ffc7b843dbe33425240820eadc66973e148aca38aadc82c39e80b0e22f2937bff3b0e95cc53f73bf2ffa4fc50c80ba755b251d83e95275c8194
 DIST rocm-opencl-driver-2.10.0.tar.gz 21380 BLAKE2B 0ffdeb00b8d35a2619f37c6aa5efa53259151b2dfca8fd2dbd2dbaa49c9806599199340043a310cb8b855384d276d482e401ccbdf60cbff8c9efc1a80241df66 SHA512 dc6ba05c2a641c0379590af71ca28425495297b753eb4bcc5ff37f44f15a5d0a7f5477c3a426aa5350df969a6a6dabbeb4a71b3ae4b4ad63abd28b28ec87837e
-DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
-DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B 8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2 SHA512 ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b
-DIST rocm-opencl-driver-2.8.0.tar.gz 21345 BLAKE2B 91ecfaf145cb4c9cc9407ca79d90fc480d25b0d2afd1b0ed7c5af7d970ed729255c7ca0a27a5729640d4ea42a2ce2450fdf5eb92aa124ad95340afea185dcf16 SHA512 d610f0e50714efa159440001a67ec7589fbd366fde953e9c789a737875dcd82a8c30fcefc3825467c1e5db7c53bcc26eb9658f2f71662acd5e021ef117ddf336
-DIST rocm-opencl-driver-2.9.0.tar.gz 21351 BLAKE2B 341e0e648f28740695dd16dc4039c1f800b3225af96a407594ce200fd6f7ff74278a8e80c44b83218cfd9fe76b33ca3b5ab0d3ef4b69156c88a6c063ce650bc0 SHA512 87a304b0864f5d0a09aff0f355d62ccbe3ea2c46f462da7acaec138d013b5e9e1f92d97afb81c86768184e05a26f3dd43d0a63cbdab3a651b410fb8c71bb1882
-EBUILD rocm-opencl-driver-2.10.0.ebuild 1111 BLAKE2B 5889949bfae15b1fc4306ab8fa7e3db954c094fa5c730d77dc762572872825e24afaf8765826e0bac1adbcafa1034912da50f651c6d15e971e03bb97b1337a39 SHA512 b47a5d08fc879673e20afc4a4d74779dba2436837ac7da5766139db4161ae98481549ef83ebf87f6223a7d1424a4ef039041f63e318179ce37294a7da8439072
-EBUILD rocm-opencl-driver-2.6.0.ebuild 1193 BLAKE2B 524c81f5e129efe47dff911dbe0a15c88d490d8b24849794e5f5ffc4f42a43bb690b262b2682b0a70245b9d6bbe20fb2fcf6f8866ec6aeff1b5e2f69a0a3ab81 SHA512 63f94d3915640420df9ecf0e55c11fbb59011be624d0a9b9a35522f39ac6038a1b90d87d90741b6703082672c8d3abe1097a9f22631eb39182c9139a5d574151
-EBUILD rocm-opencl-driver-2.7.0.ebuild 1266 BLAKE2B 8936a5da49a5e8318c36ed3ac1b49bf14b812c17b7f3a01bc05d5f5866cc666d00f1888ccf779c34cfa8372b83d1e6a5986422bcf34919d6e02dea23b8c2309c SHA512 4094f24576c450cf81b33509fcc80f44e142d7df62fd8a508bbb4b86c690e51fc02c25f61bb1c781ec7ba10c0f59ea7e1c3baad94743507ba014a074c9171031
-EBUILD rocm-opencl-driver-2.8.0.ebuild 1215 BLAKE2B 0a7943af5cb400223b58aedec47711f04306372f79e05e9dd1e05f430957b8613c488b75d4af9c9f766ea5a39ec3ac14febb7a8843c0bf29700013807441d1b3 SHA512 5d4f4d4e5d04d7437dd69fb377dae3012e5a298d7879845ef8baa0627ffa62189e7089254f5d88500a17e9120853fc7648fd5f1a4f20f715c40f7183f008714e
-EBUILD rocm-opencl-driver-2.9.0.ebuild 1215 BLAKE2B 0a7943af5cb400223b58aedec47711f04306372f79e05e9dd1e05f430957b8613c488b75d4af9c9f766ea5a39ec3ac14febb7a8843c0bf29700013807441d1b3 SHA512 5d4f4d4e5d04d7437dd69fb377dae3012e5a298d7879845ef8baa0627ffa62189e7089254f5d88500a17e9120853fc7648fd5f1a4f20f715c40f7183f008714e
+EBUILD rocm-opencl-driver-2.10.0.ebuild 1050 BLAKE2B 48aaa6a16d842d12a502f82a9f7f909ce3497e006b3c270a8dc95360af3532c3ba66da61e8bd89c30f621a8f8956ed559b434c824c2ce3334bb36fe1c2d41946 SHA512 ea263e15256a9e9337bb7a434538e97dd259065209350f63ac2d59d3fff9d6e5e40f7c4b2b247c3d50e6cd89ccd105a7cb085ad70e6a2de579a86e5295f6b52c
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
deleted file mode 100644
index d70f0977ec8f..000000000000
--- a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/85
-
-From 8819a684c9b6e154abedc041b3da545aab353d67 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 26 Jul 2019 15:54:59 -0400
-Subject: [PATCH] Use GNUInstallDirs to install to standard locations
-
-Some distributions require 64 bit libraries to be installed to lib64, for example.
-Using GNUInstallDirs ensures that files are installed to the expected locations.
----
- CMakeLists.txt            | 3 +++
- src/driver/CMakeLists.txt | 2 +-
- src/roc-cl/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1759b7..d21e9da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,9 @@
- 
- cmake_minimum_required(VERSION 2.8)
- 
-+## Include common cmake modules
-+include ( GNUInstallDirs )
-+
- # Build ROCm-OpenCL-Driver with ccache if the package is present.
- set(ROCM_OPENCL_DRIVER_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
- if(ROCM_OPENCL_DRIVER_CCACHE_BUILD)
-diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
-index 7046e34..55ed13f 100644
---- a/src/driver/CMakeLists.txt
-+++ b/src/driver/CMakeLists.txt
-@@ -90,4 +90,4 @@ target_link_libraries(opencl_driver
- target_link_libraries(opencl_driver ${llvm_libs})
- target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
--install(TARGETS opencl_driver DESTINATION lib)
-+install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/src/roc-cl/CMakeLists.txt b/src/roc-cl/CMakeLists.txt
-index 5037453..a8e2801 100644
---- a/src/roc-cl/CMakeLists.txt
-+++ b/src/roc-cl/CMakeLists.txt
-@@ -54,4 +54,4 @@ link_directories(${LLVM_LIBRARY_DIRS})
- add_executable(roc-cl ${sources})
- target_link_libraries(roc-cl opencl_driver)
- 
--install(TARGETS roc-cl RUNTIME DESTINATION bin)
-+install(TARGETS roc-cl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
deleted file mode 100644
index b37100994e04..000000000000
--- a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 1258a99decf96092de8ea512150209e14152ed9c Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 30 Jul 2019 16:46:20 -0400
-Subject: [PATCH] Install AmdCompiler.h header
-
-ROCm-OpenCL-Runtime uses AmdCompiler.h so it should be installed to the system and made available for use
----
- src/driver/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
-index 55ed13f..8f68fb7 100644
---- a/src/driver/CMakeLists.txt
-+++ b/src/driver/CMakeLists.txt
-@@ -91,3 +91,4 @@ target_link_libraries(opencl_driver ${llvm_libs})
- target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
- install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install(FILES AmdCompiler.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch
deleted file mode 100644
index 9e2a06aac979..000000000000
--- a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/88
-
-From f49ad81e246f1c196cf86f40cf44dfedec0675f1 Mon Sep 17 00:00:00 2001
-From: Mike Lothain <mike@fireburn.co.uk>
-Date: Tue, 27 Aug 2019 11:32:47 +0100
-Subject: [PATCH] Include more link libraries
-
-This is required to get dev-libs/rocm-opencl-driver-2.7.0 compiling for me on Gentoo
-
-I think it might be related to using -Wl,--as-needed in my link flags globally
----
- src/driver/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
-index 55ed13f..b93356d 100644
---- a/src/driver/CMakeLists.txt
-+++ b/src/driver/CMakeLists.txt
-@@ -60,9 +60,13 @@ llvm_map_components_to_libnames(llvm_libs
-   AllTargetsDescs
-   AllTargetsDisassemblers
-   AllTargetsInfos
-+  BitWriter
-   CodeGen
-+  IRReader
-+  Linker
-   MC
-   MCDisassembler
-+  MCParser
-   Object
-   Symbolize
-   Core
-@@ -83,6 +87,7 @@ target_link_libraries(opencl_driver
-   clangLex
-   clangBasic
-   clangCodeGen
-+  clangSerialization
-   lldELF
-   lldCore
-   LLVMDebugInfoDWARF
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
index 7d1b111fda23..1afe25e122a5 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
@@ -30,13 +30,12 @@ src_prepare() {
 	# remove unittest, because it downloads additional file from github.com
 	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
deleted file mode 100644
index 944093474098..000000000000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/llvm-roc:=
-	dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-install-correctly.patch"
-	"${FILESDIR}/${P}-install-header.patch"
-)
-
-src_prepare() {
-	# remove unittest, because it downloads additional file from github.com
-	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
deleted file mode 100644
index 4d9d844cb8f2..000000000000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:=
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-install-correctly.patch"
-	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
-	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
-)
-
-src_prepare() {
-	# remove unittest, because it downloads additional file from github.com
-	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
deleted file mode 100644
index 976d316de6ab..000000000000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:=
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
-	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
-)
-
-src_prepare() {
-	# remove unittest, because it downloads additional file from github.com
-	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
deleted file mode 100644
index 976d316de6ab..000000000000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:=
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
-	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
-)
-
-src_prepare() {
-	# remove unittest, because it downloads additional file from github.com
-	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index df6b4da3c90f..a4e884546e6b 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,17 +1,9 @@
-AUX rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch 56337 BLAKE2B bfb8265b4c901d9c71c8bacae34e43f9e951be3b7c2feb0eb76d9ceb62535a8924882c9383b7e7abf71f8aa6d22da9c78f46b9d7ba5c10e9127f05b922e85187 SHA512 660b4fd2d0d0a1aee5a3683806b5f2491bfb551101c569a297b4fd32ded507787e98cd3fea85e9f9ad4476324da407a5d527bc967e43582fc8edf9eac5caa614
 AUX rocm-opencl-runtime-2.8.0-amdocl64icd.patch 582 BLAKE2B 28e97a03f6696503b1ddc3d1720d3aa9f4e807b2e5fd01771e81f3bda61350cc580e961a90ed07499a8625ea6178e34e15f117115719a6bf04046c758eb95f46 SHA512 938abe8eadcef1d703c797f1716c5588dbe0267d5bb1e3eeb0e46b5fc52f6976751348f402332d07f3c56007e64dac672112170fc33c13cb4314a2a299735142
 AUX rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch 2778 BLAKE2B 5fe2c74631db679788767a4488d2157660e0c1c1e4291165e1d0c52c29c8d976ff5b2f691ff128ec49778d0cc2855bcfc73c3dfc0ed831d3fac114445e272408 SHA512 8c34c570957b5f25f9347b50baf47342f84f6a398e77f7b9d007d2861947b70dace27ae016c23a7959a6d936fdbe24980acc1a253a7bcaff95eea11283c89901
-AUX rocm-opencl-runtime-2.8.0-change-install-location.patch 5344 BLAKE2B f634d0d3c7f3d54e6fc30ba1228575e6ba95fda21ca63bcf4745d3d9ac8ec6eb6b0a02aab4f7ca7d5e50db61ed567073dadf84d028f5f77314cba4b57b2db480 SHA512 d5bf8459e1ceed074042664ce66608de8806b274ad12f4d1dd3487b0eb82a34295ad85c490d93d3392b82be98fe7077f78320825015df76c5d9f87a3a28e1e55
 AUX rocm-opencl-runtime-2.8.0-change-opencl.patch 3886 BLAKE2B e9833c8486757214876aba32f52722189497e5a1975cd6f7a4d64388a9cd52bfcf114625906b671cf73de052e42101ab3be7a43562c2983fe9e2ccfece3b83c8 SHA512 ae49608277493259d1348c8bce912b4d489a9edb16b0e6460336f4468530460362b2e95ac85c57543edfb8ed57b93e01f73a9b3e9012a8a333eba9eb52d80d8f
 AUX rocm-opencl-runtime-2.8.0-update-README.patch 1263 BLAKE2B f6fb48bc8ea55480c157d0963b859b47acd914adc77a1ba2780b058f50dbe820100355ec2f73badc6e0618c0b2fb39285b6589587efcf2ded1b9cce62354ec7c SHA512 4351eb77a2d5f7cdf8e014965428624b35a2314edb63f65a34f5939fab9975733b3cfa4f70a8bee2e1c3368c6ed6bbbd568a941ed370b5a9a07cc347795577df
+AUX rocm-opencl-runtime-3.0.0-change-install-location.patch 5316 BLAKE2B 3c8770657f5b944f7943454c78a89ecd473e4ec9a78652f74ceee65b0388f33cbecde57954a4d3ede84b36cb5f0850407b19fb7e342c38f6a790fb17796da079 SHA512 35a603e71139d2375d5769406de447eaa87439617e42bfc2ddb3736a32e0841fab216622c2bb45560e77489584c87e60d0fddef8fa912c841fb704ba8c635256
 DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
-DIST OpenCL-ICD-Loader-bc9728edf8cace79cf33bf75560be88fc2432dc4.tar.gz 62858 BLAKE2B 931fb7ade12debda99512d8b9fbfb987f47e3b68568863e480de406f842a014d39f0321c44420fb8b68b8757d49cc02cadf82e767c9d2b71e53bdb8e9763cace SHA512 2ab9035fbc0a80a529d1b2f454b0b9a263b6eff601121750e81e2e32581f06189566cdcf201ab741ff3f1491ead825a7858000901f8042af67b1304be622e9fa
-DIST rocm-opencl-runtime-2.10.0.tar.gz 965836 BLAKE2B 2eeb3449939389d684b016a5eabfbac6491079d4a2ebb78ef3baeb47dcd0e6e2f4e32fb788ad28f704f2564b463759b8e433517eb6bb63d3c3d43d25e524f846 SHA512 c5142391bb2d0ff92c509745da63eda8ebdbf2dd7223dbd545e394b5b716b4f0c666de3ab48f0eae94f51967185930cdf1f0cc4822d24932a2473c1a2db5f76c
-DIST rocm-opencl-runtime-2.6.0.tar.gz 986155 BLAKE2B 43469ec3a368e2ee9716a38d08df48c28165a233bd80de54f286011df25782a197e252e8e41ffa8f59eecf93d6beae5434497e8d4b648676252d32a0859ba59a SHA512 bbbbd29bf23f93440135786600cca28a806714bb207b7ad0947d26471fa38470820e7801acc84380000d43d55ff2ec1d95cee9e64b500628b6a3b026744c67df
-DIST rocm-opencl-runtime-2.8.0.tar.gz 976851 BLAKE2B 4191c2f027f615a8ba7a38d30364549df509e6bd432e5bfe3d30d40fb6bade15b58fe824b5aa9704e5d93421f28e1067d283738fa85e7ec59a444f5be25c963c SHA512 6c070d3e2f455d96f028f614f0562c0b8983b457c6295c398d6d4574133d4a7384573caa1f32e39550887861aa09aa19c9e34fc8bbae6ddc41ae395969d33540
-DIST rocm-opencl-runtime-2.9.0.tar.gz 980980 BLAKE2B b72c9659ca8ac6b12d0c5c8c204a2a481c9e057e1b6aa80e24b57e141538c345025bfe74143ee2450bb013ff1b45a314538965fdc071a6e925967368baabfb94 SHA512 9d9742da94d4dd7326e6f64042418726f8fcaa05b3a02b6a7760b2f17067747a2a5f37183a4245697211ceb21e4fa0870dfeca9970b4fd3794985311d6ff7d0f
-EBUILD rocm-opencl-runtime-2.10.0.ebuild 1793 BLAKE2B 9b3909bced5bfbf8bbd352eb07b461ed56537738ab78aa6ea3c2636d8249fce0666ae15014732b3bdeac87a307aeaa0ddaf7d3f1b5811d46dd3f8b2f06aa8148 SHA512 87b6780b899bb1642855e6191d632746e037e9424260c57a5577cad279cf6510ba370107664315971a30459b7b2cb10abce936d3ebbb2e2d30deec41ba5dc1e1
-EBUILD rocm-opencl-runtime-2.6.0-r1.ebuild 1483 BLAKE2B 7271f4b536f08c31031d4e4a38a5b9741cbd7d24799c508205dd3c9f39905173426aac248528864c41de8598bc798c55999c2c1c79d44c7ec84909dc0090a892 SHA512 81180ca79e5d5d4b3b1518f3e7a1947ff57abfb50c71006511a08f15e1d94761496eb8e8c36b76a8493bc2ac1ac43ea836c8663e1130c03b4df638d012aed49c
-EBUILD rocm-opencl-runtime-2.8.0.ebuild 1758 BLAKE2B 2dfefc99a572eed6ba4283aa11afd45716145000599967d43e77dfb6b61fb0c61a801d44f4d389b4f69a84928f1328adbe0c0cced46f3ad73ce8f2947963ebc0 SHA512 ba6ecbe7d355c4494bc68a0c1dbb4760147cb4c8ae43977055635a1f5e4d83054aef90f784db55b14af32af709077902a8a90bf776fb6b8d0949ff1db944a87a
-EBUILD rocm-opencl-runtime-2.9.0.ebuild 1793 BLAKE2B 9b3909bced5bfbf8bbd352eb07b461ed56537738ab78aa6ea3c2636d8249fce0666ae15014732b3bdeac87a307aeaa0ddaf7d3f1b5811d46dd3f8b2f06aa8148 SHA512 87b6780b899bb1642855e6191d632746e037e9424260c57a5577cad279cf6510ba370107664315971a30459b7b2cb10abce936d3ebbb2e2d30deec41ba5dc1e1
+DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
+EBUILD rocm-opencl-runtime-3.0.0.ebuild 1750 BLAKE2B f6dc34d1ed9a7ed3c661f9222b01c71c1597921cf957f1cc9a1fc06e4a19efe2144b0e0930ea91040586b2e2ca07cd7ce088bbe0c26cefa8665e02b36a07ea89 SHA512 9a2d0b17e375c6e0155a69a18e0d170ee24b9a3986659ff9f46cb6678b3eb364f811fe9f14b96874e0ed16411a4668b0f75facd15fd37909293afc53e3b41ec9
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
deleted file mode 100644
index 379dd11e9f99..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
+++ /dev/null
@@ -1,1233 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ebdfc25..fb1c3eb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,8 @@ endif()
- 
- project(OpenCL-ROCm)
- 
-+include (GNUInstallDirs)
-+
- # Add path for custom modules
- set(CMAKE_MODULE_PATH
-   ${CMAKE_MODULE_PATH}
-@@ -38,38 +40,28 @@ set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
- # override default option value in library and driver
- set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
- 
--add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
--
--find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm NO_DEFAULT_PATH)
-+find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
- 
- list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
- include(AddLLVM)
- 
- add_definitions(${LLVM_DEFINITIONS})
--# TODO: add find_package for Clang and lld, and also use LLVM/Clang variables got from their config
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
--include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
--
--# TODO: move AMDGPU.h header to include folder
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
--include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
--
--if(${USE_COMGR_LIBRARY} MATCHES "yes")
--  set(COMGR_DYN_DLL "yes")
--  add_definitions(-DCOMGR_DYN_DLL="yes")
--  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
--  add_definitions(-DUSE_COMGR_LIBRARY)
--else()
--  add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
--endif()
-+set(USE_COMGR_LIBRARY "yes")
-+find_package(amd_comgr REQUIRED CONFIG)
-+add_definitions(-DUSE_COMGR_LIBRARY)
-+FOREACH(DIR ${LLVM_INCLUDE_DIRS})
-+  include_directories("${DIR}")
-+  include_directories("${DIR}/clang")
-+  include_directories("${DIR}/lld")
-+  # TODO: move AMDGPU.h header to include folder
-+  include_directories("${DIR}/llvm/Target/AMDGPU")
-+ENDFOREACH()
- 
- set(BUILD_HC_LIB OFF CACHE BOOL "")
- set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
- set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
- set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
- set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa-amdgizcl")
--add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
- 
- add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
- 
-@@ -82,28 +74,6 @@ set(OPENCL_INCLUDE_DIRS
-   ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
- 
- add_subdirectory(api/opencl/amdocl)
--add_subdirectory(api/opencl/khronos/icd)
--
--add_subdirectory(tools/clinfo)
--
--install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
--        DESTINATION bin/x86_64
--        COMPONENT libraries)
--
--install(PROGRAMS $<TARGET_FILE:OpenCL>
--        DESTINATION lib/x86_64
--        COMPONENT applications)
--
--install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
--        DESTINATION lib/x86_64
--        COMPONENT libraries)
--
--install(DIRECTORY
--        "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
--        DESTINATION include
--        COMPONENT libraries
--        USE_SOURCE_PERMISSIONS
--        PATTERN cl_egl.h EXCLUDE)
- 
- foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS})
-   get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME)
-diff --git a/README.md b/README.md
-index a834965..e319be2 100644
---- a/README.md
-+++ b/README.md
-@@ -7,13 +7,6 @@ Developer preview Version 2 of the new
- * Supports offline ahead of time compilation today; during the Beta phase we will add in-process/in-memory compilation.
- 
- 
--## GETTING REPO
--
--Repo is a git wrapper that manages a collection of git repositories. Install this tool and add it to the command search PATH:
--
--    curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
--    chmod a+x ~/bin/repo
--
- ## GETTING THE SOURCE CODE
- 
- Main OpenCL™ Compatible Components:
-@@ -26,11 +19,6 @@ Main OpenCL™ Compatible Components:
- * https://github.com/RadeonOpenCompute/lld 
- * https://github.com/KhronosGroup/OpenCL-ICD-Loader
- 
--Download the git projects with the following commands:
--
--    ~/bin/repo init -u https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git -b master -m opencl.xml
--    ~/bin/repo sync
--    
- ## INSTALL ROCm
- 
- Follow the instructions at https://rocm.github.io/install.html to install ROCm.
-@@ -45,6 +33,11 @@ Copy the amdocl64.icd file to /etc/OpenCL/vendors
- 
- To install additional dependencies:
- 
-+* ROCm-OpenCL-Runtime
-+* ROCm-OpenCL-Driver
-+* ROC versions of LLVM, Clang, and lld
-+* ROCm-Device-Libs
-+* OpenCL-ICD-Loader
- * OCaml
- * findlib
- * A Python 2 environment or active virtualenv with the Microsoft Z3 package
-diff --git a/api/opencl/amdocl/CMakeLists.txt b/api/opencl/amdocl/CMakeLists.txt
-index 91bd42f..8606c98 100644
---- a/api/opencl/amdocl/CMakeLists.txt
-+++ b/api/opencl/amdocl/CMakeLists.txt
-@@ -21,7 +21,6 @@ include_directories(${CMAKE_SOURCE_DIR}/api/opencl)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
--include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
-@@ -67,6 +66,9 @@ add_library(amdocl64 SHARED
-   ${ADDITIONAL_LIBRARIES}
- )
- 
--target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES})
-+target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES} LLVMBitWriter LLVMIRReader LLVMLinker LLVMMCParser amd_comgr)
- 
--install(TARGETS amdocl64 LIBRARY DESTINATION lib/x86_64 COMPONENT applications)
-+install(TARGETS amdocl64 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT applications)
-+
-+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
-+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
-diff --git a/api/opencl/amdocl/cl_execute.cpp b/api/opencl/amdocl/cl_execute.cpp
-index 0336353..ee799e6 100644
---- a/api/opencl/amdocl/cl_execute.cpp
-+++ b/api/opencl/amdocl/cl_execute.cpp
-@@ -10,7 +10,7 @@
- #include "platform/program.hpp"
- #include "os/os.hpp"
- 
--#include <icd/icd_dispatch.h>
-+#include <icd/loader/icd_dispatch.h>
- 
- /*! \addtogroup API
-  *  @{
-diff --git a/api/opencl/amdocl/cl_icd.cpp b/api/opencl/amdocl/cl_icd.cpp
-index 71b886c..7e4e317 100644
---- a/api/opencl/amdocl/cl_icd.cpp
-+++ b/api/opencl/amdocl/cl_icd.cpp
-@@ -10,7 +10,7 @@
- #include "cl_d3d11_amd.hpp"
- #endif  //_WIN32
- 
--#include <icd/icd_dispatch.h>
-+#include <icd/loader/icd_dispatch.h>
- 
- #include <mutex>
- 
-diff --git a/opencl.xml b/opencl.xml
-deleted file mode 100644
-index 4813651..0000000
---- a/opencl.xml
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<manifest>
--  <remote name="RadeonOpenCompute" fetch="https://github.com/RadeonOpenCompute/"/>
--  <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/"/>
--
--  <default remote="RadeonOpenCompute" revision="refs/tags/roc-2.6.0" sync-c="true" sync-j="4"/>
--
--  <project path="opencl" name="ROCm-OpenCL-Runtime"/>
--  <project path="opencl/compiler/driver" name="ROCm-OpenCL-Driver"/>
--  <project path="opencl/compiler/llvm" name="llvm" revision="refs/tags/roc-ocl-2.6.0"/>
--  <project path="opencl/compiler/llvm/tools/clang" name="clang"/>
--  <project path="opencl/compiler/llvm/tools/lld" name="lld" revision="refs/tags/roc-ocl-2.6.0"/>
--
--  <project path="opencl/library/amdgcn" name="ROCm-Device-Libs" revision="refs/tags/roc-ocl-2.6.0"/>
--
--  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup" revision="7433f2acbf5bbc400f26494ff1dc895da6265bef"/>
--</manifest>
-diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
-index 62e2bf7..5e4abae 100644
---- a/runtime/CMakeLists.txt
-+++ b/runtime/CMakeLists.txt
-@@ -14,8 +14,6 @@ include_directories(${CMAKE_SOURCE_DIR}/api/opencl)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers)
- include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
--include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
- include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
-@@ -36,6 +34,7 @@ add_library(oclruntime OBJECT
-   utils/flags.cpp
-   utils/debug.cpp
-   device/appprofile.cpp
-+  device/comgrctx.cpp
-   device/device.cpp
-   device/hwdebug.cpp
-   device/blitcl.cpp
-@@ -63,6 +62,8 @@ add_library(oclruntime OBJECT
-   ${CMAKE_SOURCE_DIR}/compiler/tools/caching/cache.cpp
- )
- set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
-+add_dependencies(oclruntime opencl1.2-c.amdgcn.inc_target)
-+add_dependencies(oclruntime opencl2.0-c.amdgcn.inc_target)
- 
- set(AMDGCN_DEP_LIST)
- if(AMDGCN_TARGETS_LIB_DEPS)
-diff --git a/runtime/device/device.hpp b/runtime/device/device.hpp
-index 450cd69..8134fa2 100644
---- a/runtime/device/device.hpp
-+++ b/runtime/device/device.hpp
-@@ -21,7 +21,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) && !defined(USE_COMGR_LIBRARY)
- #include "caching/cache.hpp"
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
- #include "acl.h"
- 
-diff --git a/runtime/device/devprogram.cpp b/runtime/device/devprogram.cpp
-index 22fb125..3d475b2 100644
---- a/runtime/device/devprogram.cpp
-+++ b/runtime/device/devprogram.cpp
-@@ -14,7 +14,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #include "libraries.amdgcn.inc"
- #include "opencl1.2-c.amdgcn.inc"
- #include "opencl2.0-c.amdgcn.inc"
-diff --git a/runtime/device/devprogram.hpp b/runtime/device/devprogram.hpp
-index 67af239..8390e7d 100644
---- a/runtime/device/devprogram.hpp
-+++ b/runtime/device/devprogram.hpp
-@@ -11,7 +11,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #else
- #include "amd_comgr.h"
- #endif
-diff --git a/runtime/device/rocm/CMakeLists.txt b/runtime/device/rocm/CMakeLists.txt
-index 4ce7c45..617bece 100644
---- a/runtime/device/rocm/CMakeLists.txt
-+++ b/runtime/device/rocm/CMakeLists.txt
-@@ -1,3 +1,21 @@
-+find_package(Clang REQUIRED CONFIG)
-+
-+# FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but
-+# really there is no way to reliably discover this header.
-+#
-+# We effectively back up to the Clang output directory (for the case of a build
-+# tree) or install prefix (for the case of an installed copy), and then search
-+# for a file named opencl-c.h anywhere below that. We take the first result in
-+# the case where there are multiple (e.g. if there is an installed copy nested
-+# in a build directory). This is a bit imprecise, but it covers cases like MSVC
-+# adding some additional configuration-specific subdirectories to the build
-+# tree but not to an installed copy.
-+file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h")
-+list(GET OPENCL_C_H_LIST 0 OPENCL_C_H)
-+if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}")
-+  message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.")
-+endif()
-+
- include(bc2h)
- 
- set(INC_SUFFIX "amdgcn.inc")
-@@ -74,8 +92,8 @@ endforeach()
- 
- # generating opencl*.inc files
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch
--  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
--  DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
-+  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${OPENCL_C_H}
-+  DEPENDS clang ${OPENCL_C_H}
-   COMMENT "Generating opencl1.2-c.amdgcn.pch"
- )
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc
-@@ -88,8 +106,8 @@ add_custom_target(opencl1.2-c.amdgcn.inc_target ALL DEPENDS ${CMAKE_CURRENT_BINA
- add_dependencies(oclrocm opencl1.2-c.amdgcn.inc_target)
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch
--  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
--  DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
-+  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${OPENCL_C_H}
-+  DEPENDS clang ${OPENCL_C_H}
-   COMMENT "Generating opencl2.0-c.amdgcn.pch"
- )
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc
-diff --git a/runtime/device/rocm/rocdevice.cpp b/runtime/device/rocm/rocdevice.cpp
-index 8b9901b..2648459 100644
---- a/runtime/device/rocm/rocdevice.cpp
-+++ b/runtime/device/rocm/rocdevice.cpp
-@@ -20,7 +20,7 @@
- #include "device/rocm/rocvirtual.hpp"
- #include "device/rocm/rocprogram.hpp"
- #if defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
- #include "device/rocm/rocmemory.hpp"
- #include "device/rocm/rocglinterop.hpp"
-diff --git a/runtime/device/rocm/rockernel.cpp b/runtime/device/rocm/rockernel.cpp
-index 8a28acc..7d5b62d 100644
---- a/runtime/device/rocm/rockernel.cpp
-+++ b/runtime/device/rocm/rockernel.cpp
-@@ -11,7 +11,7 @@
- 
- #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif
- #include "llvm/Support/AMDGPUMetadata.h"
- 
-diff --git a/runtime/device/rocm/rocprogram.cpp b/runtime/device/rocm/rocprogram.cpp
-index 191e58c..58d82e6 100644
---- a/runtime/device/rocm/rocprogram.cpp
-+++ b/runtime/device/rocm/rocprogram.cpp
-@@ -11,7 +11,7 @@
- #include <gelf.h>
- #include "libraries.amdgcn.inc"
- #ifndef USE_COMGR_LIBRARY
--#include "driver/AmdCompiler.h"
-+#include "AmdCompiler.h"
- #endif
- #endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
- 
-diff --git a/runtime/platform/object.hpp b/runtime/platform/object.hpp
-index 8ab1b68..b33a9e3 100644
---- a/runtime/platform/object.hpp
-+++ b/runtime/platform/object.hpp
-@@ -9,7 +9,7 @@
- #include "os/alloc.hpp"
- #include "thread/monitor.hpp"
- #include "utils/util.hpp"
--#include <icd/icd_dispatch.h>
-+#include <icd/loader/icd_dispatch.h>
- 
- 
- #define KHR_CL_TYPES_DO(F)                                                                         \
-diff --git a/tools/clinfo/CMakeLists.txt b/tools/clinfo/CMakeLists.txt
-deleted file mode 100644
-index 974a46f..0000000
---- a/tools/clinfo/CMakeLists.txt
-+++ /dev/null
-@@ -1,13 +0,0 @@
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--
--set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
--
--include_directories(${OPENCL_INCLUDE_DIRS})
--
--add_definitions(-DHAVE_CL2_HPP)
--
--add_executable(clinfo clinfo.cpp)
--
--target_link_libraries(clinfo OpenCL)
--
--install(TARGETS clinfo DESTINATION bin)
-diff --git a/tools/clinfo/clinfo.cpp b/tools/clinfo/clinfo.cpp
-deleted file mode 100644
-index c5afb7f..0000000
---- a/tools/clinfo/clinfo.cpp
-+++ /dev/null
-@@ -1,832 +0,0 @@
--/* ============================================================
--
--Copyright (c) 2010 Advanced Micro Devices, Inc.  All rights reserved.
--
--Redistribution and use of this material is permitted under the following
--conditions:
--
--Redistributions must retain the above copyright notice and all terms of this
--license.
--
--In no event shall anyone redistributing or accessing or using this material
--commence or participate in any arbitration or legal action relating to this
--material against Advanced Micro Devices, Inc. or any copyright holders or
--contributors. The foregoing shall survive any expiration or termination of
--this license or any agreement or access or use related to this material.
--
--ANY BREACH OF ANY TERM OF THIS LICENSE SHALL RESULT IN THE IMMEDIATE REVOCATION
--OF ALL RIGHTS TO REDISTRIBUTE, ACCESS OR USE THIS MATERIAL.
--
--THIS MATERIAL IS PROVIDED BY ADVANCED MICRO DEVICES, INC. AND ANY COPYRIGHT
--HOLDERS AND CONTRIBUTORS "AS IS" IN ITS CURRENT CONDITION AND WITHOUT ANY
--REPRESENTATIONS, GUARANTEE, OR WARRANTY OF ANY KIND OR IN ANY WAY RELATED TO
--SUPPORT, INDEMNITY, ERROR FREE OR UNINTERRUPTED OPERA TION, OR THAT IT IS FREE
--FROM DEFECTS OR VIRUSES.  ALL OBLIGATIONS ARE HEREBY DISCLAIMED - WHETHER
--EXPRESS, IMPLIED, OR STATUTORY - INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
--WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
--ACCURACY, COMPLETENESS, OPERABILITY, QUALITY OF SERVICE, OR NON-INFRINGEMENT.
--IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. OR ANY COPYRIGHT HOLDERS OR
--CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE,
--EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
--OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, REVENUE, DATA, OR PROFITS; OR
--BUSINESS INTERRUPTION) HOWEVER CAUSED OR BASED ON ANY THEORY OF LIABILITY
--ARISING IN ANY WAY RELATED TO THIS MATERIAL, EVEN IF ADVISED OF THE POSSIBILITY
--OF SUCH DAMAGE. THE ENTIRE AND AGGREGATE LIABILITY OF ADVANCED MICRO DEVICES,
--INC. AND ANY COPYRIGHT HOLDERS AND CONTRIBUTORS SHALL NOT EXCEED TEN DOLLARS
--(US $10.00). ANYONE REDISTRIBUTING OR ACCESSING OR USING THIS MATERIAL ACCEPTS
--THIS ALLOCATION OF RISK AND AGREES TO RELEASE ADVANCED MICRO DEVICES, INC. AND
--ANY COPYRIGHT HOLDERS AND CONTRIBUTORS FROM ANY AND ALL LIABILITIES,
--OBLIGATIONS, CLAIMS, OR DEMANDS IN EXCESS OF TEN DOLLARS (US $10.00). THE
--FOREGOING ARE ESSENTIAL TERMS OF THIS LICENSE AND, IF ANY OF THESE TERMS ARE
--CONSTRUED AS UNENFORCEABLE, FAIL IN ESSENTIAL PURPOSE, OR BECOME VOID OR
--DETRIMENTAL TO ADVANCED MICRO DEVICES, INC. OR ANY COPYRIGHT HOLDERS OR
--CONTRIBUTORS FOR ANY REASON, THEN ALL RIGHTS TO REDISTRIBUTE, ACCESS OR USE
--THIS MATERIAL SHALL TERMINATE IMMEDIATELY. MOREOVER, THE FOREGOING SHALL
--SURVIVE ANY EXPIRATION OR TERMINATION OF THIS LICENSE OR ANY AGREEMENT OR
--ACCESS OR USE RELATED TO THIS MATERIAL.
--
--NOTICE IS HEREBY PROVIDED, AND BY REDISTRIBUTING OR ACCESSING OR USING THIS
--MATERIAL SUCH NOTICE IS ACKNOWLEDGED, THAT THIS MATERIAL MAY BE SUBJECT TO
--RESTRICTIONS UNDER THE LAWS AND REGULATIONS OF THE UNITED STATES OR OTHER
--COUNTRIES, WHICH INCLUDE BUT ARE NOT LIMITED TO, U.S. EXPORT CONTROL LAWS SUCH
--AS THE EXPORT ADMINISTRATION REGULATIONS AND NATIONAL SECURITY CONTROLS AS
--DEFINED THEREUNDER, AS WELL AS STATE DEPARTMENT CONTROLS UNDER THE U.S.
--MUNITIONS LIST. THIS MATERIAL MAY NOT BE USED, RELEASED, TRANSFERRED, IMPORTED,
--EXPORTED AND/OR RE-EXPORTED IN ANY MANNER PROHIBITED UNDER ANY APPLICABLE LAWS,
--INCLUDING U.S. EXPORT CONTROL LAWS REGARDING SPECIFICALLY DESIGNATED PERSONS,
--COUNTRIES AND NATIONALS OF COUNTRIES SUBJECT TO NATIONAL SECURITY CONTROLS.
--MOREOVER, THE FOREGOING SHALL SURVIVE ANY EXPIRATION OR TERMINATION OF ANY
--LICENSE OR AGREEMENT OR ACCESS OR USE RELATED TO THIS MATERIAL.
--
--NOTICE REGARDING THE U.S. GOVERNMENT AND DOD AGENCIES: This material is
--provided with "RESTRICTED RIGHTS" and/or "LIMITED RIGHTS" as applicable to
--computer software and technical data, respectively. Use, duplication,
--distribution or disclosure by the U.S. Government and/or DOD agencies is
--subject to the full extent of restrictions in all applicable regulations,
--including those found at FAR52.227 and DFARS252.227 et seq. and any successor
--regulations thereof. Use of this material by the U.S. Government and/or DOD
--agencies is acknowledgment of the proprietary rights of any copyright holders
--and contributors, including those of Advanced Micro Devices, Inc., as well as
--the provisions of FAR52.227-14 through 23 regarding privately developed and/or
--commercial computer software.
--
--This license forms the entire agreement regarding the subject matter hereof and
--supersedes all proposals and prior discussions and writings between the parties
--with respect thereto. This license does not affect any ownership, rights, title,
--or interest in, or relating to, this material. No terms of this license can be
--modified or waived, and no breach of this license can be excused, unless done
--so in a writing signed by all affected parties. Each term of this license is
--separately enforceable. If any term of this license is determined to be or
--becomes unenforceable or illegal, such term shall be reformed to the minimum
--extent necessary in order for this license to remain in effect in accordance
--with its terms as modified by such reformation. This license shall be governed
--by and construed in accordance with the laws of the State of Texas without
--regard to rules on conflicts of law of any state or jurisdiction or the United
--Nations Convention on the International Sale of Goods. All disputes arising out
--of this license shall be subject to the jurisdiction of the federal and state
--courts in Austin, Texas, and all defenses are hereby waived concerning personal
--jurisdiction and venue of these courts.
--
--============================================================ */
--
--#include <iostream>
--#include <map>
--#include <set>
--#include <algorithm>
--#include <string>
--#include <cstdlib>
--#include <cstdio>
--#if !defined(_WIN32)
--#include <errno.h>
--#endif
--
--#ifdef _MSC_VER
--#pragma warning(disable: 4290)
--#endif
--
--#if defined(HAVE_CL2_HPP)
--#define CL_HPP_ENABLE_EXCEPTIONS
--#define CL_HPP_MINIMUM_OPENCL_VERSION 120
--#define CL_HPP_TARGET_OPENCL_VERSION 200
--#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
--#include "CL/cl2.hpp"
--#else // !HAVE_CL2_HPP
--#define __CL_ENABLE_EXCEPTIONS
--#define __MAX_DEFAULT_VECTOR_SIZE 50
--#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
--#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
--#include "cl.hpp"
--#endif // !HAVE_CL2_HPP
--
--bool verbose = false;
--
--/// Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure.
--int
--main(int argc, char** argv)
--{
--    /* Error flag */
--    cl_int err;
--
--    //parse input
--    for(int i = 1; i < argc; i++){
--        if ((strcmp(argv[i], "-v") == 0) ||
--            (strcmp(argv[i], "--verbose") == 0)){
--                verbose = true;
--        } else if ((strcmp(argv[i], "-h") == 0) ||
--                   (strcmp(argv[i], "--help") == 0)){
--            std::cout << "Usage is: " << argv[0] << " [-v|--verbose]" << std::endl;
--            return EXIT_FAILURE;
--        }
--    }
--
--    // Platform info
--    std::vector<cl::Platform> platforms;
--
--    try {
--    err = cl::Platform::get(&platforms);
--
--    // Iteratate over platforms
--    std::cout << "Number of platforms:\t\t\t\t "
--              << platforms.size()
--              << std::endl;
--    for (std::vector<cl::Platform>::iterator i = platforms.begin();
--         i != platforms.end();
--         ++i) {
--        const cl::Platform& platform = *i;
--
--        std::cout << "  Platform Profile:\t\t\t\t "
--                  << platform.getInfo<CL_PLATFORM_PROFILE>().c_str()
--                  << std::endl;
--        std::cout << "  Platform Version:\t\t\t\t "
--                  << platform.getInfo<CL_PLATFORM_VERSION>().c_str()
--                  << std::endl;
--        std::cout << "  Platform Name:\t\t\t\t "
--                  << platform.getInfo<CL_PLATFORM_NAME>().c_str()
--                  << std::endl;
--        std::cout << "  Platform Vendor:\t\t\t\t "
--                  << platform.getInfo<CL_PLATFORM_VENDOR>().c_str() << std::endl;
--        if (platform.getInfo<CL_PLATFORM_EXTENSIONS>().size() > 0) {
--            std::cout << "  Platform Extensions:\t\t\t\t "
--                      << platform.getInfo<CL_PLATFORM_EXTENSIONS>().c_str()
--                      << std::endl;
--        }
--    }
--
--    std::cout << std::endl << std:: endl;
--    // Now Iteratate over each platform and its devices
--    for (std::vector<cl::Platform>::iterator p = platforms.begin();
--         p != platforms.end();
--         ++p) {
--        const cl::Platform& platform = *p;
--        std::cout << "  Platform Name:\t\t\t\t "
--                  << platform.getInfo<CL_PLATFORM_NAME>().c_str()
--                  << std::endl;
--
--        std::vector<cl::Device> devices;
--        platform.getDevices(CL_DEVICE_TYPE_ALL, &devices);
--
--        // Get OpenCL version
--        std::string platformVersionStr = platform.getInfo<CL_PLATFORM_VERSION>();
--        std::string openclVerstionStr(platformVersionStr.c_str());
--        size_t vStart = openclVerstionStr.find(" ", 0);
--        size_t vEnd = openclVerstionStr.find(" ", vStart + 1);
--        std::string vStrVal = openclVerstionStr.substr(vStart + 1, vEnd - vStart - 1);
--
--        std::cout << "Number of devices:\t\t\t\t " << devices.size() << std::endl;
--        for (std::vector<cl::Device>::iterator i = devices.begin();
--             i != devices.end();
--             ++i) {
--            const cl::Device& device = *i;
--            /* Get device name */
--            std::string deviceName = device.getInfo<CL_DEVICE_NAME>();
--            cl_device_type dtype = device.getInfo<CL_DEVICE_TYPE>();
--
--            /* Get CAL driver version in int */
--            std::string driverVersion = device.getInfo<CL_DRIVER_VERSION>();
--            std::string calVersion(driverVersion.c_str());
--            calVersion = calVersion.substr(calVersion.find_last_of(".") + 1);
--            int version = atoi(calVersion.c_str());
--
--            std::cout << "  Device Type:\t\t\t\t\t " ;
--            switch (dtype) {
--            case CL_DEVICE_TYPE_ACCELERATOR:
--                std::cout << "CL_DEVICE_TYPE_ACCRLERATOR" << std::endl;
--                break;
--            case CL_DEVICE_TYPE_CPU:
--                std::cout << "CL_DEVICE_TYPE_CPU" << std::endl;
--                break;
--            case CL_DEVICE_TYPE_DEFAULT:
--                std::cout << "CL_DEVICE_TYPE_DEFAULT" << std::endl;
--                break;
--            case CL_DEVICE_TYPE_GPU:
--                std::cout << "CL_DEVICE_TYPE_GPU" << std::endl;
--                break;
--            }
--
--            std::cout << "  Vendor ID:\t\t\t\t\t "
--                      << std::hex
--                      << device.getInfo<CL_DEVICE_VENDOR_ID>()
--                      << "h"
--                      << std::dec
--                      << std::endl;
--
--             bool isAMDPlatform = (strcmp(platform.getInfo<CL_PLATFORM_NAME>().c_str(), "AMD Accelerated Parallel Processing") == 0) ? true : false;
--             if (isAMDPlatform)
--             {
--                std::string boardName;
--                device.getInfo(CL_DEVICE_BOARD_NAME_AMD, &boardName);
--                std::cout << "  Board name:\t\t\t\t\t "
--                    << boardName.c_str()
--                    << std::endl;
--
--                cl_device_topology_amd topology;
--                err = device.getInfo(CL_DEVICE_TOPOLOGY_AMD, &topology);
--                if (topology.raw.type == CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD) {
--                    std::cout << "  Device Topology:\t\t\t\t "
--                          << "PCI[ B#" << (int)topology.pcie.bus
--                          << ", D#" << (int)topology.pcie.device
--                          << ", F#" << (int)topology.pcie.function
--                          << " ]" << std::endl;
--                }
--             }
--
--            std::cout << "  Max compute units:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_COMPUTE_UNITS>()
--                      << std::endl;
--
--            std::cout << "  Max work items dimensions:\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS>()
--                      << std::endl;
--
--            std::vector< ::size_t> witems =
--                device.getInfo<CL_DEVICE_MAX_WORK_ITEM_SIZES>();
--            for (unsigned int x = 0;
--                 x < device.getInfo<CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS>();
--                 x++) {
--                std::cout << "    Max work items["
--                          << x << "]:\t\t\t\t "
--                          << witems[x]
--                          << std::endl;
--            }
--
--            std::cout << "  Max work group size:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_WORK_GROUP_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width char:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width short:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width int:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width long:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width float:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT>()
--                      << std::endl;
--
--            std::cout << "  Preferred vector width double:\t\t "
--                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE>()
--                      << std::endl;
--
--#ifdef CL_VERSION_1_1
--            if(vStrVal.compare("1.0") > 0)
--            {
--                std::cout << "  Native vector width char:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR>()
--                          << std::endl;
--
--                std::cout << "  Native vector width short:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT>()
--                          << std::endl;
--
--                std::cout << "  Native vector width int:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_INT>()
--                          << std::endl;
--
--                std::cout << "  Native vector width long:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG>()
--                          << std::endl;
--
--                std::cout << "  Native vector width float:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT>()
--                          << std::endl;
--
--                std::cout << "  Native vector width double:\t\t\t "
--                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE>()
--                          << std::endl;
--            }
--#endif // CL_VERSION_1_1
--            std::cout << "  Max clock frequency:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_CLOCK_FREQUENCY>()
--                      << "Mhz"
--                      << std::endl;
--
--            std::cout << "  Address bits:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_ADDRESS_BITS>()
--                      << std::endl;
--
--            std::cout << "  Max memory allocation:\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_MEM_ALLOC_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Image support:\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_IMAGE_SUPPORT>() ? "Yes" : "No")
--                      << std::endl;
--
--            if (device.getInfo<CL_DEVICE_IMAGE_SUPPORT>())
--            {
--
--                std::cout << "  Max number of images read arguments:\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_READ_IMAGE_ARGS>()
--                          << std::endl;
--
--                std::cout << "  Max number of images write arguments:\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_WRITE_IMAGE_ARGS>()
--                          << std::endl;
--
--                std::cout << "  Max image 2D width:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_IMAGE2D_MAX_WIDTH>()
--                          << std::endl;
--
--                std::cout << "  Max image 2D height:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_IMAGE2D_MAX_HEIGHT>()
--                          << std::endl;
--
--                std::cout << "  Max image 3D width:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_WIDTH>()
--                          << std::endl;
--
--                std::cout << "  Max image 3D height:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_HEIGHT>()
--                          << std::endl;
--
--                std::cout << "  Max image 3D depth:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_DEPTH>()
--                          << std::endl;
--
--                std::cout << "  Max samplers within kernel:\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_SAMPLERS>()
--                          << std::endl;
--
--                if (verbose)
--                {
--                    std::cout << "  Image formats supported:" << std::endl;
--                    std::vector<cl::ImageFormat> formats;
--
--                    cl_context_properties cps[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties)(*p)(), 0 };
--                    std::vector<cl::Device> device;
--                    device.push_back(*i);
--                    cl::Context context(device, cps, NULL, NULL, &err);
--
--                    std::map<int,std::string> channelOrder;
--                    channelOrder[CL_R] = "CL_R";
--                    channelOrder[CL_A] = "CL_A";
--                    channelOrder[CL_RG] = "CL_RG";
--                    channelOrder[CL_RA] = "CL_RA";
--                    channelOrder[CL_RGB] = "CL_RGB";
--                    channelOrder[CL_RGBA] = "CL_RGBA";
--                    channelOrder[CL_BGRA] = "CL_BGRA";
--                    channelOrder[CL_ARGB] = "CL_ARGB";
--                    channelOrder[CL_INTENSITY] = "CL_INTENSITY";
--                    channelOrder[CL_LUMINANCE] = "CL_LUMINANCE";
--                    channelOrder[CL_Rx] = "CL_Rx";
--                    channelOrder[CL_RGx] = "CL_RGx";
--                    channelOrder[CL_RGBx] = "CL_RGBx";
--
--                    std::map<int,std::pair<std::string, std::string> > channelType;
--                    channelType[CL_SNORM_INT8] = std::make_pair("snorm", "int8");
--                    channelType[CL_SNORM_INT16] = std::make_pair("snorm", "int16");
--                    channelType[CL_UNORM_INT8] = std::make_pair("unorm", "int8");
--                    channelType[CL_UNORM_INT16] = std::make_pair("unorm", "int16");
--                    channelType[CL_UNORM_SHORT_565] = std::make_pair("unorm", "short_565");
--                    channelType[CL_UNORM_SHORT_555] = std::make_pair("unorm", "short_555");
--                    channelType[CL_UNORM_INT_101010] = std::make_pair("unorm", "int_101010");
--                    channelType[CL_SIGNED_INT8] =  std::make_pair("signed", "int8");
--                    channelType[CL_SIGNED_INT16] = std::make_pair("signed", "int16");
--                    channelType[CL_SIGNED_INT32] = std::make_pair("signed", "int32");
--                    channelType[CL_UNSIGNED_INT8] = std::make_pair("unsigned", "int8");
--                    channelType[CL_UNSIGNED_INT16] = std::make_pair("unsigned", "int16");
--                    channelType[CL_UNSIGNED_INT32] = std::make_pair("unsigned", "int32");
--                    channelType[CL_HALF_FLOAT] = std::make_pair("half_float", "");
--                    channelType[CL_FLOAT] = std::make_pair("float", "");
--
--                    std::vector<std::pair<int, std::string> > imageDimensions;
--                    imageDimensions.push_back(std::make_pair(CL_MEM_OBJECT_IMAGE2D, std::string("2D ")));
--                    imageDimensions.push_back(std::make_pair(CL_MEM_OBJECT_IMAGE3D, std::string("3D ")));
--                    for(std::vector<std::pair<int, std::string> >::iterator id = imageDimensions.begin();
--                        id != imageDimensions.end();
--                        id++){
--
--                        struct imageAccessStruct {
--                            std::string  name;
--                            int          access;
--                            std::vector<cl::ImageFormat> formats;
--                        } imageAccess[] = {{std::string("Read-Write/Read-Only/Write-Only"), CL_MEM_READ_WRITE, std::vector<cl::ImageFormat>()},
--                                            {std::string("Read-Only"),  CL_MEM_READ_ONLY,  std::vector<cl::ImageFormat>()},
--                                            {std::string("Write-Only"), CL_MEM_WRITE_ONLY, std::vector<cl::ImageFormat>()}};
--
--                        for(size_t ia=0; ia < sizeof(imageAccess)/sizeof(imageAccessStruct); ia++){
--                            context.getSupportedImageFormats(imageAccess[ia].access, (*id).first, &(imageAccess[ia].formats));
--                            bool printTopHeader = true;
--                            for (std::map<int,std::string>::iterator o = channelOrder.begin();
--                                 o != channelOrder.end();
--                                 o++)
--                            {
--                                bool printHeader = true;
--
--                                for (std::vector<cl::ImageFormat>::iterator it = imageAccess[ia].formats.begin();
--                                     it != imageAccess[ia].formats.end();
--                                     ++it)
--                                {
--                                    if ( (*o).first == (int)(*it).image_channel_order)
--                                    {
--                                        bool printedAlready = false;
--                                        //see if this was already print in RW/RO/WO
--                                        if (ia !=0)
--                                        {
--                                            for (std::vector<cl::ImageFormat>::iterator searchIt = imageAccess[0].formats.begin();
--                                                searchIt != imageAccess[0].formats.end();
--                                                searchIt++)
--                                            {
--                                                if ( ((*searchIt).image_channel_data_type == (*it).image_channel_data_type) &&
--                                                     ((*searchIt).image_channel_order == (*it).image_channel_order))
--                                                {
--                                                    printedAlready = true;
--                                                    break;
--                                                }
--                                            }
--                                        }
--                                        if (printedAlready)
--                                        {
--                                            continue;
--                                        }
--                                        if (printTopHeader)
--                                        {
--                                            std::cout << "   " << (*id).second << imageAccess[ia].name << std::endl;
--                                            printTopHeader = false;
--                                        }
--                                        if (printHeader)
--                                        {
--                                            std::cout << "    " << (*o).second << ": ";
--                                            printHeader = false;
--                                        }
--                                        std::cout << channelType[(*it).image_channel_data_type].first;
--                                        if (channelType[(*it).image_channel_data_type].second != "")
--                                        {
--                                            std::cout << "-"
--                                                      << channelType[(*it).image_channel_data_type].second;
--                                        }
--                                        if (it != (imageAccess[ia].formats.end() - 1))
--                                        {
--                                            std::cout << " ";
--                                        }
--                                    }
--                                }
--                                if (printHeader == false)
--                                {
--                                    std::cout << std::endl;
--                                }
--                            }
--                        }
--                    }
--                }
--            }
--
--            std::cout << "  Max size of kernel argument:\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_PARAMETER_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Alignment (bits) of base address:\t\t "
--                      << device.getInfo<CL_DEVICE_MEM_BASE_ADDR_ALIGN>()
--                      << std::endl;
--
--            std::cout << "  Minimum alignment (bytes) for any datatype:\t "
--                      << device.getInfo<CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Single precision floating point capability" << std::endl;
--            std::cout << "    Denorms:\t\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_DENORM ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Quiet NaNs:\t\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_INF_NAN ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Round to nearest even:\t\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_ROUND_TO_NEAREST ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Round to zero:\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_ROUND_TO_ZERO ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Round to +ve and infinity:\t\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_ROUND_TO_INF ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    IEEE754-2008 fused multiply-add:\t\t "
--                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
--                          CL_FP_FMA ? "Yes" : "No")
--                      << std::endl;
--
--            std::cout << "  Cache type:\t\t\t\t\t " ;
--            switch (device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHE_TYPE>()) {
--            case CL_NONE:
--                std::cout << "None" << std::endl;
--                break;
--            case CL_READ_ONLY_CACHE:
--                std::cout << "Read only" << std::endl;
--                break;
--            case CL_READ_WRITE_CACHE:
--                std::cout << "Read/Write" << std::endl;
--                break;
--            }
--
--            std::cout << "  Cache line size:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Cache size:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHE_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Global memory size:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Constant buffer size:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE>()
--                      << std::endl;
--
--            std::cout << "  Max number of constant args:\t\t\t "
--                      << device.getInfo<CL_DEVICE_MAX_CONSTANT_ARGS>()
--                      << std::endl;
--
--            std::cout << "  Local memory type:\t\t\t\t " ;
--            switch (device.getInfo<CL_DEVICE_LOCAL_MEM_TYPE>()) {
--            case CL_LOCAL:
--                std::cout << "Scratchpad" << std::endl;
--                break;
--            case CL_GLOBAL:
--                std::cout << "Global" << std::endl;
--                break;
--            }
--
--
--            std::cout << "  Local memory size:\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_LOCAL_MEM_SIZE>()
--                      << std::endl;
--
--#if defined(CL_VERSION_2_0)
--            if(vStrVal.compare("2") > 0)
--            {
--                std::cout << "  Max pipe arguments:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_PIPE_ARGS>()
--                          << std::endl;
--
--                std::cout << "  Max pipe active reservations:\t\t\t "
--                          << device.getInfo<CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS>()
--                          << std::endl;
--
--                std::cout << "  Max pipe packet size:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_PIPE_MAX_PACKET_SIZE>()
--                          << std::endl;
--
--                std::cout << "  Max global variable size:\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE>()
--                          << std::endl;
--
--                std::cout << "  Max global variable preferred total size:\t "
--                          << device.getInfo<CL_DEVICE_GLOBAL_VARIABLE_PREFERRED_TOTAL_SIZE>()
--                          << std::endl;
--
--                std::cout << "  Max read/write image args:\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_READ_WRITE_IMAGE_ARGS>()
--                          << std::endl;
--
--                std::cout << "  Max on device events:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_ON_DEVICE_EVENTS>()
--                          << std::endl;
--
--                std::cout << "  Queue on device max size:\t\t\t "
--                          << device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE>()
--                          << std::endl;
--
--                std::cout << "  Max on device queues:\t\t\t\t "
--                          << device.getInfo<CL_DEVICE_MAX_ON_DEVICE_QUEUES>()
--                          << std::endl;
--
--                std::cout << "  Queue on device preferred size:\t\t "
--                          << device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE>()
--                          << std::endl;
--
--                std::cout << "  SVM capabilities:\t\t\t\t " << std::endl;
--                std::cout << "    Coarse grain buffer:\t\t\t "
--                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
--                              CL_DEVICE_SVM_COARSE_GRAIN_BUFFER ? "Yes" : "No")
--                          << std::endl;
--                std::cout << "    Fine grain buffer:\t\t\t\t "
--                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
--                              CL_DEVICE_SVM_FINE_GRAIN_BUFFER ? "Yes" : "No")
--                          << std::endl;
--                std::cout << "    Fine grain system:\t\t\t\t "
--                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
--                              CL_DEVICE_SVM_FINE_GRAIN_SYSTEM ? "Yes" : "No")
--                          << std::endl;
--                std::cout << "    Atomics:\t\t\t\t\t "
--                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
--                              CL_DEVICE_SVM_ATOMICS ? "Yes" : "No")
--                          << std::endl;
--
--                std::cout << "  Preferred platform atomic alignment:\t\t "
--                          << device.getInfo<CL_DEVICE_PREFERRED_PLATFORM_ATOMIC_ALIGNMENT>()
--                          << std::endl;
--
--                std::cout << "  Preferred global atomic alignment:\t\t "
--                          << device.getInfo<CL_DEVICE_PREFERRED_GLOBAL_ATOMIC_ALIGNMENT>()
--                          << std::endl;
--
--                std::cout << "  Preferred local atomic alignment:\t\t "
--                          << device.getInfo<CL_DEVICE_PREFERRED_LOCAL_ATOMIC_ALIGNMENT>()
--                          << std::endl;
--            }
--#endif // CL_VERSION_2_0
--
--#if defined(CL_VERSION_1_1) && !defined(ATI_ARCH_ARM)
--            if(vStrVal.compare("1.0") > 0)
--            {
--                cl_context_properties cps[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties)(*p)(), 0 };
--
--                std::vector<cl::Device> device;
--                device.push_back(*i);
--
--                cl::Context context(device, cps, NULL, NULL, &err);
--                if (err != CL_SUCCESS) {
--                    std::cerr << "Context::Context() failed (" << err << ")\n";
--                    return EXIT_FAILURE;
--                }
--                std::string kernelStr("__kernel void hello(){ size_t i =  get_global_id(0); size_t j =  get_global_id(1);}");
--                cl::Program::Sources sources(1, std::make_pair(kernelStr.data(), kernelStr.size()));
--
--                cl::Program program = cl::Program(context, sources, &err);
--                if (err != CL_SUCCESS) {
--                    std::cerr << "Program::Program() failed (" << err << ")\n";
--                    return EXIT_FAILURE;
--                }
--
--                err = program.build(device);
--                if (err != CL_SUCCESS) {
--
--                    if(err == CL_BUILD_PROGRAM_FAILURE)
--                    {
--                        std::string str = program.getBuildInfo<CL_PROGRAM_BUILD_LOG>((*i));
--
--                        std::cout << " \n\t\t\tBUILD LOG\n";
--                        std::cout << " ************************************************\n";
--                        std::cout << str.c_str() << std::endl;
--                        std::cout << " ************************************************\n";
--                    }
--
--                    std::cerr << "Program::build() failed (" << err << ")\n";
--                    return EXIT_FAILURE;
--                }
--
--                cl::Kernel kernel(program, "hello", &err);
--                if (err != CL_SUCCESS) {
--                    std::cerr << "Kernel::Kernel() failed (" << err << ")\n";
--                    return EXIT_FAILURE;
--                }
--
--                std::cout << "  Kernel Preferred work group size multiple:\t "
--                          << kernel.getWorkGroupInfo<CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE>((*i), &err)
--                          << std::endl;
--            }
--
--#endif // CL_VERSION_1_1
--
--            std::cout << "  Error correction support:\t\t\t "
--                      << device.getInfo<CL_DEVICE_ERROR_CORRECTION_SUPPORT>()
--                      << std::endl;
--#ifdef CL_VERSION_1_1
--            if(vStrVal.compare("1.0") > 0)
--            {
--                std::cout << "  Unified memory for Host and Device:\t\t "
--                          << device.getInfo<CL_DEVICE_HOST_UNIFIED_MEMORY>()
--                          << std::endl;
--            }
--#endif // CL_VERSION_1_1
--            std::cout << "  Profiling timer resolution:\t\t\t "
--                      << device.getInfo<CL_DEVICE_PROFILING_TIMER_RESOLUTION>()
--                      << std::endl;
--
--            std::cout << "  Device endianess:\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_ENDIAN_LITTLE>() ? "Little" : "Big")
--                      << std::endl;
--
--            std::cout << "  Available:\t\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_AVAILABLE>() ? "Yes" : "No")
--                      << std::endl;
--
--            std::cout << "  Compiler available:\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_COMPILER_AVAILABLE>() ? "Yes" : "No")
--                      << std::endl;
--
--            std::cout << "  Execution capabilities:\t\t\t\t " << std::endl;
--            std::cout << "    Execute OpenCL kernels:\t\t\t "
--                      << (device.getInfo<CL_DEVICE_EXECUTION_CAPABILITIES>() &
--                          CL_EXEC_KERNEL ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Execute native function:\t\t\t "
--                      << (device.getInfo<CL_DEVICE_EXECUTION_CAPABILITIES>() &
--                          CL_EXEC_NATIVE_KERNEL ? "Yes" : "No")
--                      << std::endl;
--
--            std::cout << "  Queue on Host properties:\t\t\t\t " << std::endl;
--            std::cout << "    Out-of-Order:\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_QUEUE_ON_HOST_PROPERTIES>() &
--                          CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE ? "Yes" : "No")
--                      << std::endl;
--            std::cout << "    Profiling :\t\t\t\t\t "
--                      << (device.getInfo<CL_DEVICE_QUEUE_ON_HOST_PROPERTIES>() &
--                          CL_QUEUE_PROFILING_ENABLE ? "Yes" : "No")
--                      << std::endl;
--
--#ifdef CL_VERSION_2_0
--            if(vStrVal.compare("2") > 0)
--            {
--                std::cout << "  Queue on Device properties:\t\t\t\t " << std::endl;
--                std::cout << "    Out-of-Order:\t\t\t\t "
--                          << (device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES>() &
--                              CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE ? "Yes" : "No")
--                          << std::endl;
--                std::cout << "    Profiling :\t\t\t\t\t "
--                          << (device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES>() &
--                              CL_QUEUE_PROFILING_ENABLE ? "Yes" : "No")
--                          << std::endl;
--            }
--#endif
--
--            std::cout << "  Platform ID:\t\t\t\t\t "
--                  << device.getInfo<CL_DEVICE_PLATFORM>()
--                      << std::endl;
--
--            std::cout << "  Name:\t\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_NAME>().c_str()
--                      << std::endl;
--
--            std::cout << "  Vendor:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_VENDOR>().c_str()
--                      << std::endl;
--#ifdef CL_VERSION_1_1
--            if(vStrVal.compare("1.0") > 0)
--            {
--                std::cout << "  Device OpenCL C version:\t\t\t "
--                          << device.getInfo<CL_DEVICE_OPENCL_C_VERSION>().c_str()
--                          << std::endl;
--            }
--#endif // CL_VERSION_1_1
--            std::cout << "  Driver version:\t\t\t\t "
--                      << device.getInfo<CL_DRIVER_VERSION>().c_str()
--                      << std::endl;
--
--            std::cout << "  Profile:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_PROFILE>().c_str()
--                      << std::endl;
--
--            std::cout << "  Version:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_VERSION>().c_str()
--                      << std::endl;
--
--
--            std::cout << "  Extensions:\t\t\t\t\t "
--                      << device.getInfo<CL_DEVICE_EXTENSIONS>().c_str()
--                      << std::endl;
--
--            std::cout << std::endl << std::endl;
--        }
--    }
--    }
--    catch (cl::Error err)
--    {
--        std::cerr
--            << "ERROR: "
--            << err.what()
--            << "("
--            << err.err()
--            << ")"
--            << std::endl;
--        return EXIT_FAILURE;
--    }
--
--    return EXIT_SUCCESS;
--}
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.0.0-change-install-location.patch
index 0679da4d639a..eb1901f6a1ed 100644
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-install-location.patch
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.0.0-change-install-location.patch
@@ -1,10 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83575a3..a0526d1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,12 +28,26 @@ endif()
+--- a/CMakeLists.txt	2019-12-28 09:34:17.470030419 +0100
++++ b/CMakeLists.txt	2019-12-28 09:32:14.939030886 +0100
+@@ -21,12 +21,26 @@
  
- project(OpenCL-ROCm)
+ project(rocm-opencl)
  
 +include (GNUInstallDirs)
 +
@@ -29,7 +27,7 @@ index 83575a3..a0526d1 100644
  # FIXME: Remove following if block after enabling COMGR by default
  if (${USE_COMGR_LIBRARY} STREQUAL "no")
    set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
-@@ -46,29 +60,19 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+@@ -39,29 +53,19 @@
    # override default option value in library and driver
    set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
  
@@ -61,7 +59,7 @@ index 83575a3..a0526d1 100644
    add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
  
    install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
-@@ -84,51 +88,51 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+@@ -77,22 +81,22 @@
    endforeach()
  endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
  
@@ -94,6 +92,9 @@ index 83575a3..a0526d1 100644
  
  ###--- Packaging ------------------------------------------------------------###
  
+@@ -101,31 +105,31 @@
+ rocm_setup_version( VERSION "2.0.0" )
+ 
  # MAIN package
 -install(PROGRAMS $<TARGET_FILE:clinfo>
 -        DESTINATION bin/x86_64
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild
deleted file mode 100644
index c26ed40b481a..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-OPENCL_ICD_COMMIT="bc9728edf8cace79cf33bf75560be88fc2432dc4"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-libs/rocr-runtime
-	dev-libs/rocm-comgr
-	dev-libs/rocm-device-libs
-	dev-libs/rocm-opencl-driver
-	dev-libs/ocl-icd[khronos-headers]"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-dependencies.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.0.ebuild
deleted file mode 100644
index b576f463c545..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=dev-libs/rocm-opencl-driver-${PV}
-	dev-libs/ocl-icd[khronos-headers]"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-
-PATCHES=(
-	"${FILESDIR}/${P}-change-install-location.patch"
-	"${FILESDIR}/${P}-change-AMDCompilerh.patch"
-	"${FILESDIR}/${P}-change-opencl.patch"
-	"${FILESDIR}/${P}-update-README.patch"
-	"${FILESDIR}/${P}-amdocl64icd.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.9.0.ebuild
deleted file mode 100644
index f62a0a3951c2..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=dev-libs/rocm-opencl-driver-${PV}
-	dev-libs/ocl-icd[khronos-headers]"
-DEPEND="${RDEPEND}
-	dev-lang/ocaml
-	dev-ml/findlib"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
-	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
-	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
-	"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	mkdir -p "${S}"/api/opencl/khronos/ || die
-	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
index f62a0a3951c2..74ef3eeac923 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
 SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
@@ -25,14 +25,15 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=dev-libs/rocm-comgr-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	>=dev-libs/rocm-opencl-driver-${PV}
-	dev-libs/ocl-icd[khronos-headers]"
+	dev-libs/ocl-icd[khronos-headers]
+	media-libs/mesa"
 DEPEND="${RDEPEND}
 	dev-lang/ocaml
 	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.0.0-change-install-location.patch"
 	"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
 	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
 	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
@@ -43,7 +44,7 @@ src_prepare() {
 	mkdir -p "${S}"/api/opencl/khronos/ || die
 	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
 	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -51,7 +52,6 @@ src_configure() {
 		-DUSE_COMGR_LIBRARY=yes
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
 		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index fe0fe1b6ecd7..c27ead38b82c 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,17 +1,5 @@
-AUX rocr-runtime-2.0.0-cmake-install-paths.patch 2151 BLAKE2B 4d52316dae6fae72c85dcf0d042f97dc94910278ffecfc4ca2c4f51fe7ed9afafef994626d7f58e8f806eb3620762adfe4523630db982f715ccad6f90c120e97 SHA512 d8d3862d018582c3c4c5551ffd75dbfccb0d005bcaf0a005de07a2c0ac7d9060c21a348b2ac01b447a9ede007ffd63ba11a8a8e24d4c15c0044e2e86d6266f95
-AUX rocr-runtime-2.8.0-fix_doorbell_map.patch 2384 BLAKE2B 3fd7ca719788a48a40adfabd6543510d586f6414c19daec011fa09d801254e9a3b5169feb26e8fa787bb9f05f254b83a59552d226e0537adbe411609e12bbf55 SHA512 e2f506bc6d8a942b57d46561e29bb9b17aab5e7a8afab92e147ea6be2670c82ad7f624549a4ddfa847a2ec2984f842eaf3a12fc9ec9f5375ba8ff88c2199a041
-DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
-DIST rocr-runtime-2.10.0.tar.gz 325165 BLAKE2B 482fde76d909e40478237ade1dcf9c0d28e1d6b9f541876d91f513d68c1882ae823d08b852a7c1b112ebace68f7860305cb962aeb79d7a4e8ef9a0ad249c69b5 SHA512 92ae7ff016bec7f8c5e781633d95a01e6b3e3aee5ad702d9e5b329d8b4141722328a17a67327f4aace747cce3e22a53d1e21d304dfcd2d83dd71f2da113adfd2
-DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
-DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
-DIST rocr-runtime-2.8.0.tar.gz 324868 BLAKE2B 5c46ffec7482e09032c67270a352543465f9f8a0a7c45e9884c37104e9e12a7e4dccb60bf3904d1398ffc00d9e934fc055190ba9ba4c1104bdb83be6c758eded SHA512 428b7d1d17a82c841a4d9a2c163670464416afa3ca3c579cc63ee712880940c0150e365922ffdafa44ee81fb76295cc19b66a1a4cb0a7e9a366f56782d826061
-DIST rocr-runtime-2.9.0.tar.gz 323220 BLAKE2B 7e6338185f23011ed4105c6797431677e657c6fc198f83399daab4d3b2d3333ebd6e86c0d669bf794f984ea0346b8e528449eb5d81aff2ecf3f1871663458df6 SHA512 fa68fde0f79651956096ee506ff8b6760a9623e7d9cb099229b3951b7434bed5b501a3c6785c5767902c7dbf6c478ada5d2c2a5c5984063f0d0d0db8bca2bda2
-EBUILD rocr-runtime-2.0.0.ebuild 862 BLAKE2B c9262812cdfdc159248b81cb168b5d2465f2bd7544d576d4d7407919a0f9764a6c2eaf53731294c424755e05915ec47647435ce7524d276acbc7786bccf6ede9 SHA512 8c02bd29599c6cc7ad77dae4f8759cd4f3c2840800ecab30953d325b0ce1aa6bc5bee51ad2b5eca60eb420d5c4fce74e746cdf1efc470a4262eb5a360531399d
-EBUILD rocr-runtime-2.10.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
-EBUILD rocr-runtime-2.6.0-r1.ebuild 869 BLAKE2B e5a736b834cf77ee056ed3497bcdd3bdb0c525e3ed117164d0a28a9c49ffd079909967110af94c5c87f9e1429e58d36511f95b8bb60c3158a27800fb8679269d SHA512 f883e3f6e2354a2bdab1f5dce33eb9ae6b6405d158414f8016276b25e8e50420489419d4bd3727981bba04ec2311afa7ac3c2590148ab1f45116b7c66124cfbb
-EBUILD rocr-runtime-2.7.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
-EBUILD rocr-runtime-2.8.0-r1.ebuild 1010 BLAKE2B f94721331deaa6b107be62380a09fb2337359275fda8bf814f93fc119485aba974219833db78d92a438d91f706eb46e3a704d086661e24fc1bacd969eb010bd6 SHA512 0aa37210c6ccd697b483dbe856017e382e0b46a168f420910371e46f405e0e300a5d05f77548b29a989dde6f4065be07ceffc618fa9864baeb2ced7681a2738c
-EBUILD rocr-runtime-2.8.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
-EBUILD rocr-runtime-2.9.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
-EBUILD rocr-runtime-9999.ebuild 902 BLAKE2B 0e7ae79cbaf8eec276cee4981a4e093d4fd1121c4e71d86d485db8eecf239ed773c50934ad5010d56a69fb01408968ac99af80ee6105593b1976d31e48224aab SHA512 346a787c3be08d55b1de4bbfbea44b9e321a8f9646284667c3146181d75cd7c9e98ec594d4674cd5290ed68ce1f60afc8919efd878f920eb15ec8b408100c32f
+AUX rocr-runtime-3.0.0-cmake-install-paths.patch 2719 BLAKE2B 66e262fed83f839d87e3d31658ac7373bba7d6985d0dceecdc9d34a4734a5aa877007aa6f26d1ee9bbe8c3d232eb22b5dd98379d67c89e3e94a95c1d2e29c3be SHA512 d5ad7aa6d6531616448c131817cfc41044dcab0bb71baf5a49819996370ad8d9bf239132b54bbab1650634a953e05ff3aa5f6ee300f2aba14a70e74d3c44bcfe
+DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
+EBUILD rocr-runtime-3.0.0.ebuild 955 BLAKE2B 21e1b80748a10bd2ec2fe2e36585dec7533e895d36e4ce6db8150b547fd506f582bca87617f5c239827d0cc06ed25df81c6ca8d657f1a1fd667b7d978bf1784b SHA512 77a02af04f4af86a328fda9673c12907621287a183a6de4403d1284aeed7d8d52b7632e515136b462c1983a0860206fb8b7bbaeec8bb9bc7439be9f404f5b38e
+EBUILD rocr-runtime-9999.ebuild 890 BLAKE2B a48faca23a0911064a0d06052647ce7134f9f0f4914ccdc67b30abe7bcdb661396a532fdbddcce1d08b663a05e2d4edba93087cf4db6a5715ec720f594b47c6b SHA512 789c4b0796646199a6383cc5e4b8ef04e4756a8a5bdfc66cd87d6c8c75a0a556031ca8da99b92e5646d5c2a17ae2705a7577f0a8388bfdbe688c5f6db16fe6e5
 MISC metadata.xml 720 BLAKE2B 79e9a058e954fd4d4d7d3490f5cda3e157ac772ca9dcb973d14bae4cfe572de2edc4f6b36c8ec1803632dfeb30c734552566ed1100d0ef89c74fa7386baadf3f SHA512 3a13dc340357222fbab6e417c63c83905c3c5fb9aacff18097ba954eae0cca26e752749dd0da031658de5ab96a30528775ee55403b09b36b17c98f108bd6c1d1
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
deleted file mode 100644
index 2caeebb2bbba..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/
-
-commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6)
-Author: Craig Andrews <candrews@integralblue.com>
-Date:   Mon Jan 7 21:06:14 2019 -0500
-
-    Correctly install the library into the system
-    
-    Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
-    Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37a9b09..545f183 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} )
- 
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
- 
- ## Find LibElf
-@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
-     add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
- endif ()
- 
--## Create symlinks for packaging and install
--add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link )
--add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Packaging directives
- set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )
-
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
deleted file mode 100644
index aef3d297034e..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71
-
-From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001
-From: Sean Keely <Sean.Keely@amd.com>
-Date: Thu, 5 Sep 2019 20:58:57 -0500
-Subject: [PATCH] Correct doorbell_queue_map allocation.
-
-doorbell_queue_map should be allocated unconditionally.
----
- core/runtime/amd_gpu_agent.cpp | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp
-index 9b79a6b..76df913 100644
---- a/core/runtime/amd_gpu_agent.cpp
-+++ b/core/runtime/amd_gpu_agent.cpp
-@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() {
- }
- 
- void GpuAgent::BindTrapHandler() {
-+  // Make an empty map from doorbell index to queue.
-+  // The trap handler uses this to retrieve a wave's amd_queue_t*.
-+  auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
-+
-+  doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
-+      doorbell_queue_map_size, 0x1000, 0);
-+  assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
-+
-+  memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
-+
-   if (isa_->GetMajorVersion() == 7) {
-     // No trap handler support on Gfx7, soft error.
-     return;
-   }
- 
--  // Disable trap handler on Carrizo until KFD is fixed.
-+  // Disable trap handler on APUs until KFD is fixed.
-   if (profile_ == HSA_PROFILE_FULL) {
-     return;
-   }
-@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() {
-   // Assemble the trap handler source code.
-   AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_);
- 
--  // Make an empty map from doorbell index to queue.
--  // The trap handler uses this to retrieve a wave's amd_queue_t*.
--  auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
--
--  doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
--      doorbell_queue_map_size, 0x1000, 0);
--  assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
--
--  memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
--
-   // Bind the trap handler to this node.
-   HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_,
-                                            doorbell_queue_map_, doorbell_queue_map_size);
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
new file mode 100644
index 000000000000..29429d0c4807
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
@@ -0,0 +1,45 @@
+https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51
+
+From 09a835e8de2d88e917328a78765a1db423d21920 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Sun, 29 Dec 2019 16:57:00 -0500
+Subject: [PATCH] Correctly install the library into the system
+
+Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
+Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
+---
+ CMakeLists.txt | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f292182..7474dd2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,6 +61,7 @@ endif() # if (ROCM_CCACHE_BUILD)
+ 
+ list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
+ include ( utils )
++include ( GNUInstallDirs )
+ include ( hsa_common )
+ 
+ ## Find LibElf
+@@ -176,17 +177,9 @@ endif ()
+ set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
+ set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
+ 
+-## Create symlinks for legacy packaging and install
+-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link )
+-add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
+-add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
+-
+ ## Set install information
+-install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
+-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} )
++install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
+ 
+ ## Packaging directives
+ set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild
deleted file mode 100644
index d75707a03ba0..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}
-	dev-libs/roct-thunk-interface"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
deleted file mode 100644
index 507d471dc104..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild
deleted file mode 100644
index dc4aad01c299..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}
-	dev-libs/roct-thunk-interface"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
deleted file mode 100644
index 507d471dc104..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild
deleted file mode 100644
index 9a38ed332383..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
-	"${FILESDIR}/${P}-fix_doorbell_map.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild
deleted file mode 100644
index 507d471dc104..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
index 507d471dc104..8e95ac72ed0e 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
@@ -18,7 +18,7 @@ fi
 DESCRIPTION="Radeon Open Compute Runtime"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
 )
 
 LICENSE="MIT"
@@ -33,5 +33,5 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index 6a89ca2901eb..cc439a3d6b68 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
@@ -30,5 +30,5 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 48008f60917d..7afe53c56058 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,19 +1,4 @@
-AUX roct-thunk-interface-2.0.0-correctly-install.patch 11811 BLAKE2B d1e17c4c1d01e3c9baeabf8e7e82283dc89578f06a87de645e21786fa4d1258a07a3bbb52b1f9650f79df0e0e1464e6188f4b2fcbeed1d4398897b01aa4680f5 SHA512 3026e293da9ffc26d8a0c6c2cae1d8580c28eb05460e36568bcae5bcbea606280bca15acecd66895db7173397753beec0a2a750a8286c5372754e9861e28e870
-AUX roct-thunk-interface-2.6.0-correctly-install-pc.patch 943 BLAKE2B b6cf3f6d9a3d8e29929e3eab94155eee6c3100dd0717806ee85e355ca23a607436ab0711dd6a22ef9428443db9a85200a98edcb2f47cb318947696eded4507de SHA512 78088c886c7c7c7fe40b08bdf7596f305f3db920a10f7df1830af46b2ae5ebdef9e7d3ad84b5bce8b0cdbc952af4ffc1ace9275ccf64b473aa61db56428e6c19
-AUX roct-thunk-interface-2.6.0-correctly-install.patch 982 BLAKE2B 75306fd9f457a2d785571ba29b35012c284ce237e56636b411bf98acc85b245b4c536bbabf15ccc40a7bd55cf8e5e6e07312818dc5a278e6d10037211d0e2986 SHA512 26e5c6463fe57f03e33038107fc8883550c35c1103ff5c53a2ff7bd4531e6e8b8b16652bde719e5550ce8233180d0d90fa1bbce8dbe7693ba5afc38479429533
-AUX roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch 1182 BLAKE2B 824b99754d9a6c9ab61b9e195e34eb2927b436bf9a1080d0645e220a76199797169616518fa36154c8afaafbeacc85c3d5ede2abb4acfbc5cb4b420222deb4ca SHA512 ab8ee4abc9418809ecc01fccd91bfffc8d189405c533ced32d6f6a28ca6c4d8da0fe9b5a2b225e2a7bfb7275c3a018d1290f743d816071a1b930f608eea10c5c
-AUX roct-thunk-interface-2.6.0-pc-prefix.patch 860 BLAKE2B 93118ca68359edae385b8842512ebe37c7ba1ec88e11a90bc6ee561eb22de87364cc716830575b00dff99638a6f429060d1f90e7e46911f2c49a7aa301bf4396 SHA512 18d91c568e76c09fb6d49648b0ae425684ba5fbdb138943722fc7192b223343c7ae63f7e2ca96beadb4eb53ce090a4b3dda496d413bb16fbedcb95ee42753032
-DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
-DIST roct-thunk-interface-2.10.0.tar.gz 2683289 BLAKE2B 54e4eb6e5d6b0e6e99021b8ce441401cf5a8e1847cbb81d7a3bbf73ecc42d3296b067b0dc5fb1e90b406bf4f909e94bdd57a4c64e730f9f579a85d6d0c70df69 SHA512 95ca5ce1136ef576d86a642cb413f66ee3d407cf564f44ad0f9ee9cf6ee8aa411977beba33bebec2dfa6c650f7bf50be85de45e7debc058a3a3de662f4327c7f
-DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f
-DIST roct-thunk-interface-2.7.0.tar.gz 2677696 BLAKE2B 44e15d772f3e86994739ca28300cac0dde56a173daa3789a332d58ed7ac4f5e8705b778e1096d022225a8b89fa5ceb4e3e40b456d470e7ab325721328e04292e SHA512 325444d6b457dae03779730324bf683712acb07ed9379675b025456a8dfcc4f6ebf1d2e10bcf03b6474ad8353c20c8fa1d380a671578e47f9a7e27caf946ecab
-DIST roct-thunk-interface-2.8.0.tar.gz 2679724 BLAKE2B d7e1cbb0a21800016926caf6d644d10d0643e46ed888cb23414f92a55fa994c7f1de1982b025f9d116b3e596ff0224397180d6c974940f1b5038b331f1527c8b SHA512 c1c64192f5687744a069bcc1067d3edbd833b6e784e114e8772abc89940d24b7a0dbc0479f41d1252a4b69ca6a339b00bf849682ae235cb6d5fa76a6c84f3193
-DIST roct-thunk-interface-2.9.0.tar.gz 2683269 BLAKE2B 0dd5d4f6b4046711e2fc535012fb164b463000f19a3043398ca8e1382d373cfa4a5ba00c8861a3b0fdc8a34843fbcec644ef2c1598fdd08b4bf2fdf18ef3988b SHA512 ac6bd1550b56996edc7e5cc49200c8cb0dd8da42d6fca5eac27e48c45ce74583c6510847fe747bd528089d054faecefcfe630284b8cd1f9d692838d47643c0c0
-EBUILD roct-thunk-interface-2.0.0.ebuild 893 BLAKE2B 1b3d076a1042d862427afdd98d149f3f2716395f275407eafae0df0a8bfb1a410bae65ab16b18a8394d3d6516eabb4a358c66667b55555d871213929263a0461 SHA512 472c9f047007f97f15c9cece71aaba8473698f1e3a1b8a72f1e42b4e7aff298ea092fec272bfc0134550f7c31d74cd7476133c614337405ba824d96957a10ffa
-EBUILD roct-thunk-interface-2.10.0.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
-EBUILD roct-thunk-interface-2.6.0.ebuild 1162 BLAKE2B 625d067629a44d62e9f9b874bb74098226c6fd4bcc0afe520edcd6c815403137d28274d42b42bcce7ae1e2db6b8e5410cc8b03dde505377ffce4b2e285629279 SHA512 c04811fe533d4b06770ff1e19d0e9572d8f45f932aab8f60052a86d0749bbc082f39401e3fef701cdd7857c85754f8f57e49dedcde2b4974492612eb93ef8fdf
-EBUILD roct-thunk-interface-2.7.0.ebuild 1190 BLAKE2B 68654588a3a2a3bfbe5d50536c518e5be81fcd9edf69db25e8b7e4ecab42d8538c7575b770a5c359ca41955384ebf11e5841773d140af851deadcf21f821d877 SHA512 dc0e98aacaba2e3f24f86a7241224536021a9569fd8923a164af41b17b28e146c1bc9e4e40f65ee88f107b7ba8cc8210bbc129cec7958bc245ab1e3501afaa8b
-EBUILD roct-thunk-interface-2.8.0.ebuild 1196 BLAKE2B e76798567c890f59faa5964ca734ebdd3235bffbe950802797dfe7ee46e635aef32cf69563f455c5fa33a4034608eea55f952085decd84f7b5efb35323b256f8 SHA512 eaab8c6baa03d56bbf4486eb71b65c71f69e1df21ac05ed825092598b942468183dd0dc360ca941240459bfe4bf3f8a686766ec9d9222b60ea9a9e51ac1cd1c8
-EBUILD roct-thunk-interface-2.9.0-r1.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
-EBUILD roct-thunk-interface-9999.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
+DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d4b40e38f2bd1bd5ac2c77c189490df9bcc7864f8357c262ad62d6cbf0f62f41edd9e09f5b75ce1e66f3a589d143a3883942a12d SHA512 18756a626d57255cfdd03b38dbc56769e4e28dbe1b00cc1e3d99a39dcd943bafebedc1774c76a191cdaf83b2bce4ac464dc97cbd088894447afddcca50447e9f
+EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
+EBUILD roct-thunk-interface-9999.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch
deleted file mode 100644
index 8248c5f4b367..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/25
-From c60501d7e69db24f5d880aace73662384ea90b27 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 7 Sep 2018 10:30:05 +0200
-Subject: [PATCH 1/7] cmake: Do not mess with CMAKE_C_FLAGS
-
----
- CMakeLists.txt | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb2605b..8a0f362 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,15 +59,9 @@ set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUIL
- #set ( CMAKE_VERBOSE_MAKEFILE on )
- 
- ## Compiler flags
--set ( CMAKE_C_FLAGS "-fPIC -W -Wall -Wextra -Wno-unused-parameter -Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wunreachable-code -std=gnu99 -fvisibility=hidden" )
-+set (HSAKMT_C_FLAGS -fPIC -W -Wall -Wextra -Wno-unused-parameter -Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wunreachable-code -std=gnu99 -fvisibility=hidden)
- if ( "${CMAKE_C_COMPILER_VERSION}" STRGREATER "4.8.0")
--    set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror" )
--endif ()
--
--if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
--    set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2" )
--else ()
--    set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g" )
-+    set (HSAKMT_C_FLAGS ${HSAKMT_C_FLAGS} -Werror)
- endif ()
- 
- set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
-@@ -96,6 +90,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
- 
- ## Add the library
- add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
-+target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
- 
- ## Set the VERSION and SOVERSION values
- set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING}" )
-
-From d37b3e2e634a40192c113d9a8256f3d2aa24acfa Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 7 Sep 2018 10:31:59 +0200
-Subject: [PATCH 2/7] cmake: Do not mess with CMAKE_SHARED_LINKER_FLAGS
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a0f362..a2a36cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif ()
- set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
- 
- ## Linker Flags
--set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete -Wl,-no-undefined" )
-+set (HSAKMT_LINK_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete -Wl,-no-undefined" )
- 
- ## Source files
- set ( HSAKMT_SRC "src/debug.c"
-@@ -91,6 +91,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
- ## Add the library
- add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
- target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
-+set_property(TARGET ${HSAKMT_TARGET} PROPERTY LINK_FLAGS ${HSAKMT_LINK_FLAGS})
- 
- ## Set the VERSION and SOVERSION values
- set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING}" )
-
-From 7f9ad94a9932319930f96d49a78fa9e741cd7292 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 7 Sep 2018 10:41:04 +0200
-Subject: [PATCH 3/7] cmake: Use GNUInstallDirs for installtion
-
-This will allow distributions to install it correctly.
----
- CMakeLists.txt | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a2a36cd..58076fa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,8 +111,9 @@ endif ()
- 
- ## Define default variable and variables for the optional build target hsakmt-dev
- set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." )
--set ( CMAKE_INSTALL_PREFIX "/opt/rocm"  CACHE STRING "Default installation directory." )
--set ( CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm"  CACHE STRING "Default packaging prefix." )
-+set ( HSAKMT_INSTALL_PREFIX "/opt/rocm"  CACHE STRING "Default installation directory." )
-+set ( HSAKMT_INSTALL_LIBDIR "hsakmt/lib"  CACHE STRING "Default installation directory." )
-+set ( HSAKMT_PACKAGING_INSTALL_PREFIX "/opt/rocm"  CACHE STRING "Default packaging prefix." )
- set ( CPACK_GENERATOR "DEB;RPM"  CACHE STRING "Default packaging generators." )
- 
- ## Specify build, install and package targets hsakmt-dev
-@@ -121,9 +122,12 @@ configure_file ( hsakmt-dev.txt ${DEV_BUILD_DIR}/CMakeLists.txt @ONLY )
- add_custom_target ( build-dev
-     COMMAND ${CMAKE_COMMAND}
-         -DSOURCE_DIR="${SOURCE_DIR}"
--        -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
-+        -DCMAKE_INSTALL_PREFIX="${HSAKMT_INSTALL_PREFIX}"
-+        -DCMAKE_INSTALL_LIBDIR="${HSAKMT_INSTALL_LIBDIR}"
-         -DCPACK_RPM_PACKAGE_REQUIRES="hsakmt-roct"
--        -DCPACK_PACKAGING_INSTALL_PREFIX="${CPACK_PACKAGING_INSTALL_PREFIX}"
-+        -DCPACK_PACKAGING_INSTALL_PREFIX="${HSAKMT_PACKAGING_INSTALL_PREFIX}"
-+    COMMAND rm -rf *.deb *.rpm *.tar.gz
-+    COMMAND make package
-     WORKING_DIRECTORY ${DEV_BUILD_DIR} )
- 
- ## Custom targets for the devel package 
-@@ -135,7 +139,6 @@ add_custom_target ( package-dev DEPENDS build-dev
- 
- ## Add the install directives for the runtime library.
- install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
--install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
- 
- ## Add the packaging directives for the runtime library.
- set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
-
-From d3f841cf2c504c7af9735d27d4f4b9784754708d Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 7 Sep 2018 11:10:52 +0200
-Subject: [PATCH 4/7] cmake: Install header files
-
----
- CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 58076fa..81ec134 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,6 +140,14 @@ add_custom_target ( package-dev DEPENDS build-dev
- ## Add the install directives for the runtime library.
- install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
-+install(FILES
-+            include/hsakmt.h
-+            include/hsakmttypes.h
-+        DESTINATION
-+            ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt
-+        COMPONENT
-+            ${HSAKMT_COMPONENT}-header)
-+
- ## Add the packaging directives for the runtime library.
- set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
- set ( CPACK_PACKAGE_VENDOR "AMD" )
-
-From 66e43bab21ee2a8ba1eed59e6a5052eb2f0fc1b8 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 7 Sep 2018 10:43:26 +0200
-Subject: [PATCH 5/7] cmake: Install the pkgconfig file
-
----
- CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 81ec134..5482e02 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -169,5 +169,11 @@ set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/RPM/rpm_
- 
- # CPACK_PACKAGING_INSTALL_PREFIX is needed in libhsakmt.pc.in
- configure_file ( libhsakmt.pc.in ${DEV_BUILD_DIR}/libhsakmt.pc @ONLY )
-+install(FILES
-+            ${DEV_BUILD_DIR}/libhsakmt.pc
-+        DESTINATION
-+            ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+        COMPONENT
-+            ${HSAKMT_COMPONENT}-pkgconfig)
- 
- include ( CPack )
-
-From 5f1ed605a484e30c51954817b6d8712ab4c6046e Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Tue, 25 Sep 2018 18:47:57 +0200
-Subject: [PATCH 6/7] cmake: Do not strip targets in the release build
-
-Distributions want to generate debuginfo packages, do not strip them! If
-you want to do it during installation use 'make install/strip'!
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5482e02..f8f58cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,11 +104,6 @@ target_link_libraries ( ${HSAKMT_TARGET}
-   pthread rt numa ${PC_LIBPCI_LIBRARIES}
- )
- 
--## If the library is a release, strip the target library
--if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
--    add_custom_command ( TARGET ${HSAKMT_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} ${HSAKMT_COMPONENT}.so )
--endif ()
--
- ## Define default variable and variables for the optional build target hsakmt-dev
- set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." )
- set ( HSAKMT_INSTALL_PREFIX "/opt/rocm"  CACHE STRING "Default installation directory." )
-
-From 86b29b265c1a91d2bc931453e4edac66a6d9da0d Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Tue, 25 Sep 2018 19:16:43 +0200
-Subject: [PATCH 7/7] cmake: Create cmake config file
-
-Another cmake project like hsa-runtime could just use:
-
-find_package(hsakmt REQUIRED 1.9.0)
----
- CMakeLists.txt         | 31 ++++++++++++++++++++++++++++++-
- hsakmt-config.cmake.in |  9 +++++++++
- 2 files changed, 39 insertions(+), 1 deletion(-)
- create mode 100644 hsakmt-config.cmake.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8f58cd..6e5a0fe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,7 @@ set ( HSAKMT_PACKAGE "hsakmt-roct" )
- set ( HSAKMT_COMPONENT "lib${HSAKMT}" )
- set ( HSAKMT_TARGET "${HSAKMT}" )
- 
--project ( ${HSAKMT_TARGET} )
-+project ( ${HSAKMT_TARGET} VERSION 1.9.0)
- 
- ## Set default module path if not already set
- if ( NOT DEFINED CMAKE_MODULE_PATH )
-@@ -44,6 +44,8 @@ include ( GNUInstallDirs )
- ## Setup the package version.
- get_version ( "1.0.0" )
- 
-+# FIXME: The library version should not be tied to the project version!
-+# There are rules how to bump version numbers for libraries.
- set ( BUILD_VERSION_MAJOR ${VERSION_MAJOR} )
- set ( BUILD_VERSION_MINOR ${VERSION_MINOR} )
- set ( BUILD_VERSION_PATCH ${VERSION_PATCH} )
-@@ -171,4 +173,31 @@ install(FILES
-         COMPONENT
-             ${HSAKMT_COMPONENT}-pkgconfig)
- 
-+# Create cmake configuration files
-+include(CMakePackageConfigHelpers)
-+
-+set(HSAKMT_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-+
-+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE INTERNAL "")
-+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE INTERNAL "")
-+
-+configure_package_config_file(${PROJECT_NAME}-config.cmake.in
-+                              ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
-+                              PATH_VARS
-+                                  INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
-+                              INSTALL_DESTINATION
-+                                  ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-+
-+write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake
-+                                 COMPATIBILITY
-+                                     AnyNewerVersion)
-+
-+install(FILES
-+            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
-+            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
-+        DESTINATION
-+            ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+        COMPONENT
-+            devel)
-+
- include ( CPack )
-diff --git a/hsakmt-config.cmake.in b/hsakmt-config.cmake.in
-new file mode 100644
-index 0000000..e6bad17
---- /dev/null
-+++ b/hsakmt-config.cmake.in
-@@ -0,0 +1,9 @@
-+@PACKAGE_INIT@
-+
-+set_and_check(HSAKMT_INCLUDE_DIR @PACKAGE_LIB_INSTALL_DIR@)
-+set_and_check(HSAKMT_LIB_DIR @PACKAGE_LIB_INSTALL_DIR@)
-+
-+set(HSAKMT_LIBRARY @PACKAGE_LIB_INSTALL_DIR@/@HSAKMT_LIBRARY_NAME@)
-+set(HSAKMT_LIBRARIES @PACKAGE_LIB_INSTALL_DIR@/@HSAKMT_LIBRARY_NAME@)
-+
-+mark_as_advanced(HSAKMT_LIBRARY HSAKMT_INCLUDE_DIR)
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
deleted file mode 100644
index 4d0680415ce1..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39
-
-From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 22 Jul 2019 17:06:16 -0400
-Subject: [PATCH] Install libhsakmt.pc to the standard location
-
-pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/
----
- hsakmt-dev.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
-index eb0d3e2..195cc6c 100644
---- a/hsakmt-dev.txt
-+++ b/hsakmt-dev.txt
-@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
- set ( CMAKE_VERBOSE_MAKEFILE on )
- 
- ## Set the install targets
--install ( FILES libhsakmt.pc DESTINATION libhsakmt )
-+install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
- install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
- 
- 
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
deleted file mode 100644
index 961d2978a2d1..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38
-
-From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 22 Jul 2019 16:18:08 -0400
-Subject: [PATCH] Install LICENSE.md to DOCDIR
-
-LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e020132..398da3e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev
- 
- ## Add the install directives for the runtime library.
- install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
--install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
-+install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- 
- ## Add the packaging directives for the runtime library.
- set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch
deleted file mode 100644
index 711c16f852e0..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/42
-
-From 9090559aad755bf2b5041fb617c3ddf790c7cdf6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 8 Aug 2019 14:01:04 -0400
-Subject: [PATCH] hsakmt-dev should not install linux kernel headers
-
-hsakmt-dev should not install include/linux/* (currently just kfd_ioctl.h) as those are linux kernel headers provided by the linux kernel header packages (`linux-headers-*` on Debian/Ubuntu or `kernel-headers-*` on Red Hat / Fedora)
----
- hsakmt-dev.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
-index eb0d3e2..6af364c 100644
---- a/hsakmt-dev.txt
-+++ b/hsakmt-dev.txt
-@@ -44,7 +44,7 @@ set ( CMAKE_VERBOSE_MAKEFILE on )
- 
- ## Set the install targets
- install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
--install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
-+install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} PATTERN "linux" EXCLUDE )
- 
- 
- ## Set the default generator types for the devel package.
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
deleted file mode 100644
index 0b4a716e6c9d..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40
-
-From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 22 Jul 2019 17:17:09 -0400
-Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig
-
-The location where files are installed is the value to use; the CPACK packaging directory isn't important as the pkgconfig file is used on the system after the package is installed.
----
- libhsakmt.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in
-index 3093afc..1abb66d 100644
---- a/libhsakmt.pc.in
-+++ b/libhsakmt.pc.in
-@@ -1,4 +1,4 @@
--prefix=@CPACK_PACKAGING_INSTALL_PREFIX@
-+prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
- libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.0.0.ebuild
deleted file mode 100644
index ba407458247a..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${P}-correctly-install.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
deleted file mode 100644
index 69e6b7fe853e..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${P}-correctly-install.patch"
-	"${FILESDIR}/${P}-correctly-install-pc.patch"
-	"${FILESDIR}/${P}-pc-prefix.patch"
-	"${FILESDIR}/${P}-do-not-install-kfd_ioctl.h.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-src_compile() {
-	cmake-utils_src_compile build-dev
-}
-src_install() {
-	cmake-utils_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild
deleted file mode 100644
index e7eb65985846..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
-	"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
-	"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
-	"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-src_compile() {
-	cmake-utils_src_compile build-dev
-}
-src_install() {
-	cmake-utils_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.0.ebuild
deleted file mode 100644
index 454c65e73c12..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
-	"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
-	"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
-	"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-src_compile() {
-	cmake-utils_src_compile build-dev
-}
-src_install() {
-	cmake-utils_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
deleted file mode 100644
index 8309cffdc300..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake-utils_src_configure
-}
-src_compile() {
-	cmake-utils_src_compile build-dev
-}
-src_install() {
-	cmake-utils_src_install install-dev
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.10.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
index 8309cffdc300..9ec113c78ebe 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.10.0.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils linux-info
+inherit cmake linux-info
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
@@ -16,7 +16,7 @@ fi
 
 DESCRIPTION="Radeon Open Compute Thunk Interface"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
@@ -26,18 +26,17 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_compile() {
-	cmake-utils_src_compile build-dev
+	cmake_src_compile build-dev
 }
 src_install() {
-	cmake-utils_src_install install-dev
+	cmake_src_install install-dev
 }
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
index 8309cffdc300..9ec113c78ebe 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils linux-info
+inherit cmake linux-info
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
@@ -16,7 +16,7 @@ fi
 
 DESCRIPTION="Radeon Open Compute Thunk Interface"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
@@ -26,18 +26,17 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_compile() {
-	cmake-utils_src_compile build-dev
+	cmake_src_compile build-dev
 }
 src_install() {
-	cmake-utils_src_install install-dev
+	cmake_src_install install-dev
 }
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index b23717bb1ed6..1e954914cd8e 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,5 +1,5 @@
 DIST satyr-0.26.tar.gz 434820 BLAKE2B 4463c69e6ac2eb8237f599bfeed308265a906c6e3efa154b14eb6ee7acdc65580da9baf5ecb99e4efa4f8c00f7656ff2a747e607f2293b12a513ed680986fe08 SHA512 45dfc42e05e93fa0417c8c5d6811097cabaa0f4dcfb79df13d3840d789cfd41c84382ae84882ca120b1a3120987123a306656324cf39f306046a5d30547db656
 DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710
-EBUILD satyr-0.26.ebuild 1002 BLAKE2B b0c1a8d0834bf9afb5c75e6579d487006cdde99bc48c3fd28acd6baa962777d188550d752c6043a1cc402e42d7d2843124a5b5852746fae62c645f633d1312e4 SHA512 1940705374030503aacdf29dfad75b6052bb2357fcf808fbd8556a8e92a0b1567cd897fc8e91f6d5c4187bde67baa78263e2f3c0d54c81dae66b8b0fa8cfb949
-EBUILD satyr-0.27.ebuild 1004 BLAKE2B 511d1d574d4be5b9588a88468a2d45d9bf529d67f14f06fe259cd7ce65a7155db76051d9d8e3225d4616022f97875043f1973e6af4d4cc8eb647472a47b29f44 SHA512 ec3782a89ff3775d0cebe78c5d529f9eabd3fb5da90a6a3c69da3424dfe61f250ad218023f0d469335c5f8ca6b0ad439aa28f5463e2c25065c4e1347e6579cea
+EBUILD satyr-0.26.ebuild 998 BLAKE2B 08132e235be3f21deab7abccc2ddb5021851839f4012d985144bd89a7078a09bcf0e854e6e6c4626f9817c20a2aded73303892451e26001792b812b1e007dfaf SHA512 4c8108312645f67c1da4aafdf5693295d4706c7ca1c2f63fe7933c2283488411c30e485d188b64eb9ccffd3caf5c0927608218de5075429309cd82e06d11388b
+EBUILD satyr-0.27.ebuild 1000 BLAKE2B 2b1cb4e87e8659fa52104afbef990723f885b42cda56cede10da9239f1c5f8e7feda8e1aed6580fe9205c836e71105c93f91f45c9001334587a5a58e0b7d453e SHA512 e981c58278d065912267460d28e0eecf3b37475ef873b4b40a343617a29fcc504658ae6e182c0ceaefc60ee060155b82c193c9c8338c394e4522fc3cdf685000
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/satyr-0.26.ebuild b/dev-libs/satyr/satyr-0.26.ebuild
index 064dde807ba2..face20cac54a 100644
--- a/dev-libs/satyr/satyr-0.26.ebuild
+++ b/dev-libs/satyr/satyr-0.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/satyr/satyr-0.27.ebuild b/dev-libs/satyr/satyr-0.27.ebuild
index 0a2c9047857c..8293ade15b76 100644
--- a/dev-libs/satyr/satyr-0.27.ebuild
+++ b/dev-libs/satyr/satyr-0.27.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 023b549fbd3b..dc821238e8e8 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,5 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1150 BLAKE2B eac294763bd73110213756378114c176524f64e9c50c4104206796299bc95decc185b51514bca8b5b7f31d0fa6cdfa7384667853decc678c6b6605fe59844615 SHA512 76aa9ec1eca2e0452cf42cf95f4396bcf03fe7da10c01eb81fb9fd15d94fbdfc714a5486e12e168f2e315e6629aceaec4ef5884dad741bb0bb3e9ab832df2bb2
+DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
+EBUILD serd-0.28.0-r1.ebuild 1146 BLAKE2B 537cb27f4ffec82745703470f0be2dc609ab926b6436a91e8322c6eadcb8b294aa072dc5ec1a3c2ef6745af45a3068a33cf8c8a5b85a06928b166740e7039e05 SHA512 eaab6d8887bd979bf6985d23723b7d76c18e83e1e8ac5700f5191dcae1c116e85ba8962e9b33e532a9e105510baa28caaebc13203815296b215282d0fdfc00f3
+EBUILD serd-0.30.2.ebuild 1155 BLAKE2B d438511c01a1c727fd3951ef78170a8d370d24a95777978d7b9dffd9f215d36caf36ba54568552b303212dde2339c442fb590d960e0ce3100c29ab090feeb0d2 SHA512 faf4cb7d161b48ec142a6ba4c7b00622de7027f48f2f016a7c9d051bc46ace36bcf6d1bb53957c979b2fbb63ff639d4609a7fb4c57d367aa845a5fc91c7a984e
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index d3d37b89f09e..2549676afb5d 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/serd/serd-0.30.2.ebuild b/dev-libs/serd/serd-0.30.2.ebuild
new file mode 100644
index 000000000000..7825cd29b5ba
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 67f7acb5a21f..e8e3d8064b52 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
 DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
-EBUILD sink-0.8.0-r1.ebuild 1141 BLAKE2B 6b5d8760261e500ee0102869b986a741c1ee2e20e663bc41a47b17d4deeee9283d9f1fab4dad4a3276f8968b3a18db5ab2bcd95f802ada02f501410e72a5b6af SHA512 70a46bda78a774a717e5118880d70f6215161db2c9275cd0bfd439749b19fc43efdf47afb25b34aba43b347dd502916a1a57796efb51f19de78e15e4cced4388
+EBUILD sink-0.8.0-r1.ebuild 1129 BLAKE2B ada5bc9d8bc7de4375b19ab875e426401860eec1ebaebcb1a846ad982aa1473e26004581dba5105631ee42294b1fb7927562188b4a4a186cf7105cad61d77b87 SHA512 662d5bebdc8c6364ed509be48b3bb80d780267c9d17e40919c0f7ea03853e37191bf41bfc470696cd8e7d23f439d25afff136db8a78a6bcae6f8a36e64ae503c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.8.0-r1.ebuild b/dev-libs/sink/sink-0.8.0-r1.ebuild
index b578e12e6682..439b04419d72 100644
--- a/dev-libs/sink/sink-0.8.0-r1.ebuild
+++ b/dev-libs/sink/sink-0.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Data access layer handling synchronization, caching and indexing"
 HOMEPAGE="https://kube-project.com"
@@ -50,5 +50,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index c78103ceec94..79e2dca08536 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -12,4 +12,4 @@ EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0
 EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 EBUILD skalibs-2.8.1.0.ebuild 882 BLAKE2B f3740ba8bc67c046903273f9afb3694f8333df95da37fe23a1a52143a0b1b7ebd803d7f42c0adda6ed6271c5782fa4da54e17eb1647df86818c1712a43ff4938 SHA512 4d7e3cf600955a6e34b9c540c24d54ef6de8094cf6ec2082064f1802e7f2adb3d29dbff2cf67674ac743c526b0cdb614053f42c6e49f35f21c00b676a2678f05
 EBUILD skalibs-2.9.1.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
-MISC metadata.xml 578 BLAKE2B d5f0ec32e0f6466121a5e91ddfd707a488517f4009fbb999e2ef04d5425dadfe16d4ff7792b64b65065a24b3723aa3076999ca2ce576bb7b134916e0a723b7e6 SHA512 837e8b1a0a2cc499f6431f3ea91a6b240c74d3e6087457d1282f1389f80a501446cd49d65de4233e1a58ce5ecc8191ddb7583d1a03486c35f77c7cd47eaf4890
+MISC metadata.xml 475 BLAKE2B 14654721ef2c40091ee85f1789ac8601d271a2411f5feb4ec4c0cc99cc26e4e2e3e91cd96372320f717d43ad6d02aeb0a393ca9ea77d3c1f37a528f312fb1f9b SHA512 72c5fe49b31579d39247e67b0d1004263462e9d2240d180dd10b1dd9dc139daa3c148b15a8490ec9d2c5865acd67270729354a1dbdd4b8919fa72a6ce72ac521
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index 993ae0503a73..d591c754323a 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -6,10 +6,6 @@
 		<name>William Hubbs</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 7ff732f1563d..dc14d7944343 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,4 +1,4 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-MISC metadata.xml 365 BLAKE2B 1661f2dba2653a4fd4ca4ed53b9d10ca647c3e13ec93eb21062505578489e4d403c497f304f18be655e116f7bdad253f79de7cf185af9512676c43ff5fe3f8f0 SHA512 a5641e507a0fb5bb77278a39c5dd3f9f228438f650e8ea8710855c0499521b88b7197d89d7c5866471826485e840863258520b026c3ca1b2eb7555bc842dd262
+MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 5b486dde6ca3..b3985265b06c 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gost">Enable gost algorithm</flag>
 		<flag name="migration-tool">Build db migration tool</flag>
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 7d2ebf7a6f1a..a93316dfb843 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,5 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1152 BLAKE2B 92408bb67bc656c14968fae1db0ce2204e1c54c71eb976b4ba0ecb2982e8edc9a67df1f95d22fb508f9480885548c2a1432119747e24c16890490e43ac963281 SHA512 a3bc9158b6b8a6919092d81be2d1fd8abfcf0d67e660ee664e7483b18cffe5e7efbe863cb0f29680a95043f788dbb59d79a3b89d107db4b6781c142d1fab6d13
+DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
+EBUILD sord-0.16.0-r1.ebuild 1148 BLAKE2B 40e93c48be33c0eec86de3f1793062fcbb939bc4d816e3623689da93cb2562bd1ec2c07e81829d40b38d91c453084f64d9d5ee1fcefe069c6ff5cb1e5ae5d1c7 SHA512 0b03a9df9245fa0a7f96bc43077f1e9f4962fb301d623e45617e688b64e5a0c2e23dc3fc8cf32f889a6117377bcead920abe0f109d522c5680bb5bc0ef14785a
+EBUILD sord-0.16.4.ebuild 1178 BLAKE2B 94cb5b79c3da5194021ce48776c4500e3758a12c29af0d876c2d26d22fd8069640f214d1664409199bd5a735ec742ef34b4650173b601b3cbbca092f266f5776 SHA512 02fbeaacce80974848ea9d49ae16fc6509597d337a03a05f6f84a856bdcfa558b4e0ede03022b7af9c1eb963aba5068d8998b81e35aa39973dc249ea000ba871
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index f6f3996f2d3d..22f72b49ad8c 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4.ebuild
new file mode 100644
index 000000000000..faef78b88b77
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/serd-0.30.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 107de96a66ba..e7ced24fd87a 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -4,7 +4,7 @@ DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb6
 DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 EBUILD spdlog-1.2.1.ebuild 798 BLAKE2B 8ffe4e5f77b92df1224f720f5b3fa80343d2e4ebd358601993c55cc2a461e50acef7edf02a3114d0c6131d178a9ec5dd8e5307b0a09fae5077ddb756bdd0df35 SHA512 f9aff80aa1788c66653038857412a90b8b117f6d49a624f4b59734f8eb0dcc292914b42090389e3a2781543ae87193b7e4546398e6e1a988c7daf99769bb4610
-EBUILD spdlog-1.3.0.ebuild 827 BLAKE2B c295ba9be84849f8905ab0a5810c9627c4382b4a0ef3d398f94e1ba7cd50b6abe2f718beb954a9c6e3d8d12f0998b803f8eea0febf511799a668a29de0dd72ef SHA512 ebb8dec579977c05b6b26160b975a49f8c1993f6348904e4ca04487a74fdf1c6461417a452ccbe79e5de634f1d07f926062f774940340849cea3def63dbaa43f
-EBUILD spdlog-1.3.1.ebuild 822 BLAKE2B d532e3df48442ee93a256b55b7aaf28bd5171091f85792ff4efaa7c6a611a9f56677fdead4e77b072b3840feb2b2bfb82e440303fa61410869229dbe0ab4f48e SHA512 d043fccfe2209d64285a8c84b6790c77fa5d1cb52557e1357cc019ec90a1f843e400f83664f2ff835fc811b82f5e70c25de56702d54918c2f75398b7bc02b751
-EBUILD spdlog-9999.ebuild 825 BLAKE2B 4726e4acdb3f32de70ac18412e968968f9b68793b4bca8fd8751644c7aea179504250ccedf9667308ce02ccc56742b73d866f06c1ae39fcb29ac1c9c4151f922 SHA512 7c358d725df9d7433332e7a401a283dfd52fe40811a9679d07583a970449749b3e4cb18302b6cba997b21b032995224e938d0b5c561929094e6caa1581e3c159
+EBUILD spdlog-1.3.0.ebuild 815 BLAKE2B 2520532be01f53bb3d8d0456a9fc4d5b089c8afe47856875aa430836114b49c58f62f5de9cfe61b126d0d5ee52ff88f89da8ea69d54007f675fea7cd3b950917 SHA512 c63ca281d591f47bf05cf08097cba70a339935c002a71e214c1e36e49de03a208d0114fac7e21dbd3bcb5d4c5d626cb1b428e4245a109a01e6d97fd2cf73dc60
+EBUILD spdlog-1.3.1.ebuild 810 BLAKE2B 7f495e88a4f8bd7f7818f22f6addaee6ed9895b7e9fb740eb2bd0bd6a0faf348f64a8259f7422ba5c0c31eda4840d31abd2971b1dd8cb79655664518df7a8305 SHA512 629167cf132eec58078359c08198afc6c67ce7c2e8049248ca9e5780a81b02d489c059803fcfb913c3cb638e4aa91bad07049dc67e6430590fd4131a996b6a5e
+EBUILD spdlog-9999.ebuild 813 BLAKE2B 71b8a277040b9d9a2f481c1ca81ca7672cae9e3a98e347755dd5dd4bec11e6b33a9e755ec116c5743662369d7f3427f5339d84324c646784c4873bf83314a970 SHA512 854576a2045b682983ed166c16558789ae3db138b480dc28f0dfb0b73a2f8fbaa3936d43159691f71d86b86ea3b4614f073f9402258946ae9f37637f423f6b32
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.3.0.ebuild b/dev-libs/spdlog/spdlog-1.3.0.ebuild
index d1e170a969e1..f6cb54548b9b 100644
--- a/dev-libs/spdlog/spdlog-1.3.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Very fast, header only, C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -37,5 +37,5 @@ src_configure() {
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index ddf07aa21ca6..69ab5a2e653a 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Very fast, header only, C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -37,5 +37,5 @@ src_configure() {
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 3381d35fd4b5..f0b80109ac4a 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Very fast, header only, C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -37,5 +37,5 @@ src_configure() {
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 71d1e63474a5..074ff8f7a065 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,5 +2,5 @@ AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24.ebuild 2929 BLAKE2B 1763330001db9f888bd0255bde7732a39124383b6365f134cf22278d6c59b5534a5ad5f0ec6d92e78f0c3a596456838d92dbf1f085a9f7edc1074edb3320d3c4 SHA512 7f31eca16ec6373901784af07f3f3251bd336ec725d55e90be016e6ea4bd9f8aeb4c1ade5ea7053fdd721d330ec1fb15ba58343a18bb7cd4fe943cca9345e04d
+EBUILD stfl-0.24.ebuild 2932 BLAKE2B 7e636f17b03fda9000069f34c2026b157f043cdeedcae3c65ac3e9d7657b96db17827abd85285703ff89d77b8a71c96b5bcdd4dff5b8d1f8534024e135a86b10 SHA512 fecefdba1326ab26e743ec32e0b9e018d7343e1e05f0b8550caa70dd9b676c1c98d5fdfff6c6d8dadf9f0a9ea39dd62017852f7bec2b4aaa721892f4e0ceff7b
 MISC metadata.xml 835 BLAKE2B 9b1973c44652dcce024f65586aee64af73b7e565e3681e42dc429d58c769cc316720a6fc48baeabb9288499f9d24c42d5161cf3bdfe718265d0b203eded36c8f SHA512 7c326da342ebd368f624757f1aab37d158f752ebe45e52d85bec640c6f6cde7c5e473d9214e24e09d71b22f7790dcad22f339181b6bc7333f1187bd8ff3c6e3f
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24.ebuild
index 18f86be116d5..df27aa0aff9f 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 GENTOO_DEPEND_ON_PERL=no
 inherit eutils multilib perl-module python-r1 toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/stp/Manifest b/dev-libs/stp/Manifest
index ee0c08ca8051..d44eaf2fcbb9 100644
--- a/dev-libs/stp/Manifest
+++ b/dev-libs/stp/Manifest
@@ -1,3 +1,3 @@
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
-EBUILD stp-2.3.3.ebuild 1002 BLAKE2B 1a79e33d06bcf6ff3300268970d2eceb0d30b186e3c424a60c6b440aea4f9b16b090d8138739adebc50bbf1369a8fd1be3ed5156b16a749c7d170a1e5a6f5275 SHA512 95e67894fff3a2bca4313f86c1de94f6088cd51c03e145ef58ee0e414a0e214f096f6a740504ea6dfc663bf22cba41126e897cf95a26ebc3180700932e612c1b
+EBUILD stp-2.3.3.ebuild 978 BLAKE2B 78cbcab6fce1affe803da0f541c12554a671b2e21e6a92190c0ca8bb7b80e4e766d11dd607756a323cfb849881e3a3678bff5b258f3195c5b2c98dc1eeb7fff3 SHA512 e24da9013e8ffda8f8d7279fb300e27e16e907ed6f1925b0d3642079b6a01ee13861ec32703d7f5506d71f3e99294b125843ace67760181f8a30253623668de5
 MISC metadata.xml 881 BLAKE2B bb604f1cf823b06a4d7bff96ec805bc2418dfcdeeaa17ca88f98c509b687b7467f7c6864d25294d8f1f1e4cbaf0e7d99b82edd27fcdc552353fe5510d1fbe375 SHA512 4b3e243ae419cb974f49b6d37e3e807f5ff0676cd989dc145fcd716c23bd2292177935658ea899afd9fc37a18dffc8c0949dee4a25b2e493db0f3713703ad2cb
diff --git a/dev-libs/stp/stp-2.3.3.ebuild b/dev-libs/stp/stp-2.3.3.ebuild
index a900384b2178..69e3d1b92d74 100644
--- a/dev-libs/stp/stp-2.3.3.ebuild
+++ b/dev-libs/stp/stp-2.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
 HOMEPAGE="https://stp.github.io/"
@@ -23,7 +23,7 @@ src_prepare() {
 	# replace static lib with $(get_libdir)
 	sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -33,11 +33,11 @@ src_configure() {
 		-DENABLE_PYTHON_INTERFACE="$(usex python)"
 		-DSTATICCOMPILE="$(usex static)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# don't install to /usr/man
 	doman "${D}/usr/man/man1/stp.1"
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index d702421c5cb9..61f2fdc37b1f 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -4,5 +4,5 @@ AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
 EBUILD tinyxml-2.6.2-r2.ebuild 1260 BLAKE2B 4bac40d16ecc7b9317b74ab35c1d886074b51802c4cabe0296c99f406264200f3d9f6028806a2021fef98e0008a248ed640e8b579b122e9a0d901aa055d5be3f SHA512 5d1b14a173074853b6864f603087ed7e5165e9a0a4b9bcdced139b4d8a0d969a1ff31449ab05ae34b92d00ed95cd237134f678801937feeb7c07760daed33bdc
-EBUILD tinyxml-2.6.2-r3.ebuild 1499 BLAKE2B e3b2877851aeb77c26cb5568d701fa33f22e377450b44f9e316d93d54e4b1230c5ceee5a1aaa82155389e35d83ef058f78a47462b8ac9fa157ebd0133e157a09 SHA512 6d7016dc6a2c3585e9949879722fb557f3e712eaa2027339e36a4749521e11466fdaf50b6ae81b41d2458eebf106bee48c43442c7d125b321f5bb9370c3e444e
+EBUILD tinyxml-2.6.2-r3.ebuild 1486 BLAKE2B 4309dbc198894a9364c55a165e6fcb323730a02f405203dddfeb6295b46eddb2f3b44e50d8417e90734543b3d6e484dfc909009376a9cbde0949b87c8193036e SHA512 af2bc02a40bedf0ce019f4ed7b7851a73a049476c03a15a731361f0e1f9e82df8e53d23a06ddadf538b65df46e2ecb65dcecd0cf6a2f5487cc11546a13fa2c4a
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index 41f16d2f8a0e..967e3d3de44b 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index a98c30e21d5d..1240deb0e081 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,3 @@
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
-EBUILD tinyxml2-7.1.0.ebuild 593 BLAKE2B 4893cd8515d5b30501f9469acfc56be9f9259372ac8f14ddde970fe4107627beb292895e9dc59e74677521f25dffd99bd279b856852fa20cdeec9a4352b7450b SHA512 190bbecdd9f18d0ecc51f6e911a43b927e9d4d92e97f3cc5cdba0ba1c39bc546be86db8a36bb6fe0c5b798a79049ee66ff3eddf43b0f893a4bbdc72f68e64519
+EBUILD tinyxml2-7.1.0.ebuild 606 BLAKE2B 7980b36673f2a60aad432f55140272d670894ad51c50256d14559a6f54f6224cd6df4a7bf668c64a2d26fa8a9f141cbd6dee2b4eea81390b694a34fe5163f664 SHA512 8352ffc9ce6d44da1703252801c86b03dfbe93952c601932892d25759bc28f36ce29e24abe2391d8cff778a09cd7690a1774903ec8b72ad9833b71357f460cb8
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
index 32bfbfb71ac9..a9d54f3bf0f9 100644
--- a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="A simple, small, efficient, C++ XML parser"
@@ -17,5 +18,5 @@ RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index e6770dbeaf12..c0eb65cd048f 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -5,5 +5,5 @@ DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a
 EBUILD unibilium-1.1.4.ebuild 672 BLAKE2B dfd5dbea39d0f3b49faf9a81b5d6659af1c10d0d8fb50e1dfd81c99b81340bcdbf08259174d486c5ab539400e2c207955e6710bad83f284108e10432f9fcbb4e SHA512 286bf13e85c9c719caf3c004ff2a6a9f5e96533c4a6496af7365bacf303872bd77d1c687912e07a29c4e4123dc98d6c0cda6c0678ab224b6edf0614bdcff169b
 EBUILD unibilium-1.2.0.ebuild 777 BLAKE2B edfb4a3eff49280a9d192482dbec092c2245b7ba5c78b1bbb314116a8b9dd03c886fef53ba3820f8a845c7af79f025dbecb658b4ad214609c214df54cf9ebec3 SHA512 9861c12d38def779606ef9b1c3bcf06c6c266dcedfc11b6107ec4596c91c5b13abdebad0af3cd1c82bd502cb5d7cbd9a7a188c8fe57fdb5e3c4dd06b84f4fedb
 EBUILD unibilium-1.2.1.ebuild 774 BLAKE2B cd7373f901fd4994bbf761389a8a04be3ee90d07b6a7e0fa634e46e2e1e031744a723c68b6511d1726218ef1715bac696a9242ab182974f579b0f389a1f043d2 SHA512 7865158eb602aaf3fde2f29b38b8f3f6b38c77033e442c84eff4d4136c15075eeb40c613b93303c405d33e9057c4c49453ceadaba2a83d8a077aded42a52ee50
-EBUILD unibilium-2.0.0.ebuild 780 BLAKE2B 13992b910a52c532ac929de154be3ea54817681242873a6275cecbae05dd40f04d8de26ae6936795126b2aee35c6da8c47aca14f9235f04a3d4572bbcc8063e5 SHA512 831a5aa2863407847201a360c55b424c783ab629c6d1c9c19a6a79aa4fa5fee86a65f7b2f0eb5eca237530fd0384ab7036a27049d8dd42ba4cbde4f4bde0ce1d
+EBUILD unibilium-2.0.0.ebuild 778 BLAKE2B a85109b80a66817587a79c6d3ab8499e8320385a245baf56131af1183fc978064aa4cc09665c444f9a6ae494dafa2e9aadda8a2168023858016b13d8df9952ec SHA512 39a0ece2311404cd21a528d38a3838910a4b2464ca1b6913ceb5d63c801735958a0f395a4f011e37ffcd64feb9fffda5f97975dba6de55149d0b2b405acb5a7a
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild
index 9c76937c3ddd..7fa445cb18c1 100644
--- a/dev-libs/unibilium/unibilium-2.0.0.ebuild
+++ b/dev-libs/unibilium/unibilium-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 2ccc3340907b..55924726f4ae 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -3,6 +3,6 @@ DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a7
 DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
 EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
-EBUILD univalue-1.0.4.ebuild 725 BLAKE2B cf62f7f6d380a213adfc2df16f2845946132d5c129b109130e2c62f635cb26e8100239903d6394763f049f0a01262b1e43d0781bcbaec045aff7e23a1d399add SHA512 0872f6506fa73e0ec6f5d7eade2c6d30c65f2f3b34099ca7e11a0c87bf6cef89a8f8172206038a3b8917156b25067be12376556b6861de7bf8ca7102dba316ed
+EBUILD univalue-1.0.4.ebuild 724 BLAKE2B fbfb620290be3fa105633bad5c9d2855b9a6fc4eda41487bb9ad22b7ddc2e88aa49bae8ded734a4b46138ea27dfcdbf0013d8310469dd61a2fdfa71225f54287 SHA512 8365ca1146a8d8a7e0f6eaddb8e4450f394569d44af1a3cc9d56226d520508bff8d089ce94a4c46ea9997bc55efb9cfc4a95797bcd559c3a187297a0745ee272
 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.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
index 38bce8052ccd..f4acb09a1f96 100644
--- a/dev-libs/univalue/univalue-1.0.4.ebuild
+++ b/dev-libs/univalue/univalue-1.0.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index b5b5586feead..6ab12314f758 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,6 +1,6 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-2.3.4.ebuild 536 BLAKE2B f0ea01b1af4dba1fccb992c590e419941123a123fc451c335a160ea8ce3ecde2a2cfbe82dc99555ee374663ecc7555a6462624720a42299c39a59b3b09477846 SHA512 b769ca26494a135688895450b48b914e6af28c3f52398b3b5e7d5860efac7253acac3ee523f9a6e7742bd4e72aba14b674ad09ecc52274e90c7ecc3e514c91a9
-EBUILD utfcpp-3.1.ebuild 951 BLAKE2B c515df5484135924152bfcbd12c7b0a99067ad1a4d114562e73961c52e09ac0de079ed1e5c9147d91c0cc0a54f650782f9690bfdb22f656d0ed93e30c2362f4c SHA512 7a348c70799f8bcafb3d9e776c06d955424c1a22d75cbd255dffb48db1218693bb9c4aa7184a6d776bbf4bc21882a758e1e73bc551cd849b9c4f5b0975e47896
+EBUILD utfcpp-3.1.ebuild 948 BLAKE2B 387a70b0dbdf706c8b41620ff54938d2b0f21ed45061173e29910ec352207d0b5c933ed99048a3fa04fff13fd615ef6abfdeaac104ec9596230d18b18a7650ba SHA512 a97cbda1e503c591504368101a3b150aed6d5b215fb2f115d45ba781c2fea849672876bf9369ba5d9c8ccad52f58d0283a870ae6e0df43ec1e2d7be8b87359ad
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index bffcc704a84f..ef987e96e653 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 195e1bffcc2e..9e3742cb66d0 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,7 @@
-DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
-DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
+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.3.tar.xz 3367124 BLAKE2B 795e1615c91ac0324df2f5304951204caf9c024ca9e0d1ba768d0613f6e21393648bc3654c8cc9d386a8bef2009b4c842b1b924b1fd079e2689e6c64a7e7749b SHA512 f932fbcd42e6c82c4543efcc507abdb1e1d1af9c0eac125981c55cb052357e7723cb2a08a5aa56c02ac5228d0125c9906a133ce66f8b59fca84c773060174d0c
-EBUILD vala-common-0.40.14.ebuild 2495 BLAKE2B 0729152dfedf4b36de709f45975d9b2fbebaf96e07262e6a76377b78f81808f09ba644381d260de5a45eb015a8ce531826839279ce72e2b013ab77a2a4d4d34f SHA512 894766387ea556640229c2aeed1dcc07ccd0c43d990a4f15e84ec50957b11a15f5cb8b3bcbe4e450202c0d88a7c537b61f603f8cb3a7e35b29bf91a8154c144d
-EBUILD vala-common-0.42.7.ebuild 2496 BLAKE2B 9227207a2e94dd78a5f3fa53a32f5ded118d8345e760edc51794046e574051de3d1ed5dca1c004013383ccdbb71e5ccb637ff3b892c90f9f7645e0cbf6cc66c5 SHA512 233cdae34cbfa1985a059da4c180cb40c1d3ae1a5ff705407772d17e5dbeab51a034a9ac0ab83eaaf2ae689fb55df484d35861dffea4865a7ba0afac6af36830
-EBUILD vala-common-0.44.9.ebuild 650 BLAKE2B 0e09e3f69025cc7ce005ee788a54ac963d455fe27cca4efa4783f55889ba6a78cf1908120d69c561af808a8466769145897544899e09c4332e9a841b45a34c70 SHA512 12fb3218c79418124408195f043d913113ce54fa81582c33cc9a59e904fc175914672dbb08f8c2e81ae2791ef8c188818c78d29b550b069d7bea066e33a0aed5
-EBUILD vala-common-0.46.3.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
+DIST vala-0.46.5.tar.xz 3375148 BLAKE2B 22bf169159d4f4e23398789e46c39d98a7727cd02e6539104963d34bfe569bad25338b3455ffd32413a36f5cd6061a29bdbbdb275f225f1408d6b34967b64a6c SHA512 eb1763d9c4bfe74441640f7228d44ff7cfd9a379b24b8aa906bc59be4514b319598ffee616d3de1db101134bb163715f33dd1d7a0a10ec03246c7ccf62a4778b
+EBUILD vala-common-0.44.11.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
+EBUILD vala-common-0.44.9.ebuild 647 BLAKE2B 4f9f76c9ad522291baba17c39b254cf7f4612d4c19471f53d53944f470acf6d304d2d30f17668b10d98dc42a5c61d6431f688fbf8b7d298296652b81eee48baf SHA512 23c8e4d929f1a5b15616028461ee1f4059f72542754c6fa6823168fce74045e4862be1a475cad728b35f406f88d24ea6b525cbd8a7ff7fe107b52d2d3835cf3b
+EBUILD vala-common-0.46.5.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
deleted file mode 100644
index 3dd858ebb4a6..000000000000
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild
deleted file mode 100644
index d31592e99a7b..000000000000
--- a/dev-libs/vala-common/vala-common-0.42.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/vala-common/vala-common-0.46.3.ebuild b/dev-libs/vala-common/vala-common-0.44.11.ebuild
index f66b34153af7..f66b34153af7 100644
--- a/dev-libs/vala-common/vala-common-0.46.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.11.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index 124b1a58250d..1bf75e700cbd 100644
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.46.5.ebuild b/dev-libs/vala-common/vala-common-0.46.5.ebuild
new file mode 100644
index 000000000000..f66b34153af7
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.46.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 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 ~sh ~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/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index c8f839a5ce5f..17669833e8d1 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,3 +1,3 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-EBUILD voikko-fi-2.3.ebuild 693 BLAKE2B 4410d3281152f4586c41a65c97cf9091d8cbb438ce72b1c9be6e3c3555434c7b755cccfff24cb271d8446b501a86b9a5141e1979a299b26a44bd0f6ba24ca145 SHA512 c4f8d66f4b5d494a3836f59bbe5593e081cdf76d369a25b2d390c0112c5f4e3f7273d4da43f2c6c9cf171c348a39cf78dba00aef0c01f97b9fbf37ffac9e4029
+EBUILD voikko-fi-2.3.ebuild 693 BLAKE2B 61063c6a2cc63b6ffcff58dd62689dc32b535e4651216590e2a914242d954053a39e1a20415b78ff8428a35b216d2aeed9321b029ee8d226d871da91afbfdeab SHA512 4737a3990af9fee93ab007afe8c190fa14935d8910b9e00326b85fd7c9ea21841e7d78fa570f65a78f1415b490fd062aa578e976a9ab88aa3384bc5f1d0b16b1
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
index ea6ef0415a86..7bb1c284839e 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit python-r1
 
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index d92589e69a43..a8c214d27aac 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 61cd00272bac2513b9fe847e40608d9f9a004e6b1f9baaebfe617f992d2770229db1fdc9817b6413234261d9536d761629e8753ac12cc7e8e433c5a76bf9df69 SHA512 d5f488ca913977fc4be85098e7f91b5f2c0604d094a67f740ac9fcae19028b4a87442474e2521a1e1a79873e94c76cf0172f3368dde77244555af5b9313b1ef1
-EBUILD volume_key-0.3.12.ebuild 949 BLAKE2B 7f6cffdc5385d9ec6a295840be4310cd83872b622d3618dad9079dadfc183889eb68924813974f2a6e08037d7dabee03263623838a2a293d495e760beef7c4b7 SHA512 a1f79bf60d9b134f66565e7a4249c4fdc5c47ff1f2b9b2b8dc7130578bd67c8cf018a5baceaa0c46f62b50cd955c421cbc24ebc8dd2b6a890e3bd159c32aee0e
+EBUILD volume_key-0.3.11.ebuild 881 BLAKE2B 296861ed721b3509b048996612728e41b65fbe2645c31a4a550234c446200aa6815cf5d1887a702400187ca9181707ad7660834ecb6f7aef9c83abcbf1978d82 SHA512 12bd4c524484722fe9f86ff429ab37a31fd1315d87dfa0d9d3ac784a3456ad9d6c0a61ba725b6d5d0a99d30372cc64cbd94dc57c2267777b94a01a17331d3987
+EBUILD volume_key-0.3.12.ebuild 947 BLAKE2B b265e341c848f807784c03d85cf10c0a008c03aea734a2665a95b9c7b61fb3a22c602c9d8c9566190f09d90bb91564adb73c0f6d496702c6991cd5840ab3e944 SHA512 63828dec89462d2cce3592613e39ccd317105a128961655ce4af62e6010de2202231f47f50c16af38900b5998afecfbe123a02424df4fca59e812d120b580c2c
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index fe1f873c43b4..e8b891e427ec 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12.ebuild
index 70e2b885b754..87bc022c35c4 100644
--- a/dev-libs/volume_key/volume_key-0.3.12.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 143392d5c3c4..bc4bbd001eee 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-7.0.0.tar.xz 1086028 BLAKE2B 84bd16b9d9b191be79bd58a2eecf189971f859edd922245df426ef7871533f5e2a99d484a91241953d182047a6d70d9ee64e8754ea7638637aaf777e4382e793 SHA512 fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3
-EBUILD weston-3.0.0.ebuild 3525 BLAKE2B 8258f44f7ffc7bbe23b223a349ae3d1b147b3b79d2efe1bba9a063318bd03e51d11a18bd7d1349c5c5895ab3235f8495840be88da37b9e80e3041b9f35cf465e SHA512 e36227378b2fc8f333b38e136077a6b188e8d1ff9fcb96dd26a3f9cbde0e54eec1e1993770193d10d7af02170af29a62069cc274de7471301719538eac14a16d
-EBUILD weston-7.0.0.ebuild 3670 BLAKE2B dc1a943666a406dd2f5755be858d1ccd80be230589e3205cf6e743ac6038303acaa196a6cf5089a08e7686be38e7356644635857ea46345fa15d9b91f3374246 SHA512 06119fa8dbd5f060f1a656b017501bd218ba7e5f3650d2bfa4b11c8237d519404cf55c4d47e4e4721231cc99c94f6112817230e21c8bd0bca888d7f81233f418
-EBUILD weston-9999.ebuild 3670 BLAKE2B dc1a943666a406dd2f5755be858d1ccd80be230589e3205cf6e743ac6038303acaa196a6cf5089a08e7686be38e7356644635857ea46345fa15d9b91f3374246 SHA512 06119fa8dbd5f060f1a656b017501bd218ba7e5f3650d2bfa4b11c8237d519404cf55c4d47e4e4721231cc99c94f6112817230e21c8bd0bca888d7f81233f418
+EBUILD weston-3.0.0-r1.ebuild 3530 BLAKE2B aa846ad8390e827a6762a591d5c1fb7eeaef8c4975f1ad8ca3a08940f4ee9e408ffb85bc5aaf0bf339c370bce574c95c50f703486ae90e4beb67a0cae74cacfb SHA512 84281dcdf6f2cfa35c65f72494782da88eb57cbac5364a2871798b1981afb5256907c3de22deaac35137d677594a35bdc56d157e552bc8ef7193ccbc6a73e538
+EBUILD weston-7.0.0-r1.ebuild 3675 BLAKE2B 4f7369abd97cae719c83cea76b29510359453dd596e2a3b97c3873e8526898d4b11b4cf25008f99c958eaf8ba379124f7a68212e74f6a809f4e3ff5b536fdcf5 SHA512 6b95076dfbb1eccfb3bd62b3f392fe0d3862982d89819180cece4bf7b4a2f39ceec3b63fa2b90ecaef69378cf0123143d3911a16cb0f43e0e3c10395367d47ce
+EBUILD weston-9999.ebuild 3675 BLAKE2B 4f7369abd97cae719c83cea76b29510359453dd596e2a3b97c3873e8526898d4b11b4cf25008f99c958eaf8ba379124f7a68212e74f6a809f4e3ff5b536fdcf5 SHA512 6b95076dfbb1eccfb3bd62b3f392fe0d3862982d89819180cece4bf7b4a2f39ceec3b63fa2b90ecaef69378cf0123143d3911a16cb0f43e0e3c10395367d47ce
 MISC metadata.xml 1506 BLAKE2B 7b66fcfbb46edb8480df35f1aabe87c167f02d3cbf505939523248dabadcaab41f395f6ed10eee33c08ee3fbbc2b49d391f61811a75699d4864d6f1eaea3e6fd SHA512 833531fb156a41c3d0996c50e9e72a920b315ad41b7f9a12b82a0f071b621ef9f0b73f8fe2cd63bbce7c1d63d54f41180a3496e3479ef5d0dab725a8af3330dc
diff --git a/dev-libs/weston/weston-3.0.0.ebuild b/dev-libs/weston/weston-3.0.0-r1.ebuild
index 2a914c848f1e..25e9e7ad7e78 100644
--- a/dev-libs/weston/weston-3.0.0.ebuild
+++ b/dev-libs/weston/weston-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,7 +77,7 @@ RDEPEND="
 	)
 	xwayland? (
 		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
+		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor
 	)
diff --git a/dev-libs/weston/weston-7.0.0.ebuild b/dev-libs/weston/weston-7.0.0-r1.ebuild
index bff2ce2e638a..816ad3eaed28 100644
--- a/dev-libs/weston/weston-7.0.0.ebuild
+++ b/dev-libs/weston/weston-7.0.0-r1.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
@@ -83,7 +83,7 @@ RDEPEND="
 	)
 	xwayland? (
 		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
+		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor
 	)
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index bff2ce2e638a..816ad3eaed28 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.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
@@ -83,7 +83,7 @@ RDEPEND="
 	)
 	xwayland? (
 		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
+		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor
 	)
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 4179594b9cb1..7c84325ede95 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -9,13 +9,13 @@ DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a6
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
 EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B e28415e8afd6011e49d94dfb66880b0d79ebd75f774901980f269700dab506914e7af658d477f6a3a4a2ae63d21401fb4f5304e12a971c1ff1f11eb0360f2bcd SHA512 cb5a02386c3b80d9421f1b67c724ebc0c0d2c04b73e602e7019ca4d356d337613e56eec8d55bc6d69276b410f78a3b26fdc4293c9971e3d8c02b6bc4f8785519
-EBUILD xapian-bindings-1.4.10.ebuild 6533 BLAKE2B aca3605ecf7afbfcd5ac80ced0aefcf75c2b42b9561361116db0779f5650f0e114dfcc610f961c74829faecbd4ef3a867f4c2638929db620fb3b44f7f1b72583 SHA512 e6f6aee19f83d0473afef1a15acfa760d98f21469d4ad6ca02dbd50e41e2db310b7a19d1883823c526da69828b5ecd43ff81379d11d4b815a8ae1dd15b9405c8
-EBUILD xapian-bindings-1.4.11.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
-EBUILD xapian-bindings-1.4.12.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
-EBUILD xapian-bindings-1.4.13.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
-EBUILD xapian-bindings-1.4.14.ebuild 6536 BLAKE2B 94ec9999823108ba7a01d65a9faec5975db1f7cb0fa6c5537f16114d793123532352f2dc62d626d2c97f203b6c3b541ca14bba1fb6ef299a27fc9b9027f8e16a SHA512 3750c7e13ea753cc3d1dbf4aa8356f65bf28ba4bcaccdf4102a8a4a004acc1a994df967aeb6558860dab97a9ab8f8d640779ba3ef4fade6ee7ccc681f99c7c8c
-EBUILD xapian-bindings-1.4.5.ebuild 6491 BLAKE2B 29b71eec911c53f3377c1b1ed6bbfc6fda2357b5311f50b28eea850fca465a39e8131e44db9ae72ab040c0d1938e43f987922a6555edc0bf52b3b2f0180505b3 SHA512 f5a8731bbde8be861dcef0c544c4e2b8c12863aa4c4378c055fab2f4b2d4b7b30e63a54bb4490c0379ead90360e60cc5bdc101ca46186a43f573d3436d6184a9
-EBUILD xapian-bindings-1.4.7.ebuild 6493 BLAKE2B a48e6fa3bda13e2d0b43bf3cccbdc3dc23ebd53d00a2462351d11cac50003c15f3f409fd8514bca1fc8631ba6f61cffc0dd62fe1cb1e19f5cc6fbc82cd492249 SHA512 e04b3df07efa3a2fad53ebea36d05ca1f488e05b712f2c785d2b9ed37e9334a05207363a0d8dd260b0050d50bd37fbc9e57ad3d295e2bbc697b7c5cbebb6c296
-EBUILD xapian-bindings-1.4.8.ebuild 6498 BLAKE2B 1f69dae02f5e48291349b97022797062d2bc46783ff4cad3f82e87ac4c5e330ba391beaf44ccdf7360fb23349c4dcf51fab261fb279b9336db9644af7777e685 SHA512 35ca5ee0609d4c11d93418f2bb8dbabda6fe99909bd6d78cfb134868ca6d2b0047065b1b1beb2ea8e4a421ee32345ed361e389b152b10db8e968ee113ac9b248
-EBUILD xapian-bindings-1.4.9.ebuild 6498 BLAKE2B 076ff268360e2c907ae8c02205fa267ac87777b21845602d1ffdbacbca4d56a03f581180da763186311753dbae6382f6d28df9af4ad7dafc8eb52553f7efbdf2 SHA512 fc29b02c1fd1815f75e7fefa5160b39bf19b6eb92302296f400f27bfc25499ad6e7eedd091a718406f521926759aca3c8f0cb927110da641475105ae5ae36550
+EBUILD xapian-bindings-1.4.10.ebuild 6529 BLAKE2B 81b8fcdc400147e6ad5a30e9a0492e941b96f995ee8ed1aa4e747ca2996f45366b0a152e58f09f5d002585381be5d229001cc7b501de5308ce38dfda153351c5 SHA512 82a698624c1ebd05cc87865320b77b002c621581197157238f961980e06a6ead84b46b6c7d0728fc2eb606a9df32844ac72c70517421b3a8e6fde9eacd660db6
+EBUILD xapian-bindings-1.4.11.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
+EBUILD xapian-bindings-1.4.12.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
+EBUILD xapian-bindings-1.4.13.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
+EBUILD xapian-bindings-1.4.14.ebuild 6532 BLAKE2B c92664d24a7c29e5d49668016b79f205d8dfc2435899d0af49844cfe5573a8425d71d47050158331bed9c5c804fe9018453695bb3fae528fbacfed437e48e9b1 SHA512 5835d4b35bc897182dbcfd178037b65c45207f6ec428ede9b0eda458ff2c9723e6e33a02bbb19ce378615632ae845e61209d7c1a10a4f69dff6c8aa2fea0b012
+EBUILD xapian-bindings-1.4.5.ebuild 6487 BLAKE2B ad98b5d5999be1813ce9c871a080ce6f685e13268fe573cfabb5081586a0fb2fd15316a3f56eded41061e68e3eb0285a08097dab7f5007cdc9bc43eb5813670b SHA512 5ac14de2e3e301001e3390725a19686deffc276c8ed8493fe0e7253f40d4dacea1ff5268db4ab948c5c4a1152c18e2c53da99ed4755a804fc9cae25d1ceea2dd
+EBUILD xapian-bindings-1.4.7.ebuild 6489 BLAKE2B e9aaf4a100b116c12f413f0482df3a22bae60b0b16bffc7901ea581f078e1100e3947645e42d7a2c24dfb00540e9f0ccfd72c4c97bd92c10bb5dd4c5f48376d8 SHA512 4acab7bfb063be32f10547d3a05a294a1b7930f263f4bf11d2cc2e3d1110760cb079f4dc1115a32cbe5b7a5cd2dd5f9721a80064294291e437f0729782944f83
+EBUILD xapian-bindings-1.4.8.ebuild 6494 BLAKE2B 910de7485e9209ec103f63b9d0991d2e071e34803246aad1ca03356630bd4fa2edb751146ac704d48c1cc59ae503c52abd3abcd63a5bf09e6acb86ffc418cfd7 SHA512 b058d70d790e0f20ceaaef4d4487b3234fd5ec46c33741596a3d3bbccc81f6e24d6e895fded320318f4be522c4c176d14da11ca08a4aac83e186c99bc71280fd
+EBUILD xapian-bindings-1.4.9.ebuild 6494 BLAKE2B 214cc496f8d71ffb56dfb0041612298999bbb51960e1c6b4d99eedbb5cb13258ba1064169e4ec261c545e6bcb6793d837eaa2e616fccc0b0e4f1b961d6fafbae SHA512 b18adb4c8aafcd8a0a1919c68d171083dc6779fbbf358db89f8a76cf32b3938be36722664f9f3d3666244f82f5dbb91e4cbb984ecbb4a2fb08d65f1be69eb38d
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
index 96ee738b4601..9a638f052861 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
index ec1fbcb8679d..c17baaa699c9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild
index ec1fbcb8679d..c17baaa699c9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild
index ec1fbcb8679d..c17baaa699c9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
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 dcc5b928a135..c81d6007025a 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 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.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index bd40a3130e61..b92f1b74b466 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
index 44fc02dbf987..b29350adc492 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
index 24fba835931c..906a9b8e1fdc 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
index 1be8c8397255..98e4a9ee8962 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index ec3085083e94..65890cd2c421 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -3,4 +3,4 @@ DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d514
 DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
 EBUILD xmlsec-1.2.28.ebuild 1398 BLAKE2B 577a2435ca1e9602124663b49ee1e26fde53ab7fc663cec6d1ba7b59bd59c4fb7d5a59639305bf14bfd344a5c78ae94be807511802e43ba824a2108b5dc0b684 SHA512 11992998c302c12264340cadeb23a6d57e41a824521dcc90bf98530855cd7143f651870529357684bffce2da5aa52925756731a17ce950df39f7e185e090db84
 EBUILD xmlsec-1.2.29.ebuild 1359 BLAKE2B 004a90178fd0fbea93a3424460ebfb8af3bdb19ec7a04902a222651953f9ae73c5ceb0b210776a58013b6238ce35e6e3b4d8ef0fe069a7fcf2712b4523121df8 SHA512 d864c1e1e87056688e8a83b3da041b2195deeb6ed0fdd2f9930bbf8caeeca2b5893e3b94f3b2f1d90d99293069c80086c0c3c3f0edfdbbebb7062d6fa4cf3523
-MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
+MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index e4ce1b03a1a5..68a53aac563f 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gcrypt">Install xmlsec-gcrypt library</flag>
 		<flag name="gnutls">Install xmlsec-gnutls library</flag>
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-libs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)