gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-libs
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
572 files changed, 8058 insertions, 9262 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7cceb05e734c..53e7c02440bf 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index bf531493b27b..8ddaa3b2ca1b 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,7 @@
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
 DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
+DIST amdgpu-pro-20.40-1147286-ubuntu-20.04.tar.xz 333011308 BLAKE2B 82d0b728ee06bbc1a3dde579215a23397abb223caf7e2922b71dda9f31bebf13eaf5b1c5c7f25146dc2cfb31b57d16e848b0f902e599ed361e9285998cdb99fd SHA512 9b064a3b02d2a1ec18fdd6c098b70f4a8c6f93e4bfdc4e9a032ca387bdf7223278622c19d5bd55e493555c5f734168c3f2768cb743f9e00dcf5f96cbc399c7b3
 EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2491 BLAKE2B 7c99461fe17538e95a80513d27c8d87f4be8eb1c00a81c3abbf6d9c49e671b7d61a56cc70bb0b9ca753cd331417fb2eebccf3793e75689fe1b2b9246a1907591 SHA512 03bcf084c404fd95b3791f766ff01a9b9a0790f5d757a83c0a17c5e4a1daa38ef53ea0e1a9e49b866c04b9a05ee1c74e64f7883a900a14f3bdf247ba8a6825c6
 EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 3099 BLAKE2B 451562cc7dda6ef744ca976eee0527acc42059c5c0454cf8e5c4e06cb9a3ddd84d2abb9df5e23fd1c18481fa5856c74598fb2cccdc6585ffd656a6a826463c9c SHA512 ced6cd69974c5f4f03a29f6a02fa92ab2081cc48cc0c31fdd733dad3d524f175022242dc25318804f1963530136c9c63882fabc4ba621105ab3e6fce52ea386b
+EBUILD amdgpu-pro-opencl-20.40.1147286.ebuild 3103 BLAKE2B d6b303152046801d33b1920a2c9ff0732df5acd83fcfdc697ef03e1afcfe0c3145db01d2d6246097703d1c259b5509fd13273771e5ff92349172133a9ab5df4a SHA512 e25789fafa1799785a1e8bbe57fa0aa5b9d522d2799ffc3c58eb064031aff7199bdb9be81121512425e2049a4cff20c43992703fb9ba47e86ec45f68dc1f678d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-20.40.1147286.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-20.40.1147286.ebuild
new file mode 100644
index 000000000000..4c69674212fb
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-20.40.1147286.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-40"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-20.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON=">=virtual/opencl-3"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}
+	!media-libs/mesa[opencl]" # Bug #686790
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-20.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 20.04.1 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.100"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+multilib_src_install_all() {
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	elog ""
+	elog "This package is now DEPRECATED on amd64 in favour of dev-libs/rocm-opencl-runtime."
+	elog "Moreover, it only provides legacy AMDGPU-Pro OpenCL libraries which are not compatible with Vega 10 and newer GPUs."
+	elog ""
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index ca3c8babdcde..3a063159b833 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,6 +1,8 @@
 AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20f262cbc486d57f6a1669da225386f92ac452ab0120e5095b097543430814827e74af5f9b2a7fdbdb8811f66c6b5be27d45e5 SHA512 4be4f2904ce35f29806432c04cd6c0c23783da1ebd66fb3f091c10a04749f93ceb4d49cdf6963c1f13343dd901a97446b57d39861d7251318feb03625644c59f
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
+DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
 EBUILD appstream-glib-0.7.16.ebuild 1701 BLAKE2B 7fea4d96b083a99439e2fe5e98e6f76d80ec4a9dd2233c82d12344119388364725c614dc89451e1d763162498db82226badf603c88529bddc52ea62a4cd6417f SHA512 ccfff59f9b7f034d63eda0ee1ed099b5073f6aac2a11d0d3485b38bcadf55cba34e025d72151817c4d88ebbc7cba06dc88f66ee7e924b4705dd35577bcf20d95
 EBUILD appstream-glib-0.7.17.ebuild 1639 BLAKE2B 06ee555221d3968246d134763c936a989c51596617e78f65e56a623c8fdae014e54f1c52eee24a81b2ece1f6e593f466d65b091c5703122c6666985c27e48bf8 SHA512 f28cc553a899eb4a26356053c79be6eebde61123e0ca9043447ea4ae2799bd098d6fc4b79e8eb2967fc6afb5fbbfaae65a1a6ce8aba0cebb08067bb26577b2b6
+EBUILD appstream-glib-0.7.18.ebuild 1658 BLAKE2B a234554bf5b5341275a422389df39fe4e95d93f57e5e78756e0929a94cc5f91243dc17c32e243ae611717fc0e59e9040e365d7d0b4d91731a72f1d7a14a6f791 SHA512 faf7d4045b47caec5f2b38b447142823a19214ecf046beb5d7fc2e76895656d49014f098a05abedac93252da18409d4b85587389cdd73d7af48d19d192690269
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
new file mode 100644
index 000000000000..e78820c51e2d
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg meson
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc fonts +introspection stemmer"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0:2
+	sys-apps/util-linux
+	app-arch/libarchive
+	>=net-libs/libsoup-2.51.92:2.4
+	>=dev-libs/json-glib-1.1.2
+	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
+
+	fonts? ( x11-libs/gtk+:3
+		>=media-libs/freetype-2.4:2 )
+	>=media-libs/fontconfig-2.11:1.0
+	dev-libs/libyaml
+	stemmer? ( dev-libs/snowball-stemmer )
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-util/gperf
+
+	dev-libs/libxml2:2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+"
+# ${PN} superseeds appdata-tools
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddep11=true
+		-Dbuilder=true
+		-Drpm=false
+		-Dalpm=false
+		$(meson_use fonts)
+		$(meson_use stemmer)
+		-Dman=true
+		$(meson_use gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index f67f9faa758f..32b990ef79b7 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
 EBUILD atk-2.34.1.ebuild 1136 BLAKE2B 258da793056c38e69971be60bee19954c9852094b6dc54d0f936df83d40f7eebe62d3e82b0621a34ed1a5e1509d74b27b088ddf4db5665aca7a67065d1be7df6 SHA512 2484f173bfcc79ce6364e47e05b3c631f11e64212bae571b7f533f749f7efbc934d47aef4be6c7287d75002a28d5d9ce5dbd1d472011c1d9c7337cd9e3a64f59
-EBUILD atk-2.36.0.ebuild 1139 BLAKE2B b2d2106c8b030438271a2ec8abdb8006ba3a2b8109bb0d03eae48e67a3489a8f7995c82c2fa1e543dfc8ac9a7a335bee876e5c3fdb2a19127cbc9acff6383d62 SHA512 92607180705869f56aa963bebccda79cbbfe1cace019cb82f8d83b75c590d98c1851bf798b3dc791f4609570cc61fef7ec76d250269ce6f90505b43d275e5059
+EBUILD atk-2.36.0.ebuild 1136 BLAKE2B 258da793056c38e69971be60bee19954c9852094b6dc54d0f936df83d40f7eebe62d3e82b0621a34ed1a5e1509d74b27b088ddf4db5665aca7a67065d1be7df6 SHA512 2484f173bfcc79ce6364e47e05b3c631f11e64212bae571b7f533f749f7efbc934d47aef4be6c7287d75002a28d5d9ce5dbd1d472011c1d9c7337cd9e3a64f59
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index c4b58080ed40..46521641412a 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/bareos-fastlzlib/Manifest b/dev-libs/bareos-fastlzlib/Manifest
index ad9678e20418..f2e564b17588 100644
--- a/dev-libs/bareos-fastlzlib/Manifest
+++ b/dev-libs/bareos-fastlzlib/Manifest
@@ -1,5 +1,5 @@
 DIST bareos-fastlzlib-0_pre20140912.zip 379089 BLAKE2B 6a6aa9bfbf54492c6f54f06512ed4c503656d5115ad37cad72fe85e75099093f0093fd20c42d340293ebdb11d59a8fdd38944ba65846af5f6bcaab73783c4d34 SHA512 94b9bd1c599b65d2dc074beb77fb8fe4139647bb047bcfd52b36126dd95ddb3e3e88cdb10464631594ebaff18405446a566fed4eb83ba08e71894de5a47d019f
 DIST bareos-fastlzlib-0_pre20150524.zip 379650 BLAKE2B 0ef9cc815da6926ff2922cd61a0670f3f55ab2094e2986bfe8ae4b6847eae72ba0ccd27821fbf7b1d09eebf405cd5fcd759d074d890b11e62b23d22a45361758 SHA512 cf4b657ce27fad7bf8e0ed5183507f544783f4cf9d72a50754ecdce9784095ec110b51cc22c164610dc037f23a30f945a9c69e38c6cc8e55cf7691ac2b473bc8
 EBUILD bareos-fastlzlib-0_pre20140912.ebuild 615 BLAKE2B 3c889b08735acf86c45ecce4012995359c20b9a00d1a571266d01241f316cf129f77c21c72576682dc6c9677ec40add211c7ba4adc29d11b1868d4ca2a850b7a SHA512 51c5e2109974113773650383ecbd6d1b659573c5459c15205d883f23ccbdf60a2a9db25cc8b40fcce0449d3635732e282b6ee4f477c1cd45beec7914fc6a53c8
-EBUILD bareos-fastlzlib-0_pre20150524.ebuild 615 BLAKE2B 3c889b08735acf86c45ecce4012995359c20b9a00d1a571266d01241f316cf129f77c21c72576682dc6c9677ec40add211c7ba4adc29d11b1868d4ca2a850b7a SHA512 51c5e2109974113773650383ecbd6d1b659573c5459c15205d883f23ccbdf60a2a9db25cc8b40fcce0449d3635732e282b6ee4f477c1cd45beec7914fc6a53c8
+EBUILD bareos-fastlzlib-0_pre20150524.ebuild 665 BLAKE2B 7d7144fcf9b0b3fff03624a17138b82e1d63d65f43687f12510d70278fe8ab9428a9a1bb002e3ae93f7d0c31072cf8a48ba38e98fbaf023648395aff5c739a80 SHA512 8903bb08b48fd24acf1a8369e14cf2aaed19b1867cc89eb93a4f417d34c1ff8e6ae5b6eb0bd08f3395c02b7a4b0679e3a39119eddc88374a9daf1161a6828ecf
 MISC metadata.xml 341 BLAKE2B 90fd686e41c5147f54e18ac1764f58f1c3ca5b23d30ef8b91d074a6585e48db99cc1b1b8c14514616c5fb9d1cf2e27fc1a06784544bbd0e5440381a325caf392 SHA512 42a17b883b1b739d4c8a916ca7fb1791467ae306a51b37d003b621b4d63bbf23e764c1b9e6628bfa32910e1bed2440e2f87e214bdde2db3a26a3d24f7b1cf1bc
diff --git a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
index b748fee355af..e657d1537775 100644
--- a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
+++ b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.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
@@ -21,8 +21,12 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/fastlzlib-master"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	find "${D}" -type d -name libfastlz -exec rm -rf {} +
 }
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d9be27bb106f..ce0eecc14c0f 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,12 +6,9 @@ AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 10
 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
 AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2
 AUX boost-1.73-boost-python-cleanup.patch 3414 BLAKE2B 5167f69bbaf47be548a522638ac4a2dc9bc355d5f237738f9775b2e25a5050b6faacc5f1ce60a484f1664159ca9ba8937db3d9f8e4f0fd76117ff7f61c65cd37 SHA512 b5406e6a31a7feec590f2ee0195fc96e8830b51c270c74162d01b86b748bc11fd353ae97179e0096502b6d7dae69cdc0a478f513e2d7622455bf23a9b0da390b
-AUX boost-1.73-geometry-private-inheritance.patch 913 BLAKE2B 390a9e20a1f86f68f05b61478da3df9043de27f4f111d08789b017b16a4dc6026e5b16658742644fedc5d19cc65186d058f83af6c2d028acac9c21577ac6bddb SHA512 3a52baeb9836a6ececf4b6334c845542c73751ef82b3c0ac217e8416d56a94ece6fc5d80c94ab9aae3cba7123c2e1b65f999c81a758375c3da51807d5cbec963
 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 EBUILD boost-1.72.0-r2.ebuild 11331 BLAKE2B f7294b4da3f7ec6e91766f0ca4439ff24b12f7eb16e1875fdb29d276396bd3c48a094d7fd909c49fce9013118f10a13606d9a8da444f1e9268c6bb9a1c12672a SHA512 1662769daf62586acf8894bf46ff506721054001b2f130f3818575c661bd9de10e1b433bae0f35bc4aca8f04ead7a84b5a8c4ac15cda8bee0c7e0829449b1b66
-EBUILD boost-1.73.0-r1.ebuild 11342 BLAKE2B a56c730c06512795c2bab24328c3754b7882db93300cc0e2d67a97b3761749e783454b770a8676deac10a032e7e01c0ea8b02feee1ca5ffcd5bc8bf55714ac46 SHA512 2819b369f167417b2fcc4d66cba8257eb313314ef161800be39be031c56fa8de214a83d27784a2cdbb334202de147f958ea6a08e597efeaf15fff6ecdb8dd94e
-EBUILD boost-1.74.0-r1.ebuild 11232 BLAKE2B 7a4df095b55cd0a76bc0b032e73c5d2628e03aa6e78a387b8805dbabf762a718ea3adefc7d19086cc70f815727294c95c03f2307fdc8bb6d2e20f8076bfbf9f1 SHA512 b85bfd9ad79eef5dbd8dc910f09af8419a9eeb9c52c48be4b80fc7b077474120d42032eefe21fa57a77182aa05d99fa46b07486cbdb845a92dfc4c5426c2817c
+EBUILD boost-1.74.0-r1.ebuild 11224 BLAKE2B 4251b39853cf0d542ab3e38d6a193d2ed569cb1e2989daf8c7733a0093762bfcba61ecf5840261aadb3be11a3e9ce420a20bd6a1cdefd3a22d89801e4a1e3eaf SHA512 c40ac4570f08537f46147771c23b0096349128fa3cb74d68d98d0cf5e787e8a71048888341ef0c014a303b7230de71af43a7e65c683678debc8e1d4d2d31eafa
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.73.0-r1.ebuild b/dev-libs/boost/boost-1.73.0-r1.ebuild
deleted file mode 100644
index 0e349645c055..000000000000
--- a/dev-libs/boost/boost-1.73.0-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-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
-	# upstream unresponsive to pull request
-	# https://github.com/boostorg/python/pull/286
-	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	# Remove annoying #pragma message
-	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
-	# https://github.com/boostorg/geometry/issues/721
-	"${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || 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
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	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 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
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/boost-1.74.0-r1.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild
index 7c71efd0cdef..289729c05267 100644
--- a/dev-libs/boost/boost-1.74.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
deleted file mode 100644
index fef7bafec8ff..000000000000
--- a/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <boost@kayari.org>
-Date: Fri, 5 Jun 2020 19:29:27 +0100
-Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public
-
-Fixes #721
----
- boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp
-index 2d324cb7f4..5709a930cc 100644
---- a/boost/geometry/index/detail/rtree/visitors/insert.hpp
-+++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp
-@@ -265,7 +265,7 @@ struct insert_traverse_data
- // Default insert visitor
- template <typename Element, typename MembersHolder>
- class insert
--    : MembersHolder::visitor
-+    : public MembersHolder::visitor
- {
- protected:
-     typedef typename MembersHolder::box_type box_type;
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 35844cca6181..7c9944170a6a 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,7 @@
-AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
-DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
-EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
+DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
+DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
 EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
+EBUILD botan-2.16.0.ebuild 3089 BLAKE2B b75fc14404acbcc0d1e88278e47283ba0655c318c393deea9b4d26020e7ff45e892beb26d2fee90aec797c34a8c4caa4ca46acd920d434c3f7c89ad3476c6ea3 SHA512 5a8813e00f96d2201dea7bf5c1d10043180a59cca1217b7cdf291c65c1529069e38451b30569c4727af6e548ccdc103c2617d6e6275d703d0ad5835172383730
+EBUILD botan-2.17.2.ebuild 3094 BLAKE2B 155d33762a02cb0737058a8985d17da9428fb521d1f82b66469457475efb94915a45beffbd3f76eb8fbf074ed9ce70e9663eae7f462dd89739e59d8d64566680 SHA512 8569fa59f78203c877a0ac4dfb46e7af807348df2f6ad91b433df32d33e4c76d0fd0e1f50b61a6641bffde39269ed0d7fd0afd4bc64a51084ca86b63060f1f86
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild
deleted file mode 100644
index 366559333192..000000000000
--- a/dev-libs/botan/botan-2.14.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bindist-test-fix.patch"
-)
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) CHOSTARCH=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	# Don't install automatically, do it manually later in right place
-	# https://bugs.gentoo.org/723096
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		$(use_enable static-libs static-library) \
-		$(use_with boost) \
-		$(use_with bzip2) \
-		$(use_with doc documentation) \
-		$(use_with doc sphinx) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(usex hppa --without-stack-protector '') \
-		--cc=gcc \
-		--cpu=${CHOSTARCH} \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		--docdir=share/doc \
-		--libdir=$(get_libdir) \
-		--os=${myos} \
-		--distribution-info="Gentoo ${PVR}" \
-		--prefix="${EPREFIX}/usr" \
-		--with-endian="$(tc-endian)" \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--without-doxygen \
-		--no-install-python-module \
-		|| die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl python_domodule src/python/botan2.py
-}
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
new file mode 100644
index 000000000000..4fb2d52c4d0f
--- /dev/null
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_P="Botan-${PV}"
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+
+RDEPEND="${DEPEND}"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling module(s): ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	local chostarch="${CHOST%%-*}"
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
+		chostarch="sparc32-v9"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) chostarch=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	# Don't install Python bindings automatically
+	# (do it manually later in the right place)
+	# https://bugs.gentoo.org/723096
+	local myargs=(
+		$(use_enable static-libs static-library)
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+		$(usex hppa --without-stack-protector '')
+		--cpu=${chostarch}
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--docdir=share/doc
+		--libdir=$(get_libdir)
+		--os=${myos}
+		--distribution-info="Gentoo ${PVR}"
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+		--no-install-python-module
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/botan/botan-2.17.2.ebuild b/dev-libs/botan/botan-2.17.2.ebuild
new file mode 100644
index 000000000000..17cef74104b9
--- /dev/null
+++ b/dev-libs/botan/botan-2.17.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_P="Botan-${PV}"
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+
+RDEPEND="${DEPEND}"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling module(s): ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	local chostarch="${CHOST%%-*}"
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
+		chostarch="sparc32-v9"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) chostarch=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	# Don't install Python bindings automatically
+	# (do it manually later in the right place)
+	# https://bugs.gentoo.org/723096
+	local myargs=(
+		$(use_enable static-libs static-library)
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+		$(usex hppa --without-stack-protector '')
+		--cpu=${chostarch}
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--docdir=share/doc
+		--libdir=$(get_libdir)
+		--os=${myos}
+		--distribution-info="Gentoo ${PVR}"
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+		--no-install-python-module
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
deleted file mode 100644
index 35b17976dbd5..000000000000
--- a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/randombit/botan/commit/df73ee690c5795be586cd4df3e33253113a0dcdf
-https://github.com/randombit/botan/commit/d9d6d7a593da135d2046aeb8a9e05e967d90f538
-
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 47a5bf5e56..07dc86ef21 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -909,6 +909,15 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-+   {
-+   std::vector<uint8_t> enc;
-+   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
-+   return enc;
-+   }
-+#endif
-+
- #if defined(BOTAN_HAS_ECDSA)
- 
- Test::Result test_ecdsa_privkey_import()
-@@ -976,13 +985,6 @@ Test::Result test_ecdsa_privkey_export()
-    return result;
-    }
- 
--std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
--   {
--   std::vector<uint8_t> enc;
--   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
--   return enc;
--   }
--
- Test::Result test_ecdsa_pubkey_import()
-    {
-    Test::Result result("PKCS11 import ECDSA public key");
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 07dc86ef21..c77e8ea42e 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -28,10 +28,14 @@
-    #include <botan/der_enc.h>
- #endif
- 
--#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-+#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-    #include <botan/pubkey.h>
- #endif
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+   #include <botan/ec_group.h>
-+#endif
-+
- #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11)
-    #include <botan/rsa.h>
-    #include <botan/p11_rsa.h>
-@@ -909,7 +913,7 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
--#if defined(BOTAN_HAS_ECC_GROUP)
-+#if defined(BOTAN_HAS_ECC_GROUP) && (defined(BOTAN_HAS_ECDSA) || defined(BOTAN_HAS_ECDH))
- std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-    {
-    std::vector<uint8_t> enc;
-diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
-index eaae358420..d9b7858898 100644
---- a/src/tests/unit_x509.cpp
-+++ b/src/tests/unit_x509.cpp
-@@ -603,7 +603,7 @@ Test::Result test_verify_gost2012_cert()
-    {
-    Test::Result result("X509 GOST-2012 certificates");
- 
--#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG)
-+#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG) && defined(BOTAN_HAS_EMSA1)
-    try
-       {
-       Botan::X509_Certificate root_cert(Test::data_file("x509/gost/gost_root.pem"));
-@@ -1600,6 +1600,11 @@ class X509_Cert_Unit_Tests final : public Test
-                continue;
- #endif
- 
-+#if !defined(BOTAN_HAS_EMSA1)
-+            if(algo != "RSA" && algo != "Ed25519")
-+               continue;
-+#endif
-+
-             std::unique_ptr<Botan::Private_Key> key = make_a_private_key(algo);
- 
-             if(key == nullptr)
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index e00316b13f39..3cdd7b5929a6 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
 EBUILD boxfort-0.0.1_pre20200110.ebuild 946 BLAKE2B 955d51f99410c6fad234b3809d39dcf4ddcfb9767926a0d10faa29d3617ca268f74a17186cfead644abe7c299e33ada7df528921e8e93800d4e223e647370bdb SHA512 e9d41bc6d42a6aafe88143bc18ab77a2951edf9da7979a8df27e84b3e55bf3ad88db4fd11a41d64ccb6f69d166b34048fcd2d9472903648fd0af93016cf4d069
-EBUILD boxfort-0.0.1_pre20200902.ebuild 939 BLAKE2B 133fc0a9e9dd6e125344511b1e33433bbf54213557963cc673113298f7a08228d98ffd607e5a68224ee772c23cd680b329cc1bbf6d3ce1dec7e647a67f363733 SHA512 78ba5c0ca379d97e40bfd0b34649b125de6dedcdd32b3e355e922222463e27a58ddf45950c5db1299e35b525eec85ab48661d485a96a94e935267d13a04f44aa
+EBUILD boxfort-0.0.1_pre20200902.ebuild 938 BLAKE2B a445936d76ec5f77d6bac5d1f239c5238686614a770e2868a3c58cd775530e480d12bca88422e59fd5a6c01a5e0cef0f403c09ce454b7221460008d24f39e4e3 SHA512 fe3798ec76f7447d4f362cab6129587eed0b5a843d615c86cd310ca243e0d77fcc57b3ceb8d539e4e7ca67ff3fe424c7b8daaa0cdba4feb167584eef4e267eff
 MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
index 970c74b5d5f0..243999c6e8c9 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/busybee/Manifest b/dev-libs/busybee/Manifest
index e5db569fdb27..0ac6e18fd6b5 100644
--- a/dev-libs/busybee/Manifest
+++ b/dev-libs/busybee/Manifest
@@ -1,3 +1,3 @@
 DIST busybee-0.7.0.tar.gz 367175 BLAKE2B 29dc5c021dbbc91497d855b26adbeb6464999a92ac9d13af689ec09e76f9779f0ec8d36b210e432eb77ee6eec125f0bfbc7eb0b87f085969a422a2a7e2286002 SHA512 9bf868b6d02b0286d89ff371964e7d32dd373049c1437459b79f0789741421ebb2810d9d58c51d86225cc190d6e23d57c816d079298b0bcfa1e4da815bda2474
-EBUILD busybee-0.7.0.ebuild 392 BLAKE2B 3628f9d51a9bb1466e239f3fb6b17eec80c10c42a06f17c49644fb95f0ef242db63557a35dd97bcf41e78acabee0d8d1222c8622e6a435abbde55bc761206de2 SHA512 055ddd2181cd75cd661fd543149df943df867f4ac2041ee99324b04aa0d3f69562aea61a954afc7c80a3df652950734c262ff683bcedb83b62e8ba063cb21cd1
+EBUILD busybee-0.7.0.ebuild 498 BLAKE2B 7fac345ee5adfc1691f564f66489efab22e761d460ef52799e1b7ea29b4d870ef545512f6830d81e302faefd5c7f2da894f97ef5010af717b6dc2fb96351dab4 SHA512 587eb59ddd96ebcc684a898dedb45d4c63070ecee505bb372bac20142f640c83a6cdf5b8f8a79d5ed6f0875a12e12ed71c77a2f106bc2b0f5479bd3f7e699b73
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/busybee/busybee-0.7.0.ebuild b/dev-libs/busybee/busybee-0.7.0.ebuild
index 165343bc960f..ad936c434700 100644
--- a/dev-libs/busybee/busybee-0.7.0.ebuild
+++ b/dev-libs/busybee/busybee-0.7.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
@@ -11,8 +11,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE=""
-
 DEPEND=">=dev-libs/libpo6-0.8
 	>=dev-libs/libe-0.11"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index bfd892912ab9..9dfd420c4ef4 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,5 +1,3 @@
-DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10
 DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475
-EBUILD c-blosc-1.20.0.ebuild 1109 BLAKE2B c8e687c306f166ef06a1af3035e0e6557d05856d578446481dc6a0c1f47943a2123e21ac84ec3b0a4a89a5eaf08e74c7a98bf45c8063dbea7019522956f12970 SHA512 e8a3c7df73f5658c0b56c6ed7f71049ee889ed79ac7d2175c9790c8402712b1d25535fffc3894161e8729ae441b355f28c124cedcecbf14820287ec425c1b3cc
-EBUILD c-blosc-1.20.1.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
+EBUILD c-blosc-1.20.1.ebuild 1116 BLAKE2B 02a343be0d3eaa9c68527412bfa9fcb4f617ffd8710ac438f55710dbf9bf5262e2756b6d31625c0066af40995d32f8052932a06174e7e7432bf95d651c88ae55 SHA512 a841e25358a6b757a38d40e03bd563c5e485bd8d56177a544d158fb4147bc2c2badf14cc7059180cb0566a7b22dd070ceeb04b71c92d3f97413a0d89f4d15581
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
deleted file mode 100644
index 6cb8f5af1a3e..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.20.1.ebuild b/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
index 894b71680371..a29541d5e367 100644
--- a/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 7ac1a9ae9ed6..6e4a0ff9a97a 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.2-r2.ebuild 1472 BLAKE2B a233c75fd89ca49998a33115cadafb8316b4c84ade32c65ae9b1e96a5ca35dec2fe7de18d4cf932d68f4b35ae7bf932d6728375f40dea2370e7e6ca3492c7798 SHA512 15a9bc5ff2dea34565a4166bab754f06fce83dc04dda60a2d04828570dee55ee8006797f3c7e532f7192a4395731088bc82aa9cb6e5e03dc108aacf35e0c8db4
+EBUILD capstone-4.0.2-r2.ebuild 1494 BLAKE2B 38ad0f26e2ff55c5c4f25143a67ac535b2cf5987ffe4e944ef819ef0cde74a83b2dd1097d0f4462e80581777d27c210b7492ca6229b72f2ba4a5d05bd1453d25 SHA512 007a3bb0ff2ba16982c81be8b03708d36b61d88637a40095e41eafa1791b30a258f32b7f3dc2caf1585677c6199e63e552a7f87ccef27d79742f7226644a4e6d
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 09477aff2a6e..dbebb9fd25b4 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
@@ -48,6 +48,7 @@ wrap_python() {
 }
 
 src_prepare() {
+	tc-export RANLIB
 	cmake_src_prepare
 
 	wrap_python ${FUNCNAME}
diff --git a/dev-libs/cl/Manifest b/dev-libs/cl/Manifest
index 40d6da740e93..6afa5fb1a4c5 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -3,4 +3,4 @@ DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630ea
 EBUILD cl-1.2.3.ebuild 632 BLAKE2B 7882f31c8e02540c8ed061b218c6676cdb303deb056f74024ce447c6edcb49fb620d29c667957f91611aac92d1e7454d5c7680af4da4ce6cf9de862096bd0c01 SHA512 25cb9c95249908be4baab3dba8b6f0ce5c227d9b30d9355ef818557bd4f560277420c68186ba23da2d901d3bc09877ad6fbe3ef955df8f533af50f85e4ea885f
 EBUILD cl-1.2.4.ebuild 634 BLAKE2B 28bdc5aeb4e95d6e90c73da885be55df8dea96d5379bda58274e87a809f4b5c0f535e2a759feddfba285c07f07c2d733c87242f64d79e253781bd5e0f0f02b98 SHA512 923186f9725a3f928d1ad1c035e7604f52f1ca31c721b20d6e9220e04e7a994efb52c59098b9dc2b20db83d04a02bb68edf7aba2078edc6ff1308031a0d611e8
 EBUILD cl-9999.ebuild 598 BLAKE2B bf094e1740ce11fa5df1acb211576b4c2535b28abcb50ea8cee089597ecafff60e0b2638b45f270ab274f93a093d524dd3822e8d41a9b2456ccf5905d0f986f6 SHA512 9c19c9546d93683432aff81fe2bccc305b663c832fb85514879884dc76c6b52f149173ed0e05e5a0851e66bcc839bb1b5a4b9368e8a91d6057094e3b04d09c21
-MISC metadata.xml 319 BLAKE2B 103a4cc1fa1801324ec45de442cb3a2b21f73ee1215b0fc9fcda884783d42e3ebcfb903cdff4b2ed1b4dae60efb1fb07faf3d40905eedf4c412d9896ed8856e8 SHA512 b3bcd712352fb18ec4125fc66e6d5c6bae148afc1530742a834b6026c911c9b2848d51c133366a18d59dc7bd30c7943b506211f1fb905e7ca224239ba5d09bea
+MISC metadata.xml 242 BLAKE2B 498ef94cbfabfde7f3466c887e02ca4a668df7f7a6709de93b2b7d45aa1c8434580418ac3193a36596163e3ba2b168601066f2424fb0351f0f880be522fc719a SHA512 1cf1ccddd19d1895cef7b356b9aea1aec44b21adbc573a0e51858661f5ef6d81b0e15936fe70bd271b75fd019a27289f7c35c530298d49ea0596cc6ffd0ed709
diff --git a/dev-libs/cl/metadata.xml b/dev-libs/cl/metadata.xml
index b2f11e650c2a..f60477966bfd 100644
--- a/dev-libs/cl/metadata.xml
+++ b/dev-libs/cl/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tonyrog/cl</remote-id>
 	</upstream>
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 0a3ed090ad71..fa183df87e2d 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,4 +1,5 @@
-DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
-EBUILD cloog-0.18.4.ebuild 1385 BLAKE2B cf3f72b4e6405fab7b1e376466ff9d6f4173c91310342731f6f728ee129fd624d481af98f28c7480559e4d893e2c4448dbfcec30ff97ba877cf02521341af8e7 SHA512 f6bf82c8d1a78e78aab1151f724cb3dbcb2b4a8ae178f27aed12d9df4ffde4e1f4646d0f3313e8f68c60b1d08633a6f6688ffb6bff0d57d45419c62db5a51621
-EBUILD cloog-9999.ebuild 1418 BLAKE2B 6669775c81ec4e0f23b7e5208dc29fbabc21b29d467c52a3e66ddd026ca0cfc9ea1bdd65fdde5abb7b0decef0f7863fdd62112ca265e4e9c028636224985385f SHA512 cedf51282c4e46ec1f62b920fe25bef47dc25e75fde881a9e35a9340ce055bd57bc2b7ef785486d8510e3130bf48f45b91d2e263f9b1b1559005f0bb4405e123
+AUX cloog-0.20.0-notex.patch 1326 BLAKE2B c0a6b0961b46523219bbe55ad962ff3b7cf3f335dfe9a3cb7d0c783573026647317c74e5fefd7dd7c7ef7f16a4a5de4c317fd82be692fd31f8c36e4538b448b6 SHA512 4c011cedb37d0ec2ba97bc0904721a463197fce789eff657d05372b31df639af54bb2830729c32b78f9c4095f97a994fa9b1118de17ded0f0a00f9d4bfb9714f
+DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347
+EBUILD cloog-0.20.0.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
+EBUILD cloog-9999.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
deleted file mode 100644
index cc37d6f8a906..000000000000
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils ltprune multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./get_submodules.sh
-		eautoreconf -i
-	else
-		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-		# sed to avoid eautoreconf
-		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-	fi
-
-	# Make sure we always use the system isl.
-	rm -rf isl
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-gmp=system \
-		--with-isl=system \
-		--with-osl=no \
-		$(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-multilib_src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	emake -j1 check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/cloog/cloog-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild
new file mode 100644
index 000000000000..590340afe675
--- /dev/null
+++ b/dev-libs/cloog/cloog-0.20.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/periscop/cloog"
+else
+	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+	S="${WORKDIR}"/cloog-${P}
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/isl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
+
+DOCS=( README )
+
+src_prepare() {
+	default
+	AT_NO_RECURSIVE=yes eautoreconf -i
+	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+	# sed to avoid eautoreconf
+	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
+
+	# Make sure we always use the system isl.
+	rm -rf isl || die
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-gmp=system \
+		--with-isl=system \
+		--with-osl=no \
+		$(use_enable static-libs static)
+}
+
+# The default src_test() fails, so we'll just run these directly
+src_test() {
+	emake -j1 check
+}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index c85bd46b030f..590340afe675 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -3,47 +3,47 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit autotools
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://repo.or.cz/cloog.git"
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/periscop/cloog"
 else
+	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+	S="${WORKDIR}"/cloog-${P}
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
 LICENSE="LGPL-2.1"
 SLOT="0/4"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/isl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
 
 DOCS=( README )
 
 src_prepare() {
 	default
-
-	if [[ ${PV} == "9999" ]] ; then
-		./get_submodules.sh
-		eautoreconf -i
-	else
-		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-		# sed to avoid eautoreconf
-		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-	fi
+	AT_NO_RECURSIVE=yes eautoreconf -i
+	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+	# sed to avoid eautoreconf
+	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
 
 	# Make sure we always use the system isl.
-	rm -rf isl
+	rm -rf isl || die
 }
 
-multilib_src_configure() {
+src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--with-gmp=system \
 		--with-isl=system \
@@ -52,12 +52,6 @@ multilib_src_configure() {
 }
 
 # The default src_test() fails, so we'll just run these directly
-multilib_src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+src_test() {
 	emake -j1 check
 }
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-}
diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
new file mode 100644
index 000000000000..72c75a1820d4
--- /dev/null
+++ b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 9edba30..fcca42f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -181,19 +181,6 @@ doc:
+ 	@echo "              *-----------------------------------------------*/"
+ 	doxygen ./autoconf/Doxyfile
+ 
+-#/*****************************************************************************
+-# *                                   Doc                                     *
+-# *****************************************************************************/
+-
+-if HAVE_TEXI2DVI
+-pdf_DATA = doc/cloog.pdf
+-dist_pdf_DATA = doc/cloog.pdf
+-doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi
+-	$(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@
+-endif
+-
+-doc/gitversion.texi: @GIT_INDEX@
+-	echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@
+ 
+ #/*****************************************************************************
+ # *                                   Tests                                    *
+diff --git a/configure.ac b/configure.ac
+index 88d346d..fec9b04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd)
+ dnl Configure needs an empty install.sh file with this, i HATE that...
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+-AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
+-AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI")
+ 
+ AX_CC_MAXOPT
+ AC_SUBST(CFLAGS_WARN)
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index f126e5124bf4..339046652f7c 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,7 +1,9 @@
-AUX concurrencykit-doc.patch 589 BLAKE2B e8812a5d72ba8ee3de915f0c52cf44e55d3e2ae52adeac9b80f4788db80b8c8dbbfdfc11c6199ce19edaa2ecaefe1825d2b9ff656aab1525180f349e5a14994d SHA512 5f07ba35e8b0d6bd70aa234592499648839c53c532ce7755ed7ab463b0e415451a7dbacdccc64dbf57b0efe0f37ae4a49468f7af43801b1daa7074714fe18e3d
-AUX concurrencykit-glibc-2.30.patch 1024 BLAKE2B 1e973dfd3b55dde0a187c7b7dc76ee5e374e2ce8bf24028b5b0758c8c62933e566e7c4ac6a9e98a53e7ae7df74856a335e1b7302e3a9bf6f87bc9909f533f1cb SHA512 6702c3c156589c167e36bf81fbd22f7031b95d539c66c700e915018425ce49bffd7aaded210269e4326cd561682e07ae253d13c952bad5eff8832befcc98f82d
+AUX concurrencykit-0.7.0-ar.patch 3293 BLAKE2B a5e67853a4d6c08f8f0d93d528bd93688e3edfc434bca235ef272cbd95e87430e64596301d6bf7ce366b0faa0892ecaf479aa0b8e877c4c0bb2d04901bb58168 SHA512 6394717aec1c10766aae8aff8f7cc0b0aea1bcad8e71f017c6c2765f2e5fe43f29a1733480fa280dc2da36a50d74f2095a2e51a42b79b27b776e99b4f971f03f
+AUX concurrencykit-0.7.0-glibc-2.30.patch 1609 BLAKE2B 1aa8eb4d29ed2ecb52b1fa942eead2e88a97979c331f2227d05b578505df35d9f9549798ebc401632bc29572f0c12351e2b4485471767b70dd3eadcb2ff010ea SHA512 fe6e25a67025c5f4ef9affbd32cb4fe0c29879af866c2b621be004fbbd3ff8b203f7655aca8943bb8303a318aecd387352256b121eab68487fac0a135ad82903
+AUX concurrencykit-0.7.0-gzip.patch 1553 BLAKE2B 8a164f19cdeab56fd9a1099c312bc04209e24e2bc1798da5e56c6c4414b327801f73e6c222e665bf8299c8620a12ebcf73bbf6839075274cdcb759261b79fe35 SHA512 bef714a6d22ee6ae5a8e70befcfc92a254fbd724646832043dce03ce1b4f922fc8c6bf91d9b37433b8849afc5e276ea5d7510fcff6fdd0e20aa650414766ce02
+AUX concurrencykit-0.7.0-static-libs.patch 3170 BLAKE2B 8884eb8cfffdc5bdf864ec29495e8a209befdd8c7318e49bbee15821c42c7a18b0ed8d52ee07b72974318f57785a7867bd47461a44e535102bfc03c650e85af1 SHA512 52ac965f0876cca54a60ea05e1bcee9a72534368646594b55ced604f425e505bdf39b836c3a19fc5fca49a6838866e0fef4c192ff073bdb864f113e41ba87cc4
 DIST concurrencykit-0.6.0.tar.gz 217198 BLAKE2B 5ba85bd111c06e7be7af5679227350efe187836e5cb2afc19bff4a8f0fbcd97e9631fad64397b0426e8020a6a0f103a0fbe3bf8f83810eaa8a3a1b429a3e8383 SHA512 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0
 DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
 EBUILD concurrencykit-0.6.0.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d
-EBUILD concurrencykit-0.7.0.ebuild 721 BLAKE2B eed6fdd8a7f1e263fa2d1456eb91057bece5535d2e742270d060e06ca7c73e2018df0eae1396dee3599012a27e377b1efd94001cffa6dc3e6bebca007c03158d SHA512 2040a1cc83f656d8f0f3c2bf97984904a21cd70c5cbf01c535844bfc4d7831a95e07fa2fb1febd1aa94add5bc84c22c150b6cd4f0586ce938c32e53fe26342bd
-MISC metadata.xml 449 BLAKE2B 1567c91f6f505bfe5f1b9b737f6dfb02e8ba4ff8dd7ee1c629e314cc6c646c21b9c870d5bd6fae28551bfbeae8901922821f3c2eb1f1351b8733616c613a7fea SHA512 402d971b138335d751d645cd8face4addcda8f351e95bf8a0826b7fdd946c9cf6a22bb0ae274e51f39ee4d56389887856f84a83451040adc12e29d9740982d33
+EBUILD concurrencykit-0.7.0-r1.ebuild 866 BLAKE2B 58555f7d90f850792dbcef3933cb822b003ba2af724bff6cc0496d2391ccb1fb3127a13f814007f4fea1537875c75776f09355d570d017d7ac55b08f1430e692 SHA512 371c423b9bda8a0aeb793c160f5e4041d4591131dbe2f710f89d64bbc43b5ff089353c84209cd4229278a97f1a0d9e51f809c52036ce97096da8cc7424824d95
+MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..52fdc2f36338
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="ck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library with concurrency related algorithms and data structures in C"
+HOMEPAGE="http://concurrencykit.org"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# The 'libck.so' has a name collision.
+# See #616762 for more information.
+RDEPEND="!sys-cluster/charm"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ar.patch"
+	"${FILESDIR}/${P}-glibc-2.30.patch"
+	"${FILESDIR}/${P}-gzip.patch"
+	"${FILESDIR}/${P}-static-libs.patch"
+)
+
+src_configure() {
+	tc-export AR CC LD
+	$(usex x86 'export PROFILE=x86' '')
+
+	local myeconfargs=(
+		"--disable-static"
+	)
+
+	GZIP="" econf ${myeconfargs[@]}
+}
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
deleted file mode 100644
index 24f79b725083..000000000000
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library with concurrency related algorithms and data structures in C"
-HOMEPAGE="http://concurrencykit.org"
-SRC_URI="https://github.com/concurrencykit/ck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-# libck.so name collision #616762
-# these packages have nothing in common
-RDEPEND="!sys-cluster/charm"
-
-# https://github.com/concurrencykit/ck/issues/147
-# https://github.com/concurrencykit/ck/issues/150
-PATCHES=(
-	"${FILESDIR}/${PN}-glibc-2.30.patch"
-	"${FILESDIR}/${PN}-doc.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
new file mode 100644
index 000000000000..70dd46a113f2
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
@@ -0,0 +1,112 @@
+From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <ck@bl4ckb0x.de>
+Date: Sun, 22 Nov 2020 00:55:36 +0100
+Subject: [PATCH] Add support for setting AR
+
+By default, the command 'ar' is called. Is should be possible, as with
+'CC', to override that value and set an own AR.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure       | 11 +++++++++++
+ src/Makefile.in |  2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 1b85d113..78535332 100755
+--- a/configure
++++ b/configure
+@@ -146,6 +146,7 @@ generate_stdout()
+ 	echo "           SRC_DIR = $BUILD_DIR"
+ 	echo "            SYSTEM = $SYSTEM"
+ 	echo "           PROFILE = $PROFILE"
++	echo "                AR = $AR"
+ 	echo "                CC = $CC"
+ 	echo "          COMPILER = $COMPILER"
+ 	echo "            CFLAGS = $CFLAGS"
+@@ -215,6 +216,7 @@ for option; do
+ 		echo "  --cores=N                Specify number of cores available on target machine"
+ 		echo
+ 		echo "The following environment variables may be used:"
++		echo "   AR       AR archiver command"
+ 		echo "   CC       C compiler command"
+ 		echo "   CFLAGS   C compiler flags"
+ 		echo "   LDFLAGS  Linker flags"
+@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then
+ fi
+ assert "$CC" "not found"
+ 
++printf "Finding suitable archiver........"
++if test ! -x "${AR}"; then
++	AR=`pathsearch "${AR:-ar}"`
++	if test -z "$AR" -o ! -x "$AR"; then
++		AR=`pathsearch "${AR:-ar}"`
++	fi
++fi
++assert "$AR" "not found"
++
+ cat << EOF > .1.c
+ #include <stdio.h>
+ int main(void) {
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 0b7ae7b6..73788497 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -25,7 +25,7 @@ libck.so: $(OBJECTS)
+ 	$(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
+ 
+ libck.a: $(OBJECTS)
+-	ar rcs $(TARGET_DIR)/libck.a $(OBJECTS)
++	$(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
+ 
+ ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c
+ 	$(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c
+From 866c2af332a075cc83af78b184be0d5e6152de13 Mon Sep 17 00:00:00 2001
+From: Olivier Houchard <cognet@ci0.org>
+Date: Sun, 22 Nov 2020 01:16:10 +0100
+Subject: [PATCH] build: Make the lookup for an archiver report success.
+
+Move the code looking for ar outside the compiler checking code, and make
+it report success if found.
+---
+ configure | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/configure b/configure
+index 78535332..16a8f64f 100755
+--- a/configure
++++ b/configure
+@@ -647,15 +647,6 @@ if test ! -x "${CC}"; then
+ fi
+ assert "$CC" "not found"
+ 
+-printf "Finding suitable archiver........"
+-if test ! -x "${AR}"; then
+-	AR=`pathsearch "${AR:-ar}"`
+-	if test -z "$AR" -o ! -x "$AR"; then
+-		AR=`pathsearch "${AR:-ar}"`
+-	fi
+-fi
+-assert "$AR" "not found"
+-
+ cat << EOF > .1.c
+ #include <stdio.h>
+ int main(void) {
+@@ -736,6 +727,17 @@ else
+ 	assert "" "unknown compiler"
+ fi
+ 
++printf "Finding suitable archiver........"
++if test ! -x "${AR}"; then
++	AR=`pathsearch "${AR:-ar}"`
++	if test -z "$AR" -o ! -x "$AR"; then
++		AR=`pathsearch "${AR:-ar}"`
++	else
++		echo "success [$AR]"
++	fi
++fi
++assert "$AR" "not found"
++
+ printf "Detecting VMA bits..............."
+ VMA="unknown"
+ if test "$VMA_BITS" = "unknown"; then
diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
index 452421c63125..77e63e3de7ef 100644
--- a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
@@ -1,3 +1,20 @@
+From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Tue, 29 Oct 2019 17:30:09 -0400
+Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid.
+
+glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/).
+gettid will clash with the glibc-provided symbol. Remove the
+macro and instead move to a dedicated namespace.
+
+We go this route to avoid introducing unnecessary complexity to
+build.
+
+Fixes #147
+---
+ regressions/common.h | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
 diff --git a/regressions/common.h b/regressions/common.h
 index 6e53483d..9cdc690a 100644
 --- a/regressions/common.h
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
new file mode 100644
index 000000000000..62477f9acf6c
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
@@ -0,0 +1,58 @@
+From cb63256ae2e5fde7a67d7740bb2f4a0eab538a2d Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Thu, 9 Apr 2020 20:08:40 -0400
+Subject: [PATCH] build: allow GZIP to be set to empty string in configure.
+
+---
+ configure | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index 2cbdbef3..ed188f96 100755
+--- a/configure
++++ b/configure
+@@ -325,7 +325,7 @@ done
+ HEADERS=${HEADERS:-"${PREFIX}/include"}
+ LIBRARY=${LIBRARY:-"${PREFIX}/lib"}
+ MANDIR=${MANDIR:-"${PREFIX}/share/man"}
+-GZIP=${GZIP:-"gzip -c"}
++GZIP=${GZIP-"gzip -c"}
+ POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
+ DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
+ PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
+@@ -583,21 +583,26 @@ else
+ 	echo "success [$BUILD_DIR]"
+ fi
+ 
+-printf "Finding gzip tool................"
+-GZIP=`pathsearch "${GZIP:-gzip}"`
+-if test -z "$GZIP" -o ! -x "$GZIP"; then
++if test -n "$GZIP"; then
++	printf "Finding gzip tool................"
+ 	GZIP=`pathsearch "${GZIP:-gzip}"`
+-	GZIP="$GZIP"
++	if test -z "$GZIP" -o ! -x "$GZIP"; then
++		GZIP=`pathsearch "${GZIP:-gzip}"`
++		GZIP="$GZIP"
++	fi
++
++	if test -z "$GZIP"; then
++		echo "not found"
++	else
++		echo "success [$GZIP]"
++		GZIP="$GZIP -c"
++		GZIP_SUFFIX=".gz"
++	fi
+ fi
+ 
+ if test -z "$GZIP"; then
+-	echo "not found"
+ 	GZIP=cat
+ 	GZIP_SUFFIX=""
+-else
+-	echo "success [$GZIP]"
+-	GZIP="$GZIP -c"
+-	GZIP_SUFFIX=".gz"
+ fi
+ 
+ printf "Finding suitable compiler........"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
new file mode 100644
index 000000000000..3e1d080a5f4d
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
@@ -0,0 +1,75 @@
+diff --git a/configure b/configure
+index 7853533..4e1ee9d 100755
+--- a/configure
++++ b/configure
+@@ -119,6 +119,7 @@ generate()
+ 	    -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g"			\
+ 	    -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g"	\
+ 	    -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g"		\
++	    -e "s#@DISABLE_STATIC@#$DISABLE_STATIC#g"		\
+ 	    -e "s#@SSE_DISABLE@#$SSE_DISABLE#g"			\
+ 	    -e "s#@PPC32_LWSYNC_ENABLE@#$PPC32_LWSYNC_ENABLE#g"	\
+ 	    -e "s#@RTM_ENABLE@#$RTM_ENABLE#g"			\
+@@ -156,6 +157,7 @@ generate_stdout()
+ 	echo "    LDNAME_VERSION = $LDNAME_VERSION"
+ 	echo "      LDNAME_MAJOR = $LDNAME_MAJOR"
+ 	echo "           LDFLAGS = $LDFLAGS"
++	echo "        STATIC_LIB = $DISABLE_STATIC"
+ 	echo "              GZIP = $GZIP"
+ 	echo "             CORES = $CORES"
+ 	echo "      POINTER_PACK = $POINTER_PACK_ENABLE"
+@@ -205,6 +207,7 @@ for option; do
+ 		echo "  --platform=N             Force the platform type, instead of relying on autodetection"
+ 		echo "  --use-cc-builtins        Use the compiler atomic builtin functions, instead of the CK implementation"
+ 		echo "  --disable-double         Don't generate any of the functions using the \"double\" type"
++		echo "  --disable-static         Don't compile a static version of the ck lib"
+ 		echo
+ 		echo "The following options will affect specific platform-dependent generated code."
+ 		echo "  --disable-sse            Do not use any SSE instructions (x86)"
+@@ -293,6 +296,9 @@ for option; do
+ 	--disable-double)
+ 		DISABLE_DOUBLE="CK_PR_DISABLE_DOUBLE"
+ 		;;
++	--disable-static)
++		DISABLE_STATIC=1
++		;;
+ 	--platform=*)
+ 		PLATFORM=$value
+ 		;;
+@@ -330,6 +336,7 @@ MANDIR=${MANDIR:-"${PREFIX}/share/man"}
+ GZIP=${GZIP-"gzip -c"}
+ POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
+ DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
++DISABLE_STATIC=${DISABLE_STATIC:-"0"}
+ PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
+ RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"}
+ SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"}
+@@ -717,13 +724,24 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER"
+ 	if test "$WANT_PIC" = "yes"; then
+ 		LDFLAGS="$LDFLAGS -shared -fPIC"
+ 		CFLAGS="$CFLAGS -fPIC"
+-		ALL_LIBS="libck.so libck.a"
+-		INSTALL_LIBS="install-so install-lib"
++
++		if [ "$DISABLE_STATIC" -eq 1 ]; then
++			ALL_LIBS="libck.so"
++			INSTALL_LIBS="install-so"
++		else
++			ALL_LIBS="libck.so libck.a"
++			INSTALL_LIBS="install-so install-lib"
++		fi
+ 	else
+ 		LDFLAGS="$LDFLAGS -fno-PIC"
+ 		CFLAGS="$CFLAGS -fno-PIC"
+-		ALL_LIBS="libck.a"
+-		INSTALL_LIBS="install-lib"
++		if [ "$DISABLE_STATIC" -eq 1 ]; then
++			echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2
++			exit $EXIT_FAILURE
++		else
++			ALL_LIBS="libck.a"
++			INSTALL_LIBS="install-lib"
++		fi
+ 	fi
+ 
+ 	CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses $CFLAGS"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
deleted file mode 100644
index 40aa466bb4e6..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-doc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index cbad704..f476925 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -1,7 +1,7 @@
- .PHONY: clean install uninstall
- 
- MANDIR=@MANDIR@
--GZIP=@GZIP@
-+GZIP=/bin/echo
- GZIP_SUFFIX=.3@GZIP_SUFFIX@
- BUILD_DIR=@BUILD_DIR@
- SRC_DIR=@SRC_DIR@
-@@ -206,7 +206,9 @@ refcheck:
- 
- install:
- 	mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit
--	cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit
-+	for target in $(OBJECTS); do	\
-+		cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \
-+	done
- 
- uninstall:
- 	for target in $(OBJECTS); do 			  \
diff --git a/dev-libs/concurrencykit/metadata.xml b/dev-libs/concurrencykit/metadata.xml
index 5acb2fa5df31..8600ab81dac4 100644
--- a/dev-libs/concurrencykit/metadata.xml
+++ b/dev-libs/concurrencykit/metadata.xml
@@ -2,12 +2,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>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">concurrencykit/ck</remote-id>
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index a440c009e1ff..d7436035275a 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,7 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
+DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
 EBUILD confuse-3.0.ebuild 1144 BLAKE2B 6bd65ec30d98b58809d3534fa706ee3342ded63b16d67647b56da1868b8005c1495b28572a1eba084bc3d839a0b9149733be04cc13b5de4dbbbf32ea37bd3b96 SHA512 7b99185b9266523218389c64f7ce04f0eddbce8c8c15cdc045885d7924d11ee2cd8823e1209b23f5d96c94dbc9006d3f872fc47d6394119371fa182d60419fdb
-EBUILD confuse-3.2.2.ebuild 1166 BLAKE2B d1cc36dc2714940b29af9c75fcfe50b8ffc7ca23fd37759fdecdbf84493098b923c4a03ef20e36998b4babd8d810ec3a398a2b877131bcd3bb8f767c93201bfd SHA512 08013b8392e51852abf619d717eb1e36a76c2d4eef8b3f29823e642cf63bf30c21d049153c07334384c6ab16920e8683c6ef0747130fe924656e53ffeab5452f
+EBUILD confuse-3.2.2.ebuild 1158 BLAKE2B d5c70f358f19069692966841921a71f86a18c234e70efa7175dd90fe07e98bd65de5a1f5524fbef691f7e7724a09221b2843b1bd63e5dd6f0178c9743a56b98e SHA512 cc010f8ff44fbfbacd2ba20e574e9eb92ab383cac955740bc68c3d7a3aa72dc3023ae4f32ce8e30f5a17008aab5cfc2fce845c5a5764ba1f34370e1e6d2daf69
+EBUILD confuse-3.3.ebuild 1166 BLAKE2B 3479038d7f5ac05e9ca88db18c856b790819c2b3dcd4a06af3cabc4bd9daebabf668b69e4b1176a0b332313235c44ecece4ebddc2a11c10466b676577f766c74 SHA512 712be1e3d84038b6c1bd94a98c4993d5de0c558b3264a959aad74521202572eedd4527991ef564fb0f56ca8e896c2a0af77875a13e79b9a4408e2683d4c3e148
 MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
index 76799f458701..5efbbf361833 100644
--- a/dev-libs/confuse/confuse-3.2.2.ebuild
+++ b/dev-libs/confuse/confuse-3.2.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild
new file mode 100644
index 000000000000..b1d52d810168
--- /dev/null
+++ b/dev-libs/confuse/confuse-3.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="a configuration file parser library"
+HOMEPAGE="https://github.com/martinh/libconfuse"
+SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/2.1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="nls static-libs"
+
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# examples are normally compiled but not installed. They
+	# fail during a mingw crosscompile.
+	local ECONF_SOURCE=${BUILD_DIR}
+	econf \
+		--enable-shared \
+		--disable-examples \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	doman doc/man/man3/*.3
+	dodoc -r doc/html
+
+	docinto examples
+	dodoc examples/*.{c,conf}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index c13ac10c8390..7abc8a3ec9c2 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -5,5 +5,5 @@ DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 787
 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 1856 BLAKE2B a2cd76c4874eed3a9d604425023d545453ee3b66467454fa0282ca775632e2eb7a66b9df539c15c3692e6b41e9b5b96b7509a293214c3b082e764d3d17780050 SHA512 4aef26ada1b00047dd2a5a73d1e3f016b3223d0f135962f568a2bbf558c6597da18b7f362b5a331b3ee4e3e261cb0ded78a2c7a21045b8dfc5ee46df26459645
+EBUILD criterion-2.4_pre20200110.ebuild 1857 BLAKE2B bc63691c90dd9b8be7122aa2ce34a39815ace1b0d768fe400ce46c42d3084072781407e72155b0f10b1a79bdd509b10977b7a3bf86781656b24043373ad205a6 SHA512 568284fa88d4de235ce71488ff608609b5740e5f0c7374c642a5f7f09bef094a7fdf94bcae6a8d62c7f5c8fef23c82f54c88a4d147853d521a8c58cd13650558
 MISC metadata.xml 464 BLAKE2B 336514e525410272f84e05c76be4fad57be4198bc88ebcc5f048615f233a0b69035b27728e15b2190ba04c13671aee6756be24b4fe8a5b09118b78abef918529 SHA512 42131d0130a9d260ac5f305a261c883a3c6222c21abdeef290d9f71f3080932acbd4127eb44266b4c69c782eb63f18df4fcf4a5a97829d9f8483fc1d3d853a1c
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index c96a9344ef58..e00741d0b9b2 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/nanomsg:=
 	dev-libs/libgit2:=
-	virtual/libffi:="
+	dev-libs/libffi:="
 DEPEND="${RDEPEND}
 	dev-libs/boxfort
 	test? (
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 214a5cb31c18..2d6362f37140 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -5,7 +5,11 @@ DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844
 DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
 DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771
+DIST cudnn-10.1-linux-x64-v8.0.4.30.tgz 678710754 BLAKE2B 5ad59925a500968eef8306c7e207c12ea2f55deecd2d044d7f1f158b76264aeb954f3029d1eaa5ef2aa6939c56e39177af28fc00cc04e2fdf26f9091ef46f3ca SHA512 419f2875a0b362107ede5d238250496c1011cb8e1fdaada1ebdca8737e9df4eaddd1d3a25feeb0ef9baa0100c9f84507e527ed922b676f7883e0594b017ed9d9
 DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
+DIST cudnn-10.2-linux-x64-v8.0.4.30.tgz 700128057 BLAKE2B 9883cb5993850b9dc0fe703925be4980b7768a6b1be940058f727e69e5d606f25b54ec3368fd22dddcc39092ac488ded4a9078c4ebb743e12c59688413c056cd SHA512 ab41425bc5fad91e9a4270059d8125efc93407956b64c2ecc926506d4c826f33fb7561b143b159e92b286937e940f05fb2f4059747ee80c28b1e7a4d8b53c000
+DIST cudnn-11.0-linux-x64-v8.0.4.30.tgz 1048904376 BLAKE2B cb9ee44998ca17f670430e2e0641d3f804ff468e1b9fedc88ae6827b340917a89a8dafce88318f30f70333b06dea87c6f7b76851b3fbad6902b020b79e1cb085 SHA512 3364625e24bf5e57ceb4e38cf4eca81341245d9ba354816247537c943c70f9981719cf94873b19aa23b45c64d16a0374c0b9f60328e76f8e5b38f6c88610bff4
+DIST cudnn-11.1-linux-x64-v8.0.4.30.tgz 1510998061 BLAKE2B 1829886516d75ef6015cdbfe26ab8508d9e99d9a3c39b2fedc236663e509f4bfe9adaa54814906a2bb5b885379d4e2349e46d3580f815acdb16e9f73d51574d9 SHA512 57615fef93f0897ede6d65da255a61f2e84d25ef46cd85c5f65558ba4bd8fee6f1ff06a4b0ecf20d0ff92bfd019a3068c719cdcd0de0eb2d16b18caee4aae610
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
 EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e
@@ -18,4 +22,5 @@ EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c1
 EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.5.32-r2.ebuild 858 BLAKE2B ce144c670e508c53d1f3d1621616dbf49c1493445058cd027f1920942a5f254c0133fb39e7aef9514284e2fe3a87b0a36770167176c25dc133be945525f3619c SHA512 18c3b7686ab6242a6a6fb5883d0a5484a37fb040be46ffc7087da28a4b1d7913b3eaa6ef9ce2d52194592b4b6a6b79aee302f1c9c9f79c582ea99f853219a9dc
 EBUILD cudnn-7.6.5.32.ebuild 718 BLAKE2B e8fec9a34ff7103a60c8ec7f226d29054c711c13cc127a41abde7620344246edb06139147a769a3b3b0a7fd007765177ed781726a297bd9d013cc2e44e86bdff SHA512 d435be66ef4be1c40885016c5e13d5fd11dbadc4d109f06da5eef3608bd3d57e7b66b54d3f6ea12c6a94a4d91aaf8b8b6fd3872aab7205d4473ea61281cc8182
-MISC metadata.xml 384 BLAKE2B 6c8db23046a505ae05111e6cbba3493cba9ce481b633291c5b43af091c760fab3873b864661e04b2e2850b7fba875358cab7782578166b33e474ee6c52b5ce70 SHA512 059d9339b98bf62a46c1f909e2ef7004f85ca62c04b4a21158d433f062327ae9d55405218e0f0df9b3a3242677f0bda3e9892193c6166897c4b53acc547ce537
+EBUILD cudnn-8.0.4.30.ebuild 1090 BLAKE2B 1d85500b4fc1095fac64b155eecd9bcea4ab794319b1efb884d64023508bc5105c7a294323d8c7e26dfbc837ea8e9a903a15e4c80414782cce142ebdcf888717 SHA512 d945ebf9509e03f99026220176624f7ae0289878e03aaeb16387761d8d496086b9ff5b40538132eabb09989dc32ea548ea8285b4fc546a17d9b552676ed45d0c
+MISC metadata.xml 492 BLAKE2B 0d757f175d18c84a7c9cbe077d382285a905e4670028f2ff2bb4fb793be819de38916fbbb27129ce4d78b2db72a4cd32a4d9911874d43df5083b651f8135523e SHA512 8bf084e468673e90b19a0e53985e81bf770de4276e5455a4155f06b0519c75720509c55cb9c1fc5f23798b0f835c6b4f4eb025ef402cb48334a06b025954b2bf
diff --git a/dev-libs/cudnn/cudnn-8.0.4.30.ebuild b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
new file mode 100644
index 000000000000..43f665fadede
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+SRC_URI="cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz )
+	cuda11-0? ( cudnn-11.0-linux-x64-v${PV}.tgz )
+	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
+	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
+
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+IUSE="cuda10-1 cuda10-2 cuda11-0 +cuda11-1"
+REQUIRED_USE="^^ ( cuda10-2 cuda10-1 cuda11-0 cuda11-1 )"
+
+S="${WORKDIR}"
+
+DEPEND="cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* )
+	cuda11-0? ( =dev-util/nvidia-cuda-toolkit-11.0* )
+	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
+	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index f40517d5d330..31978d943c26 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -6,7 +6,9 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <use>
-    <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
     <flag name="cuda10-1">On nVidia CUDA 10.1.</flag>
+    <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
+    <flag name="cuda11-0">On nVidia CUDA 11.0.</flag>
+    <flag name="cuda11-1">On nVidia CUDA 11.1.</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 27d3ef61445b..fddd9920b417 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 1931 BLAKE2B a44bdce16b8c41a503fa3fbd1a00d2004e4bd74972c7c01b86ee298575dca57b37df94fb8ff67ae81d2623f23354108dced126948dc8b1b65056c458b5805947 SHA512 19a2e03cacc7cdf83dfb17a814bbe966ba66bc473357ffaab5eb91c7f57276d7e4ba1f975d2594f88dc82090547333f94db99618708c691408af2df442dadfa7
+EBUILD dbus-glib-0.110.ebuild 2550 BLAKE2B 62c0efc5a9321aa72c27481db578bfa5ad252e39d78e313171a7314e2d6fcac4413fce9e5a98423e7249dd3f3333405ba25af399ab1e7a4e3d25dc46a3a59131 SHA512 979283a5e976572055562ae2558ec616f53647dcf6aa425ad925509bbabe2fc0c57a6b1f50468ac0a27b6f38a2af5989db7523af4e989567b863ba69235d5bee
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 9e47f93d6afc..2d3b43af461d 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit bash-completion-r1 eutils ltprune multilib-minimal
+EAPI=7
+inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="https://dbus.freedesktop.org/"
@@ -14,25 +14,35 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+DEPEND="
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
 "
-DEPEND="${CDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/glib-2.40:2
+	>=sys-apps/dbus-1.8
 	>=dev-util/glib-utils-2.40
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
+" # CBUILD dependencies are needed to make a native tool while cross-compiling.
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf )
+
 set_TBD() {
 	# out of sources build dir for make check
 	export TBD="${BUILD_DIR}-tests"
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--localstatedir="${EPREFIX}"/var
@@ -42,6 +52,15 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 	)
 
+	# Configure a CBUILD directory to make a native build tool.
+	if tc-is-cross-compiler; then
+		mkdir "${BUILD_DIR}-build" || die
+		cd "${BUILD_DIR}-build" || die
+		ECONF_SOURCE="${S}" econf_build
+		myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" )
+		cd - || die
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
 	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
@@ -60,6 +79,8 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+	tc-is-cross-compiler && emake -C "${BUILD_DIR}-build"
+
 	emake
 
 	if use test; then
@@ -82,5 +103,5 @@ multilib_src_install_all() {
 	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
 	rm -rf "${ED}"/etc/bash_completion.d || die
 
-	prune_libtool_files
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf
new file mode 100644
index 000000000000..463638710ad0
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf
@@ -0,0 +1,76 @@
+From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 2 Dec 2018 16:26:07 +0100
+Subject: [PATCH] buildsys: use variable for glib-genmarshal
+
+When doing cross-compilation, the path returned by pkg-config for
+glib-genmarshal can be incorrect (because it is the runtime path,
+not the build-time path).
+
+Change configure.ac to use pkg-config to get the variable.
+
+This allows overridig the path at configure time, by using the configure
+option GLIB_GENMARSHAL=/path/toglib-genmarshal
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[smcv: Fix typo in commit message]
+Reviewed-by: Simon McVittie <smcv@collabora.com>
+---
+ configure.ac                           | 4 ++--
+ dbus/Makefile.am                       | 4 ++--
+ dbus/examples/statemachine/Makefile.am | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e00bc38..8be3147 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32],
+   [Warn on use of APIs deprecated before GLib 2.32])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40])
+ 
+-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+-AC_SUBST(GLIB_GENMARSHAL)
++PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],,
++    [AC_MSG_ERROR([cannot find glib-genmarshal])])
+ 
+ dnl GLib flags
+ AC_SUBST(GLIB_CFLAGS)
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 37c6334..2e8cb27 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1
+ ## we just rebuilt these manually and check them into cvs; easier than
+ ## convincing automake/make to do this properly
+ regenerate-built-sources:
+-	@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
++	$(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
+ 	echo '#include <config.h>' > dbus-gmarshal.c &&						    \
+ 	echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c &&					    \
+-        @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
++        $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
+ 
+ 
+ completiondir = $(sysconfdir)/bash_completion.d
+diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am
+index 187b044..c8fe029 100644
+--- a/dbus/examples/statemachine/Makefile.am
++++ b/dbus/examples/statemachine/Makefile.am
+@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml
+ 
+ sm-marshal.c: Makefile sm-marshal.list
+ 	echo "#include <config.h>" > $@.tmp
+-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
++	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
+ 	mv $@.tmp $@
+ 
+ sm-marshal.h: Makefile sm-marshal.list
+-	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
++	$(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
+ 
+ BUILT_SOURCES += sm-marshal.c sm-marshal.h
+ 
+-- 
+GitLab
+
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index f7584bce0aa0..d8bf15dedc2b 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,3 +1,3 @@
 DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011
-EBUILD distorm64-3.5.0.ebuild 597 BLAKE2B be31f99966ab069f4fb32c75243c71f82ac80ddd2b89ae44ea3651ac06d4b5bb075f8015f05ad2ae2c929eb9cb135abe2a1a90346ca44a3e9b0d83beab507b3b SHA512 2e8a6654c369469cf82c63335d196ec86bb85a72d54c5db9a5ccf5d31b30cd5559183f6da95d90d045a56963707aa02ef51c619719b647d22683491a5733e7a4
+EBUILD distorm64-3.5.0.ebuild 599 BLAKE2B f215baf2ee1027eee05b036df12de1452b9e2dedb7cd99fcee974b3ccc2d0067f16be61bbfc5bfef364a08e22c6077360bb1f986a106a1c0cf990a27f9a57233 SHA512 64ada4b9f4b9e4fccea5a8f50a25d5349ad3a40994b9f8ec79703c39433a07cfede5e04bc755774e014570d679009acb91c42efe1e5b03fd5d6d6fbbea91b4b0
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.5.0.ebuild b/dev-libs/distorm64/distorm64-3.5.0.ebuild
index 33a2f40462cf..001d04eb4798 100644
--- a/dev-libs/distorm64/distorm64-3.5.0.ebuild
+++ b/dev-libs/distorm64/distorm64-3.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 9d7b0259e87e..a7c0cf6e6e11 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -7,4 +7,4 @@ AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r7.ebuild 1856 BLAKE2B 5b53473108b3734739b190bcbb6de70223f995c56eb2970c60711e2fe0381acc64fe63c7077bc827e9c9fab93787887d1cc11eaa45fc0f6c3b5d356c31a67f35 SHA512 2f38656b920367281a179afb298c7fc2a4cbe7f3db56001f9812711c6836ad18e579c7e78427d110b329a528b443bf40852aaae92819b2aa8e13d88dcbd18f57
 EBUILD dmalloc-999999.ebuild 1715 BLAKE2B a531973e0e40ca54c17ae6f9b48b8b6b6cd211d4c1e97a0ee8ee22295433c28542344bcaec213cf7576cb3fdae1b3afb10a21ef4e3c783d57a2df5ac514f653c SHA512 a82821e40cb40fe7a88b6b840138894a1cd7823a716a369115bbae82ea046dbae1cf202cb0c6c789e177954133dcd70120091b6b1c8e29df2ad2aa595873ece2
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/dmalloc/metadata.xml b/dev-libs/dmalloc/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/dev-libs/dmalloc/metadata.xml
+++ b/dev-libs/dmalloc/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="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index bfcb3bdafa03..56af61d58f8b 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 593 BLAKE2B becfc0b4f984e4d8b6f8665ebef7249ff836b05f33945cc1d0c151b05ca96ea1e279630c36589bcbc9e2dc4e84d10ed3922c2e721e22c5367513ab2f33d9cbbe SHA512 91e42a0821cd44c544b04d4d34e96cd22d0fe9d6099004e85a8f408e1b4b2fb1992ad9fe0318c980fde00d6f1ae0f3e909bed8062033770ca2abfaa2f3f4765b
+EBUILD dotconf-1.3-r1.ebuild 638 BLAKE2B 2fe08ad0f784bcf4f7c1f2a4ee631d907e04e9bf9d36206d20165609653584b3273c4f866846b7c43942a8f0c8d6dd1c44e48beafb7addaa61abd593e9fb0f08 SHA512 b507f249a25d1192b469fd4a2b6bbc866e256ab3c82125a008a838cf72287a69c7f8b0fbfb1b498de554c10fa9a2bea706f1bac97ec34c3c38dea80008a35c6b
 MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index 7190481f9fab..293fd121585b 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -17,6 +17,10 @@ IUSE=""
 DEPEND=">=sys-devel/autoconf-2.58"
 RDEPEND=""
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	emake CC=$(tc-getCC)
 }
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
new file mode 100644
index 000000000000..35aabec55be5
--- /dev/null
+++ b/dev-libs/dqlite/Manifest
@@ -0,0 +1,3 @@
+DIST dqlite-1.6.0.tar.gz 155087 BLAKE2B 97a49f78f1b6af5ff5abfe6c5e1e3eec67cc1da4bd9c49b785e6fff60e5fd39fa1f479269ec098935ebb7fbbca6346859b54bd0c9b8f428557e2768da938da0c SHA512 07abf0d3247afd0a8f4ea053e10fbf2e53f69dc1101a7e54e064282eee3590ef5925e9b794a7cfd891247747d34b68340946d322d582ce49282b6f56804e8578
+EBUILD dqlite-1.6.0.ebuild 789 BLAKE2B fb67dc96a7efeeb149816bf8b5e16d4d4aa9ed8aa5264775951110d35b99a11f57fc9f0d77da1a0749f42e2d9a2c4ecf6ab691759c0d3af7f05c4a249c8a0cf6 SHA512 e84fd2da2289952852fd1ddf5f6a7cdb720ff7403de10bfe6382c069d8f10ce21408b07e9573de1664015d05cbb5b66f1672760ff51a07b6cd611a4d193ba4d3
+MISC metadata.xml 864 BLAKE2B d4b41f296b83ca318affe7df6ae3eba7b470d75bcdf343ea701890e43d62de317aefc1b4f47a939cd909ddc002201a6f77cb7662afdd8ad601f010ba0a8d16e9 SHA512 086eea8b0a1e5c58b26321bc4db1466437bda4e7129757efadc49b751a9ff2b9472b72ab83881c8e9aea171a052f9434723f27b4ccd3ae4ca15f21f165a1ca92
diff --git a/dev-libs/dqlite/dqlite-1.6.0.ebuild b/dev-libs/dqlite/dqlite-1.6.0.ebuild
new file mode 100644
index 000000000000..6141fc58dc01
--- /dev/null
+++ b/dev-libs/dqlite/dqlite-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
+HOMEPAGE="https://github.com/canonical/dqlite"
+SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libuv
+	dev-libs/raft"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/raft[test] )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-debug
+		--disable-sanitize
+		--disable-static
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/dqlite/metadata.xml b/dev-libs/dqlite/metadata.xml
new file mode 100644
index 000000000000..d15b38e95613
--- /dev/null
+++ b/dev-libs/dqlite/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
+  <longdescription>
+    dqlite is a C library that implements an embeddable and replicated SQL 
+    database engine with high-availability and automatic failover.
+
+    The acronym "dqlite" stands for "distributed SQLite", meaning that dqlite 
+    extends SQLite with a network protocol that can connect together various 
+    instances of your application and have them act as a highly-available 
+    cluster, with no dependency on external databases.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index 433aee59a858..4ba94ceeb9f3 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,3 +1,3 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
-EBUILD eb-4.4.1-r1.ebuild 712 BLAKE2B 7d9682663250322dd2b0a4dd3e22fecefa98b4d1780b3550f44d0c73ec2b18a4d332de0947f78927d56450be83c422e059a639e1dadc24c66a4cdc89002490e8 SHA512 a426622825115a7f6df7a48725396397e7ed0ffc57cb9048007ea565a60179711998ab30c94e3af161c807b014e6132e210e3eff7df1a3c137c49062a7f37181
+EBUILD eb-4.4.1-r1.ebuild 820 BLAKE2B 41c8ef1035366c60f986c893b25f4478deac6528ded5ba6ca941bb464f0361ff4cf77e6ec746bdf3dfa921abe3c321cd89ee8a14753b3d9b85f6ef9d6df16b9a SHA512 c5e2c076e27000f3a1c997c2e18808f2faabce69761f471128a1b488d99e6eb7572291db8e6e5e72e2555dad8cb729ebe749cedab7fdc8fc73e100594da03391
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index 254ea4b8e9b2..fc59b4ffde58 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books"
 HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/eb/"
@@ -14,12 +14,9 @@ IUSE="ipv6 nls threads"
 
 RDEPEND="
 	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README )
 
@@ -28,5 +25,11 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_enable threads pthread) \
-		--with-pkgdocdir=/usr/share/doc/${PF}/html
+		--with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 94f828357c89..d1f6d08e8522 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,4 @@
-DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
-DIST efl-1.24.4.tar.xz 72283172 BLAKE2B 4e21b21108337fdf3fa7be55e804f25f32dd8dc6a1743819910d83da713bae28cb4771f2f0df5d392a6f542158ed3c48566fef8d8dfaad9c65747f9a8ee1560a SHA512 5796b33152e0375196d54557803db5928bfc45267250b80406043157193773084c39482bca40dc6811f4a3dd53d416b0d3b8317405923add0560debb24a3a385
-DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
-EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7
-EBUILD efl-1.24.4.ebuild 7343 BLAKE2B a6730f3d79edc0fcd5d8a913a0c166c36e5f4127dff362d0f43b0013e274cda38a3e1d7bc2280864f54b2f84c13f90b6a77d6ebb47f7827fb97bdb42a815f0f2 SHA512 10b9a2fc8d5caf3cda150c82ea09f30b7d823c691cf0370dea6493e310a4c0ec61475e507bfc1e43ec4f9d29d386d16d5d3288e89f7fa4832ae66bad19610e20
-EBUILD efl-1.25.0-r1.ebuild 7767 BLAKE2B e65c2de696221a73a94f9ea81691ed94418b45a55a46b6163905bc866de409f6ecf35689568f2b6b815089ecbf96fa0067480123c6a70817ca372c6ed4740126 SHA512 e2e3f4bf98d1042a595b4035c8c5bda9997e9ac5c330a86c6d12f3f1ebfbc2bfa610269d80b2cf7fc0e65fdb3aaf81c730e819b5f1bfab6c62ce3a421b6344a7
+DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
+EBUILD efl-1.25.1-r10.ebuild 7774 BLAKE2B 3787eb8fafd4e6277612a18850e5ecb296ff1373877249977e8c26b1f609b484ed8ffa8f18f2fdf48845b4bdb3db1c3f57c99ab9ed80d0339583ddceb3d2430c SHA512 b057178a6b6fa9e527bfbc1ac572930dd101f3bb64b16b159ecf51a3049e3dfae5c338ecdcd8438bf7e1e3be7851537ec3d1e2950b2728266e9610949883b28d
+EBUILD efl-1.25.1-r2.ebuild 7742 BLAKE2B 528c2395dea3802f79acb8cfcdadaa7bc96e964bb26a147c042213576e22469424a632a72bf7f95080cc79de20989b58d99f1e165e0fd71d0ed8d6a26dc4ab06 SHA512 a4cf73b4392d24abb785087b47423b4eaf225dce324ecd74b9fcf30415288d52d8b9c299d6ea1b198e0f9aa944fc7eae5ce0eb5a07561d6881bbc76f17777e11
 MISC metadata.xml 1985 BLAKE2B 5ad17cbfc665a26357c6b8d473d211663224eca97ed9a22c8575122e331b9661118890db1cf4f41e9e0e9b16f157d48da0920026fc83fdf965e4d1bd7c3d1ede SHA512 dbc127099457c88bcc419bd0c415f801765aeb85f010d7de43ea03e9400a7888c33c80f53048bf4edfd34ff95a43ac506026775a7bf11b041adc89acef0ec15d
diff --git a/dev-libs/efl/efl-1.24.3.ebuild b/dev-libs/efl/efl-1.24.3.ebuild
deleted file mode 100644
index b07e53a6ee40..000000000000
--- a/dev-libs/efl/efl-1.24.3.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 x86"
-IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
-	fbcon +fontconfig fribidi gif gles2-only 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 +svg
-	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
-	xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2-only opengl )
-	^^ ( lua luajit )
-	ssl
-	drm? ( gles2-only )
-	examples? ( eet svg )
-	gles2-only? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2-only !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-only? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	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 )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="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=true
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D 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-only; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	local disabledEvasLoaders=""
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local bindingsList="cxx,"
-	use 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}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	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
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.24.4.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index f9943bbda177..778024e9b3f1 100644
--- a/dev-libs/efl/efl-1.24.4.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson xdg-utils
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua-single meson xdg-utils
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,18 +13,17 @@ 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 ~ppc64 ~x86"
-IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
-	fbcon +fontconfig fribidi gif gles2-only 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 +svg
-	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
-	xpm xpresent zeroconf"
-
-REQUIRED_USE="
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+	xim xpm xpresent zeroconf"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
 	?? ( elogind systemd )
 	?? ( gles2-only opengl )
-	^^ ( lua luajit )
+	?? ( fbcon tslib )
 	ssl
 	drm? ( gles2-only )
 	examples? ( eet svg )
@@ -30,13 +31,12 @@ REQUIRED_USE="
 	pulseaudio? ( sound )
 	wayland? ( gles2-only !opengl )
 	xim? ( X )
-	xpresent? ( X )
-"
+	xpresent? ( X )"
 
 # Requires everything to be enabled unconditionally.
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${LUA_DEPS}
 	dev-libs/check
 	net-misc/curl
 	media-libs/giflib:=
@@ -61,6 +61,7 @@ RDEPEND="
 		x11-libs/libXScrnSaver
 		wayland? ( x11-libs/libxkbcommon[X] )
 	)
+	avif? ( ~media-libs/libavif-0.8.1 )
 	connman? ( net-misc/connman )
 	drm? (
 		dev-libs/libinput
@@ -88,8 +89,6 @@ RDEPEND="
 	ibus? ( app-i18n/ibus )
 	jpeg2k? ( media-libs/openjpeg:= )
 	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
 	mono? ( dev-lang/mono )
 	opengl? ( virtual/opengl )
 	pdf? ( app-text/poppler:=[cxx] )
@@ -123,19 +122,24 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
+}
+
 src_prepare() {
 	default
 
 	# Remove automagic unwind configure option, #743154
 	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
 			die "Failed to remove libunwind dep"
 	fi
 }
@@ -165,7 +169,6 @@ src_configure() {
 		$(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)
@@ -174,13 +177,12 @@ src_configure() {
 		$(meson_use gstreamer)
 		$(meson_use harfbuzz)
 		$(meson_use hyphen)
-		$(meson_use luajit elua)
+		$(meson_use lua_targets_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)
@@ -191,6 +193,12 @@ src_configure() {
 		$(meson_use !system-lz4 embedded-lz4)
 	)
 
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
 	if use opengl; then
 		emesonargs+=( -D opengl=full )
 	elif use gles2-only; then
@@ -212,6 +220,7 @@ src_configure() {
 	fi
 
 	local disabledEvasLoaders=""
+	! use avif && disabledEvasLoaders="avif,"
 	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
 	! use dds && disabledEvasLoaders+="dds,"
 	! use eet && disabledEvasLoaders+="eet,"
@@ -242,13 +251,13 @@ src_configure() {
 	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
 
 	local bindingsList="cxx,"
-	use luajit && bindingsList+="luajit,"
+	use lua_targets_luajit && bindingsList+="lua,"
 	use mono && bindingsList+="mono,"
 	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
 	emesonargs+=( -D bindings="${bindingsList}" )
 
 	local luaChoice=""
-	if use luajit; then
+	if use lua_targets_luajit; then
 		luaChoice+="luajit"
 	else
 		luaChoice+="lua"
diff --git a/dev-libs/efl/efl-1.25.0-r1.ebuild b/dev-libs/efl/efl-1.25.1-r2.ebuild
index be750ab8e3a4..019efc881f10 100644
--- a/dev-libs/efl/efl-1.25.0-r1.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	examples? ( eet svg )
 	gles2-only? ( || ( wayland X ) )
 	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl || ( elogind systemd ) )
+	wayland? ( gles2-only !opengl )
 	xim? ( X )
 	xpresent? ( X )
 "
@@ -133,8 +133,8 @@ BDEPEND="virtual/pkgconfig
 
 pkg_setup() {
 	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0
-		/usr/$(get_libdir)/libefreet_mime.so.1.25.0"
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
 }
 
 src_prepare() {
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 9c87d00b3337..b9b299cf7ff0 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,10 +2,9 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
-AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c
 AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
-DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
 DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
-EBUILD elfutils-0.180.ebuild 2422 BLAKE2B 40571def8e77f4d077623ad2b0c4a600b4bc70f14702facb099958a4260cc638e3ac19ecc73b043d531c3cee873fca1ad254e0c5d3bc3ba1e003edf27f786b6e SHA512 82614e2da77c393a36fa9a1a0a121743acc3db4f2d2c66521c214d3adf80c27f945403f86ac7861e87dc2b2c2ad7ac9c0a0d79662c4ce3ec29ed245f9845dc9e
-EBUILD elfutils-0.181.ebuild 2466 BLAKE2B cb089361fbb8e912888ac81f13e686161d3ccf06bae6d2705ed4e77ef38460290f5c8b389d5e9c0de298d65cfe72edc49d1c8380264bbf7572ac93296cc07333 SHA512 83d659750dc4a6d68471d7305a064802de231e69e1f8b75a662d382bf076427a19789623bd35b401d5fd7d8b4d11ced747315ec64c3a7583b850a14f2ba1cc05
+DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
+EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
+EBUILD elfutils-0.182.ebuild 2553 BLAKE2B edb14ebc017f9608d4699551fc591f45adec2399273b6ac1f28af0c99bdbafbb120bb41381d3e8788b99188a41cb3509469a9e3c114bb356587a84253a00fa8c SHA512 57e8042ec67e61b6d883f87980b71ffccd2c557299c71545f1487a046b7d49a778dcead68ab8c35386e55e33de8c6728586ba61d9a4bf7ff0d14db6efdd20650
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index 83603f15c7b3..4a77d80ae440 100644
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index a8ed95308653..9b7966145b09 100644
--- a/dev-libs/elfutils/elfutils-0.180.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.ebuild
@@ -11,20 +11,22 @@ 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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	!dev-libs/libelf
+"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
+	sys-devel/m4
+"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
@@ -32,7 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
 	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
-	"${FILESDIR}"/${PN}-0.180-readelf.patch
+	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
 )
 
 src_prepare() {
@@ -61,10 +63,12 @@ multilib_src_configure() {
 		$(use_enable threads thread-safety) \
 		$(use_enable valgrind) \
 		--disable-debuginfod \
+		--disable-libdebuginfod \
 		--program-prefix="eu-" \
 		--with-zlib \
 		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
+		$(use_with lzma) \
+		$(use_with zstd)
 }
 
 multilib_src_test() {
diff --git a/dev-libs/elfutils/files/elfutils-0.180-readelf.patch b/dev-libs/elfutils/files/elfutils-0.180-readelf.patch
deleted file mode 100644
index a347d03041dc..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.180-readelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Use tool-prefixed readelf.
---- a/configure.ac
-+++ b/configure.ac
-@@ -200,7 +200,7 @@ fi
- # We really want build-ids. Warn and force generating them if gcc was
- # configure without --enable-linker-build-id
- AC_CACHE_CHECK([whether the compiler generates build-ids], ac_cv_buildid, [dnl
--AC_LINK_IFELSE([AC_LANG_PROGRAM()],[ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no],AC_MSG_FAILURE([unexpected compile failure]))])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM()],[ac_cv_buildid=yes; $READELF -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no],AC_MSG_FAILURE([unexpected compile failure]))])
- if test "$ac_cv_buildid" = "no"; then
- 	AC_MSG_WARN([compiler doesn't generate build-id by default])
- 	LDFLAGS="$LDFLAGS -Wl,--build-id"
---- a/configure
-+++ b/configure
-@@ -5343,7 +5343,7 @@ main ()
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no
-+  ac_cv_buildid=yes; $READELF -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 4a02a52f9019..b5936796b7a7 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -5,6 +5,6 @@ DIST ell-0.33.tar.xz 490180 BLAKE2B fc0f558a54bd57d7866c77ba3fdd97e0f35c33fd7ca7
 EBUILD ell-0.28.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
 EBUILD ell-0.31.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
 EBUILD ell-0.32.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
-EBUILD ell-0.33.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
+EBUILD ell-0.33.ebuild 1252 BLAKE2B f89ab50eba3d1ffc74f4a3c2504cf0ff8bcb25fcef7dcd7545019623f8bf05edc57e348b122751fa80d41af6e2d50c82b657ee806886b834b442b56912bc39e9 SHA512 bb5b32fc5d590979d02b0ebc04ed9fb780da0d6ebe5acfc9e36999ede1aeae099705e624a1af3bfb9a2e34cf6028bf1de81b18fb004964cdbb00aa472b3b31c7
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.33.ebuild b/dev-libs/ell/ell-0.33.ebuild
index 6c1b04339772..d66532bb9418 100644
--- a/dev-libs/ell/ell-0.33.ebuild
+++ b/dev-libs/ell/ell-0.33.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 1a019fd52e54..f7086084d040 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,7 @@
+DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
 DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
+EBUILD expat-2.2.10.ebuild 2542 BLAKE2B a48db7ea86bd98b7afe42004e1a7f01cc0dbf548b96bc52e37a4433710a9de568c03177a094c5562b2e5c24db9a6d362f5b3dca7d571bd776e70840fb0283ca2 SHA512 888878858f2ae8fdef1a8e3b37ff35872b56df96b922ee2f9feeea1c95737280b615b4b7d872d8e81901dadf63c4c411943f5cc87e072919942a5cbe0d351bd8
 EBUILD expat-2.2.8.ebuild 2509 BLAKE2B 7b76c5410eadbab36e3dfd5f99720b2f969c51d131d1228fafec265707d8dfc9df4fd98ef776778e9c23b81f298e421a4068cfa26cd500236f84328dc9d6d365 SHA512 da6448c66c60edbe38762de1ebbd3bdf68041e6f3c9afbf8ef95ea470250fb9576a9fbdb343e9aee90af74ce207e0fcf52b4115e71b78ff573e3449fee6fec0a
 EBUILD expat-2.2.9.ebuild 2542 BLAKE2B a48db7ea86bd98b7afe42004e1a7f01cc0dbf548b96bc52e37a4433710a9de568c03177a094c5562b2e5c24db9a6d362f5b3dca7d571bd776e70840fb0283ca2 SHA512 888878858f2ae8fdef1a8e3b37ff35872b56df96b922ee2f9feeea1c95737280b615b4b7d872d8e81901dadf63c4c411943f5cc87e072919942a5cbe0d351bd8
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild
new file mode 100644
index 000000000000..2da0a2ea35e0
--- /dev/null
+++ b/dev-libs/expat/expat-2.2.10.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AUTOTOOLS_AUTO_DEPEND=no
+inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	if multilib_is_native_abi ; then
+		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+		use elibc_FreeBSD && gen_usr_ldscript -a expat
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html,png}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/faxpp/Manifest b/dev-libs/faxpp/Manifest
index 2f391f13007e..02e2e8d5201a 100644
--- a/dev-libs/faxpp/Manifest
+++ b/dev-libs/faxpp/Manifest
@@ -1,3 +1,3 @@
 DIST faxpp-0.4.tar.gz 512740 BLAKE2B 922c0fe6092517c6d4fa6d1cc7169bce7d97b873c49e3d6a776174e43cfc72bcd5f38b1baf8cee4239aecfd7820a3e6b0594a1fa94e4a45392ac2cf0d6889dbd SHA512 25b871a6419b70d9ee85817cda267dfff7ed8aa99a031493a6ccaf1faed80e113ceb7407df1629958d7841c73ba3bee760af9f595dd71648d853561e8c8f33d8
-EBUILD faxpp-0.4-r1.ebuild 515 BLAKE2B 7cdec46e7b0c45139cb858c2c5e588504a483265aed0e86329c827ad2e66aa21b55744e2fe8ba1cff7484a2b37252c60321333823fa16bfcfbaa3c30609fbbb5 SHA512 c54c64eab185d287e6975a4cfa72853b9eef3acdaaaa17035aba8b0c74c26275dc5c565ac712589bcaac88ba4124806d6c7ac2f4cc969fde8fbb6842124a31e8
+EBUILD faxpp-0.4-r1.ebuild 600 BLAKE2B 4c3f2abac2a9bf64e3bf993f0712bceb7e7357591f0e0a2ce654f35232771ff839ee304b440af3ddc44cc695e8d115defd98f1a23cfcdde36ae2ea5392213c78 SHA512 f6f3c275853e27e16d1b09c0458675cbae18434d10c68f37613a4c1e1f6de3c5c1098e8f9dd04381c623973bd27ff56a02c3d998b65e1fd4c03dd2e6bda5c5b7
 MISC metadata.xml 242 BLAKE2B 71d0f287af2c52ce2a8c0c681cf83005d1de3e9ed3c3da4433b355f926c510940a20147b18a68ea49c22c3ba2b416ef884905845be9d7e41b26982ce783945f8 SHA512 70445376619a9563f9714681fc55a4115cfd9406c80f465e59ec730798d62106cf1910b3d847ae0d8e3d9b8dc2da496047d1a75d6493678baacdb16409ad9d12
diff --git a/dev-libs/faxpp/faxpp-0.4-r1.ebuild b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
index 70d50bbaeaaf..60af37fc3cee 100644
--- a/dev-libs/faxpp/faxpp-0.4-r1.ebuild
+++ b/dev-libs/faxpp/faxpp-0.4-r1.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=7
@@ -12,6 +12,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
 
@@ -23,4 +27,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index c3b9486a0770..ee16b0addfef 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,7 +1,4 @@
-AUX 0.13.1-meson-0.53-compat.patch 908 BLAKE2B 2fb471f9f500623565491df116099198be990c4ccf9bc308a2fd0fc2676b81c9f1ae5aa9a6168703066a35a0c3d87d480610d81333da97c1363d87265ccbf998 SHA512 2e4ee26a529d2a854027abb9d0a1414d1059f55fb0ac9ed5edde36049819bcc77f1e971b9b8a98e56db6ab18e6704591f9ea906ecd12f9bbff17816d40f3bc5d
 AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a
-DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
 DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
-EBUILD folks-0.13.1.ebuild 2127 BLAKE2B fbd9a7223cb54a3b7131dd65644d4b3232ff6f5746c0dcb9cab470e82180844b45b0b3a8c34f5949863dd7e728b2a1a3f8a75ba23e9f1c66fe480beb900bafd5 SHA512 78ec67564db62ff9c97326a0cb971b7240eb3bc9e1c28e07b10d60acb5a030a595abd093fef877fd68915a780b5a6f4ec9fe45c25eca793122e95f72cdc06ca9
 EBUILD folks-0.14.0.ebuild 2578 BLAKE2B fd63633e12ed937f579a562c94c455d78dcb4898fb5e6cc68e7f091e296b28827c93c8f26f8e392f67f09b6cbf5d8c64ec624cfd4e884bbcc6ac61b0009921b3 SHA512 ee502d9c4e68ffdc09e0c9dca1ed7561c269487610ac88f25a37bf7cb160879e7c5b889bfbb5e006b59e8ac288966c52d93adb0496833f05ac03c213f68af865
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
deleted file mode 100644
index a31a5c697e2f..000000000000
--- a/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c973f2910322a2b6cfae210730bfd6d3d8259e01 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 1 Mar 2020 10:41:30 +0200
-Subject: [PATCH] meson: Disable unused dbusmock check as tests are commented
- out
-
-This avoids issues with meson-0.53 like commit 1853567d79024, but
-by just dropping the check, because the 0.13.1 release had tests
-commented out fully anyhow.
----
- meson.build | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 8d09149e..8f52bb7e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -123,10 +123,6 @@ endif
- 
- if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
--  # Needed for the BlueZ tests
--  pymod = import('python')
--  py_installation = pymod.find_installation('python3')
--  python_dbusmock = py_installation.dependency('dbusmock')
- endif
- 
- if import_tool_enabled
--- 
-2.20.1
-
diff --git a/dev-libs/folks/folks-0.13.1.ebuild b/dev-libs/folks/folks-0.13.1.ebuild
deleted file mode 100644
index 0d40a5ff9011..000000000000
--- a/dev-libs/folks/folks-0.13.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 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="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="test"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-"
-
-PATCHES=(
-	# Alternative to https://gitlab.gnome.org/GNOME/folks/issues/119 as tests are commented out in 0.13.1 release
-	"${FILESDIR}"/${PV}-meson-0.53-compat.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 0c857495adb8..36c41d0b89d9 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,5 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
+DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
 EBUILD fstrm-0.3.0.ebuild 803 BLAKE2B 52f8d34804c41344d3414cb9b07e476f49cef9f6e41db960e33fce21d404cc011ad97b92dee7288e868a12e10020a16e328b805c320c4395fc7967411faec988 SHA512 9d81084901f1d029c9e62117e294b1f6985870928db5f8aac00d71449874b67a378d5d3f7d46503ce8eed22ea916eefdf4e60142059b092addc9dd7a0dbdb829
+EBUILD fstrm-0.6.0.ebuild 828 BLAKE2B a7b481fa2a227491417d4d09e6d540c6667caef22343663f442b22500691f8ab21c86d94fcf9ce8415a5a9a2e04b1b861ba37fc865d2ef7bf7dc6bc4d4bc3bcc SHA512 1c8e905ac28673f0e881a5c57e0b4ef78b2c6ab335d95927a287f8224cb9b6ba257cfc3c4c279f1d6e48b4210469cba6f441482449dc331dbb9ce30eabc8017a
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.0.ebuild b/dev-libs/fstrm/fstrm-0.6.0.ebuild
new file mode 100644
index 000000000000..806ef1cc0cf3
--- /dev/null
+++ b/dev-libs/fstrm/fstrm-0.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Frame Streams implementation in C"
+HOMEPAGE="https://github.com/farsightsec/fstrm"
+SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs utils"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="utils? ( dev-libs/libevent:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable utils programs)
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 42ade8127cd2..99e49d654f48 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,5 +1,3 @@
-DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
 DIST gdl-3.34.0.tar.xz 531368 BLAKE2B 5e32c330ab2fda0b9f06de0fd9d7e3f3118b0af36a73f4f0280f069b49002a4d00e5cbfd373d65b0ea7a15bb5b577f8babbdf7ee71ed7db773d2ad65008a452e SHA512 8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0
-EBUILD gdl-3.28.0.ebuild 729 BLAKE2B 1b46485f8ac883f64d5c35b46992a7eb3e8a82ecae841eee29f29a9752f794f8d2975b3cdfe4d551a0ec8a1687961db0116ade3936d30804ceaf3e458aa167e5 SHA512 09a66a3105ecd29787f0378e6bea909aa9312e6c211eabbf11d21775d5ef7e504a60d87912f95d5e6f326c1df8c9d4a9ea4ee17c5b8a3cb25ac69f71f52c0260
-EBUILD gdl-3.34.0.ebuild 731 BLAKE2B d1dac1a6ea3bcf061b9e39115c405190f0b87eebf34bc1adf84577efc8d62edbf5ce9dcf33cc72978acc712fe596159a7e214c62622db27d2010636df8984d75 SHA512 d8cf39270d3a37b1e363022e65787bb92a4a6e90486dbfb6144bfda667f47442ffa498d26db92af004c4caef3450dbb55ef538a0ed68dd89810eede352affe4a
+EBUILD gdl-3.34.0.ebuild 729 BLAKE2B 1b46485f8ac883f64d5c35b46992a7eb3e8a82ecae841eee29f29a9752f794f8d2975b3cdfe4d551a0ec8a1687961db0116ade3936d30804ceaf3e458aa167e5 SHA512 09a66a3105ecd29787f0378e6bea909aa9312e6c211eabbf11d21775d5ef7e504a60d87912f95d5e6f326c1df8c9d4a9ea4ee17c5b8a3cb25ac69f71f52c0260
 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
deleted file mode 100644
index df1f4b4c6f8a..000000000000
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME docking library"
-HOMEPAGE="https://git.gnome.org/browse/gdl"
-
-LICENSE="LGPL-2.1+"
-SLOT="3/5" # subslot = libgdl-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.4:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-gtk-doc
-}
diff --git a/dev-libs/gdl/gdl-3.34.0.ebuild b/dev-libs/gdl/gdl-3.34.0.ebuild
index 1cab54f3f74e..df1f4b4c6f8a 100644
--- a/dev-libs/gdl/gdl-3.34.0.ebuild
+++ b/dev-libs/gdl/gdl-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 5dc3df970396..9ca03f84f040 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,5 @@
-DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74
-DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
-EBUILD gjs-1.58.8.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
-EBUILD gjs-1.64.4.ebuild 1124 BLAKE2B 8a31589c2645c762e70f19fc6987d8b1cc07b8fa6531c3f4bd15ffdf339ddd54c4f2d9a03746a34ab4c559f05d486467857f26842c9fcc6bfa5db4997eca7e97 SHA512 1a4648b0fdc426c8cf4a43110c470667e287f9d6fe446b546c70495d4ecb4511395fc1e7e37f14edf05f53580eafc6d30742b78142d065e3c4967c16c2ed3f51
+DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f
+EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
+EBUILD gjs-1.66.1.ebuild 1115 BLAKE2B 5eac3f9f32f7b9bd13f0e3ac4aee039fbeb211349e91072a2898695181caf0d4771a73d6ce19ce774ed3df69a8a2bc1937de1623ab9359b166a6e147a0bc66a2 SHA512 e1c1b283e411e3f1426b4a58206af749bcf8bee08bfb3bb7b737ddc61bf8e8a9b18a01f2b12be70af57ca69ebabbfbb0197efb1e388dea9329ba55431443c153
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.58.6.ebuild b/dev-libs/gjs/gjs-1.58.6.ebuild
deleted file mode 100644
index 2f256eb68f48..000000000000
--- a/dev-libs/gjs/gjs-1.58.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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 +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	>=dev-libs/gobject-introspection-1.61.2:=
-
-	readline? ( sys-libs/readline:0= )
-	dev-lang/spidermonkey:60
-	dev-libs/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
-	virtual/pkgconfig
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-
-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 \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_enable sysprof profiler) \
-		$(use_enable readline) \
-		$(use_with test dbus-tests) \
-		$(use_with test gtk-tests) \
-		--disable-installed-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 emake check
-}
diff --git a/dev-libs/gjs/gjs-1.58.8.ebuild b/dev-libs/gjs/gjs-1.58.8.ebuild
deleted file mode 100644
index 2f256eb68f48..000000000000
--- a/dev-libs/gjs/gjs-1.58.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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 +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	>=dev-libs/gobject-introspection-1.61.2:=
-
-	readline? ( sys-libs/readline:0= )
-	dev-lang/spidermonkey:60
-	dev-libs/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
-	virtual/pkgconfig
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-
-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 \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_enable sysprof profiler) \
-		$(use_enable readline) \
-		$(use_with test dbus-tests) \
-		$(use_with test gtk-tests) \
-		--disable-installed-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 emake check
-}
diff --git a/dev-libs/gjs/gjs-1.64.4.ebuild b/dev-libs/gjs/gjs-1.64.4.ebuild
index 48a880b97706..8c6b028bbd65 100644
--- a/dev-libs/gjs/gjs-1.64.4.ebuild
+++ b/dev-libs/gjs/gjs-1.64.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.66.1.ebuild b/dev-libs/gjs/gjs-1.66.1.ebuild
new file mode 100644
index 000000000000..fcc5377cbee2
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.66.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson 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 +sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.61.2:=
+	dev-lang/spidermonkey:78
+	cairo? ( x11-libs/cairo[X] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e9e29a5cc0d2..572184d8edbf 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,8 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
+DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
-EBUILD glib-2.64.4.ebuild 10341 BLAKE2B f86bfc8fff0ebc1fd53b89f98a3924cdbf814de9fe2a8cdd0a65aa5cd5a4c24d04b112cde58e1a3b5911d74de8cc65087fd09a88192c9fcbe1ecc8178748052b SHA512 d0b44d65e055f1afc22126675ed54f5168faa3b55aad5f1bf52880d71232f226924c9c888ad3dd969fa010d089dc0634abefb90c16368840ac161435e043d8cf
-EBUILD glib-2.64.5.ebuild 10343 BLAKE2B 84d82001f55a173d36d263675f0168a0d8f9cfae88c53358b722ebf9c7a07fe12a10ecde623e3e26423216a08ca74a94037727ac64c8287a3de80334dc8ce4a4 SHA512 a5f70fe09a276c7a1e4ebb6e924995b0e216879ab42fd57dc185716c3985547c1e46aeea2e2798548a33d227afc9c4cfc961fb2e0fca17b156022bc168b341b5
-MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
+EBUILD glib-2.64.5.ebuild 10340 BLAKE2B cd7a783302d17fe7804354bf5a64e5d912d978431d6759624d0721e1f7acbd294ee824f397fb0f2a4a3b7fd01d240dee92217177566a66e982ea6d436a7a1969 SHA512 353274e00044263633096844343b2e029d48ab7fe9ab1c8b9549ae89d6bdc501258bee4fb8651a259c118f3a5aaefbfc49683de6289d60e74da2009519861e2e
+EBUILD glib-2.66.2.ebuild 10455 BLAKE2B e26e33e8dc849ca858a5b35f8fb946aee37b7c3a24115f6714bdd9ecfe56ea7a9424f59b68221355060351c39bc027db929395e58623b6e17603e000640641eb SHA512 d1fb735c53107aee869ffbffc4b9f97cbbd37a82a7cd0758360a99d51c274d1c3353d005dbbb8dc8576ad0aa1ecd84f043631fbfa8a37531bfe23cff18e2848c
+MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 837596c8f777..0f1b0aee616c 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/glib/glib-2.64.4.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
index 0f764c01d3b6..a48545f55145 100644
--- a/dev-libs/glib/glib-2.64.4.ebuild
+++ b/dev-libs/glib/glib-2.66.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
 
@@ -11,10 +11,10 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
@@ -30,7 +30,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
 # them or just put the (build) deps in that rare consumer instead of recursive
 # RDEPEND here (due to lack of recursive DEPEND).
 RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
+	!<dev-util/gdbus-codegen-2.66.0
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
@@ -42,7 +42,9 @@ RDEPEND="
 	!kernel_Winnt? ( virtual/libelf:0= )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
 # libxml2 used for optional tests that get automatically skipped
 BDEPEND="
 	app-text/docbook-xsl-stylesheets
@@ -168,6 +170,7 @@ multilib_src_configure() {
 		-Dman=true
 		$(meson_use systemtap dtrace)
 		$(meson_use systemtap)
+		$(meson_feature sysprof)
 		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
 		$(meson_use fam)
 		-Dinstalled_tests=false
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index b88ccebb54c6..c1bb61a327bd 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -19,6 +19,10 @@
 			Build support for profiling and tracing using
 			<pkg>dev-util/systemtap</pkg>
 		</flag>
+		<flag name="sysprof">
+			Enable profiling data capture support using
+			<pkg>dev-util/sysprof-capture</pkg>
+		</flag>
 		<flag name="utils">
 			Install gtester-report utility to generate test
 			report files for your software; build gresource utility with
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index dcb5cf520c8a..99a917878215 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
 EBUILD gmime-2.6.23-r1.ebuild 1499 BLAKE2B 5fa080e22105dedbbb3c948aebdc41cdc8dfacfd42b858173d8044b7cf8f9dfce8f0271fbe27f5c48ba885d0502c64f723228373a39970f63d3a07ad740c01c2 SHA512 cbcd5ce244219de5e7ef7b604a0349df42005dd23a30f5c74ca501b77b035ef01e6d8d9528bb1112f982abd92ff505ea3457bc92fd0f8dc865f1432678f10e14
-EBUILD gmime-3.2.7.ebuild 1577 BLAKE2B 19966e1e5ed21a24da86b6f99715b20fc4d0c0819b0736cf026b4e1597ddc0576f8d135097244de9c747c7b649d0c021162606c07ba4e857f1ee6ca31db8aeaa SHA512 339593494d4287f84fe3d9c4e6d707a7775f3be9f572714468f74a3c24b0f5a930d6171443d13f8a5d518294e84d882de32c2f1133845051a6f705742c93fc21
+EBUILD gmime-3.2.7.ebuild 1576 BLAKE2B 9e225e514c113c70ab51afc18579ede3e9fb95b3d12016febffd426fdc421bad041537c27ac0cb935323c89237d653cb548a28116ca43af522ca4d864ccce848 SHA512 84c7558ec0e9cebb59fb96ca078c75b09de09c951a37686bf36fef64336bec4ccd610f2dd79f7ac0972957ba7522e72db880373544187d3d315eb095d7a4d3f5
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 4d2f9bd3c3a5..3475f16747b9 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 206c496c383e..4b40e3151abb 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,6 +1,8 @@
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
 DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c
+DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
 EBUILD gmp-6.2.0-r1.ebuild 3008 BLAKE2B 32304976b7a0c1c8d8dd5cde7f0b30b41e3568e40fb3b22283fcd87df5e9fca03224dc0f9a5ef31040df914c499070edb9664c34db3534a1d8b5662eef90a564 SHA512 1f007bbd5ebcfe296cdc58db07a96a64819e4e9b2354b3480580b905f458a90e7756157ba9dc88f34dd0b556c0e111956164d477285ce299c134decc166e8124
+EBUILD gmp-6.2.1.ebuild 3090 BLAKE2B 649e43d598437975eade390df11c295f0525af1f68f906bbb5b9fe8a7d13fa17755c28d1a15724bb44f58eefa22df3b219be22200dfd7815423126f4163aa206 SHA512 5ab0d2e36e55fc4373bb2224ab6ea6f86f049973df60c95d9cded1a7d2d8ba6ea40044213332ebd24d26e2671257ce05e8c135014580d563e3b0b16bbbdbd81a
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
new file mode 100644
index 000000000000..85f0e1d3160b
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MANUAL_PV=$MY_PV
+MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
+HOMEPAGE="https://gmplib.org/"
+SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	mirror://gnu/${PN}/${MY_P}.tar.xz
+	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
+# The subslot reflects the C & C++ SONAMEs.
+SLOT="0/10.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc +cxx pic static-libs"
+
+BDEPEND="sys-devel/m4
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P%a}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
+)
+
+src_prepare() {
+	default
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# https://bugs.gentoo.org/536894
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
+	fi
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/usr/bin/env sh
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+	EOF
+	# Patches to original configure might have lost the +x bit.
+	chmod a+rx configure{,.wrapped} || die
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	#367719
+	if [[ ${CHOST} == *-mint* ]]; then
+		filter-flags -O?
+	fi
+
+	# --with-pic forces static libraries to be built as PIC
+	# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--localstatedir="${EPREFIX}"/var/state/gmp \
+		--enable-shared \
+		$(use_enable asm assembly) \
+		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs || rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
+}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 7ff7c1324cb1..46c5fe61d623 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,7 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
+DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 EBUILD gobject-introspection-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
-EBUILD gobject-introspection-common-1.64.1.ebuild 933 BLAKE2B 42bed1558e4aeff881f6a10774fb01479543975c19ff924b7b67612a3d50c1b59d8b154dbde9e74eaf0f19685183ae4fbd8d02009c1d9661c2424879d7f24d34 SHA512 69e82eeeb88c01b67444f73ca6c50f4851f254fa8131b7f2e85d45cbd2a08a3a91d62fdf3da59c967a4c3bb5fb069cc00650f79299e6b5b8c1ca5257f5ec0504
+EBUILD gobject-introspection-common-1.64.1.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
+EBUILD gobject-introspection-common-1.66.1.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index 160b9fff2b40..2b1f0b3ef7dd 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
new file mode 100644
index 000000000000..08b6851ff4fb
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
+# 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() {
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 189db31194fc..b93b9880a459 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,7 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
+DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
-EBUILD gobject-introspection-1.64.1-r1.ebuild 2006 BLAKE2B e4342bc36794a030d166ce478e0ace1c1430aa8cb6507b7e7c55c0d5e114dacd4780df4e63af0fac0e4f806f5da00472090c814368b8dcf6c0cabee351ade871 SHA512 930c6f396f393c15f0e487d666a1826594d07db1008a7f389cb2a5073725f1ad5bd9d9d0a93b0218f4a41a934997e353f63c7741f8bf2b67e5c40a29ba2e1c4c
+EBUILD gobject-introspection-1.64.1-r1.ebuild 2004 BLAKE2B c6ee8892a0dcf4e119a8f12b726c74bcdb9cc99c221087e397d8b4fa431311aa577dd50f0772f2dcc927e2478cd323af26a456c7721a0172feea2c19af528248 SHA512 5bc8ce8f069053ca9f5974b17a6be3853874d34a647149f79dcfe02f6ca854b281e8b729bfd4b11c5b80f9a955b5493a380eae4e0a3ac08b059447e2962af053
+EBUILD gobject-introspection-1.66.1.ebuild 2015 BLAKE2B 3eaf6341f3b9b9aad6dd948e30af8f485f861ecb95e177edcfe3e2b1cf380512fdc764b1a4a02a7b5e511611ce6f836c7f0560e5c9abdd7a0a728596d27fc712 SHA512 3f9b16d0cd6fa55df67272cf07991381fd552ab6935ca939ccad6a76c12f78f84a1e9e6d1d6e5e3d4a98a6718a357acf7cb5883e2ff0bad8b838271ae7532d57
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index 4296dae81691..1091eb833434 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
new file mode 100644
index 000000000000..fb1e487fd1cc
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml"
+inherit gnome.org meson python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.58.0:2
+	dev-libs/libffi:=
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	gtk-doc? ( >=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# 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/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 7fa57dacc3f2..9a697ae14e26 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,4 +1,4 @@
 DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
-EBUILD gost-engine-1.1.0.3_p20181031-r1.ebuild 872 BLAKE2B 56d7d15c6e05c12e81ef011a5680e459ed566fa9dd99abb3b4b516e34daba57a8836f2d0727008960706e59449dbcd72720f92e44aa76c2eb3590e4f5bb21f30 SHA512 005a8592a97e4be5d05274222cd95a72f94d7c4ca8f2a1af79e39e86e2e0c38723023243deacb4bd7f4fde04ccbe97559b1d1891b6e630b54ea6f4900f4f729c
-EBUILD gost-engine-9999.ebuild 797 BLAKE2B 6da28707e72dfeb1aca295ac8572815eed38a7c9b070438e8d61978c951a6ac310b6f0f89a318b5e61ecdd7cf844462f6214ecf554e28e8cfe4ec74800e65275 SHA512 033105332abc1945bd0f1a7902dc07f172e15d950a86f366c3d9e999e62d00bb6632048ec2e61f09d600edc74896cfba431c5892f00c4141f7d8cf88eb6e9de3
+EBUILD gost-engine-1.1.0.3_p20181031-r1.ebuild 976 BLAKE2B f633f6a8452c103e15e3f059e71b554a1deebb0b0da4f42d696420abc1ea2d780c80d979176d7d95f40a50952c15cf4ce11c96836ed37bfbbb51b0dd6b24dbfa SHA512 47294737be21c61a99222c02c38c7294c38eb3cbc57093565564d027c7d8eeb57659a37d17e17893a72b05c51b9803ef460e861c534947366983c6a60a42dc6c
+EBUILD gost-engine-9999.ebuild 907 BLAKE2B ac8fca4012b1fae656adc421d5261b31f5c989f7f6c0fb7edbd8e8852324a9c9dc0417b792e0a1d811eb4284d117a1fce486d26c5c0efbc8953f2c019081ee2e SHA512 6255a12cd39fac787e4113aa4f3b2a64672230e44d044b64788067bb70e877a92deb2cca8c20793e4123895c41a37948a4fcfaa026334a896d5f2a69a15f1fbe
 MISC metadata.xml 341 BLAKE2B fe6664fbcd10736141fcac977eb33d5f7b398af02b107c366fc06769150cc709bc7530896ee8a424bebf6dcaf6e12c37a8c1be65f7e53036d90d9159ad63d1ec SHA512 4d9d7229aec6f3ce7e6ea3a560d9ea126c64ada9dca18534d184073b0da130e2858e5ffa2eb9b34c61ce40ca44be42a043bd8b68f0446c7c41364d3a8d59ecf1
diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
index 9bcff53af420..fec5175b2bcf 100644
--- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
+++ b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-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
@@ -32,3 +32,8 @@ else
 	SRC_URI="https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/engine-e5cc3684f3b3ad40e186e23b00b253d234df92ab"
 fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
+}
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index 1d7a11fbc17e..945c78a4f22b 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-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=6
@@ -28,7 +28,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~hppa"
 	SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/engine-${PV}"
 fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
+}
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index 6b74b6703d3e..53c3272ef927 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-EBUILD gumbo-0.10.1.ebuild 884 BLAKE2B bc8297f6a9405b306daef9d8fa064f009f19895050efccc7a0ee3883113254e47e5a0e3aaaf319794430ec3d60282172dc3eccd150697cd7cd352e5090df3c6a SHA512 ac61e3ff9d3fa948c5059abf0ba012a3c73011d5041c479f9880729f8fa2e69635c3444f1110b546ef051b00864f7d3a3545d51acb8daad0b761374ac080212d
+EBUILD gumbo-0.10.1.ebuild 977 BLAKE2B e6190f2cf11fac96c494ea3bba51898518cd99100562b4ceee72bab54a17dd0bb208c6945d6a90bea090d6a743957bb215368002852a8acdc399f9985befa131 SHA512 5844d9318c2235ea6abbe3e06dddf0677869d89eced821daffe41aa0d521eefb057bf4bbf0cbb098a5ac003bcd04cdb2170a77b60c7bb2a39889053cb7acfcfb
 MISC metadata.xml 316 BLAKE2B f653d0ab857f07f4dc00630d5c795c86920514c04e51d0e86eb761d3f8298b8a4aa6ece91fe387fb1ec1e94b46cd8429405dbfd9303d1c591d155a0521e1547c SHA512 64d8505048d0a0eaae29a8078d340ae290f9bcd2971028e069fdca2f3dc503cec644109a9d695f7e63ce4cfdb6a1e6375e49292580aad1b4e61a46612cfc7c25
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 45ee50d5db5b..d046877829c1 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 
@@ -11,35 +11,36 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/gumbo-parser-${PV}"
+DEPEND="test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-DEPEND="test? ( dev-cpp/gtest )
-	doc? ( app-doc/doxygen )"
+S="${WORKDIR}/gumbo-parser-${PV}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	default
 
 	if use doc; then
 		doxygen || die "doxygen failed"
+		HTML_DOCS=( docs/html/. )
 	fi
 }
 
 src_install() {
 	default
+	use doc && doman docs/man/man3/*
 
-	if use doc; then
-		dohtml -r docs/html/.
-		for page in docs/man/man3/* ; do
-			doman ${page}
-		done
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index f1d8ad847b6a..9d637d7f200b 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,5 +1,8 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6b7385718898c4091b2bdf79f409fb34b1499b3af6ad903f524d6dbe96dcb90e404f6b2c33d03e4a2cd829bea18adb8 SHA512 ac6ddda51071918234cf3b79c4df094ec14c5eeecc35f4cabb2c5b6549089db704f7a69585a9bb21c95b72b203010f75c23252e80663381502663d76538f3820
+AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
-EBUILD hiredis-0.14.1.ebuild 1899 BLAKE2B 36cf0eae92dc3cfed0979be6ce3b46d2d582fd944fcb40fa0e34cb855e9dd63acccd0cdb7b5af33147a8984a8d168e821283054ef07babbebaac7973d2040960 SHA512 1db9c4fd111f6763728fd0594e042e9e074c4f28294c0c3b724052b701dab642469c9e6a0480bee2ff56faacb6b5cb0cc0f1d91681842f4ff51937893f1f03a8
+DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
+EBUILD hiredis-0.14.1.ebuild 1890 BLAKE2B 109667eb491520623a1a19d320344c1fd56f3b54b695ad8540e0862fb161b0f43bd7a98248478d1cbd7c28b4efa29ce846fadd7099758b72356d00fd32b7257f SHA512 a36938d6d27ca67b19971e1b3b12b36420d4ea1521eec70857f878a988f7ee5e60335f69f06a234d5c1ebd34ba7acc45b77885edb19c4c2ea03cffbd50ef50ea
+EBUILD hiredis-1.0.0.ebuild 1908 BLAKE2B 48ab82962c5436da52c3e3ae8a372286e17a566d7410b7723215b6ee07fcbd2d642a336c971d7aea1f62ad5a71f5126e54b397baef10035bc1ef48ded1af67cb SHA512 4bfe36d12afef468b089e43f5a463a928faae849622dab6ba654ce47bee993fc0c8a5597ba48270621d1d4e3b49cbd8ad0b9b5eb9a85d72ffba8bd179e5080f6
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch
new file mode 100644
index 000000000000..c8a5822c8ef0
--- /dev/null
+++ b/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch
@@ -0,0 +1,53 @@
+diff --git a/test.c b/test.c
+index c0eeca7..5d70471 100644
+--- a/test.c
++++ b/test.c
+@@ -641,6 +641,7 @@ static void test_blocking_connection_errors(void) {
+     struct addrinfo *ai_tmp = NULL;
+ 
+     int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
++    #if 0
+     if (rv != 0) {
+         // Address does *not* exist
+         test("Returns error when host cannot be resolved: ");
+@@ -662,6 +663,7 @@ static void test_blocking_connection_errors(void) {
+         printf("Skipping NXDOMAIN test. Found evil ISP!\n");
+         freeaddrinfo(ai_tmp);
+     }
++    #endif
+ 
+ #ifndef _WIN32
+     test("Returns error when the port is not open: ");
+@@ -670,10 +672,12 @@ static void test_blocking_connection_errors(void) {
+         strcmp(c->errstr,"Connection refused") == 0);
+     redisFree(c);
+ 
++    #if 0
+     test("Returns error when the unix_sock socket path doesn't accept connections: ");
+     c = redisConnectUnix((char*)"/tmp/idontexist.sock");
+     test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
+     redisFree(c);
++    #endif
+ #endif
+ }
+ 
+diff --git a/test.c b/test.c
+index 1e8fce1..91625ca 100644
+--- a/test.c
++++ b/test.c
+@@ -1324,6 +1324,7 @@ int main(int argc, char **argv) {
+     test_blocking_connection_errors();
+     test_free_null();
+ 
++    #if 0
+     printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+     cfg.type = CONN_TCP;
+     test_blocking_connection(cfg);
+@@ -1332,6 +1333,7 @@ int main(int argc, char **argv) {
+     test_invalid_timeout_errors(cfg);
+     test_append_formatted_commands(cfg);
+     if (throughput) test_throughput(cfg);
++    #endif
+ 
+     printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
+     if (test_unix_socket) {
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
index b0bf2fbfaedb..c930d36b3258 100644
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -69,7 +69,7 @@ src_test() {
 src_install() {
 	_build PREFIX="${ED}/usr" install
 	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
+		find "${ED}" -name '*.a' -delete || die
 	fi
 
 	insinto /usr/$(get_libdir)/pkgconfig
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
new file mode 100644
index 000000000000..5ca5e35b261c
--- /dev/null
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimalistic C client library for the Redis database"
+HOMEPAGE="https://github.com/redis/hiredis"
+SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1.0.0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+IUSE="examples ssl static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	ssl? ( dev-libs/openssl )
+	test? ( dev-db/redis )"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-1.0.0-disable-network-tests.patch"
+	)
+	default
+
+	# use GNU ld syntax on Solaris
+	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
+}
+
+_build() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBRARY_PATH="$(get_libdir)" \
+		USE_SSL=$(usex ssl 1 0) \
+		DEBUG_FLAGS= \
+		OPTIMIZATION= \
+		"$@"
+}
+
+src_compile() {
+	# The static lib re-uses the same objects as the shared lib, so
+	# overhead is low w/creating it all the time.  It's also needed
+	# by the tests.
+	_build dynamic static hiredis.pc
+}
+
+src_test() {
+	local REDIS_PID="${T}"/hiredis.pid
+	local REDIS_SOCK="${T}"/hiredis.sock
+	local REDIS_PORT=56379
+	local REDIS_TEST_CONFIG="daemonize yes
+		pidfile ${REDIS_PID}
+		port ${REDIS_PORT}
+		bind 127.0.0.1
+		unixsocket //${REDIS_SOCK}"
+
+	_build hiredis-test
+
+	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
+	local ret=$?
+
+	kill "$(<"${REDIS_PID}")" || die
+	[ ${ret} != "0" ] && die "tests failed"
+}
+
+src_install() {
+	_build PREFIX="${ED}/usr" install
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	local DOCS=( CHANGELOG.md README.md )
+	use examples && DOCS+=( examples )
+	einstalldocs
+}
diff --git a/dev-libs/http-fetcher/Manifest b/dev-libs/http-fetcher/Manifest
index 0504befa10ed..0dcd6b7e8345 100644
--- a/dev-libs/http-fetcher/Manifest
+++ b/dev-libs/http-fetcher/Manifest
@@ -1,3 +1,3 @@
 DIST http_fetcher-1.1.0.tar.gz 382470 BLAKE2B 6d2c7139d3e9435ff993fd5cd097c1b85b8900e048e6f93fc5e4f61f44f1eb47e0b9cd04c90985c15391ce862356a47acb56bfd8ff16050ca562095c80cb3f12 SHA512 136eceabc317bc4bf9956272ebbdae735ff589012ed0b17210fdb70051389bb7b3c1b43cdfc322a340e5538e9fd60b7b5216d3d46c439ac9df6af29e621bb1fa
-EBUILD http-fetcher-1.1.0-r1.ebuild 638 BLAKE2B 6c2d37f10be149d10683395ae24a0e2160b68a04c68abe7d239af58a8e19c7238ea6872814ecfac34a2aee52912b9f849385135c36f58bac489f3c88590d3307 SHA512 8e3e356069a435df2ca31219d99699e6985176b858f55a276a55e064f8aef38d3b23d12204ff3c3a7f90c6abfd6ce4c6869786cf53f060f6c357840614219a4a
+EBUILD http-fetcher-1.1.0-r1.ebuild 702 BLAKE2B dfb34c5218c987046d448681735e6d89b2c754ff14734e53418a58bef518bb48d8cfdcd09ceabe8cefc0c59e264052ea3f1a16af808410de686277bba0b52077 SHA512 f3350413ebd398299c6e0640644e11708498a693aabb0efcfc7b13ba4ec8abda27807c1a3d73e7774bcb81f33f451e0eab93cc0e02ee207f173227b6ab80064e
 MISC metadata.xml 333 BLAKE2B af3916f84f1e47250b8a4abac78cd72b5b9deb2212a94de92030c1d5b6f754501e35e267112a51c907d3b97c4484fd5b1a952610dda668aa39ad84be042b99d0 SHA512 0be8b9414e23971abba7606c7332511588a0abadd68cf6f7026bd4a5b729e7bc9c7123af103c3dffa0c6cb04517a5302cbb015c4b6f20916eec87808bb8145f8
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index afd0991dade1..0d694ccc9dd4 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -26,10 +26,13 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-strict \
+		--disable-static \
 		$(use_enable debug)
 }
 
 src_install() {
 	default
 	dodoc -r docs/html/*.html docs/index.html README ChangeLog CREDITS INSTALL
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/hyperleveldb/Manifest b/dev-libs/hyperleveldb/Manifest
index f81dbeac8d19..6fea6365da86 100644
--- a/dev-libs/hyperleveldb/Manifest
+++ b/dev-libs/hyperleveldb/Manifest
@@ -1,4 +1,4 @@
-AUX snappy.patch 1092 BLAKE2B bb134a799bae1631e8158787a54c059093555276d0006f975b1294bd8f3865601d45fde6c8473335015c3497f9151e457f3e1e03e322f037258f43ac1979280d SHA512 e6cb0bbfae14637a7ff084100c5347fafdf2c87ca5bc32457be9bc65c45cc79986ac70f2d23881cf5691e987853d6934dc2e929ad008e246809c7fbc3cf2c45d
+AUX snappy.patch 1016 BLAKE2B f53a9742bbb016f1ea8ff22fe5d440cdf3e5a528d4c5099b27ee7eb7b8d5c1ba08ad92118ec46777be2e63aef9c7337decdb2c03c51f440cb0152f6968c7b35a SHA512 c791faa7f7d0c3f1a94526f2ae0c3833c7b5f29e1a64c81447dda3b05134f1081b69a9963540e6cb5e4076b65e8b65ab1f3402f4e2eef4b9372a0b57ff0d094d
 DIST hyperleveldb-1.2.2.tar.gz 584955 BLAKE2B de578b83ae3ea4e3802bee9936d5917af421baf2513da9e4575b8965a8bcc53565fd56105eea70a0c0c62ddefc3c5c11bb3511b52c6c09e68c5a416d6aa06ac0 SHA512 6fb7a84ec237a5a1a3f5f7c90965a0b0661a6143722a159a189c4c54231d8c5746dcbb76713fbe9b8b2529467f287365d30dd7115fb5c1ef54f864686a709eb2
-EBUILD hyperleveldb-1.2.2-r1.ebuild 474 BLAKE2B 43d3f09e08d1319ebfba5254d5c660b1ad8275d1b7168ecd88c3aa48353624d180f88d44839a27e93c3ac3ba86eeaa70a05ad452d884d983f0c0c0af523a21a3 SHA512 54ff35eb32c7f555281f6fa96cee853373a1d562ee885a213ad3f52dab503974ce80bacdf7bc0997a17a0beaeaf58c32b3d1513fbf7b6bea5e1d244dc2e2819c
+EBUILD hyperleveldb-1.2.2-r1.ebuild 581 BLAKE2B f4b82fa5015581ebceade2488d252ed943ef0fe45a4579dabcdd6bca18c977768fce17486a148ab7d8fabfe6d88039c76b50a82eba0261ebd7c77784545858a8 SHA512 bc34848116d6bb26938584a3a0b87b4657483f1ff417e64aa3839e7824b04ef628281343edc68e3139aa22191899a9da3b303fe617557b1fd2aee6dbadca7425
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/hyperleveldb/files/snappy.patch b/dev-libs/hyperleveldb/files/snappy.patch
index f926e3f6a38c..db3d2e3885a4 100644
--- a/dev-libs/hyperleveldb/files/snappy.patch
+++ b/dev-libs/hyperleveldb/files/snappy.patch
@@ -1,5 +1,5 @@
---- Makefile.am 2014-07-29 14:44:37.851568232 +0800
-+++ Makefile.am.new     2014-07-29 14:44:54.687855718 +0800
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -196,7 +196,7 @@
  TESTS = $(check_PROGRAMS)
  
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
index b9f1cd0e7a48..1a42b9d33f78 100644
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
+++ b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WANT_AUTOMAKE="1.11"
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Hyperdex fork/extension of leveldb"
 HOMEPAGE="http://hyperdex.org/"
@@ -14,14 +14,22 @@ SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	dev-libs/leveldb:=[snappy]
-	"
+DEPEND="dev-libs/leveldb:=[snappy]"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/snappy.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}/snappy.patch"
+	default
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 394f875693eb..f499c0741f5a 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,4 +1,6 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
+DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 EBUILD icu-layoutex-67.1.ebuild 2502 BLAKE2B e452136b482c356e571acffad2a251bd784425dad08053c0d07f8d844e85e1838600ac60413e4bbd2fc19c654e355dce1609d72b1f89bad9d01f71210e9e80bd SHA512 5ef730853a72505f6d0f36033b128b5de2c3182eff92c3c36607b33d4f6095e96f46419fc9105a32341a2fcfc679ebc1ab5ffe2f1f10542c14b4d13b6a67020b
+EBUILD icu-layoutex-68.1.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
new file mode 100644
index 000000000000..62b585924f49
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index 007658c05769..0239016c76cf 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,3 +1,4 @@
+AUX icu-le-hb-1.0.3-icu68.patch 1931 BLAKE2B 56bbb65821e575e2c270759f5ddd5107a2e4935295b0320dd6e69d902fb47bb851290d99704c609f82e9efaf35fd7dffe2c52ea0393bfe63abff20930883ea5d SHA512 1e2f8c079b9e1340d857bf09670958894c427eac20a29f564ef1d91b82b3eec7331b79dfc41ce172a95e2ab6678e41a42098e6af0da2af93ac5646415bbea010
 DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
-EBUILD icu-le-hb-1.0.3-r1.ebuild 936 BLAKE2B 8c7d9f8567d1d40b8e1f48b900ef748ef748c5b9823d12bef22431d217ef175d0642607c9a39581b2f99c743f093f2f47b230c64187ab4ad63cb28aa0fc6dc2f SHA512 3350c4c4b441f56a0d797d810f1cc8c751a6dabc54f376bc4107f36496dd29118cc03915c3b943e22af1adef2beaa900f07976e44485cd0ea1db29fc2cc8bf66
+EBUILD icu-le-hb-1.0.3-r1.ebuild 989 BLAKE2B 3421aeb3459d7a8bd45b91936afc32f22f51dc2723b8ee67637675fdaca4d4b8bfb28bcca10574649c4b7bfe46dff91f47ae3b13997c92b26aec035f5b7208fd SHA512 bbb13e2d7ed73003a8c5f2f09f64a028ad56abce63ddd5df4b6b81302fb89c42c9b5e71294aff28471b279512014ee98576a5b019d869ae385f81ae212944dbf
 MISC metadata.xml 464 BLAKE2B 326f9087cfc3c08145ed5ef2dd2c109fcf1c81ca3a8a4394504045361243c4e9db69fee1f47d67bb7aa9a91e3d6e62cc61f45a74b611d62c389a70e1a1829058 SHA512 40aeb13c0ee32afb9b58e3412bf26806bbf724deebd6b966477412df1889cfc62c90755820381d3622a535ce83ec7bf4e051f85dea84138b84bf553ecc7b84fb
diff --git a/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch b/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch
new file mode 100644
index 000000000000..9aa6958faff9
--- /dev/null
+++ b/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch
@@ -0,0 +1,58 @@
+From c0a0a85833cdcceb636dbe986f39a43ac40f839f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 15:04:44 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/LEFontInstance.cpp  | 2 +-
+ src/LEGlyphStorage.cpp  | 2 +-
+ src/LEInsertionList.cpp | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/LEFontInstance.cpp b/src/LEFontInstance.cpp
+index e5595f2..89bc3ed 100644
+--- a/src/LEFontInstance.cpp
++++ b/src/LEFontInstance.cpp
+@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset,
+ 
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
+ {
+-    return mapCharToGlyph(ch, mapper, TRUE);
++    return mapCharToGlyph(ch, mapper, true);
+ }
+ 
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
+diff --git a/src/LEGlyphStorage.cpp b/src/LEGlyphStorage.cpp
+index bac403a..b537676 100644
+--- a/src/LEGlyphStorage.cpp
++++ b/src/LEGlyphStorage.cpp
+@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosition, le_int32 count, LEGl
+     // just got replaced by the insertion
+     fSrcIndex -= 1;
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ U_NAMESPACE_END
+diff --git a/src/LEInsertionList.cpp b/src/LEInsertionList.cpp
+index c64b8a1..3e39952 100644
+--- a/src/LEInsertionList.cpp
++++ b/src/LEInsertionList.cpp
+@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCallback *callback)
+ {
+     for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
+         if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
+-            return TRUE;
++            return true;
+         }
+     }
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ U_NAMESPACE_END
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
index 29001e5eecca..fa6e7b24bd9a 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-icu68.patch" #751931
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 78a4bf1d7900..c75f4b8dcdc8 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,5 +1,7 @@
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
+DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 EBUILD icu-67.1.ebuild 3335 BLAKE2B 355e74e20aee373cec9241a9b080f610f8c29461b0636c04767c7132826f34346532b15c45d027fd27708744063efaa7163e65040b8b1612c679056c23a66290 SHA512 30ed94fe4c6fb563e2421921b33d2bc5c0066a80f531337861fb0d1614098d4ea411bc58dccd1873296c2d6e39ff39cea8d8402059135aa5fd07fab18fe57602
+EBUILD icu-68.1.ebuild 3343 BLAKE2B b786864541035086d91e701ce101079e25efb10263535b623d76d1a25be63d19315f02c2d7c83007f191e020708d5f91f472967823ce42c17da2dcba0cc298a4 SHA512 02ffddad997ede82780250a3e81fbd4a2e857ce77a0687af22db146f93dc2eadd0cb855a1669ea9ea08993486694996fdab3b53c73e40bdbc401a40a4915d102
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
new file mode 100644
index 000000000000..50248a6dbbd2
--- /dev/null
+++ b/dev-libs/icu/icu-68.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://site.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 2edd5aa134f0..48e5b3e33bbd 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -2,6 +2,8 @@ AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574
 AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
 DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
 DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
+DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
 EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688
 EBUILD igraph-0.8.2.ebuild 1169 BLAKE2B e15a502fa48ac7f7174103cb76db131333f3635ca55ef838abf1107835d7c8adb5a91244f2a5b34cd129290252416a385259182b3b5167dcab76336acda5a91d SHA512 efa374895127874150b12119c1a81aed2d03be6e5fc9648cb0be1553f7770ab48d34c73aecc2e4fa1e21a892d1501d6e371023b07aca8b520e483d19df527524
+EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
 MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
diff --git a/dev-libs/igraph/igraph-0.8.3.ebuild b/dev-libs/igraph/igraph-0.8.3.ebuild
new file mode 100644
index 000000000000..186bd9a51133
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.8.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk:=
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch )
+
+src_prepare() {
+	default
+	rm -r src/lapack optional/glpk src/cs || die
+	eautoreconf
+}
+
+src_configure() {
+	# even with --with-external-f2c
+	# we don't need f2c as none of
+	#    arpack lapack blas
+	# are internal
+	tc-export PKG_CONFIG
+	econf \
+		$(use_enable debug) \
+		--enable-gmp \
+		--disable-static \
+		--disable-tls \
+		--with-external-arpack \
+		--with-external-blas \
+		--with-external-lapack \
+		--with-external-f2c \
+		--with-external-glpk
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
index 5d75a05a1f28..99f2b3a24c35 100644
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@@ -1,4 +1,5 @@
 AUX injeqt-1.2.0-gcc7.patch 588 BLAKE2B a2baa067eb643613bdedc1b0249cd3aa9bcc5e0e1e06eb828e8ac8af73042836299d68cd1972c927d31e6f79780dc6439806b8292d7516b65f26fcf1f21972ef SHA512 d61fefd0150b5429123ba4fc3a361e22f3663a7cdd14a8244537ff82d042479e04c254b2521761a05032c25e265ad4a42f4a48f8b546a42dd9f66787e49bc5c7
+AUX injeqt-1.2.0-no-Werror.patch 716 BLAKE2B 3c16470c0f40a96fc46a8a194d8cc5f9ed936c0df9ee977fa74355ecbc99aa00bd726d1c8b6269f1b644d09ee624fb7ef20c49de400351cc668ded695b66b7ea SHA512 ea31cd3e81d06d601bddbc0fa007f3916d733c22854e809c903239d3f04d845954449e243ac02afbdfdfceb39efbca36cfc48a0fb88b3bed81c498c23756f55a
 DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
-EBUILD injeqt-1.2.0.ebuild 697 BLAKE2B bc64c9e7a20c79a5b66619a5e9028053a89ffad6fc506541741c91d4b1a6b9a39086b048bf66a5287c2bad0f9a8c0d777f4457cb152d815fc0e65940275f705f SHA512 d473ce5d453b58de09cc2c242bd1e6ca563d17acd38ba550205c7e11eedd2982bf366ffae48a19241d50259ece512d0d837b8799f3fdbab27028d4efa2453172
+EBUILD injeqt-1.2.0.ebuild 738 BLAKE2B c20add47f5b127a20930daf9a7bca600a4001a4422473c6a9a610453014ce3dfc85667a3619fe470eff2a705776bd8d5a6e67acecc3c8f22011362278301ccb3 SHA512 8c4a84b349670ad2b809d4c66e385ed6a8dd9fbc5a4953481390d956a3743e9beec082b6907986fc73b6092a60c3acb641f65e0807c3ae5abf05c426b24d292e
 MISC metadata.xml 328 BLAKE2B d23a1f7b8bd482bfec92060b9f20f94efee5ec28fae5cd8e8df35c8d80d2b93a8e6b7474138ae53762f3e1c96f5bdda99d93841bd5f5598ce0698f6f72024dd7 SHA512 b095ba0bbe9d89d1d7b18fc13b3c03c23a8c2ad38f9871f3814dc4595e88a93d7682d3f18c31fd810bffeae25cc04de9c2681e933a7de103b8d1bc1e1bf4c3b3
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
new file mode 100644
index 000000000000..ffb8aae9b1b7
--- /dev/null
+++ b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
@@ -0,0 +1,12 @@
+diff -ruN injeqt-1.2.0/CMakeLists.txt injeqt-my/CMakeLists.txt
+--- injeqt-1.2.0/CMakeLists.txt	2017-04-21 11:40:08.000000000 +0200
++++ injeqt-my/CMakeLists.txt	2020-10-14 02:04:12.645803149 +0200
+@@ -37,7 +37,7 @@
+ 	cmake_policy (SET CMP0043 NEW)
+ endif ()
+ 
+-set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
++set (WARNINGS "-W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
+ set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
+ 
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 3d9de6be309d..42410678e47c 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
 # https://github.com/vogel/injeqt/issues/18
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}/${P}-gcc7.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc7.patch"
+	"${FILESDIR}/${PN}-1.2.0-no-Werror.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index fb32bb9bb155..b7fad2efc949 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,7 +1,6 @@
+AUX intel-neo-20.37.17906-no_Werror.patch 324 BLAKE2B 60fa6150f50986a12daf7a55b49cc7be6c8a6c314de750937f806ee0f057140a0d41630352914e529e79adf30ccea41bf0f3bae3cec68378ad3897e3047c7202 SHA512 74843a8a6114dc79d92906f957dcb1b411007ba4c27ebe1b46121acfd9dae34b122e711cfc290ecced7f5c622ee7340c8294fc7ef45b88dfdc6ac807cbac1785
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
-DIST intel-neo-20.36.17813.tar.gz 3459305 BLAKE2B 81996bb5946ff6334dc06aceed7e5f01f1ec1e417de7a600d41af43e0f74e3003b293f2981ad742e4f9df630aa81e9a21f6a0a04e9615ee4caa97fae4fe682bf SHA512 366120e785e068393bc0b1c2345eb3d2eca46d6c7485736d7e2aeece91d404f9b802230873b6f868fdd9d7a9852112a8aa216cde1210ab51d430dcef9601d968
 DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf78ee2512adf80f6869e9a99ff18aba5463b2c47e62cac3122eb899c644f5bbea6dd3205d348d071ea8854e3271b9e25fb34 SHA512 3db9b05dbfc05de8e5aad4eac631320642ff03444ff3eafe0f9cf72897e2dfb723563ad9f953a900a19511cc8affd3832d3f3fa966d9388714c326c71180e8f6
-EBUILD intel-neo-20.16.16582.ebuild 1197 BLAKE2B 480adbc18a35ac51f842cb996f32abce6006a15907d96fc91c900a5acb053b105b8111c3bef818ca3f8d87822123fd703cf57b01fe8694706c01bbc873116441 SHA512 5eaf2f8757db684c8cc7eeca9de1446a3d15761c69cb58888ff46862d51204a5f5a8ff350a89bd80c3bcbcd969856f5d796081ca658b72b83bd821f0da63f299
-EBUILD intel-neo-20.36.17813.ebuild 1198 BLAKE2B 190a825c85eac774f52eed0205e6f758c4a071cfa19e39fa30a4569b046531481b07d1cf22d630e6c9af5c9fb133b6fdd106ae17f51987b2020b2c1a247cf00c SHA512 9876ce22eaa6685a9623e3653fde979f6450fdfe93b58e9c1dde104f64c182059c9ae9cbf52e7dc3951077030022b92f063afc0905ec265e15835bd9e96ebc8f
-EBUILD intel-neo-20.37.17906.ebuild 1198 BLAKE2B 60f0e920cb2b2f0f779726107d99ac7f2ea6720717093beb8d2f779794de35405e5aa514cb44492d27b3cee459c37bcfb6b70d7f7de219e241abb6eb3888c198 SHA512 e23cbc54ee00785599fc35375f44978e72a3d3deab9e264be68b7c29ccd4497aa00cd95802cb92362a505b5877719dd72f8d98c3224b3dd6e3b4bf3ba8b6f625
-MISC metadata.xml 1173 BLAKE2B 60913d5c1e3b546b4a9a8f35341761a89a4c8e1a7ed3c63ba992eabfc28c01f790f1eb006220ccb3c764a0b6325e6e8f56186a058ec9387226eb2a911c9b73c2 SHA512 f2b373b08f2b599a1dcaef3ea32157a7278c8088a247d8275f68a35730ee28d065acdf8e99287a853a0a761bc497a5e48c72c3352a8f8cdbc9828134bab6c602
+EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
+EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
+MISC metadata.xml 1095 BLAKE2B 4669305d1799b9fde4b63f735593ad7e42d17b5ec65ef482a316c7347bdcd0c37b99700f4a29865352dc18e06ca8c38ddaeb650cc12793ecbca7ffbe6eec27cf SHA512 fe9a420c66ee8a86954f52d824a4f812667a5a84fc2fecdc286bd590413e0ac1ae55452dc736a4b315a0cbf15ac22f8a4b682226cac8b2377db9533bedb13fb2
diff --git a/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch b/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch
new file mode 100644
index 000000000000..aaa34012096d
--- /dev/null
+++ b/dev-libs/intel-neo/files/intel-neo-20.37.17906-no_Werror.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -801,7 +801,6 @@
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
+     endif()
+   endif()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+ 
+ # Compile code with defenses enabled (settings to be used for production release code)
diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
index 96c7b18829cd..9c033bd1c114 100644
--- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="l0 vaapi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild b/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
deleted file mode 100644
index 6f29828a72b3..000000000000
--- a/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="l0 vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON=">=virtual/opencl-3
-	>=dev-util/intel-graphics-compiler-1.0.3826
-	>=media-libs/gmmlib-20.2.5
-	l0? ( >=dev-libs/level-zero-1.0.0 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	FAQ.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DBUILD_WITH_L0=$(usex l0)
-		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
-		# If enabled, tests are automatically run during the compile phase
-		# - and we cannot run them because they require permissions to access
-		# the hardware.
-		-DSKIP_UNIT_TESTS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
index d5b0ed670f89..73c9118afb5f 100644
--- a/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
@@ -30,6 +30,10 @@ DEPEND="${COMMON}
 	media-libs/mesa"	# for Khronos OpenGL headers
 RDEPEND="${COMMON}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.37.17906-no_Werror.patch
+)
+
 DOCS=(
 	README.md
 	FAQ.md
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
index 0cb86b121696..cae799d9f329 100644
--- a/dev-libs/intel-neo/metadata.xml
+++ b/dev-libs/intel-neo/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="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>The Intel Graphics Compute Runtime for for oneAPI Level Zero and
 		OpenCL Driver, informally known as NEO, is an open source project providing
 		compute API support (Level Zero, OpenCL) for Intel graphics hardware
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 4889b00c8ca7..aaddfe53152b 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,4 +1,6 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
 DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
+DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
 EBUILD isl-0.22.1.ebuild 1331 BLAKE2B e22315634005c66ad6cb1bc0960d5350233d194044cb7e96bcfdeb97d1228befde5a7f8a699e385e41e09a8420a92d3557f76a1464aa79f8e0235efdeaed244a SHA512 3cb1827059d630d334c22eede743300b0d6b6199525607653b8970bf3b8f4f533ba9c27447f759687643a05975d2a5d7afb8b54354f88c2d3724d50abb898a96
+EBUILD isl-0.23-r1.ebuild 1862 BLAKE2B e7736afdca4453dd17c8ba7b53b8b4419bc110ddd5733ed309f37da37928d79d25303e13cf8fe841168f229cff71d1eb1cc05f957a2edccdf7eafa166ebb0a63 SHA512 45a62ce2c2f08f3f32c91634121e701b13d38a2453c0918c77e0c76b3ad49337aa66e03c62367dd259979b34cd690fcc02662d088837a3032137f80a51d2d37c
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
new file mode 100644
index 000000000000..ee79d99fae15
--- /dev/null
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal preserve-libs toolchain-funcs
+
+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/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+)
+
+multilib_src_configure() {
+	local econf_opts=(
+		$(use_enable static-libs static)
+
+		# AX_PROG_CC_FOR_BUILD deficiency:
+		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	)
+	if ! tc-is-cross-compiler; then
+		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+		# even for native builds. As a result -O3 is being used
+		# regardless of user's CFLAGS.
+		econf_opts+=(
+			CFLAGS_FOR_BUILD="${CFLAGS}"
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
+}
+
+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) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
+
+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) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index d8bae99b4aa0..81450c4f305d 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
-EBUILD jansson-2.13.1.ebuild 896 BLAKE2B 3692dfe2b23f2d67914061e0a5a59df63cb6799dadfd6235c02fce77b2f831c98aff1d6b6ccfa1899d2c3794d0e1de5194c87352242587030cb759febe937e28 SHA512 daea0277d404311fb46c0141752ebccb511bc3e052efa3047352cdf0fca26e79e01fe39313e5c37610b013b42f8ec65a49db2a5e6067b4f09d4f782ee5d84520
+EBUILD jansson-2.13.1.ebuild 889 BLAKE2B 4a291ece01c4820ae413d675423d6591c8a8177a955c17c13f23bb5d2429d2395efdea6eb1613bce46f7b2584104734aea092f896df00ccc0efe8c392491dd45 SHA512 9d98f73be1db6e8d4492891047c1dd3ccd02a6dbe716d42baef049e04f1c7871a1bb62a38bdc90eb630b77db9b23ab858134a94b046df724f7c77d13f62081e2
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index 830692135c98..00eb6d74fa27 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="doc static-libs"
 
 # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 5c87a7246914..c5ee05a4f8db 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,5 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
+DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
 EBUILD json-glib-1.4.4.ebuild 1513 BLAKE2B 5b25ecdf9e892824564e56605ca5bd0f8c21ff037faa70d39d4167d850996e2ab0f68784279b3b885504d98e344e6c62f10a349e6ed3434574780f5c0422943c SHA512 688bb6e76bdfd6ae49cca7fe04db4f3fa118bcbe6438de8f7142237acde1194b840cf4473a9eed636de5254b0337a1e9326fdf7e312b16754a2d42fca5e3ad67
+EBUILD json-glib-1.6.0.ebuild 1545 BLAKE2B e7fe9cb86f92f4f2d191251d5603c28bb39c3f5a569f5dab0b3cc8e437de31f91ac0df1d2a2405f344226b57b6e9c1ea2fca6642dc5ef3c2506a25dfeb85fd75 SHA512 4fe1d16e9d72c81968c55504232a97229f9265e80347941a0032906ff130600026712da3ff923259a30c4437fb16104aa74de3451845318364f72a698b3553ed
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
new file mode 100644
index 000000000000..3723a06a5540
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson multilib-minimal xdg-utils
+
+DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}"
+# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
+BDEPEND="
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
+	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
+	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Ddocs=$(multilib_native_usex gtk-doc enabled disabled)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 0306e0067ae7..0e4d95ce7954 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
-EBUILD jsoncpp-1.9.4.ebuild 1035 BLAKE2B b287b5f7d5ed0d156ad9db401fb6252915783f86a273516b8f2c31938d1a19e29a6cd6ecd774ef50962878a745dbd71f1a2d26ccecd15b0fd3c1db652abf2cbb SHA512 b97101d3c16ed538fa01799c6f1d900b03dc10d5bdddc585b2f004571f61ca0756edcf531c5131bec32ebbf86664855fa2d97443436301c07b968de9a82162d5
+EBUILD jsoncpp-1.9.4.ebuild 1027 BLAKE2B f0c137cced15dd26a0c379d6578ffbd7cebbb1743381cf1d15ff9ada9c88555d58fa330785f8b0a681114ed59dd1a7be4acd785ec4cee3df20b5ff4af0324642 SHA512 7af331b12975097c826d5d954cfb8693228a1adac9807523eb9df58d3bdef461e7c9f8d7f6588e0f2cccb02e3b577ce6461dfb494c00e9ead2f9bc48d4a11e19
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 1d7f0a221b2b..e06032f66c70 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 8bf2081a2b1e..6a2df713a9a0 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
 DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
-EBUILD jsonrpc-glib-3.32.0.ebuild 950 BLAKE2B 1a5f899fcd1aa09f924ced35d237fecc2e83178e2df4149cd6973bbe9f5a26e63f56c388bf8e4dfb98f20f3d22a1c14708e3fb628bc46156bb2fad6273f957e6 SHA512 d18ea1e621e48980411ff2aa284acd7f0913b7ba4ca89f4b46fa030331c73a292e7edbacbb5a401e7be7d4d0b6ce34ee6cc9c932cc40dbcaaa919f4f760aa8d1
 EBUILD jsonrpc-glib-3.34.0.ebuild 971 BLAKE2B 4f0ba2deafc37cf4051ba58ee20c19c669c1f46b78c893b2c859a55bceef4e0fb2a28118d208c5bedbbc5260eb6d5ee9884c7163132fd0212642bacb1b4fab7c SHA512 93372b1f84231ef06344b177c5696b9da31863e46bfb24814d7d99eccce5f069ae23fdb9b2f3b1227bea3d3064a8957b5cf31c299ae30b4eeb4acb8c2eecea74
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
deleted file mode 100644
index 26713eaa276a..000000000000
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg 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}"
-BDEPEND="
-	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/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 471655f0075e..29ecfcea58bc 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,3 @@
 DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
-EBUILD kdiagram-2.7.0.ebuild 861 BLAKE2B 8bae841cda73ac6fcc36ff091326029e8281b208e2cefb0b2b3e37ba62d3df59fadf05b6db45aa55aae52a592884033299c2afcc3cf04f6f79b687d808b26b5a SHA512 76a8d2c8816355b75eebb284b55361dd7c2039681aa4154885ee27e8145e4cfb9b85d712c36b0219470ef4112aeff34fc50ef04d1d17d4e116a99b7d156765a0
+EBUILD kdiagram-2.7.0.ebuild 832 BLAKE2B 3387718914baf3dc319847459b5674ac8a8d3e93c2a027da009beaf47bc6551d1749f62647caca93feda84d722ac5fba0528b85d217e41761589992f82062cd1 SHA512 a2cdd3a8e297d8253dda98ab8f4812b083dfe03e4e8f5f0e76c04b5110d1dad9f251a6be1db2a2751f881d3f6cb6ab7c5e95a12238eb5c10fe6353004dc1739a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
index 12b840ff0e2e..eae79d8708d2 100644
--- a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
@@ -11,12 +11,12 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html
+HOMEPAGE="https://api.kde.org/kdiagram/index.html
 https://www.kdab.com/development-resources/qt-tools/kd-chart/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/kpeoplevcard/Manifest b/dev-libs/kpeoplevcard/Manifest
index aa3a4ea08821..2532d9b5034c 100644
--- a/dev-libs/kpeoplevcard/Manifest
+++ b/dev-libs/kpeoplevcard/Manifest
@@ -1,3 +1,3 @@
 DIST kpeoplevcard-0.1.tar.xz 13424 BLAKE2B 567b5f081283da8af26e03c3e46c50bf67524146171a6f8afa938ac9609d11bfe32ad8de39a29ec0431af135f33825149fb8e98a28141941fd418539a8f03c30 SHA512 9f11ee768d1ddce1f03f41b604180078c0315eb8b9f0118dd99eba65333400b0a0ed12ab1e08ebce3c6c0a2c93563e5c3e832a0cd458d6ea296bd64eeb9413e7
-EBUILD kpeoplevcard-0.1.ebuild 628 BLAKE2B 72c43b73dbf114dfbe054079c02fadec23ecd2015f49ef8b4b56f3752a62bfde16ea3f10c22e1800df24ce1f916c3e1b97b16ca960dc56d3b99204606c07b8f2 SHA512 2c5824805d20e8155c7f27effa172af7a731c47725f90e05779f6c6bffebfc3784310763a449c40226c7d97fe99e964eaf8533a280cd974b97214ed8ebbafa8d
+EBUILD kpeoplevcard-0.1.ebuild 635 BLAKE2B 1f989f739e8f5f7d8a2fff9423176113ef2f90b66d441e417fe4bfa5b6af22642d01b240f9aa28e85fa1937a711c5827ec004316a1e74b126cb90f4fc4e451f5 SHA512 57653385b0a45fb2d5ea66973b2cb664045830a31b020666a812f7ed066f86ffafdfe35c0978d00b9294dc019a401c2fcb14d3c9ced20d4c069b55df6604ba97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
index 7d21913d4eb4..1d705d08d4ab 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 687421953941..f3934e9bc26b 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,3 +1,5 @@
+AUX kreport-3.2.0-gcc10.patch 4160 BLAKE2B 1d3e579ac1c2e6da0cecc22a2128746a6f3fdf99c7b4b5b66e0992f10ec9555b83efc6b6eff62acc5c2a72299abf3baf6b0e7fec9b7b0c57702a23d7cdc4cec4 SHA512 a378710adb3c885591dadb878ad6c4c8ed6c3e92feebfd59aaf8eaf1f03ddbe720d4480622e744c37ec0d7bb52812b9e91eef90ff5d3af30f70da7bbbba5aff8
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
+EBUILD kreport-3.2.0-r1.ebuild 1379 BLAKE2B 29e9eb5d8bb5f72bb6beb7fd3ffae37bedbf1153a207d4c661201d40a62233a30c4d99967fc8441c8bedfdc3382b83d3a4a3b4cdaca63dc7bfa218b763f65dcb SHA512 f13c2b26d270addcb8644ab542471746590d06d44be6fc540e70605fa66e67904ca1b4d6547501a8f66e86358d231b5d94e09649193bdbc2494c0d012caca4fb
 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/files/kreport-3.2.0-gcc10.patch b/dev-libs/kreport/files/kreport-3.2.0-gcc10.patch
new file mode 100644
index 000000000000..8d5b26bee064
--- /dev/null
+++ b/dev-libs/kreport/files/kreport-3.2.0-gcc10.patch
@@ -0,0 +1,120 @@
+From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Tue, 16 Jun 2020 21:59:12 +0200
+Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
+
+BUG:422886
+CCMAIL:adam@piggz.co.uk
+
+FIXED-IN:3.2.1
+---
+ src/CMakeLists.txt                            |  5 +---
+ .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
+ src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
+ 3 files changed, 48 insertions(+), 8 deletions(-)
+ create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1cf0b389..65bcf6e5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
+ 
+ if(KREPORT_SCRIPTING)
+     list(APPEND kreport_LIB_SRCS
++        renderer/scripting/KReportGroupTracker.cpp
+         renderer/scripting/KReportScriptHandler.cpp
+         renderer/scripting/KReportScriptConstants.cpp
+         renderer/scripting/KReportScriptDebug.cpp
+@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
+         items/text/KReportScriptText.cpp
+     )
+ 
+-    qt_wrap_cpp(KReport kreport_LIB_SRCS
+-        renderer/scripting/KReportGroupTracker.h
+-    )
+-
+     list(APPEND kreport_INCLUDE_DIRS
+         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
+     )
+diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
+new file mode 100644
+index 00000000..9274d4a5
+--- /dev/null
++++ b/src/renderer/scripting/KReportGroupTracker.cpp
+@@ -0,0 +1,26 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "KReportGroupTracker.h"
++
++KReportGroupTracker::KReportGroupTracker()
++{
++}
++
++KReportGroupTracker::~KReportGroupTracker()
++{
++}
+diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
+index e434e05a..4c0852ea 100644
+--- a/src/renderer/scripting/KReportGroupTracker.h
++++ b/src/renderer/scripting/KReportGroupTracker.h
+@@ -1,3 +1,20 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
+ #ifndef KREPORTGROUPTRACKER_H
+ #define KREPORTGROUPTRACKER_H
+ 
+@@ -7,16 +24,16 @@
+ /*!
+  * @brief Keeps track of groups as the data for the group changes
+  */
+-class KREPORT_EXPORT KReportGroupTracker : public QObject {
++class KREPORT_EXPORT KReportGroupTracker : public QObject
++{
+     Q_OBJECT
+ 
+ protected:
+-    KReportGroupTracker() {}
+-    ~KReportGroupTracker() override{}
++    KReportGroupTracker();
++    ~KReportGroupTracker() override;
+ 
+ public:
+     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
+ };
+ 
+ #endif // KREPORTGROUPTRACKER_H
+-
+-- 
+GitLab
+
diff --git a/dev-libs/kreport/kreport-3.2.0-r1.ebuild b/dev-libs/kreport/kreport-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..058f6a40c5ba
--- /dev/null
+++ b/dev-libs/kreport/kreport-3.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Framework for creation and generation of reports in multiple formats"
+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"
+IUSE="marble +scripting webkit"
+
+RDEPEND="
+	>=dev-libs/kproperty-${PV}:5=
+	>=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:5= )
+	scripting? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package marble Marble)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
+		-DKREPORT_SCRIPTING=$(usex scripting)
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index d0ec8bf4cb52..ba59e048e60e 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,12 +1,17 @@
+AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5
 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2
 DIST leatherman-1.12.1.tar.gz 816002 BLAKE2B 286bbc24971b2769c8fae73a274b05ce34ad5469f8647681869cecf133f2c3d9c9fab75327fd610aa8957c359baed645c221aa0670789a0f75888f624ea473a7 SHA512 d2bb2b9aab2749df61fb29e984a9058165851c0d4dce45efb102673dbb2e7b56d12005db106f967a6e5ad93b37ea7f7ed88337bf41ffb503db8b2152c87151ad
+DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
+DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f
 EBUILD leatherman-1.12.0-r1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b
 EBUILD leatherman-1.12.1-r2.ebuild 1327 BLAKE2B 005078e2c9134eb470c2bd653ccd34b7131427d0d86b95bae5117df553b19888f218083c48ab7f4a9892e54dcffa3e7a67030b2b449cb9a297041bfe39b938b4 SHA512 35e7561d08c736cdfea0990183888094521541df8c18a88e937fa6f9dbb23ef56cad91ce042e2b0fc83a9e0e98516abcb5f9affa539095559947a461fc42bc72
 EBUILD leatherman-1.12.1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b
+EBUILD leatherman-1.12.2.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
+EBUILD leatherman-1.12.3.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
 EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/files/1.12.2-shared_nowide.patch b/dev-libs/leatherman/files/1.12.2-shared_nowide.patch
new file mode 100644
index 000000000000..bac6fe7eb2dc
--- /dev/null
+++ b/dev-libs/leatherman/files/1.12.2-shared_nowide.patch
@@ -0,0 +1,108 @@
+diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt
+index ff9dba6..5d1b9ce 100644
+--- a/nowide/CMakeLists.txt
++++ b/nowide/CMakeLists.txt
+@@ -1,7 +1,5 @@
+ find_package(Boost 1.54 REQUIRED)
+ 
+-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
+-add_leatherman_headers(../vendor/nowide/include/boost)
+ if(WIN32)
+     add_leatherman_library(../vendor/nowide/src/iostream.cpp)
+ endif()
+--- leatherman-1.10.0/execution/CMakeLists.txt~	2020-06-03 10:30:05.027479897 +0100
++++ leatherman-1.10.0/execution/CMakeLists.txt	2020-06-03 10:30:18.871483297 +0100
+@@ -1,4 +1,4 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
+ 
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
+@@ -10,7 +10,6 @@
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+ 
+ leatherman_dependency(util)
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(file_util)
+--- leatherman-1.10.0/file_util/CMakeLists.txt~	2020-06-03 10:30:05.031479898 +0100
++++ leatherman-1.10.0/file_util/CMakeLists.txt	2020-06-03 10:31:04.550494516 +0100
+@@ -1,9 +1,8 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
+ 
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+ 
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(util)
+--- leatherman-1.10.0/logging/CMakeLists.txt~	2020-06-03 10:30:05.035479898 +0100
++++ leatherman-1.10.0/logging/CMakeLists.txt	2020-06-03 10:30:19.092483352 +0100
+@@ -4,7 +4,6 @@
+ add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+ 
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
+--- leatherman-1.10.0/tests/CMakeLists.txt~	2020-06-02 23:24:17.146002133 +0100
++++ leatherman-1.10.0/tests/CMakeLists.txt	2020-06-02 23:26:17.780054923 +0100
+@@ -1,8 +1,8 @@
+-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide)
+ if (LEATHERMAN_USE_LOCALES)
+     set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
+ endif()
+-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
++find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
+ 
+ include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS})
+ add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})
+--- leatherman-1.10.0/util/CMakeLists.txt~	2020-06-03 10:05:44.277172451 +0100
++++ leatherman-1.10.0/util/CMakeLists.txt	2020-06-03 10:06:52.969185017 +0100
+@@ -1,10 +1,8 @@
+-find_package(Boost 1.54 REQUIRED date_time chrono system)
++find_package(Boost 1.73 REQUIRED date_time chrono system nowide)
+ 
+ add_leatherman_deps(${Boost_LIBRARIES})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+ 
+-leatherman_dependency(nowide)
+-
+ if(WIN32)
+     set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
+     set(PLATFORM_TESTS "tests/windows/environment.cc")
+--- leatherman-1.10.0/file_util/src/file.cc~	2019-12-14 20:46:29.000000000 +0000
++++ leatherman-1.10.0/file_util/src/file.cc	2020-06-02 22:42:45.100963441 +0100
+@@ -1,6 +1,6 @@
+ #include <leatherman/file_util/file.hpp>
+ #include <boost/nowide/fstream.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/filesystem.hpp>
+ #include <sstream>
+ #include <leatherman/logging/logging.hpp>
+--- leatherman-1.10.0/util/src/environment.cc~	2019-12-14 20:46:29.000000000 +0000
++++ leatherman-1.10.0/util/src/environment.cc	2020-06-02 22:42:45.101963441 +0100
+@@ -1,5 +1,6 @@
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
++#include <boost/system/error_code.hpp>
+ #include <stdexcept>
+ 
+ using namespace std;
+--- leatherman-1.10.0/util/tests/environment.cc~	2019-12-14 20:46:29.000000000 +0000
++++ leatherman-1.10.0/util/tests/environment.cc	2020-06-02 22:42:45.103963442 +0100
+@@ -1,6 +1,6 @@
+ #include <catch.hpp>
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ 
+ using namespace std;
+ using namespace leatherman::util;
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild
new file mode 100644
index 000000000000..75314013d9e0
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.2.ebuild
@@ -0,0 +1,61 @@
+# 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 )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
new file mode 100644
index 000000000000..75314013d9e0
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.3.ebuild
@@ -0,0 +1,61 @@
+# 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 )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 6b12b795fd00..f41719857eb4 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,5 @@
 DIST level-zero-0.91.10.tar.gz 291352 BLAKE2B eaec1aa89b529b84d312f21c91e03c9ae2911193ad25a3884b677108bd3cf18d70b56174f515ac6ec2d61de0a80bb70bdf98834e4f932729e5809855ba42d087 SHA512 d98caa0ec135dc111ba8d34c2102f704e384cf6f6eb8ff147642cb1ce1de2fc96804e4f35e68df41a7e5404ba3702e87ec29f2334b19d39752351af5f5c999cc
 DIST level-zero-1.0.0.tar.gz 448583 BLAKE2B 21c3bfe3b960c153e5bfd2f57d84d5297fc0cbcdb2cab954f1e9669e966d02e756c8a5726b2aaead01a834b8b362130d30c12b7590384d629de36c713c0629c1 SHA512 69fd0f8a951dba44be8e41897824261d105ff27ba7924b86bcd97c00d3be41f4ad1ad5eeb08f1c8361c802fd3e76715cfd6c2e21ca83c16a603490b2ce111887
-EBUILD level-zero-0.91.10.ebuild 884 BLAKE2B a8ab92c96765be2b7515ff63fa3c1e185ee7ee4a317cda770794caf520fcd33fa77e7becc577f58e7bac040bb5d6215f84672ab5550079ed3013fdc50a4d9d7c SHA512 44ce70eb8c71b9f462f376017d186d1c066d90c780f8200793866ee7ad501797add2d7c3bc97d1329bda39811a266660f556e6177d87524a04432f51e5133a5d
+EBUILD level-zero-0.91.10.ebuild 883 BLAKE2B 3abcea17935f73a1dc030fc1cec4103ea9b9efce71c8909c8a123f0885e89e5175ebd044545534d4d1e14c8e6c0f82a9fab36e256d32ad781f869b9ab6eff190 SHA512 753080be169166d29a6ee9f0ff55bd6ebc414662ac8a8b625721b5a9a77198737d162367c8b7fca2a48459f31504e1faafdc06fb89ac70fb410d6d712591904f
 EBUILD level-zero-1.0.0.ebuild 729 BLAKE2B 1a9e381c8eea4036a1243b316db9a3ce50365b4d76d800ffbcda9eb75d43bd5c57848312f1898631b6c1e6eafd257af3c352d61e862e8307a0335daf09978cdd SHA512 176e351e56076881fe20d95438cd1d38a4feaaab5ebe9df9b5438109b2abe04130a926cf4137afcdfca84e1ac64665622619a8c6fe06a1e6d49965a7b634139f
-MISC metadata.xml 332 BLAKE2B fc1fda0254b44ee3a749ffca43baf6317073bbe9c992f520ebf8a7f2556c8380bad425644f0737d2db4e91316da39cef1e32e5e6ba56d9844cfaa0ca5b8236db SHA512 af6011c8ada6ad21e7e7b8b7f2aab8607ce3b2eb2284848e8168be35416b9f1be516b3b0980a1b6c57d8c8aaa86b31bc45375cc5b2778f1c509df3450c63a43a
+MISC metadata.xml 254 BLAKE2B a145270127ed2edfebcab245a3cd1d30c01bdc556c1be4413d84fee7d267e926105dbd3eacd23116de171293787771e733890ada1ac1aa1179d1a7f1c6a43ab0 SHA512 5434613b7507fedf370e065a373894055b4e36421901d38b88f0cba1f161bd0b3ffdec3d8d8bd7e1dde1445f87163c6dcbc81d09e0547dc6c7159091ac2fc7ca
diff --git a/dev-libs/level-zero/level-zero-0.91.10.ebuild b/dev-libs/level-zero/level-zero-0.91.10.ebuild
index 99ac29609fcd..3c4112a69ae0 100644
--- a/dev-libs/level-zero/level-zero-0.91.10.ebuild
+++ b/dev-libs/level-zero/level-zero-0.91.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="dev-util/opencl-headers"
diff --git a/dev-libs/level-zero/metadata.xml b/dev-libs/level-zero/metadata.xml
index 9ca0b21dc7a7..559b22254e6b 100644
--- a/dev-libs/level-zero/metadata.xml
+++ b/dev-libs/level-zero/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="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">oneapi-src/level-zero</remote-id>
 	</upstream>
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index aceb0c8a8c1f..4a48e16ac2fb 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,5 +1,7 @@
 AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
+AUX libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch 2937 BLAKE2B f5782aba2d3ac8252c9deacfa4a416081927c0df03cc7cc9c0ff4f763da4a7a230f7a6a7a2a2fa8b742bf75dc32f161580d5ff64bbe938f0014c5898d2eb3caf SHA512 c048ebddc8a8609d8af83fd79ec426fa9e08b61d82e916f5d98c300173bf63ff0e1ded881248758904d3fd790e4a8e07257fbbb7e01d5a99dbead23c2d0fe8e5
+AUX libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch 483 BLAKE2B f81ffe5960196ebf683f9f52b5cba097843727086f4e836f7d27788e1cfbcb7d54196f19bf0035910aeb087b8896b54f7d91e318781fed05c74571a0a000d63a SHA512 a9ece0e95155a83a26fa070381edd3e46bf6c0346e5b5adbe6dde84e9a5792fb6d92b40dc98f7309f2776efcbeb0cd8ff7da1c0091f399b1e00eef809d930a3d
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r301.ebuild 1921 BLAKE2B 83e31df36b0e5b4f4ec9199c8c425118c0c96d05ce79dfc7f6d5367ca64eb3c5966f59fd4768ea64e5aae27ceea3a0a754bad4b51f2f815fb5220f742b9e4b2b SHA512 48b4eb0ffc72c1930eda352c6874a2728a4f45d88d1a0e2c3ebaef4e18394dea014643113119811e0931cde851c59f200e32dafa0ea59246361ee3e0eea6308e
+EBUILD libappindicator-12.10.0-r301.ebuild 2112 BLAKE2B 1b023a5c34ad17ac37e9a5fa266704212b315970a45ef7c38a40779f56b1aabdb7ba2fc107fee08b02556eb45ff3455ee0ae8cfa73036e20f0086cbaf7efd7ba SHA512 60635b2a3aad69c039dcea4e2dc33a4ed94e55af2a41ae883c1cba9265489c4695fba19d690cc5b2b478410d3588569eae14a194bf75a5c70168ef3eda3f44c0
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch
new file mode 100644
index 000000000000..bea1274ed243
--- /dev/null
+++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch
@@ -0,0 +1,74 @@
+--- a/src/app-indicator.c	2012-07-11 13:28:34.415113869 -0400
++++ b/src/app-indicator.c	2020-03-19 12:14:47.813191652 -0400
+@@ -443,7 +443,7 @@
+ 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
+ 	                                  NULL, NULL,
+ 	                                  g_cclosure_marshal_VOID__VOID,
+-	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                  G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-attention-icon:
+@@ -457,7 +457,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__VOID,
+-	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-status:
+@@ -505,7 +505,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__BOOLEAN,
+-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ 
+ 	/**
+ 	 * AppIndicator::new-icon-theme-path:
+@@ -1175,7 +1175,7 @@
+ 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
+ 
+ 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
+-	              label, guide, TRUE);
++	              label, guide);
+ 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
+ 		GError * error = NULL;
+ 
+@@ -1490,7 +1490,7 @@
+ static void
+ theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
+ {
+-	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
++	g_signal_emit (user_data, signals[NEW_ICON], 0);
+ 
+ 	AppIndicator * self = (AppIndicator *)user_data;
+ 	AppIndicatorPrivate *priv = self->priv;
+@@ -1904,7 +1904,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -1982,7 +1982,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -2048,7 +2048,7 @@
+ 
+ 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
+ 
+-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
++		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch
new file mode 100644
index 000000000000..34471fbfa265
--- /dev/null
+++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch
@@ -0,0 +1,11 @@
+--- a/src/app-indicator.c	2020-10-31 03:31:51.966830232 -0700
++++ b/src/app-indicator.c	2020-10-31 03:36:04.252822972 -0700
+@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self
+ 		gint n_elements, i;
+ 		gboolean found=FALSE;
+ 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
+-		for (i=0; i< n_elements || path[i] == NULL; i++) {
++		for (i=0; i< n_elements; i++) {
+ 			if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
+ 				found=TRUE;
+ 				break;
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 0a3bd6b40731..534690231318 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -33,6 +33,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-conditional-py-bindings.patch
 	# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
 	"${FILESDIR}"/${P}-vala-inherit.patch
+	# https://bugs.launchpad.net/archlinux/+source/libappindicator/+bug/1867996
+	"${FILESDIR}"/${P}-lp1867996-fix-g-signal-emit.patch
+	"${FILESDIR}"/${P}-lp1867996-fix-iterate-search-path.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 1289eecee3de..5c72524882b2 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,13 +1,5 @@
-DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
-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
 DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
 DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
-EBUILD libarcus-3.4.1.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
-EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
-EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a
-EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a
 EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da
 EBUILD libarcus-4.7.0.ebuild 1296 BLAKE2B 46122f8ecd8ca43cdec1a249d01198b5e5d72257d69c42a11ab3fe3bc8b555e68cbbafe548f6cd30bb53573b5fd5379208cc90c37378393eef177618152aecfa SHA512 4575ab25cd24d8745f8a19ccee7fd0157e4fcdf7cf2ea74db4cf1e96cfd941436351117b6f3d50641b9cbbe669b7289628d0d3df4dfd9d1a0c5a54da0802a928
 MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
deleted file mode 100644
index 120cd3820013..000000000000
--- a/dev-libs/libarcus/libarcus-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
deleted file mode 100644
index 120cd3820013..000000000000
--- a/dev-libs/libarcus/libarcus-3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
deleted file mode 100644
index 0dbed3da3dd0..000000000000
--- a/dev-libs/libarcus/libarcus-4.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
deleted file mode 100644
index f949a913e19b..000000000000
--- a/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 99ff2f7ea6a9..fab32318347a 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,3 +1,5 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
+DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
 EBUILD libassuan-2.5.3.ebuild 1223 BLAKE2B cf011f69d8ed47b936561330c6401a660314364b813abfd67b59c08004512406b6526fab81004410b666cf4a8e0afba337cf9fe64e32136199b2e195d08bcda6 SHA512 6f1b1d362c384699a31074f266d25bcb011cd5400bceb7462294bfe343b6f6a6ad64fd4c66384d6c5604569e5bd07df0e57bc421ae8532059c16057033bb2d6b
+EBUILD libassuan-2.5.4.ebuild 1233 BLAKE2B db7471a8118dc02e3ad096c4c323e613c2e0060b33b3bf19978b6e93b80f7c3eab88f029ae78f5834b55ef890eb9950f26daa0b255e904dd289b6eb6f03b6ea5 SHA512 7476857a1b982a0ae0e0235902d717c7074fbe51d5eb0f57a8e488a3351bc7048efa8b75f81a93dcdabc601deb87404427bdbd7d3cc30bef6e11defc7a33b752
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
new file mode 100644
index 000000000000..bfdc9bf52091
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/libgpg-error-1.17"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		elibtoolize
+
+		# fix standards conflict
+		sed -i \
+			-e '/_XOPEN_SOURCE/s/500/600/' \
+			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
+			-e 's/__EXTENSIONS__/_NO&/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index 3e6728fc432d..6dfbc9053545 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,3 +1,4 @@
 DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9
+EBUILD libbase58-0.1.4-r1.ebuild 1321 BLAKE2B 86feda0a11a1f7964ab39092be08a26afc51c16854e688faf0ed103e1f609663452fab56a2243f1d6636879a52d9f385d5f84ae4f9fb55cb1ce6882bf9b56baf SHA512 5cbb5289d381c926cf4ad21316cc960772f8e6c547267888ea18ff8d836edd0ac2fde746c0899c295e5814f610930cc2dcbc9d1e118ccfec4ea71cfc7dead783
 EBUILD libbase58-0.1.4.ebuild 559 BLAKE2B 9194cf1bf7f8f6e5b065f5043efaabfee32e6de8f7d743c45189e9149224b677ef6e310649d1c5b17fd53d715882035514426d5b417ae786d8840b4bd91acab2 SHA512 9d7718bf1cb20eb8208adff9bb65e44ef32ca0804ce403a8868c4ad47b333ca50498d84a758bc0f4c06070a2120ed0896b30106911e9cd8c7d8dcd3e511916f0
 MISC metadata.xml 546 BLAKE2B 82f8c4af155cefd55772b9bb93f62ca3ac7bebe9ce51519066ee9439293933490d279a6f0da794d1b39fc7eb1a8bf04ccd911685a11f262549957fcc2bdca476 SHA512 2944ee72c2a86666eba6ad64046c1d607b816ab8f2a0c1f3cc38805ebd4c95f9169afc4438a523298ac0a0038c2d9ea702571fb407fb7bf87d8e8fcb3b2ea052
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..375b6956313a
--- /dev/null
+++ b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C implementation of Bitcoin's base58 encoding"
+HOMEPAGE="https://github.com/luke-jr/libbase58"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="test tools"
+RESTRICT="!test? ( test )"
+
+# NOTE: If not testing, we don't need non-native libgcrypt
+RDEPEND="tools? ( dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+
+	# NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for 
+	# multilib support.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconf=(
+		--disable-static
+		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
+	)
+	if multilib_is_native_abi && use tools; then
+		myeconf+=( --enable-tool )
+	elif use test; then
+		myeconf+=( --enable-tool --bindir='/TRASH' )
+	else
+		myeconf+=( --disable-tool )
+	fi
+	econf "${myeconf[@]}"
+}
+
+multilib_src_install_all() {
+	if use test; then
+		# It's hard to control this directory with multilib_is_native_abi && use tools, hence -f.
+		rm -rf "${ED}/TRASH" || die
+	fi
+}
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 2f273a515ac2..2b53ec7e1b81 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -7,10 +7,14 @@ DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524
 DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
 DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
 DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe
+DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f
+DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a
 EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
 EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff883734ee0a80ab44bea1960d6ea04960d6207e2a27278bba1716333df10684adebf9ea833f471dc07b981a9ecb37 SHA512 420a4b0daf9178266793113ef97aa90c5cf44a233256b65b8e60829873c90343af8606d17a138589aa5ff728cd42b85afe70f4bf9b3851112edb9a7a0c69c672
 EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
+EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
+EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-9999.ebuild 1156 BLAKE2B bb01f0ee3f26e065c38295a8ab1d9983ab214f5477d0913c9d15bc703718de6fa22e2f8a4d7933d3c4da1c6c02293fefd774040919ef745f171edecd25f60cdd SHA512 d55c4d73534e97e5b0c2e49486ed89097e482450b26ba098d0ee7f640c53a9b2d6e3b17c70958a619a7714311b40fab1de514542adc1e0d60ecfd60bc2d0d497
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.1.1.ebuild b/dev-libs/libbpf/libbpf-0.1.1.ebuild
new file mode 100644
index 000000000000..1c2508425132
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+	append-cflags -fPIC
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbpf/libbpf-0.2.ebuild b/dev-libs/libbpf/libbpf-0.2.ebuild
new file mode 100644
index 000000000000..1c2508425132
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+	append-cflags -fPIC
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 75c4a0b749c1..a24313c59b92 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,9 +1,8 @@
-AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 AUX libcec-4.0.7-no-override-udev.patch 850 BLAKE2B ce5c795ba3db2d6600b93af6d15d95794435b22c29eb0b65f1d6dbcbb877f076abafd2b2b8d7bd751b981a34a939d61bf7389118a7252d7fc0517c472f583fc2 SHA512 fb23ccc01fee0c61453490e2f8037b1d30124077847e09f8a5e08365bca3253fa883484d412ae1f60cd7beefc6f2075a83bcdd36e160b14ebae23f4be41fb78b
-DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
 DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200e79332470d2b5b2e64966834a0604d4684ad5919a00aaf60f05f4dbbbc9ce13a0dcf0ba4fa11d1f6a0391673 SHA512 424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81
-EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
-EBUILD libcec-4.0.4-r1.ebuild 2040 BLAKE2B e304595a2b71afee365435d94118a21a3fd14098d2d88be082d96ccbd35d74e3bbf88eff89e880e26480af375505afc1d45ad5adddde687907e1ffa5bc95cc40 SHA512 2033915d614f6155ee1d5bcb287a4218ffa3b116247e33d06ce8979950abd202fcddb5fda32937310a46ad7180e86f78eb9a72f4b4476a52887e82828a65971b
-EBUILD libcec-4.0.7.ebuild 3297 BLAKE2B 50f35a47f4ed68092f94f6e2c9e2a5b5a4de0bc6c4181b28ee212f4ec8ffd0dac9b0c04c662cba3286293c766304f632b75ef800c89d856c2451f38d76505127 SHA512 e77db16d409ec6412f2734a58b501ef6ee7f0289b17519e0af9c3a410cd1cd9ba74236c1875ce5b7fecc6020c1bb0dda14f5aedb9c75b435432423a6fe51eb1d
+DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
+EBUILD libcec-4.0.4-r1.ebuild 2022 BLAKE2B 2088e3e67a7476b6f2351be8ea588b6f9e100311c9fc1a8148b8bdca8a4a6984abb7e3f07035dee2a63cfa7a9a0b2185121128bce49770d9d05ac9b661d77079 SHA512 a0edd244262f2346b827abb1515a3e647ae5f79fa2d865beb68c8e4ede11a02d2ef1aab3985af6278b3935c7948145fb7fc08c3b9c9c269c18c863f70a927e38
+EBUILD libcec-4.0.7.ebuild 3275 BLAKE2B bc8eda27105cbe1b134192416b5cca696559de6c8268eb3ce6e98ccb0945a564791081a00dccfdf33fc1758c9d704e80b8296b84a0108662b0ffd608e6af823d SHA512 c55459f1615341301a8b5ea8df8c98e3960726160bb4074e92d2289b0f538b30dac461fb27864fcf7e021266376308a611e4ff3ff57f030dacdf8ed08df9c9fc
+EBUILD libcec-6.0.2.ebuild 3271 BLAKE2B cf6e8bfbab9cfce561660002a9ead81a11792839cf68a3e94f6b62a0d9f9eba17fa12a9f878f39ac55114f6f25599be8f984dfc955377f656e29fd16ae1ab64c SHA512 39911b7928f231eea45e14d1288d8d74124aca144c2c347c1b1ee3a8c2cecb0355bf5ac19824f8d7c85d7f4e4ab7352f04d9f147417e7180edfbc58c55ba8bc6
 MISC metadata.xml 911 BLAKE2B a1c97593e181f44ae3c90ba70e8d36344272663b3d7090ca9b2716df532903ec821009321b0183dfa82b6c881349f559216ff040ed1f45e78c214c8601ab67d1 SHA512 7c5dd62ea6d854fdc4e7083487e141c703543d7220ca98fb9431279080ead371a42ee386d1c015dbfc3ea96e183cf4b8f810d8a6a5791d58aca4b3cdb38a7dab
diff --git a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
deleted file mode 100644
index 673c6f86c972..000000000000
--- a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-+++ libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-@@ -27,8 +27,12 @@ set(cecclient_SOURCES cec-client.cpp)
- check_library_exists(curses initscr "" HAVE_CURSES_API)
- if (HAVE_CURSES_API)
-   list(APPEND cecclient_SOURCES curses/CursesControl.cpp)
-+
-+  # tinfo
-+  find_library(HAVE_CURSES_TINFO tinfo)
- endif()
- 
-+
- add_executable(cec-client ${cecclient_SOURCES})
- set_target_properties(cec-client PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH})
- target_link_libraries(cec-client ${p8-platform_LIBRARIES})
-@@ -44,6 +48,9 @@ if (NOT WIN32)
-   # curses
-   if (HAVE_CURSES_API)
-     target_link_libraries(cec-client curses)
-+    if (HAVE_CURSES_TINFO)
-+      target_link_libraries(cec-client tinfo)
-+    endif()
-   endif()
- 
-   # rt
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
deleted file mode 100644
index 7a242dcd5187..000000000000
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cubox exynos python raspberry-pi +xrandr"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/udev
-	>=dev-libs/libplatform-2.0.0
-	sys-libs/ncurses:=
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	xrandr? ( x11-libs/libXrandr )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
-	use python || cmake_comment_add_subdirectory "src/pyCecClient"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_PYTHON_WRAPPER=$(usex !python)
-		-DHAVE_EXYNOS_API=$(usex exynos)
-		-DHAVE_TDA995X_API=$(usex cubox)
-		-DHAVE_RPI_API=$(usex raspberry-pi)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_SITEDIR="$(python_get_sitedir)"
-	)
-
-	# raspberrypi-userland itself does not provide .pc file so using
-	# bcm_host.pc instead
-	use raspberry-pi && mycmakeargs+=(
-		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
-		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You will need to ensure the user running your CEC client has"
-	elog "read/write access to the device. You can ensure this by adding"
-	elog "them to the uucp group"
-}
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index d89298c497b1..4f1dbb82397b 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+inherit cmake linux-info python-single-r1 toolchain-funcs
 
 DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
 HOMEPAGE="http://libcec.pulse-eight.com"
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Do not hardcode the python libpath #577612
 	sed -i \
@@ -68,7 +68,7 @@ src_configure() {
 		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcec/libcec-4.0.7.ebuild b/dev-libs/libcec/libcec-4.0.7.ebuild
index 67a73ca791e6..55442c3f1e34 100644
--- a/dev-libs/libcec/libcec-4.0.7.ebuild
+++ b/dev-libs/libcec/libcec-4.0.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+inherit cmake linux-info python-single-r1 toolchain-funcs
 
 DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
 HOMEPAGE="http://libcec.pulse-eight.com"
@@ -51,7 +51,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Do not hardcode the python libpath #577612
 	sed -i \
@@ -91,19 +91,20 @@ src_configure() {
 		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
-	use udev && \
+	if use udev; then
 		cp "${S}/debian/pulse-eight-usb-cec.udev" \
 			"${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die
+	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	use python && python_optimize "${D}$(python_get_sitedir)"
 
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
new file mode 100644
index 000000000000..9ffaf6366ec5
--- /dev/null
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+
+inherit cmake linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
+HOMEPAGE="http://libcec.pulse-eight.com"
+SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/libplatform-2.0.0
+	python? ( ${PYTHON_DEPS} )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	tools? ( sys-libs/ncurses:= )
+	udev? ( virtual/udev )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.7-no-override-udev.patch"
+)
+
+pkg_pretend() {
+	use udev || CONFIG_CHECK+=" ~SYSFS"
+	ERROR_SYSFS="When using libcec build without udev, kernel config option CONFIG_SYSFS is required to automatically detect P8 USB-CEC adapter port number"
+
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Do not hardcode the python libpath #577612
+	sed -i \
+		-e '/DESTINATION/s:"lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}":${PYTHON_SITEDIR}:' \
+		src/libcec/cmake/CheckPlatformSupport.cmake || die
+
+	sed -Ee 's|[ ~]?#DIST#;?||g' debian/changelog.in > ChangeLog || die
+
+	(use tools && use python) || cmake_comment_add_subdirectory "src/pyCecClient"
+
+	if ! use tools; then
+		cmake_comment_add_subdirectory "src/cec-client"
+		cmake_comment_add_subdirectory "src/cecc-client"
+		sed -i -Ee 's|add_dependencies\(cecc?-client cec\)|#DO NOT BUILD \0|' \
+			CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LINUX_API=$(usex kernel-cec ON OFF)
+		-DHAVE_LIBUDEV=$(usex udev ON OFF)
+		-DSKIP_PYTHON_WRAPPER=$(usex python OFF ON)
+		-DHAVE_EXYNOS_API=$(usex exynos ON OFF)
+		-DHAVE_TDA995X_API=$(usex cubox ON OFF)
+		-DHAVE_RPI_API=$(usex raspberry-pi ON OFF)
+	)
+
+	if linux_config_exists && linux_chkconfig_present SYSFS; then
+		mycmakeargs+=( -DHAVE_P8_USB_DETECT=ON )
+	fi
+
+	# raspberrypi-userland itself does not provide .pc file so using
+	# bcm_host.pc instead
+	use raspberry-pi && mycmakeargs+=(
+		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
+		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use udev ; then
+		cp "${S}/debian/pulse-eight-usb-cec.udev" \
+			"${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	use python && python_optimize "${D}$(python_get_sitedir)"
+
+	use tools && doman debian/cec-client.1
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev"
+	fi
+}
+
+pkg_postinst() {
+	elog "You will need to ensure the user running your CEC client has"
+	elog "read/write access to the device. You can ensure this by adding"
+	elog "them to the uucp group"
+}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index f53fda8a8225..1ef5a7422775 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,13 +1,5 @@
-DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
-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
 DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B 43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3 SHA512 43f7606529a933067bcb82a16e95d76f713a7847535887968c2933131d3197ec6127376e10c7d5f1debd218fc902962329fe22d4f9229b434a804daff94122cc
 DIST libcharon-4.7.0.tar.gz 151221 BLAKE2B af9fe83e07303e1ff296b878c9745a329531a9957ad16a9b39b36e53f3f2275f850806b6d1a51638013c7148f3ee68b92489a67629a6026056a8c4ed3f2338b1 SHA512 690ce086bf8bba3eee2ce087d02ce00c23a7ac4079b0a2961c05cf75d461b0d5dee0c1f86ed769b50f1cd9ef83d8570a54f4fac628e0c19a5a593138292bc64c
-EBUILD libcharon-3.4.1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
-EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
-EBUILD libcharon-4.2.0.ebuild 563 BLAKE2B 05d8210539c2251b38bc8314a70aceca0a5355b81c98e444c918d678b719efecceaacdf4e587b4c7da8a855fec1c288084958e155580148db58396d945abb90b SHA512 3fd4727350ed0160d2024e04f29dee04468f93490a81c9c6639bc018f3da8b68743107680222dfd0ecbd8324a7935c148061bf928fcd90a53d07a5760aee9bbd
-EBUILD libcharon-4.3.0.ebuild 783 BLAKE2B 116426e6f5089367803504a211916b3a72f97164ef43526e44e12ce51cc15d3876ecc519d643dc3ac5d37140dbcf7b57e6d8bc1d5d8214848ade6c6d35745c65 SHA512 0d3cdb427aa4f7e375baca1818fc5160cbccd45bfcb1dc03df7f873bef33ffc6584b5627fed840a059a432bf9048b2dad18b6763ec774d5f73e08ddec5f82fc5
 EBUILD libcharon-4.6.1.ebuild 879 BLAKE2B 16669d87920270c86b67935c836b5f6929218aeaaa8904301c7ccd439954b6a6efb26b0e06c8dc82531ceee401def4581da1b85ac6e08eb668aa2c1b984ef1a9 SHA512 4675e202878348756d337c789f08d610ebd44cfa74e29b2fc76eb424e81358a5fedce52995b304a365fd118ab61e1754583257b3de8ca875206dad0a3f2fb135
 EBUILD libcharon-4.7.0.ebuild 1780 BLAKE2B a042010ac83d21edf3a2c7f03d8bc16d0e876f2182cde29975b62b84dc2caa1b4779620424b51165db5e74352f5f23207cef135c24448b7daff40ea24c158302 SHA512 0fb259054a968f0d3bd3cb36dfe425389393328611a6cc20fbd2c5c46091e791d0108e44fab1a679df3c42df49bccab11867aee4a55a0cc0924bab039d34966a
 MISC metadata.xml 1098 BLAKE2B 6167df47c3514dfd94d9e8d9046167ec1af4b02a224428671f3a3a70471f4fa81805ceb18c9ef85fa687e74c8229c2ee0d1601c9203c329b89644ad300611b30 SHA512 a41c8b8bf3904242479f66cae5875fe9991e8ad1b7cd706393570218c223985c15cce9701b4c4191a6b5b2d15d72a45e3743bfe4c6d985ee6861483ffa24b358
diff --git a/dev-libs/libcharon/libcharon-3.4.1.ebuild b/dev-libs/libcharon/libcharon-3.4.1.ebuild
deleted file mode 100644
index ffdec8a73007..000000000000
--- a/dev-libs/libcharon/libcharon-3.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND=${PYTHON_DEPS}
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild b/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
deleted file mode 100644
index ffdec8a73007..000000000000
--- a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND=${PYTHON_DEPS}
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-4.2.0.ebuild b/dev-libs/libcharon/libcharon-4.2.0.ebuild
deleted file mode 100644
index f216952ac7f4..000000000000
--- a/dev-libs/libcharon/libcharon-4.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-4.3.0.ebuild b/dev-libs/libcharon/libcharon-4.3.0.ebuild
deleted file mode 100644
index cf5a18458b03..000000000000
--- a/dev-libs/libcharon/libcharon-4.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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_src_prepare
-}
diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest
index 98d21e9700d4..ec97c5f67a29 100644
--- a/dev-libs/libclangformat-ide/Manifest
+++ b/dev-libs/libclangformat-ide/Manifest
@@ -3,4 +3,4 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libclangformat-ide-10.0.0.ebuild 1724 BLAKE2B 4b7fc4a91fff065ef5b9687dbbab5e905d39a9ec6b7903b90c27e14e232522ba79ad928873a658c46c60eb5e7e596c798fccc9189844b5e002313fe02b95a9c0 SHA512 21d3e5d1960548bb04a5a57ccc40b3aaf4f1df69ed9ad650253b6f01b655a9fd7232e035c27a3b037b93f5e83930ce10ff995560429aa62e27cba99c238a539c
 EBUILD libclangformat-ide-9.0.1.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7
-MISC metadata.xml 247 BLAKE2B ab9618e71ad95ebd451d7b51076eb19801293790b027d4e390b35c1f2cc31ac20f8f41f91b8e167f700a3a42e7f366e2292e944fde98502016a4b0587c66d833 SHA512 be8285f713dca05e18b9ee5c5c45b4938cbc5ef707b0224a0aec98934633f7fcf526b6322e91a67b33804ca99a0997e1698bd2c772fa709256006517c89b7f51
+MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libclangformat-ide/metadata.xml
index d472e560c734..915f00227065 100644
--- a/dev-libs/libclangformat-ide/metadata.xml
+++ b/dev-libs/libclangformat-ide/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>pesa@gentoo.org</email>
-		<name>Davide Pesavento</name>
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 4a6f39b14232..e3ca6792ede4 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,5 @@
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
+DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d
 EBUILD libclc-0.2.0_pre20191024.ebuild 1576 BLAKE2B eb9ab28009e52164890c3e99bba1c644b06c536df84f96d950ddc3171a2a6157c0a081b6a0038254176ed7964320dcc4dae0a66552e98b59e24ea5d5ff32cead SHA512 1ce5f96ecfb430f93f90e06b3ffae33e3db9e98923237649501e35376acdf7556560c7879e748da30b8b7b04ca072a274e729b7a3d0ce5be5677b6b961c78c0a
+EBUILD libclc-0.2.0_pre20201001.ebuild 1472 BLAKE2B f0340b5ffae1233a40e9fb857d1682aa85638de38300c5efb791c06e4bb7c345cf5b7c8e9ae93058cbc9b3a23c90d77694172464ecceef7846f672084453c742 SHA512 9cdb9b48c9d7d0591b10bede8f8044a6428371cfa4be31d578a6a486c666e06ebb4749bbf753e597927bbcdcfe61f39eae62257d640dd16336f365538e7e1e94
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
new file mode 100644
index 000000000000..7d1b7558a901
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake llvm prefix python-any-r1 toolchain-funcs
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+# libclc subdir of https://github.com/llvm/llvm-project.git
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+BDEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+		sys-devel/clang:9
+	)
+	${PYTHON_DEPS}"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
+	use video_cards_r600 && libclc_targets+=("r600--")
+	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 530c3855a298..4eddcdfe6d23 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -5,4 +5,4 @@ DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a12
 EBUILD libconfig-1.5.ebuild 1149 BLAKE2B 861f459cd4e24bd963bab3f40fc4cfe2dde2d6f12dfaa1126499104930116f3f137fc4b7660b3e501c8ca7c33ae1b0fd4c8ce4be0ead5e6ee742d882d89e92c3 SHA512 fb12451fbe810025ed30a7521ae7608ef231db463a786bd8a4068a9816bf650a3378702bb0df86006e630d8267212f03f712b80ae2dc355161ad3b162c491ac2
 EBUILD libconfig-1.7.1.ebuild 1081 BLAKE2B 0159ec03bd1eda0dfb8c0879a0e0c7faf8c271d6c9f5e97f43faa5f61933b62c9de5e8c856f7484a2715ea7fc1d5bebb3d217c8dcaa63261f298fdf00b781e9f SHA512 b0d628091682d9035255b9bd0b41f1f4d41950b8c1e21ce16d052108590cc0e03e765169d5839d1725b9fe410233ae848d5b336c95c32e78a1cc0907c30b6881
 EBUILD libconfig-1.7.2.ebuild 1033 BLAKE2B 384b66df38f05486c522851f54d4b946c0a1efb0054a31abba2484546b9f47eaf9d8a2b25d265a1cdbda28b0dd64a7f4592c66cd2597bf0bd8ddb1e0a833e945 SHA512 23c567fe24499eed8a3bc453ede334a5609a9cdd597181a58dc7c9425502bfd07de675f54daab651b53f602febe5ff5336c15421b301e6334e436068a4408c42
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/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="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 9def5e8b6675..359cf1276af2 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,3 @@
-DIST libdazzle-3.34.1.tar.xz 440496 BLAKE2B 88321e82f1961ffffc46c2e484b39a80e201498c1f5aaf3beabe59f9d24c21b446485aeb1e70821868d207d222e9a4c9c06353f3add28a1c12ba84f90f79e640 SHA512 bb55c21c8d15406e4f09514c36e3e633d13c0cdb6b30b40a7da7e1cb5e307f371c905dbd8ee5e56d04e225df4c1c8eb9cd273df76814a4cec6ea1328b998d95e
 DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f
-EBUILD libdazzle-3.34.1.ebuild 1667 BLAKE2B 649f65fb8b4f68889b27894d94aa858e0eb6fdd9f8b8e13c50acc0f377931952611b139a13e617bffeabb6695288c34d2a2c15ed17de36eae82063e93de27f93 SHA512 ac46eb71815d8a15dbb19c759dd02227aa70109af192aaf4d5f4959501780a966d82592fb4f745607790eeb47169cd2cc5b924889f896c1bfaa8b45570aa60c8
 EBUILD libdazzle-3.36.0.ebuild 1695 BLAKE2B 42df0fb02ff8f2c40b0de1a786f32c79c847a5c1488eb8fb09ba5d106c439ebca3fbdac90e1359c436745d154fe7b2ab2f294469ba17029e63cd9eee73c6355b SHA512 d6a3bd2d6ed1b0b8f1544957c9ca3764c9456052c4549614749bb75501e28633333a1e8c2a7fbbc8ebf48d4c0cc3546b25f67b599df01c19dde76bab45044afd
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.34.1.ebuild b/dev-libs/libdazzle/libdazzle-3.34.1.ebuild
deleted file mode 100644
index b3991be21c35..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.34.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-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
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-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/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 097ecededad2..2b9380d40513 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,5 +1,5 @@
 DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
-EBUILD libdbh-5.0.19.ebuild 708 BLAKE2B 82ace046432d7666c421aaf9505369b3f1592837d9923de5e2b50d09df0cbcf29fe1a5896fa5dae05d01d07bfd755df8fde2a3e83ef80148534679231d8b0888 SHA512 31d810325ff995f78de3b75b8b7344fccd718a311127fe16fa2a49b103b09104a8e9136ad7ab5822442c2e2b48e93500a91e79d75ed759de666c49516b4a0fbf
-EBUILD libdbh-5.0.22.ebuild 705 BLAKE2B 8f346677cb5e394eec35d1aa223e57ba671b04bf16dc9d231eb11c3a6ffed1d241594af7ab5654dadb24590f97979197611e6ca69f6bb75a5464a64d74c84815 SHA512 2da38bb65e367e80e7ea78a5ecc89f4da8bff8d9120fed18f6329ab11a3aa017a6fed290fecadcdba19f0ab669285a0ca4456cc0849a6d321c5441a68b50ea5b
+EBUILD libdbh-5.0.19.ebuild 766 BLAKE2B 776458c68471e42a401937f8d6c8eeb05d7e1365412c00212ef9e32ceb0f06c8afac848b584066aea5a2d723557527cb9e805b5218ebc90e882544271509b859 SHA512 5f2a90307c5c7009efa691d2f0a5608f6f67df1ae95d8a95fd0e5758f21f4bbc2ef42b3bcb3ef19b46d2259a09090a0e33d742a377fae1d3af943de6e2aa6c28
+EBUILD libdbh-5.0.22.ebuild 743 BLAKE2B b6b0c9b0fd998adfc02e34b47edcf15b85562faaab3b0a8920d62b979c4a0367b620c95dd19737e3242f10a165addfc21d7879e0c0853e2e27858564de30c495 SHA512 a30978a83bf0a27ca44b6f50e8b24f271e199892acfba9000fbebb4a263cce680d23ff7f889c98bbb20ae8bab5750b7ea34aae1c3287ce188f85b258cd911133
 MISC metadata.xml 436 BLAKE2B 8817621c260b3c6153ddebeb5b7d3b0877340f4b2eafb10318713ed7b8ac07a7a76c09480d25fc33ecc900b27e7750c1ee3b538d2280241bea4f7bab3cd91c20 SHA512 a43a689f3355779e44fcbe6aefbebd84f1e339736a58b6783c9b62a35b00139250899adc62e633d8ba209d68245df46f4041aa68e8d13184a934f5ba4d834e79
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
index d545dd68e5e6..81bdaa952a54 100644
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils ltprune
+inherit autotools eutils
 
 MY_P=${PN}2-${PV}
 
@@ -31,7 +31,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild
index a32cdfb61dfe..e15065a43d35 100644
--- a/dev-libs/libdbh/libdbh-5.0.22.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 MY_P=${PN}2-${PV}
@@ -13,9 +14,9 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-util/gtk-doc-am
+BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -28,8 +29,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index da4aeb382362..8f230fe15004 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,12 +1,6 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
-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
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5
-EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd
-EBUILD libdnet-1.14-r1.ebuild 1483 BLAKE2B 8958077ab8b4c04f6b56cbbb19af258d838e0e973728187b37e827b0e96e36a2a131aac66be1524ac4774d8e384067d1a643f9f8874dbccc5f21c201e9927409 SHA512 d44804937d5fdde9198045f6bd2af607819ab9e078270b90955a589c9d4becfa92e497a911e8cccd6f71bfa038a7aa42bdc2eb65d8fe29ade6e84f1d599fe74e
-EBUILD libdnet-1.14.ebuild 1438 BLAKE2B 26fea0961643486ddba314b80cc9844c262edcfecdfd17d5b31c7b6781b2322d032572a28282811064026874ee6a41cbe14d14397b11c6737ba099a48cc7b438 SHA512 cfebda19c0867bc45b3050e58f7ff113dfc88a6e4a360b82f03497f355b189b559bd62b2fce98c3d116d9b097d24585dd2fdfe03f85991f7866689d57690cab1
+EBUILD libdnet-1.14-r1.ebuild 1476 BLAKE2B fe622b61d8bcd0c16a14c7fc496f55021d6e1b5880ee5eefb65c1ea1237ff4d850282ee0dc150b4a2f81825c4f5ebc80357b57dc83c26d46b0701f979a62d49c SHA512 85017562b1e3275d7eb255d87330b6f812ddfb8531a16973545c782dd639e12265c0e97148b63fa9e394955c99d5dce3a2e692a0c893fac6fbf6f7bc8333a7c4
 EBUILD libdnet-9999.ebuild 1376 BLAKE2B 9b8e58f34258ff145a513a3758b458e69cf6dce876b9488648c81c75a5ea074044bdec2494b86f40ca1ee8f4738e4a294530e45d61f56b9b3b1037c118287f2f SHA512 8b59231e80d511ff5bb59bdb750daf2713379358889805625a81e06b3481b031586fa2cb4aa7d959a6e75960edb7a4628c9fc833f1d4814b643cc91d62a5637d
 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
deleted file mode 100644
index 53b21531ca66..000000000000
--- a/dev-libs/libdnet/libdnet-1.12-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AT_M4DIR="config"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/dugsong/libdnet"
-SRC_URI="
-	https://github.com/dugsong/libdnet/archive/${P}.tar.gz
-	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )
-"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 python static-libs test"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${DEPEND}
-"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DOCS=( README THANKS TODO )
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	# Useless copy
-	rm -r trunk/ || die
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
-	use ipv6 && eapply "${WORKDIR}/${P}.ipv6-1.patch"
-	sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
-	eautoreconf
-
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
deleted file mode 100644
index a7cef11fa49a..000000000000
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AT_M4DIR="config"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils ltprune
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/dugsong/libdnet"
-SRC_URI="https://libdnet.googlecode.com/files/${P}.tgz
-	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 python static-libs test"
-
-#DEPEND="test? ( dev-libs/check )"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( README THANKS TODO )
-
-src_prepare() {
-	# Useless copy
-	rm -r trunk/ || die
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
-	use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
-	sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
-	eautoreconf
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index a709c3f636c7..aa60351e6e6c 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libdnet/libdnet-1.14.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
deleted file mode 100644
index 3c236abaf8f3..000000000000
--- a/dev-libs/libdnet/libdnet-1.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/ofalk/libdnet"
-SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="python static-libs test"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${DEPEND}
-"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DOCS=( README.md THANKS TODO )
-S=${WORKDIR}/${PN}-${P}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-	sed -i \
-		-e 's|-L$libdir ||g' \
-		dnet-config.in || die
-	sed -i \
-		-e '/^SUBDIRS/s|python||g' \
-		Makefile.am || die
-
-	eautoreconf
-
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index f8a350e4da4e..690785ec4adc 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,3 +1,5 @@
 DIST liberasurecode-1.6.1.tar.gz 209761 BLAKE2B 94c26cd49e3181a02908c5379dec69da4e37501c7c0123e63d368c3c19b72f344f2246bfabfa5e7e0aee547f6a746ca5aa1f72ff4370c975425d68abe00c07ed SHA512 7d0fa00b12bc561272573f4425bdecab3c2f0f40914f50adfd471b464232047de70036f4cfbda5f93f843afbfc60ecc0afb40705bb772453c4956565083bb2d0
+DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5
 EBUILD liberasurecode-1.6.1.ebuild 800 BLAKE2B 82bd50037625ee3c7996499f8deef9d2a50616fd1e2449c2ecb4332aae83a1e0f131270b0902fe1bac99a8b664362c23b34a759633ce04ce2a84958e88ea291f SHA512 adacdf535eba63f5e187634b95e3d0b4f0e4875a756ce8dd81c832693d24d9581f395351165ece4684c3b960fb804e57838a14ec8f341ef861a2fe56f8f8693e
+EBUILD liberasurecode-1.6.2.ebuild 802 BLAKE2B 3216fd64683f6ea81190a207bbe34691b0cc6263b81801592eff988fe354e5046c6c5645d0e58d875a0d923762cb7c3e0ad357e0f648a6339fd133638f4e20e1 SHA512 70de6f46d7cc96fb08973c0e49076a2e2b1ae0f63048b85a6bddf2c6a273169660c3b4d72124dbb249c2596937321dbb35289cea9b8f03dd69f38f93a24fe440
 MISC metadata.xml 464 BLAKE2B ca354debebf2db1768ff8cd28d88b0edeb6a57d47fad34837d04e6ad21f59e37204c85b63df08dbee14d3eae342db561a785bf00ecb2d908fc5c0112a72baa6d SHA512 1b94d0071d7670f163e28193c066b6a9f39a086051aba5e6291c0f31d56465e6cbf48798adf6fc90e08fd56121063d909bcd4aeec58547539ec72dde4210b197
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
new file mode 100644
index 000000000000..34a6b8d50a9a
--- /dev/null
+++ b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils ltprune multilib toolchain-funcs
+
+DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends."
+HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
+SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="sys-devel/autoconf
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF} \
+		--disable-werror \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index c208b5775873..343cdc80c566 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
-DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
+DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
-EBUILD libevdev-1.9.0.ebuild 1198 BLAKE2B cb04493b3395c2936a7d7ae12a83fa2af05d3642c7751440087e978ab483d93feef05a8d1b951ad43a007b6481f8abfcb9f957811918682867e094ff8c51c1fc SHA512 eefca4687835e7d811fc7e4eaa73376989103b80f0aa32aa4c152133aaff001772fdf1de9adff315a25a99d8da7ce29e533de6439595bd4fd7a03beb0ebc777c
-EBUILD libevdev-1.9.1.ebuild 1201 BLAKE2B 1b7f26a8cfef1dbb3020a3c4fbee8cd3a1bd1c596dbcad177015f644268de275b5d2d780cac4bbbab270fe78f10aea7c92030544c97faa9e5033cd99494234c4 SHA512 821d8608a6b206e423592bcff85c37dd612689e9b0c7d0a59b40d4ee2477271ad83d0c2268c9adf3583877395b0cef76a8f6495a8c79e6d2fcaa904f5fa99e2d
-EBUILD libevdev-9999.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d
+EBUILD libevdev-1.10.0.ebuild 1255 BLAKE2B db5362fc5b28a3fb4217f21ec2429ee91410b8f5a6289c9ff3794428fe5374d45368d0dba4de29923c7b410000592fc8033c24a0a20a9bd24b177dc7d0ee364f SHA512 098e5b1adb48cdab57951e68a91f6d5128116ad0eb4248ea6c039790c753a4f8cbc38646d0ce328ab1574cd23500445a92659047161e8ec4f5a1e1b6ec9a25a3
+EBUILD libevdev-1.9.1.ebuild 1246 BLAKE2B 4c752d3fb3115742cf9bbae3c4fe024ff653c9b95d4205c47fdeae72dfc66ef90f23cfa862385275a671a738390109a62733ec79e3deb4354aaba6ea88e5f926 SHA512 52d2ed4b2a193975188e43d9bf5aa610fbbbd8892eb89549007e8ba42746fcfe6950d79c989578ee97873cbe6df0cf750908c933edd6aaeefcfd4b48a67b85b0
+EBUILD libevdev-9999.ebuild 1255 BLAKE2B db5362fc5b28a3fb4217f21ec2429ee91410b8f5a6289c9ff3794428fe5374d45368d0dba4de29923c7b410000592fc8033c24a0a20a9bd24b177dc7d0ee364f SHA512 098e5b1adb48cdab57951e68a91f6d5128116ad0eb4248ea6c039790c753a4f8cbc38646d0ce328ab1574cd23500445a92659047161e8ec4f5a1e1b6ec9a25a3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.9.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
index a89a1b34d155..b1bba3f2823e 100644
--- a/dev-libs/libevdev/libevdev-1.9.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit meson multilib-minimal python-any-r1
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
@@ -43,7 +43,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild
index 2a19758515cf..6077f50061b1 100644
--- a/dev-libs/libevdev/libevdev-1.9.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 LICENSE="MIT"
@@ -43,7 +43,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 8f8dd07ac544..b1bba3f2823e 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -43,7 +43,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 940243639c6c..8001ff13a0d4 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -4,4 +4,4 @@ EBUILD libevent-2.1.11.ebuild 1676 BLAKE2B f49807e0141e8dce19fbc298fa83c06bada4e
 EBUILD libevent-2.1.12.ebuild 1814 BLAKE2B 327abda5ded9d4f501caec1b34a9e0c2b026034e8dbde231a605273948d69aa74e91a7930d4ce1fa841b2b69df489c1a33f5b0cf8196dc7dfcbea401f0122ac1 SHA512 4db5a373ca47fbdc9511335cc457e0ab909cfc082ee7dcb6410bb7016509a32771ec6b4f5d3ffdbe750f85c28e319204783447fe05a29707864dd0a874b39389
 EBUILD libevent-2.1.9999.ebuild 1454 BLAKE2B ea626beb07c670f44b0d66f534933baa9a56c1db12e330022eb79388ce86518b9394187008c0107cae83abfab219bd179a9f0f79b7cbb79d1f5d78fbd0602a43 SHA512 68daa118fe9171bf7e5818628cff1b41aa21f67ea965b95aa2d3c0f544f57f2f42905ff9847b27ea4ec516b007ad3273a3e0ea98b7063c38ab3904cc2e6e98c6
 EBUILD libevent-9999.ebuild 1456 BLAKE2B ef35cb0e687a4e96c43112c6fcca73e9596ebc51f07beb1f28f19babdfb064c462b38c6c791f20e0efa64c4ca4b446b91df68051f9eb0a5f378021008c22e3fc SHA512 a41daeef937820670ab644e658e15399b5eb2dfca6cea10b149dc3aa281d2dbbc7ec2a391bcca71fa4b105feebc880bfaa8d0246b7c90daaaba883f56d404159
-MISC metadata.xml 903 BLAKE2B 821ef22428235e3fa2821a7c7b41210966f75144a7c6ec16f25a333e0548e4fef339060d7e199e58c2860792baf6f78297696216b3ab2ad79a1c541840217195 SHA512 29d47bfbb688221bd9d7759893328eb03b59c4b4b07d135b6fb3aa1968ee97abb44a2196da27ba01abade5fc8d754e4ce80b05f712b2f267b83a9fc71bde8f3e
+MISC metadata.xml 934 BLAKE2B 1c37f6a1f0b514a598cfe1be2129f4a1352cfe0c55b8c72cf4bc36732f5187833d274a3629c9fbe36d90c4f602f33035bdac3dfc624653dc25f7c6e9ce4ee71c SHA512 d344d34077216a10d4a220f9f77ccf7f0f804da9fe461042b5095f81d6f634d7c96c99b2a046c7d5b3fb4be6d93203fd64fcde40ee1a173c7c207062c02488e8
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 78451ccf1300..d7f4026a4918 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -1,21 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<upstream>
-<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
-<remote-id type="github">libevent/libevent</remote-id>
-<remote-id type="sourceforge">levent</remote-id>
-</upstream>
-<use>
-<flag name="clock-gettime">Disable use of clock_gettime even if it is available</flag>
-<flag name="debug">Support for running in debug mode</flag>
-<flag name="malloc-replacement">Support for replacing the memory management functions</flag>
-<flag name="mbedtls">Support for <pkg>net-libs/mbedtls</pkg> encryption</flag>
-<flag name="ssl">Support for <pkg>dev-libs/openssl</pkg> encryption</flag>
-<flag name="verbose-debug">Support for verbose debug logging</flag>
-</use>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
+		<remote-id type="github">libevent/libevent</remote-id>
+		<remote-id type="sourceforge">levent</remote-id>
+	</upstream>
+	<use>
+		<flag name="clock-gettime">Disable use of clock_gettime even if it is available</flag>
+		<flag name="debug">Support for running in debug mode</flag>
+		<flag name="malloc-replacement">Support for replacing the memory management functions</flag>
+		<flag name="mbedtls">Support for <pkg>net-libs/mbedtls</pkg> encryption</flag>
+		<flag name="ssl">Support for <pkg>dev-libs/openssl</pkg> encryption</flag>
+		<flag name="verbose-debug">Support for verbose debug logging</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 6bbebda7e646..71d48bf77c45 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,4 +1,5 @@
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
+AUX libffi-3.3-compiler-vendor-quote.patch 896 BLAKE2B 6c2895f821f11f3e41bf078c8ae5d4b97c50ec0db007380f6d33159adc7e2101a6db21b6513db2cd596834c5d71dd36be63c5d108ed79de6b91b4d281b019d71 SHA512 e7ab9255af8528e6b9b7ce3fd4a016d6b67b24e27aa00131d2240aadc4dc599ea33492944641608146e123a6cd363df411f614436cb999eadc2e840e7de93f77
 AUX libffi-3.3-power7-memcpy-2.patch 1086 BLAKE2B 954504aca37f2dd16913c3fb3d61e8fb5e8db017d897405905366f4701bf2357871dd41e86e59050733f04321e0155b03683577f132504aec5c476cc78323be6 SHA512 5a0d8590c2e53e20e4384dad704060a2c781b91487a0e14d2f1521f69b722ccc60e25b84c38f9ded65b01bef49250e07c6935be577d100aea18496abfbe374f5
 AUX libffi-3.3-power7-memcpy.patch 1681 BLAKE2B 6e3df741b07718f13c347ae54fe82bbf0f433790d14dff4114ffa77f2c3700460801af3fc5a649589ab2d1d0122db0729cd1aaa5321ea3f7822b1cd4d7f64b05 SHA512 13eb09d8080cadedb959c8d62d37f80bf3c32fbe488fdb59955ff6c8649f1086baaedb015e47ee52de65836f57bc172dbce2d2b3bc1aee6aca07eb9da451cf70
 AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534
@@ -6,5 +7,5 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r2.ebuild 2700 BLAKE2B 2f5669b7f15368ad63f7cd397c75281bd91897b993c1e5702d6e69043073eb28d3c7900a80d8e8453d4849e0eb92b05209b580d2f9268c69725d0526d4e18e41 SHA512 afaa4d12655e7d42f36fd7780e4928d32b7143a8c449cfe64f56d291a8745cbeab664b2b394ed0c24004340b7da81e9b2f89ea0e0992ea247e3b529a5aa64116
+EBUILD libffi-3.3-r2.ebuild 2132 BLAKE2B f43309407a223ae675f111dce582d96b1a9400bdaa9ed92fcd9c2a7218e9e669e06fd81deb171d2c3848ae22fc4315d864ddd2bea4863c1b10bdcc614ddd7b83 SHA512 3c377d5ad57c7d4063a6d84eb055fe5be502ec1d3acf1b3ec330f60c879ce1f20342f454e917b93cf5f1451fd6713ee189012fb9b225e60b81177063c21804ec
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch
new file mode 100644
index 000000000000..db5b69ce2db9
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/753299
+--- a/testsuite/lib/libffi.exp
++++ b/testsuite/lib/libffi.exp
+@@ -287,9 +287,6 @@ proc libffi-init { args } {
+     verbose "libffi $blddirffi"
+ 
+     # Which compiler are we building with?
+-    set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"]
+-    regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor
+-
+     if { [string match $compiler_vendor "gnu"] } {
+         set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
+         if {$gccdir != ""} {
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ fi
+ cat > local.exp <<EOF
+ set CC_FOR_TARGET "$CC"
+ set CXX_FOR_TARGET "$CXX"
++set compiler_vendor "$ax_cv_c_compiler_vendor"
+ EOF
+ 
+ AM_MAINTAINER_MODE
+--- a/configure
++++ b/configure
+@@ -17402,6 +17402,7 @@ fi
+ cat > local.exp <<EOF
+ set CC_FOR_TARGET "$CC"
+ set CXX_FOR_TARGET "$CXX"
++set compiler_vendor "$ax_cv_c_compiler_vendor"
+ EOF
+ 
+ 
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 19e01b0832dd..55138eb082d5 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib multilib-minimal toolchain-funcs
+inherit multilib multilib-minimal
 
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
@@ -32,26 +32,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch
 	"${FILESDIR}"/${PN}-3.3-ppc-int128.patch
 	"${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch
+	"${FILESDIR}"/${PN}-3.3-compiler-vendor-quote.patch
 )
 
 S=${WORKDIR}/${MY_P}
 
 ECONF_SOURCE=${S}
 
-pkg_setup() {
-	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
-	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}"/conftest
-		echo 'int main() { }' > "${base}".c
-		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
-		if [ $? -eq 0 ]; then
-			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
-			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
-			die "The system is in inconsistent state with unknown libffi installed."
-		fi
-	fi
-}
-
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	# --includedir= path maintains a few properties:
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index dab235c0242c..fcb5f7d82e38 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -7,5 +7,5 @@ DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
 EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a
-EBUILD libfido2-1.5.0.ebuild 908 BLAKE2B 4d36147e57052d072309f7fc9946097f4d9d9fab38159cbdc749f0e1a9c5213deb644aa6470880f26561889300f2750f59b5c072fc69add130fc3db86ca39c17 SHA512 a76cc636f87e87498bbc56326416bc4d7ee93a8f28885887a0af03bdd6266beaf70e44acbe12eefeec0a4e2ca3a455be4a4442e4f69b5f2bc7b684ff47eef087
+EBUILD libfido2-1.5.0-r1.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.5.0.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index 2005a19941db..8fbe1628305b 100644
--- a/dev-libs/libfido2/libfido2-1.5.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -20,7 +20,11 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 "
-RDEPEND="${DEPEND}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
 
 PATCHES=(
 	"${FILESDIR}/libfido2-1.5.0-cmakelists.patch"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 855295d404b1..7fbc8d1a3ee0 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,13 +1,7 @@
 DIST libfilezilla-0.20.2.tar.bz2 549679 BLAKE2B 929c535ed7ad65fb35bc7f3a21c827ff51d01e387f383bf677f86b78aa79deafa81781eee87afe3c9c8a4d48c60ea02f7fff45b4e469f3755511c9b11001dc88 SHA512 242df38b335558c83fde91800787992adaa617292d119a15d8036adc1622b207127d0e8e6fb935b4300e1e0d63e196636589ba513e410c751dea052164a773d7
-DIST libfilezilla-0.21.0.tar.bz2 552491 BLAKE2B fb2729c1c2616b4dbdc292651fd5afe85fdcd77dd70d179605f737539dd4db54c95aeff9053131076241ca57317b2361a201f6fae381c374e81ca4bc250cf1ea SHA512 a4986f8da4ac6980e7b1e564d3b033853b0e5442e4bbdee337238ad5e896b80c74e7176f973055593bd45789c41725a6315c6d510ad44354588188a1cc9f29f9
-DIST libfilezilla-0.22.0.tar.bz2 557320 BLAKE2B 864f286844a3693ae1aa9f0176dbcf32a6a483174aa4b29e23ebccd309f88e97cb84368b3b5d22f07f94d396885b992e2e2e4b2f64bfec490bbcb898c88e0dc5 SHA512 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e
-DIST libfilezilla-0.23.0.tar.bz2 560028 BLAKE2B f5ef9001babc1cdf5f36ecaa88aacdbab99d2f65fb6554296c54ed63c6131cc03f16b92635b7c71375b94394d02b0596500c6c796c4efa6fc2c74f561c640d1b SHA512 a69040b7767e4568ba155adce67a5755b2947a73626bad89c89c88c773cb99147349ec5c3b8cc746715c9270b54ac6bc70fd57c77fe125b2dc6753669dfe93d7
-DIST libfilezilla-0.24.0.tar.bz2 560451 BLAKE2B 2806820e3aca63e1a018b01b990e7580c53d32d6e0e519a316a172a516c4b24aa38e5e1847fb40db7d21c22b68caffdafd3701273ac96561305661b9b8a86716 SHA512 f5fd2ca426235e03e26209b975e2eda4763ef1bef16a1b424ce4a248245163038d4e56089d523d77b8370f52a2947873d8439f4fc9478ba57fcef453c2f54861
 DIST libfilezilla-0.24.1.tar.bz2 560439 BLAKE2B f4848149839fa121ed856726769a9517932ab0b34dd19696d66bd15ad8208fa0bb3e7dbf9cb31baeabea02ec6e0b7d0c8e48fbca3956c26251dcbbb4332c727c SHA512 f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c
+DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a
 EBUILD libfilezilla-0.20.2.ebuild 1084 BLAKE2B 86e8f9e37f842925b7d681ed00924c72d8555553dec8a84fce045e92320c25bcc299ace08e52879bdd67d2f57eccd95ba6db5937e92b214d29414654095bbb16 SHA512 1c79733f899c6703df637720591b5b84b17fcee1acc224b224fe25c440d77dde0fbd54d272b715436d2fa69560de76406a2856500e979864ca5caaf42620d4e2
-EBUILD libfilezilla-0.21.0.ebuild 1087 BLAKE2B 60d3c3e36532022c5d100508ba220a5a128b461324201cf1a1cae0b5599fa90399dcfd85eac8f57c2851610067ce237fa31bef608204a27e3b484e735fc084d4 SHA512 e16ea6e70a9f805bdc5556df9801242f2a37724f2532b008bea7f30361d39b2531118a8d615e0691e64540d1fe79869b126e438d15284e00b35d0e52c2111598
-EBUILD libfilezilla-0.22.0.ebuild 1087 BLAKE2B bb93cb261fb3d9e2e7779fa26c0a954f27b9c5ad2de4b462b3d97af617369a51b2627fab61144f115e5e517340ff6286ea9f72ec0e90ed96be9527a1e4f16261 SHA512 a996968500007e666db75fd884490950a3aa45e6f9fe3e447ba6a1357ee9f6b72b81ca24048ff5769d10cbe757dc93968afdbd12d57d1cf341f5607be2f80244
-EBUILD libfilezilla-0.23.0.ebuild 1087 BLAKE2B 78ae435cdbe136082a59fc3674647105b294fe40d9cd0e3f06415973693a532620501c9230020dac061305180ddc54295503a5dcdc67962b55cdbbe41673f4b2 SHA512 f409e8d2ee4b4ae85dcda7ff515444d8fc8602f2aab9bde827dfad5a7af331b119ff6c3629d1e3dce14cdaed06c01516c28ef745df0ae88ac90f64b954db56b5
-EBUILD libfilezilla-0.24.0.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7
 EBUILD libfilezilla-0.24.1.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7
+EBUILD libfilezilla-0.25.0.ebuild 1201 BLAKE2B 427473b746a72e37aa0eb92d658c31fc0af5501c85f1a6f3fd8a9cfe48f6b2584ebf2ca9ebcd62c2c62159c9be082155ba35fb1604dc278f6ff3981386033fdd SHA512 ab8a7e31c21f61998eca7055a1a0fcfac0111a9bb953d567901cd8bbeaf9778e3247d2d728798f58b85217b09ac73e63be310ac9fab71fd98c9405654e83c56a
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.21.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.21.0.ebuild
deleted file mode 100644
index 03074019d21b..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.21.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/6" # libfilezilla .so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild
deleted file mode 100644
index 37ef85045da1..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # libfilezilla .so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild
deleted file mode 100644
index 098195366965..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.23.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # libfilezilla .so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.24.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
index 06fb1f38b744..74e3d6fd82a5 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.24.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://lib.filezilla-project.org/"
 SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-SLOT="0/9" # libfilezilla.so version
+SLOT="0/10" # libfilezilla.so version
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index 03c2f3eeaa52..452b73d589e0 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -1,3 +1,3 @@
-DIST libflatarray-0.4.0_pre20200314.tar.gz 165804 BLAKE2B 593e26b4c67ca67143ac9fdfca697700ae4caff807bca0b50d7a2de05ad8dadb79c98f9db39b728fdf098cd8e948c99963d11cf95bbc31b6c0f485e81d9736e8 SHA512 3f78c0db04e3de637fd8ed938c2d4d88d1eb270fc6a95f2d1b0909c4a6df40720e77c2aedac5ba38be32f703600a075107000ba028b38739b4206b7498f66955
-EBUILD libflatarray-0.4.0_pre20200314.ebuild 1115 BLAKE2B f2708cea44cf0398100e746edaa4fc2fdf9b4993c042fd96931b8b80a0b6f5508ca08f9da44e3427d0b843887823180a6a7d4e3dfd9799b25dad20f000bea860 SHA512 4235837df7995aa15735421eb144e62d564b9b7b9be9a936ad49538670d5a4eb0cd93af32d51934a5098ed6622ea2d7da28cae82c95025955a25fdc8605038d7
+DIST libflatarray-0.4.0_pre20201009.tar.gz 166551 BLAKE2B 6e2a13b69a8cd21124c02c849956b85fed1c57d01e2b359044302573526d281b191454acbc0ef37355c0c7b5f8b34d48eed4ca0d5d44f75008040950cb570cbf SHA512 2d2111cdb0c5d80e2af04eb3b53e6aa0a3ca989809adc0e8ca654c31a46a3bcbd916eb0a5b5f9e86391e54a22bbefec3d1cbdbe0dbbd0c538da0130dcc7db562
+EBUILD libflatarray-0.4.0_pre20201009.ebuild 1115 BLAKE2B bcb1ab5ea118471e40c08ef2011314a1294f704ad3502c6cf5283815ff05b52a4a56e42afffb1a8ac399263a92083dd42757a9b4c6ec89900f58337cbb151af5 SHA512 e7c865d5cfcd580a863c80ea93bd64f2bfdbb1c22838ec8db1f934b5e856fa92382c2a0035ebff53cb8c582f311ed068c69392dab2e6a010d0fa5d5620ee2fd4
 MISC metadata.xml 796 BLAKE2B 97e9da58126fc47aa98f30b4e5389ac90f792db95e84a2186d7cc8702719c299d8e8b8bb9de3d91c21babeb6e1c21a778da4e6719d84975d142ab1fbd8256ca5 SHA512 672b8ab81e7915b0477c716493afb2e64b48749bdc510da3f01efc0a20ae5cc49facfd97ab96ba4661783142671f5c68d9f4511f89f928875f9a5c47d0cdb085
diff --git a/dev-libs/libflatarray/libflatarray-0.4.0_pre20200314.ebuild b/dev-libs/libflatarray/libflatarray-0.4.0_pre20201009.ebuild
index 95122803d1b1..89ce35e4b3e3 100644
--- a/dev-libs/libflatarray/libflatarray-0.4.0_pre20200314.ebuild
+++ b/dev-libs/libflatarray/libflatarray-0.4.0_pre20201009.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake cuda
 
-MY_COMMIT="c5d90fb37ef52dbe56f611979fbe120fa1303284"
+MY_COMMIT="c8df37f6ac73250998b90c397458469902d6d9b9"
 
 DESCRIPTION="Struct of arrays library with object oriented interface for C++"
 HOMEPAGE="
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 2a46beb50c28..3b30e38adff4 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,6 +1,8 @@
-DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
-EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
+DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
+DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
 EBUILD libfmt-7.0.3.ebuild 778 BLAKE2B 9e9b994e80f7e6991913d2a553f76a7cc1690fc39a8c2692ff670a59734be819bc0cd56abffa82445e8e731faa95868341585457fbe7485ec639f1ae5d8154be SHA512 a818d4846e0551fd7eac246654d76104cda35b4a1d8d16f50d4e41876223298dc6c6eb4cff56a4ba2ad6bea304d4ba995f5a984fcadd98b4da5c95e8a905270c
+EBUILD libfmt-7.1.2.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
+EBUILD libfmt-7.1.3.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-6.1.2.ebuild b/dev-libs/libfmt/libfmt-7.1.2.ebuild
index c3530a47003d..376757b05ade 100644
--- a/dev-libs/libfmt/libfmt-6.1.2.ebuild
+++ b/dev-libs/libfmt/libfmt-7.1.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfmt/libfmt-7.1.3.ebuild b/dev-libs/libfmt/libfmt-7.1.3.ebuild
new file mode 100644
index 000000000000..376757b05ade
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-7.1.3.ebuild
@@ -0,0 +1,36 @@
+# 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"
+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 ~arm ~arm64 ~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)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6919ce47025a..2b705c041bf1 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,5 +1,7 @@
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
+DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
 EBUILD libgcrypt-1.8.6.ebuild 2252 BLAKE2B 282625b77faf7a06d9ed5b33e96d163254af1c0b1edcdaec38ed4a882b1a623cb7ade5a482987430fd59f0b2688f2cebbbf50435a59471b13e0a56005a9cd181 SHA512 a656809c97a012245ece9578eeaec9e1d8b1d2cf12b307762d28c2ac9fa9f8abcb38dcad676e79990feeca10840138cf5134b8fa15920316b43f541fe6c82a33
+EBUILD libgcrypt-1.8.7.ebuild 2261 BLAKE2B 8169ce9eed626366712b4138105364f5fc46d2bf70656ef8b25b90c510d129acf8c6c8474527028f3220a6fed341ec900d1140e0bf6b190e6e6d2647e59893bb SHA512 8da9245f2d5d29cfe4fc4b51f6c94ac25ba32d1e337f708bd800309d37229b2f34df9d20608023cda228180bfd3b5a053bba1ba0fca0660e5f880f1e857f8b5d
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
new file mode 100644
index 000000000000..d95cba2dee7a
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		CC_FOR_BUILD=$(tc-getBUILD_CC)
+		--enable-noexecstack
+		--disable-static
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index db99a1f27642..a3c17b0fcf33 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1,5 @@
 DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b
+DIST libgdata-0.17.13.tar.xz 849888 BLAKE2B a364f6175828dcf6d870ddf8489da3703b987587639675ed5cbe851de8761d918da9ef91531d2b992ef5188b51f00f4bc13c3ce3b36afe6d07c4e162a93b2889 SHA512 b074097bd3cc78951638f0d726a948c9ba994c64c85c0cfe713c3d87419a9a96b66688bde88732dfb529325dca2b8251bd161337532bffaf9564f7f5819b9343
 EBUILD libgdata-0.17.12.ebuild 1764 BLAKE2B cb791f3610253c6d818650a8f22da2845f54b23d7eed8d78e51a5e7705482369709d088390618dd6b2b81db6248925e0f8e38a98ca984c2853b02a5cee160b53 SHA512 afd6a51628c772a174763460eb627bfbe07bb15543c0005a6e00052e7214896d4f38ccb87f273bae4943d4c28e2e89370ebe559fe50e2170f89fb521a21e34bb
+EBUILD libgdata-0.17.13.ebuild 1743 BLAKE2B e5832c553866b10c96690bfa181279d1c71cd452ba459f244fa12f2ec400adb486cf0af155d6327d985ed4eced7ce14e2f7f6279583ddf2d288ec03aa5f8c544 SHA512 2d89751c08033cfa76d324986d303c7c4c5ccd85520d9c706f164d4c7317d4dbb0aaa748dcf48da5ea6636d6ee49483022e119beae5e9a02d4779ee14aad84f6
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.13.ebuild b/dev-libs/libgdata/libgdata-0.17.13.ebuild
new file mode 100644
index 000000000000..e8fed43b5332
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.17.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+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 gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/json-glib-0.15[introspection?]
+	>=dev-libs/libxml2-2:2
+	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
+	crypt? ( app-crypt/gcr:= )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=net-libs/uhttpmock-0.5.0
+		>=x11-libs/gdk-pixbuf-2.14:2
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# Don't waste time building a couple small demos that aren't installed
+	sed -i -e '/subdir.*demos/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtk=disabled # only for demos
+		$(meson_feature crypt gnome)
+		$(meson_feature gnome-online-accounts goa)
+		-Doauth1=disabled
+		$(meson_use test always_build_tests)
+		-Dinstalled_tests=false
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 114b325a18dd..5dffb370ad90 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,5 @@
 DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
-EBUILD libgit2-1.0.1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b
+DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
+EBUILD libgit2-1.0.1-r1.ebuild 1723 BLAKE2B 66423a046e92f83e993832162461d1b667e4e76b0044e67b1951b5b589f2b3d42017a8390b8bc18365ada4f01cbbcfae4327f2001eeb3388b71839ffd406d029 SHA512 50a855668687a4eacac6d0bd61095b4523ed595b438d14854e03d6e06c4fe146164b415753bf252e7a8261327d017a65ae85ff5cda56fe9074e2b0b84d4e7b3c
+EBUILD libgit2-1.1.0-r2.ebuild 1729 BLAKE2B ee97f7f5e46fa12f4276999a91887c1bf4509f4158c286521d28c90fce843a52afb766ac4065cc250343069a7d468c08ae420aa73f27c1214e8c31f897918284 SHA512 27d5a32adc67491da4218ea07b4d2542cba6d90f2887e0e91dcf037787514455cee6143f423cd4a3fe588888706bec2f2c71701ad52eecc82873ce67d9d97950
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.0.1.ebuild b/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
index b9b87e7ffc99..19f69847b508 100644
--- a/dev-libs/libgit2/libgit2-1.0.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake python-any-r1
 
 DESCRIPTION="A linkable library for Git"
@@ -18,10 +18,11 @@ IUSE="examples gssapi libressl +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
 	gssapi? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 "
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..40e1fb17fcef
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_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_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_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/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index dbc1802cb5cb..ac9ea0f955aa 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.4.tar.xz 336708 BLAKE2B ecd21376ce8d83a0a8c0f65992ba4d39d54b3b97d90df8adab0d5c5714d0c9841711a21dc611c94a8141313ff991c3a8787f7e27492c149a7f76e25d8a2fa8d6 SHA512 2b2c77210103610cb91554f870d634bc8d06f0886eef5166bf9909c1975a87d960005640d48e3e917f74c7553e3ae07d473ba06c6c5d6582313c50a390ec6168
 DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
-EBUILD libgnome-games-support-1.4.4.ebuild 539 BLAKE2B c8ada946bb8232de5d729d8600ccdf585febfcfccfd06ed559dccd7de49c57d947433427a179de41778e37b14845baf4fbc2752c52060794037e8ac9a525b670 SHA512 bfa18199d67b31f345cb5d27aadafb5c9fa722b95d5de426bc4cc1f4f049bced42769e62ce66a47a2d89e64ccc39d8069dba69ddfcf8de975b0ed6c26b3a0cfa
 EBUILD libgnome-games-support-1.6.1.ebuild 666 BLAKE2B 0bbf6c886e20d56785ced43dfb3ca8fd4fa5fe205c3a22c56aad82a179bb57e966e1dd6bc6c057e640ca29b7256ef91fbdb3c0da9cd53e7f2c2ed2615379cb27 SHA512 abb35787d23eb98d9cb36e4673af42b3f5208cda2476462a4775afbe510bc56bffe8ea26553ee7ab36779c06b8f007435a44e487bb5c09f469f5f9ac913b9a28
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
deleted file mode 100644
index 3309b9a2a735..000000000000
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgee:0.8=
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.19.2:3
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index f1b06f9357d9..9cb081f11127 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,5 @@
 DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
-DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a75017e0309b6b2d1924bb6a978190d4b171416053cae424d272a7b43e1536abd92821198e4e7f553bb16d19f SHA512 abbec6b5a5f27b5061ff165db97915d7356b23757de12b640f54741927ac860264af3daed15d4b4b5f3df494acb20695070dcb5ad104df2defdcc7229634c42f
 DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
 EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89
-EBUILD libgusb-0.3.4.ebuild 1698 BLAKE2B 02d9da0f09ea400a6516e26b10246bfae5646f64ba75c17bb60ca019dc51b63738519c4249bdb82bb373a4743190fa4bc9ee623c4ff17ea66e519c940c118daa SHA512 83005576562412286f7e50f41af90176500450ec0c8f8c8d1b2a4f092d3cf229556c8d852d96e11151e34a9437eb83ca045fab1ca7463a7aa0ee39bf599dfd24
 EBUILD libgusb-0.3.5.ebuild 1698 BLAKE2B 02d9da0f09ea400a6516e26b10246bfae5646f64ba75c17bb60ca019dc51b63738519c4249bdb82bb373a4743190fa4bc9ee623c4ff17ea66e519c940c118daa SHA512 83005576562412286f7e50f41af90176500450ec0c8f8c8d1b2a4f092d3cf229556c8d852d96e11151e34a9437eb83ca045fab1ca7463a7aa0ee39bf599dfd24
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.4.ebuild b/dev-libs/libgusb/libgusb-0.3.4.ebuild
deleted file mode 100644
index 7b23026baa05..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson multilib-minimal python-any-r1 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="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	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
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-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 b237f7bf54f9..dc80bbb7e893 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,9 +1,6 @@
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
-AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081eb82c6726cde11af9d18fb193794339f639953653f937442bb78a9561cde9a0860d0d4841ec50943d218f87ea4507bf05a7b45337 SHA512 529fe41ded3a199795d39490804f6ab8bfb108e0c9b8ca4cafd7b4a27d695d0a32aaa0954b0a89650d160cba3b7ddb2efad4170f2fbdad806e611aaf918b83cb
 AUX 3.36.1-autoskip-network-test.patch 1062 BLAKE2B ae819a4e2f3db2a20c516a15b6f8ceeb33c4149a8010c8821aac925b0e81ffb43b5d02de09affdec2b1abc70bf432b2804c9e55d1b261360be17fa95f20d0e74 SHA512 de6f0f0727c0fb21aa7eea652084b7d7b2c526044e69a8a4b6ccaf813d4bc2162726c87224d25cc9a5773aeba76c57b4a2e1bacf9476dc4ea789aacd06d789bc
 AUX 3.36.1-tests-locale.patch 1825 BLAKE2B df10a2db35720cfcb8b8c67f73573067cdd420a11276fee75f399e47e4b68e3d054d94587e68f7cffcf8de3267351bbdcd61879d5470532f8430a52c33b28ee4 SHA512 0918cd2b8fc9265e974e8315671698aa0e8f3442a30d4f545ef35cf64347a85e93500fc414c17afb6fa89f8eec8d9c1e19b90d2327fca6b6ca426b95719dcf33
-DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
 DIST libgweather-3.36.1.tar.xz 2702144 BLAKE2B bd867461b64ef81607695ae1a3796d2b096129a9a60721c5fcb20d8c35859c0b76a985e9393c23b311f7c0fdec3e691618eab83a826b483c427287906d575251 SHA512 6c7090b0b6dfac61e73a398d34329cd706080a007694ceb3d47700b4f444982f8ca989dd6dfaefe85b79ffd5af9c423be4bf1bd8491ac0ba6bd15c150d97b26d
-EBUILD libgweather-3.34.0.ebuild 1716 BLAKE2B 9d3eba6e7f1e3b200dceda12ebf7525403b9805c7e6eec14429f9490b5f9414fa5145e1b600b6af943a2fda342a4bf8ce705e94ed4b5a88540a552b9dadb338a SHA512 a47c9c7a28fbc6533398ac6e47350f54ce9dbc50f6bab4e9d87fb97ec427dba7f000101cc0aa75a434288d1bec66e77117b4d0de1e70bb163f9b268222593680
 EBUILD libgweather-3.36.1.ebuild 1864 BLAKE2B 5a2ec73581ed8dd92f933357af78da1a986fc1a957661023ea1a18cc6618034211d8d94287bd5621bef6ffd9d66ce3cebc7a1c127d9b1fb2af2c6dc3a5cc3e13 SHA512 235f133a6209d6cd446aa2d75fb992c41c4ebe633eec76df62973e2ea379456ebc460c54696bfa3fda1eaa0d51d08fefa9460d4a2cb87c7e6048fdd8d843da5f
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
deleted file mode 100644
index 29956e3f498f..000000000000
--- a/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ee246dc058098dee1709d76635e72db35efcef4e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 20 Nov 2019 10:55:02 +0100
-Subject: [PATCH] tests: Add another duplicate
-
-$ wget -O- -q https://www.aviationweather.gov/docs/metar/stations.txt | grep KX26
-FL SEBASTIAN        KX26  X26          27 49N  080 30W    6   X           W    8 US
-FL VALKARIA AFS     KX26  X26          27 49N  080 30W    6   X                8 US
----
- libgweather/test_libgweather.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index 1bfa3d4..8a21911 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -336,6 +336,7 @@ parse_metar_stations (const char *contents)
-                 "KHQG",
-                 "KOEL",
-                 "KTQK",
-+                "KX26",
-                 NULL
-             };
-             if (g_strv_contains (known_duplicates, station)) {
--- 
-2.24.1
-
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
deleted file mode 100644
index c2bb3a9431e0..000000000000
--- a/dev-libs/libgweather/libgweather-3.34.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 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-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0: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}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
-	"${FILESDIR}"/${PV}-tests-Add-another-duplicate.patch
-)
-
-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 bbbd9c46ab65..b66aae6ac64c 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,6 @@
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
+AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d765cd7968ce148e42cf3cb13cbd3439d6d802352101a4b3a07f4a8f82b7e151f2239fbe8d792ab536707db75347dd SHA512 98b0b685676e7aa54e49050ec8adab4bb6cd3827fcd3977c156d841a527268cb47b3227852036f4bb195931ae8295fa6761bc96f4d4042f059193ab6f75aa27a
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
-EBUILD libical-3.0.8.ebuild 2269 BLAKE2B 6f7fc6267d9d4c9f4f75b09920de6f4335138cea80e458c1846ce3557f81dd9bb7bed011fbf40864a513ba79a49f32a2e72747df932ae77d4974baa41df02bfb SHA512 5cb1772d760a922725a36cf60ef8ac50cdef95610bbad69feeef97021a22605fb8dc7baa5b624a5d535cc4bb8764aa941ae7b6e7e61c56fa47760250163a4b16
+EBUILD libical-3.0.8.ebuild 2342 BLAKE2B 5d6e1af8238a4cf3a32a2e94c6d6210062cbf85033822250b0a4c4abab8b53f6a0b3c26d0202a01abaac2759c926f0244adb4b652996ed0351bc26c307bfd6c7 SHA512 c5b33832c5002eec96d1c9abb3dc2e5f0295d422cc3f431526bf2aa418e48eaee0d521d19cefc7ca1a607a7dce590150ed3a7fc2a3b204139cfd99f0657dc144
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
new file mode 100644
index 000000000000..1974db76b0a5
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
@@ -0,0 +1,44 @@
+From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 11:24:34 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/libical/icalrecur.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
+index 91522161..159163c5 100644
+--- a/src/libical/icalrecur.c
++++ b/src/libical/icalrecur.c
+@@ -143,6 +143,7 @@
+ #include <stdlib.h>
+ 
+ #if defined(HAVE_LIBICU)
++#include <stdbool.h>
+ #include <unicode/ucal.h>
+ #include <unicode/ustring.h>
+ #else
+@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
+ 
+     calendars = icalarray_new(sizeof(const char **), 20);
+ 
+-    en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++    en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+     while ((cal = uenum_next(en, NULL, &status))) {
+         cal = icalmemory_tmp_copy(cal);
+         icalarray_append(calendars, &cal);
+@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
+         }
+ 
+         /* Check if specified calendar is supported */
+-        en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++        en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+         while ((cal = uenum_next(en, NULL, &status))) {
+             if (!strcmp(cal, rule.rscale)) {
+                 is_hebrew = !strcmp(rule.rscale, "hebrew");
+-- 
+2.29.2
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
index fa889a4d2296..376befd62e06 100644
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ b/dev-libs/libical/libical-3.0.8.ebuild
@@ -48,6 +48,7 @@ DOCS=(
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.4-tests.patch"
 	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928
 )
 
 pkg_setup() {
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 234755d69f65..d5391aefb65c 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,7 @@
 DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0
+DIST libinput-1.16.2.tar.xz 595632 BLAKE2B 0010ee7495e35d093d9cff72195433cfd571fb0b6d2bfbfa61b19eb6baa6cf6d00728673408d9d2427c3cb948e146ffd5a0184fe9a7ca3cc9bf8889b64a55115 SHA512 3394faeb0cdb0a543624e150f04a98f3bce8d67438e47455808bde8eec8ea9cdafb86056e5f8d3431352ae33714e490c55edeb51e0af1972c68fca07c1ef1daa
+DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e795279273277c9cad4676f484856d2677845ddc1c5102f2430645053a77c1cde48bb32530d4290ade576843a51ded SHA512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39
 EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
+EBUILD libinput-1.16.2.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
+EBUILD libinput-1.16.3.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.2.ebuild b/dev-libs/libinput/libinput-1.16.2.ebuild
new file mode 100644
index 000000000000..e2ae19212794
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.16.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libinput/libinput-1.16.3.ebuild b/dev-libs/libinput/libinput-1.16.3.ebuild
new file mode 100644
index 000000000000..e2ae19212794
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.16.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 6d01d58e915d..3fb7f1d668a4 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,8 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0
 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
+DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3
 EBUILD libjcat-0.1.3-r1.ebuild 1490 BLAKE2B 8e6d9e24040d80aa12aefdde4a4797195b33b6dc8c9231d72936eca56069dae966e02d0c14989848a862b65053b840a14f22ce892992eced17e62f0162fb7313 SHA512 e74e0c6753de3d507704e9b799bdd6a81554b12dc7747559e5fc2e03288ffff1de26acf77aa909fbc4410696e657fa86b85b39bf929336879d77543c7c466990
 EBUILD libjcat-0.1.3.ebuild 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f
+EBUILD libjcat-0.1.4.ebuild 1497 BLAKE2B 5e5013083c7279d402d7b20ff52b13be880da21f19a0636442d668f6f24628e39889e725171da24e4c7069fec0cafa5cf4d4bc1b9f3af9d43f0482f4d3187c54 SHA512 3208b02146241fb96b83c9509da4e043b6c940315723383d0bb5083af2f3a084cb2fc2935dc7b00b9aa743017a69874def0dc6adee3b2c3df27e46fcd3346368
 MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild
new file mode 100644
index 000000000000..585819c14af0
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+	"${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vala-bindings)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 79efe01b36ab..8dd458267272 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,6 +1,8 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 DIST libksba-1.4.0.tar.bz2 651319 BLAKE2B 0e3f49fd0d389d905ff75ddad6ac1f3d158d2d4d9f47d08c14d11e3fdc07aa3f661e7ea53612770269b4e08e7b61af2d83a1679874daa0605638454059cb3321 SHA512 7c1666017ebfa50b5663153dead1e019e0ee342c4f44ee8f644fc749e82dcc983237ef0f557de9de3f7908dc90405d967a4db2e36e04fe0d5a09edf49f8a0c8d
+DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
 EBUILD libksba-1.3.5-r1.ebuild 776 BLAKE2B 9b948e3df0c84119d0c0974a26d4cf459492e282fa5efa49557de21707ef0b0f9897979a3745a9ef62143c0c2d18ab316765df1e5748d4bd93beb40579ac97b8 SHA512 2470eac50d217d0f55aafb00bc7472838d41b908360f82171854b71830c694ab3ea020733fa40c73419517655e921a31cc8dd79c8afdbdb335eb333a014d1da6
 EBUILD libksba-1.3.5-r2.ebuild 1040 BLAKE2B 8c46f984ce2c32ef10474865be55b553b43aa17f001b484a82eae18efd0d66f4f7e7c9472c91d3980de836a72c105f1e4e608715405da25bb74e5f43bfc51319 SHA512 372baf48e452491a1e3855c344a8f8b54b5c8d17c9463d48cbacf0303449dea5d3acaa51b7fa4fa269fef80b0a51ddd49288c338d78e645355a565f511947484
 EBUILD libksba-1.4.0.ebuild 1066 BLAKE2B 1e1b1bafe5833bba24cd3d3369be1c70f6ea466d4ff789455eebcb397bd5beb46a057bcf09f93f76271430d13a3c3e3ae1a46eb273f8e7bebc478cc73d6ff8c0 SHA512 216796c77a8b0451f97724e14e9f78223eba29a5327395f843e0b0e33627180850e981dfb1cfb83e34b0458473ae58efcb24ed2d17e688786feab2e1e087ef3c
+EBUILD libksba-1.5.0.ebuild 1066 BLAKE2B 1e1b1bafe5833bba24cd3d3369be1c70f6ea466d4ff789455eebcb397bd5beb46a057bcf09f93f76271430d13a3c3e3ae1a46eb273f8e7bebc478cc73d6ff8c0 SHA512 216796c77a8b0451f97724e14e9f78223eba29a5327395f843e0b0e33627180850e981dfb1cfb83e34b0458473ae58efcb24ed2d17e688786feab2e1e087ef3c
 MISC metadata.xml 252 BLAKE2B da45974cde6a1708a138afe22c68a85a8ff108b4fa2761d3552c4c9200dee3f548bb3a351a70b3129e574e21b52ca9dc2028776ca644f7e0d5a7c82ed6dff0aa SHA512 1b195c0e35c6cd524cbb5e1088f3a634a1917095d133ce81625eef7b8ed76532a9e3dc7b364fcc3f65a13767cddfd194512104586e4a55487b1ffa067cfad3ba
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
new file mode 100644
index 000000000000..c2943f6574d1
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
+
+src_configure() {
+	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 "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index c1dacd7758a2..28d4bb4c0a40 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -3,9 +3,9 @@ DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff
 DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
 DIST liblinear-240.tar.gz 558915 BLAKE2B 50aba25c0cb6f9be505b6f9f2b84c67c772b1c8c56cb4b3580b4615c22d30b97a510b28e3d180af29e6c29c4ad77d011319298d6301cb4b2708ad6caf0e1dfc2 SHA512 70e392700cf278d1b62ee7a0b5862dd2a8ea0de28e9660c6d7bc4cac7f098608eba2d20d8f28b5ce0132af09a4446a2cf8aac2ed5f62d35fe304d7a8709ef1d5
 DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
-EBUILD liblinear-210-r1.ebuild 1165 BLAKE2B 56bba8adbcc2b11f32f39494755eaf76f805145bdb685cc3752394ee97601883194b84a24880e2f23735a82734ba0b55470ee6ef0ea40959a26ae53b1723df3d SHA512 3d680e769f50672a5efb141fa2a0cf69ebf5180aaa190a7da80046b340e2666f84295023b9b06a260f4c0ed252e5daad21e558d4c3b3e83f0735ce2170b972f0
+EBUILD liblinear-210-r1.ebuild 1164 BLAKE2B 2f0412e646bf6a35ade1f2bd59c74cb989180008899db2b2ddc12d65cfe0d0da3901d9135cce7fa70ea1e6bf39748471c5e65190ff86a9a632d334c45c8e83f1 SHA512 3ac2479b283923a91379aa06fa1922035d25b939907cf2246201019ee1d87557534658a69dab596645b115f45b37c731b77d4d3adbed8caf48fd66ddebbc8b04
 EBUILD liblinear-221.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912
 EBUILD liblinear-230.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912
 EBUILD liblinear-240-r1.ebuild 1197 BLAKE2B b5fe1724ad652ab0edbde72c15403c4ffd261c046a51636529eec347291a3e835a31a0e6b17cca09a4699057d1432e3966d40fd2d253a7e2a8cfc429adcf2e33 SHA512 1a3cc696d0c8b6783be860522ed931057bd334f73ed4033f763d74a564db453d6141e6423a3a633013469359801e379797c448bf8faecf1340b28f92413aecc5
-EBUILD liblinear-241.ebuild 1197 BLAKE2B b5fe1724ad652ab0edbde72c15403c4ffd261c046a51636529eec347291a3e835a31a0e6b17cca09a4699057d1432e3966d40fd2d253a7e2a8cfc429adcf2e33 SHA512 1a3cc696d0c8b6783be860522ed931057bd334f73ed4033f763d74a564db453d6141e6423a3a633013469359801e379797c448bf8faecf1340b28f92413aecc5
-MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
+EBUILD liblinear-241.ebuild 1189 BLAKE2B 62d3178aaa9d4fd1a8b61984c42eb556686d88f0a0d92a8d93b01c968cabc7e831bcdf1d821bf400fc464290e2ff572f6b2d964850f54d4f25bf5a6084def63b SHA512 9b6a207306e2e585693338dfe8192242334e93e50bb0b55ade7d42498994734c8ec931657d66abccf77c5987167f006be45968284cb9497ed41e07acc83c3e92
+MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index b21799d14162..fb59d193d192 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-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"
 
 src_prepare() {
 	sed -i \
diff --git a/dev-libs/liblinear/liblinear-241.ebuild b/dev-libs/liblinear/liblinear-241.ebuild
index ede9a159d953..d5be92f8f8d3 100644
--- a/dev-libs/liblinear/liblinear-241.ebuild
+++ b/dev-libs/liblinear/liblinear-241.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/liblinear/metadata.xml b/dev-libs/liblinear/metadata.xml
index 97b5450a7dc9..33332f22c172 100644
--- a/dev-libs/liblinear/metadata.xml
+++ b/dev-libs/liblinear/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jer@gentoo.org</email>
-    <name>Jeroen Roovers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cjlin1/liblinear</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cjlin1/liblinear</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index ecbdc5f70cfa..93adb287ac1e 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1,3 +1,3 @@
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
-EBUILD liblogging-1.0.6.ebuild 813 BLAKE2B 9f0f75b4d4cc1f28daf26e33982eb6f338e8569905f8a0f8f9f81fa676cb7bb0aee18a120c988ca909aefa5438b5ded2a2590de3dc7bf1c32c55c2155a573f4e SHA512 adc5da8bdb207461fcd51a15953df1ff00d07ea9bc4ea6467ddbd1889a22041b818e183a3ee795cd008cdf53eb0cd79f408c5f6031ad86c6c58d4f38d580f72a
+EBUILD liblogging-1.0.6.ebuild 810 BLAKE2B 4722b70856779bed1b9b36bc5ca921b4f49e63010394096944cf212b9cf06f607155e796a590ad831ddc45add6a51ce6ceb1100a2733c54140b1a838962ac669 SHA512 4b50aeeebd01692ede1149983ebfa7985544fbe00f2f8c8d083fa5e14fd8ec5133ab03b89416ef01e945da2a6813c20f39b9e63535b5b88fab792cbc757592ec
 MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/liblogging-1.0.6.ebuild b/dev-libs/liblogging/liblogging-1.0.6.ebuild
index 920b54472c5a..5974f3ede556 100644
--- a/dev-libs/liblogging/liblogging-1.0.6.ebuild
+++ b/dev-libs/liblogging/liblogging-1.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit autotools
 
@@ -12,20 +12,16 @@ 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"
+IUSE="rfc3195 +stdlog systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( ChangeLog )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -34,6 +30,7 @@ src_configure() {
 		$(use_enable rfc3195)
 		$(use_enable stdlog)
 		$(use_enable systemd journal)
+		--disable-static
 	)
 
 	econf "${myeconfargs[@]}"
@@ -41,6 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 6214b79e3005..4eb3bc1cadd4 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,5 @@
 DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
-EBUILD liblouis-3.10.0.ebuild 1514 BLAKE2B 5fdb331c3cd0cffc293d4eb49d12686aa913757f22533a29d8f8ad9a498556d3128d2ef44275a40ead84b5ca169b14882131d39f67651b197a9d1441e90be4f9 SHA512 3e8be1ca7bdf9cdaf0ebc30daa19b06354a71ef18979cc8151d9b1dfd9bb54980b5afc69c429d983c059b3e4694916c1ec2ad6b2e92520fa350d58854a7a3b4a
-EBUILD liblouis-3.13.0.ebuild 1677 BLAKE2B b5d6052c4181a39a18d4ae588ad176838116ba069a2862c9bbf9b3abbbd2188face6cb3d2a1393c871424a3851f1878adc63fe8d047603f22dbe347eb51782cc SHA512 17d780709ed26ed7c7b794be0c0269829a655eacfcb39ba1d3b570bcbfa6a07a71b33d8eee89ef5ca1bd89b00aec141f8a2e3bb3aaed8afe3d0a05d0ea43c43a
+EBUILD liblouis-3.10.0.ebuild 1582 BLAKE2B 87c3210d127199e2e9616e7fb9b16e768b2864f1d614b2ebfbd65bd7cf19786b468d2a1cf36bbebc371446243a94c3c62dd0f718604ca105f6cdbd6abd9d2e90 SHA512 fc13a3605413ffd844f3ce0312fc38df619339cf0f56cb00a9cfb782765c835db3b0131c92d9367f51342585438b2cb7e609b78d295e6e2a2baa06152d26ba12
+EBUILD liblouis-3.13.0.ebuild 1745 BLAKE2B 6ecb01c6907bf344200bbebc85506e3cdb3bd40256a84e882fc53134ed556ff6dbf4c06861a7b14abac7741cb5d6e9e058f7f0c9bf6c5ff0a0da00c972c79ed5 SHA512 bbd644940b639556eae499a4d264278481e7f1af5d4fd9e31a516efa1612497f2ceabf20cb0431a0a0034de514703813d99efdfaa3596195caf9e6183692ba66
 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 0c8cd99301a1..4aa446669163 100644
--- a/dev-libs/liblouis/liblouis-3.10.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.10.0.ebuild
@@ -33,7 +33,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-ucs4
+	econf \
+		--enable-ucs4 \
+		--disable-static
 }
 
 src_compile() {
@@ -64,4 +66,6 @@ src_install() {
 	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
 	HTML_DOCS=( doc/liblouis.html )
 	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liblouis/liblouis-3.13.0.ebuild b/dev-libs/liblouis/liblouis-3.13.0.ebuild
index 59d9912bc1d7..752c1cd1a9fe 100644
--- a/dev-libs/liblouis/liblouis-3.13.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.13.0.ebuild
@@ -38,7 +38,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-ucs4
+	econf \
+		--enable-ucs4 \
+		--disable-static
 }
 
 src_compile() {
@@ -68,4 +70,6 @@ src_install() {
 	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
 	HTML_DOCS=( doc/liblouis.html )
 	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 6ef57879945c..368c688c7eee 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,8 +1,4 @@
-DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
-EBUILD libmaxminddb-1.3.2.ebuild 626 BLAKE2B 6b032b35fffe60fdca3f2860077f23231106bf6d57a490ed5fa49a4825fcd78e994af5febce06d087b3fa9f1a92c090061c2bbe147a278b77b88084ce1fc72cb SHA512 0208be02580f946de2576230c00d9efd468270dd73545fc5522609abd653d65165204e3d0389bb4074843182ba7b49767e63b25932819e43cb7d5f470a2a80f6
-EBUILD libmaxminddb-1.4.2.ebuild 632 BLAKE2B 4449256e3b4eb997828b90c599d9180eb7a152bd5491b127700b9c79fc9d5e8ab703829c45dd4df6deff5172266e34ae3a7ceadbdd1ca1bb2aaaf239a2aa1442 SHA512 51646143eaa81370f61190e6b793056211eda73110ba36e3912f7a03b6bee91e40cdd7d5c4be0ef890bd27bce998bba59a2d691c3acdf4e6c5bb102342006029
-EBUILD libmaxminddb-1.4.3.ebuild 634 BLAKE2B c7ad32d48226eaa1ccae35516699e20c4a3f87955923ca222d6b9f5be65492d44eb7be3cb6c70153236b1a557415db6eb110bc5f9b6dc0bb347de2a16db907c9 SHA512 e44cf48578161fd5234f424da8a0e3bc276ac9e4f1bdc7cdc2dd7f983922a93219ee808e4f55eaca95cfd3bef14950ce1fb8e59f3d4387b3c32458e0587d83aa
+EBUILD libmaxminddb-1.4.3.ebuild 626 BLAKE2B 6ffb01b7caad7b8738f4e781e0ac979716b6bfc8b35832edc011fe34cbb1c91ddce5a0934b6808a105c5df52d8c8c0d56d928acb5797c92ae996bc1931dedccf SHA512 b618e648bcdbcb73a4d8c31e9bf597f2d52c18c0a1b307b0a2faf3970b9aaca447bb72c1e3e0ea3a289980bab2bb72f145207f309db5498631312e905bae32ce
 EBUILD libmaxminddb-99999.ebuild 599 BLAKE2B 2f281f45f33c357d7691fff9ee23543188caaf053f26eb2042480bf686bd3fe3198f666b898aa588ce9fb8e0ed90c5dd9e83264e1167fa9b8833bd6acc59b012 SHA512 498788586fa32e19ca8757386f65d0b6299fd5301e5fdecbe6aa9b71ab5f1b0c12faf325b2bba13875cb9a65222bbff7031daa272dd12c70c5893ce10f82a842
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
deleted file mode 100644
index f093d97c8040..000000000000
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="C library for the MaxMind DB file format"
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DOCS=( Changes.md )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	tc-export AR CC
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
deleted file mode 100644
index 92c3e272b6dd..000000000000
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="C library for the MaxMind DB file format"
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="static-libs"
-
-DOCS=( Changes.md )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	tc-export AR CC
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
index 3e02e09d373c..ecd39d177aeb 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 42cb10cd17cf..2351612166cb 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 849 BLAKE2B fcc88474bbd0e2554490685dde90f1512fc12de6b575fd8c3774de7ac21188b646aaec197af3ac7f46e56ef3df5c58189295878cb7dc675080cc5bcdb597874e SHA512 e40efc7c932be26067334a26b8ed505f39abf0241ff7d96321a51e4e3c5d442ecb3d0e6bc9d19b1d7105f9275a5dca1b0ba9391c1a0d3133a36d832a12661dc6
+EBUILD libmix-2.05-r7.ebuild 840 BLAKE2B cba916d314742d27f94384cd32745ea99e480c1397d7b752be5b639d04a86f45380e69aaf4f4e267963dc97bda33c23992a20777e6d81562342bda1d81714503 SHA512 98764e31f545b3bea7842aeacd7d845f93d2288cf8df337f9b38941aca4a1cba791578d766c006e7ec006401bb332ca802b640d29115ecc07053144a63973ba0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 46afa114ab87..e40aae85cb5c 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools base multilib toolchain-funcs
+EAPI=7
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
 HOMEPAGE="http://mixter.void.ru/"
 SRC_URI="http://mixter.void.ru/${P/.}.tgz"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
-S=${WORKDIR}/${PN}-v${PV}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-pattern.patch
 	"${FILESDIR}"/${P}-gentoo-r1.patch
 	"${FILESDIR}"/${P}-libnet.patch
 )
 
-DOCS=( CHANGES )
-
 src_prepare() {
-	base_src_prepare
+	default
+
+	mv configure.{in,ac} || die
 
 	sed -i \
 		-e 's/expf/libmix_expf/g' \
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index 90f614a66292..06e679c22311 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -3,5 +3,5 @@ AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158b
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
 EBUILD libotf-0.9.13.ebuild 879 BLAKE2B a3719983bf6de5d6f16a404e833c1749cb42dcac97b3308e8081bec6fd61e637e24c2219e7ddf7e6e91cefab44ef8b72b79d023aa76239298ee4868e12e988f4 SHA512 415002854bcac560e0be0e43d73486e4d40617f541f4abb3968d9aeb48e25adbd659f7b2de7d0afb4bddabdf16e79640234eb9e13a07909d65a33d2b89189d57
-EBUILD libotf-0.9.16.ebuild 988 BLAKE2B 40ff19731a695de5bab26d5b45adbfd43986bd9c9d4262a6742bafcc373eb572e6dff90ac768f96fd9b968fcd8711633a992447f52c1cb9cd0149a14276bc498 SHA512 b07abc17e608c9b01baf07b4bfe60588067d9eb80846b03793283a913880bdf33ccedc729e75d10359aab525d1af495bc276e7f1570f759511e30a2b7e61bd6d
+EBUILD libotf-0.9.16.ebuild 980 BLAKE2B 9d80c500688e5ffdbdf88c663eb091eb93cb4cb62a1b84f78296f09cbfc6a1d67f74cec22e1914eea7d61fe18b58514c5bc7768ce6db8edc6c8d8078cbfcd3b8 SHA512 e7db42bfe22d204651b31639a8a9846d64d83335e67e29adee1c893098454aa3c00ee34f4752dbc07d09d8b343308da2c7f4292c6d6542a8b7018d7cde2515e1
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
index 0ed54fe76641..36ea187d50d3 100644
--- a/dev-libs/libotf/libotf-0.9.16.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 0b8863b5d962..bdcfa4e9e13d 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,5 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
+DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
 EBUILD libp11-0.4.10.ebuild 784 BLAKE2B 5d1fbb3bc9e54e6901a4c6ad4a8cf14a88f8488fdf5be7370ce4c970c80e1032722ef6773a77c1a4eab9949194e834ae5e8a6572c029b80babecbc55104493a5 SHA512 e5fc6cab83014394893f4c380777d0c2a2b09e8c6ba9db8b99eb0f45e80b0194a429a12ab1f2911af7f0be2447e8b45ba00b04554d084724a4a2043200557f32
+EBUILD libp11-0.4.11.ebuild 792 BLAKE2B c7e8284ef4f67d1d72aa184594d5ba7a883bec4ab79420c25c1baec9aaaf331134d9e450b3b89ca592029a6f4d1536b6b9ba05d4b312357ebdba0b57b6a18809 SHA512 1e772b0605053409f8442dbde0cd4480a783722507254f2b4d4d3942e65f27fc39ad7f9b2bfb596da5598cc1c6874167de1e8e94535b4b244a2b103632a68da7
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.11.ebuild b/dev-libs/libp11/libp11-0.4.11.ebuild
new file mode 100644
index 000000000000..695cc0c18930
--- /dev/null
+++ b/dev-libs/libp11/libp11-0.4.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl bindist doc static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( >=dev-libs/libressl-2.8:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable doc api-doc)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpo6/Manifest b/dev-libs/libpo6/Manifest
index 1276a0ae245d..c3942aeb54aa 100644
--- a/dev-libs/libpo6/Manifest
+++ b/dev-libs/libpo6/Manifest
@@ -1,3 +1,3 @@
 DIST libpo6-0.8.0.tar.gz 364709 BLAKE2B 848a69ee3e4685bd81a3c6974b342b420c00e20cd78058a3f87bdbe7ee20b47cf4a43d5bbc3c613bcf01a70c7cf19658521a5450f54f18b4a2717e53408e57d0 SHA512 0fed5af37f47245ecdd84dd4dcc5d24dd84dacbd93cf1eb9b4b2e86fba6d26e7f459a9a274b0c42397fc5e22d48cb603ee2b809979cf48675710ba9221d8a3bf
-EBUILD libpo6-0.8.0.ebuild 318 BLAKE2B df5eb949760adc946f41209237c5df0df9f443d14611add21bdb1f93c681cee294a0a608f4472592f792715fd7f52ea818cee98740d545b0c3931241ff5d8688 SHA512 8753e951e9cbdfa941c6e279a2620622466fa10f9ff85691acdf6706c25f12af4ee3da27631c433f26612d02131469391eede408b07e1cb292f2a70d7697dc0d
+EBUILD libpo6-0.8.0.ebuild 393 BLAKE2B e0d41bf95ebc71d19847c00d52a270b87235c788a263fd700da790f6ad4034815baa5d8e989cb3a8ae93ba11e005fc9c938bfc2aa89c336dd7f09c666641c4bd SHA512 7a05b2560818c0fbd8b3b8bbc93e07bc194e2b9f0c1713977f0f7ec7192bbd884da79cb4f3ddad54ac75b447eb83fdc181cb14e7eebafe126614dfe669606924
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libpo6/libpo6-0.8.0.ebuild b/dev-libs/libpo6/libpo6-0.8.0.ebuild
index 810e8444c7be..94435303959f 100644
--- a/dev-libs/libpo6/libpo6-0.8.0.ebuild
+++ b/dev-libs/libpo6/libpo6-0.8.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
@@ -11,7 +11,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE=""
+src_configure() {
+	econf --disable-static
+}
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index b80ddec063c0..6a681241a6ac 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,5 @@
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
+DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
+EBUILD libpqxx-7.2.1.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
new file mode 100644
index 000000000000..1ce7f1510f3c
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
+SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+	)
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT}/etc/libpqxx_test_env"
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			cd "${S}/test" || die
+			emake check
+		else
+			eerror "Is the server running?"
+			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}
+
+src_install () {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 9fae1463c092..d0a2f58ffc44 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -5,7 +5,9 @@ AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
+DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
 EBUILD libprelude-4.0.0.ebuild 1722 BLAKE2B 2b36c1e22214a06f031d3a98a97d189cb73a366cb8e96e897a1cc89a32908f4dd6fba4229112128571062ce09f4d730c0449a86067ecc2a5312edc388cb81ef1 SHA512 2f5d8c16260d0315e1f351943621b9021836596202f54397e6864e532ddc037a4374351399636c1450711d700e0d8e99524a43e4ba1d28873f981ad8ad8b33f4
 EBUILD libprelude-4.1.0.ebuild 1723 BLAKE2B a77bd79df9b56432009a6d94903891bc2bc1f207a2d3d5c088d58ac61ff1ecde897a184301aef80d9da7b10c202246ac18dea144a1d29ffeb10d2beafeff74a4 SHA512 44ceb27532b2bd81fc2d50c8258969a559be61249fb05080c350413c628e40e7d17e8e02d32c9c159f44ac0eb81c4b59d3236d39b8eaa999345cf632886f6f02
 EBUILD libprelude-5.1.1.ebuild 2006 BLAKE2B 82bffd675533d7ae41c4f660d0bfe4053b5dd820ae83337b582a17a030b807a1578be95bff26502c3e07bf0aa8048b352d79dd1a331921d45d3baee35057f594 SHA512 21deba252e8d04e8dfcf9815d54a77dadd731dc94e5bd246ea4483eb686feb93db02cd48aacf425e3cd589a3a4157e623982a83e445d4f0d9ecf360dd4aa462e
+EBUILD libprelude-5.2.0.ebuild 1949 BLAKE2B f4bbc30333ed72d5373759868880742f4f0bf68fe2b2ecc3a6a47a59963b99e33cf87057ddd56249eb7266abb79d75e69d6beabe0f0da06e86fde4c512754082 SHA512 2e3971c1395f317bf3a32fedfc73bd2e5566d5ae889fff3609a77097d87d6a72fe32b523b42c1bb5bef8e59243396bbeeea381a8220b50f431f990ec669220ea
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-5.2.0.ebuild b/dev-libs/libprelude/libprelude-5.2.0.ebuild
new file mode 100644
index 000000000000..b067890b2796
--- /dev/null
+++ b/dev-libs/libprelude/libprelude-5.2.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby25 ruby26 ruby27"
+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.2.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-4.0.0
+	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_gtkdoc_1.32.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
+		--without-python2
+		--localstatedir="${EPREFIX}/var"
+		$(use_with lua)
+		$(use_with perl)
+		$(usex perl '--with-perl-installdirs=vendor' '')
+		$(use_with ruby)
+	)
+
+	if use python; then
+		python_setup
+		myconf+=( --with-python3="${EPYTHON}" )
+	else
+		myconf+=( --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
+
+	keepdir /var/spool/prelude
+}
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index c5a64fe51ed7..b115fc98ddf3 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,11 +1,13 @@
 AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e
 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
+DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
+DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
 EBUILD libpreludedb-4.0.0-r1.ebuild 1617 BLAKE2B c628a418f913705392514b549157ffb7b26e3386d7344ff60b1f6118f3d12126b771de65fbac3a77fda0eaef465a63bc2efd83975ff68e5fff6c34353e4b8904 SHA512 fa971d8b86862e3f584cff7aac1a421896fc49723b2289b0610bdffadc04a372a7d61a9dd2c2424c386a821eaa884d6941c13028f0a5d5c172aa62146419745d
 EBUILD libpreludedb-4.1.0-r1.ebuild 1625 BLAKE2B c56a5c27a6eed2be65c14d9c634679efe5b9d171cb1e89b814ff1edb7e1ae88113a1ec81424c7cc747b6367d9e4cd3821f017a42c25dad26503574f1b00283f6 SHA512 b5631bc895aec95f79e54c1cee2c90f0be8cf346e0c54b2ee2b41f0f18373c1779a8b29890d110da6274b36ac8d721dd619e84500df0815da5d3a81715dc90c3
-EBUILD libpreludedb-5.1.0.ebuild 1787 BLAKE2B 2826d2ecb615e9b67578fa9db9af92f25dafc3fe1751d5f0dbf8836c47ff808ec2c04c99fcdc11a5bb0038fc70ed116e813fb4f2c36e3682f8a2f2e0faa78573 SHA512 59757bb18600aa48cca3743632c86a542eb2200076b0a5487313d6b4ba9437907e876deac64537551652ffbaab37cad37bedb60e8c281567650bfec84e413449
+EBUILD libpreludedb-5.1.0.ebuild 1879 BLAKE2B 68870886dbf2cefbca7697f2c565d6d1d66fd7a8fc96101afd6049880063a7768eed4fbf6660f1ab528e02bf1c8735641564f794c4ffd01bf28751c5cf306e54 SHA512 6d9dc4b0d65182ebe251a65949cdab613bd9508e024840327bbabf2113a7afeb8bdb584abbf2e37cbcb7af194d041e824994e3f66d672745d2747f32bb83381a
+EBUILD libpreludedb-5.2.0.ebuild 1876 BLAKE2B f5dbadce7ad720bc40f76175a5eb52899be785d0bbdf810b17add326ab1ca65c63e30012533dc46e7fab0e7e38c8de0a4db86dfe7f6ff2c1b49a6c1e8107606e SHA512 1e1d95e94c31ce6bd48749f1f63a57122d91a1398d7e72b2aae1287137b8afebd07cd746303e2503e428c1ef6edc4ec539a5af5f0d1c6691046a16c0b019f5fe
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
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
deleted file mode 100644
index 5bd38a6f4c16..000000000000
--- a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch
+++ /dev/null
@@ -1,544 +0,0 @@
---- 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-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
index 9e2c81a16649..13715fbe4d42 100644
--- a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
@@ -10,7 +10,8 @@ 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"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -40,7 +41,7 @@ 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"
+	"${DISTDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
new file mode 100644
index 000000000000..5e73804b50a0
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+
+inherit 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
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/libprelude-5.2.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-4.0.0
+	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"
+	"${DISTDIR}/${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
+		--without-swig
+		--without-python2
+		--localstatedir="${EPREFIX}/var"
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		myconf+=( --with-python3="${EPYTHON}" )
+	else
+		myconf+=( --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 a3fd02c3f54a..24472c2267fe 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,3 +1,5 @@
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
-EBUILD libpwquality-1.4.2.ebuild 2022 BLAKE2B 32521750921086c81b2c19c4fc1adcef691d41c91b6efb9594d6734e8bad3b8d1f167b2d24094aa07d531dc25d8100c34a83817b5edb679fbf972fa5fc06c8cb SHA512 2b45b9eb26c2e7f9a7fd9491cfb418325b4751dfcef3590f6b4624b00d849d5aa08c3ce013bcde109775c0696a41117b35f5d6c7951647a39fd6f831773a4811
+DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
+EBUILD libpwquality-1.4.2.ebuild 2022 BLAKE2B 74d84ac10f0c7810f73ef6c9a0560cb06f281cf7ae0253b46a28c0718d88980396bba45ee28337e15ca638a3e8c4ad3b3d6ad889c8de011aebf7ae5cab6b326d SHA512 49e871c6bf23b8bfa3edead430516c969b8d6b25d43e03ba3c379b88f2f07fc6ddd50174717cb169b57358094a673147c4b5bcb11e8a97ecb3cac1d89d2fc980
+EBUILD libpwquality-1.4.4.ebuild 2030 BLAKE2B 0cdc460ef442d53d4c40bd1d5529229e480d3c9606033aceeb738b6f3d4116e32c34ba2c4472c5eede949b93ddb0484540a90ecec264a673cea48816bb86308b SHA512 a3a4c6bf7f06943ab17ac9e0b4b67d6758e23a886aed6e506dfde95615f364fbffc575886680a80189b0a4a3169fa7aa326184fe628f92297edd89354ad6e212
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index 0492bf376362..1a1619b34a8e 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit pam python-r1 toolchain-funcs usr-ldscript
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
new file mode 100644
index 000000000000..e12f25aba459
--- /dev/null
+++ b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit 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 ~riscv ~s390 ~sparc ~x86"
+IUSE="pam python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+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
+	find "${ED}" -name '*.la' -delete || die
+}
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
diff --git a/dev-libs/libpy/Manifest b/dev-libs/libpy/Manifest
new file mode 100644
index 000000000000..5f3adc7296d9
--- /dev/null
+++ b/dev-libs/libpy/Manifest
@@ -0,0 +1,7 @@
+AUX libpy-0.2.5-cflags.patch 841 BLAKE2B 00b6cc57401dc4c2a807e3a46659453dccf1d4cf59b5fdf6aa61426ac0922d1be6f4658fb4736787019fbd6a3b1aaa4294e3aae7be329ff9d215565c42083cf6 SHA512 5bc9ae86ad3abe7551c422a383217a12aec84376ccf23a7ffb9aaf18b1101972efe5730cfcfd194bd6c77d5d10d02f1cde2b13295c9464f503951bdb87afd6e5
+AUX libpy-0.2.5-no-werror.patch 286 BLAKE2B 3c623746f7d97c94eaab94c75d50cae433c6a9d545ee751d2a35c2e361b2260d789fee269628416f0d6e0f060f012a4cd696cf7ea58f11ff0df63cab223107d9 SHA512 2ea9e9d3040ffcb76c49f4e4b6123a8d6d739fec4898877d2dac151d35d31f12c156024beaeb82c470d92007318e3126fd8b94f0db340db08c87cad42c00879b
+AUX libpy-0.2.5-permissions.patch 360 BLAKE2B dff3c4650d5779e8756dbd30a62a6105070ef97cc806f5de1de106f5f51fdf29b514601dfae8d645e51aa36a9914e77998f6a36560990f1f656048b19121db32 SHA512 6eced1f0d98a9157bc7efe540bbc3211b4e4c78cfce533d96e71f1503f07355665da0d715b1fdf4d9e0394cb624f93b817f90801a830bb091a19b85963ed86dd
+DIST gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz 862253 BLAKE2B a7d7acd2a41924d37c06e4908315d80df92815ed3e81973baf915951f2fcfeb4485ce690ba224cd7168537d81bf43b84efbecef8074dd3246a020e0877924803 SHA512 f01af7e17a3b7fb064bb5b7f1f75f0eca5e987a9976555734a88b7f7a18a763c620668da0628cb6bd1553a69b248bb0b91569b99cf873789c5b27700c25a479a
+DIST libpy-0.2.5.tar.gz 201467 BLAKE2B 629f650740a54736bc014abd63c729c11070d7d226469668386b6fe187a05b830b7ababa17e6c90777c97d2af5397cb1295712218626c837c1cc2c5526e957fc SHA512 8127bdeffdf218837928d6e5743156987cb5e3ca943ec3e84f1fb5d01c1c5fa387eca3b8c276d60d1eeb18fad7a9555bc54c113c976f1d5f23f779336dd6ed71
+EBUILD libpy-0.2.5-r1.ebuild 1242 BLAKE2B c49291bf0f2f40148a4260a773d2cd6ad79a9cee630e620c00321bf4a0e93d12a3ce1e80e3b452cb5c20e4ac5955655ae204a3f2cec6374a63fdf54515fec982 SHA512 c9f14cab6c3e6cfaf455b169c090bea3def6410d7dc0f6c08941838b9303211eef380d547f1cc6cf39b1350c8d2cf72483d3a65ce5c83c2dd86d543975060e2d
+MISC metadata.xml 354 BLAKE2B 8cb70562636ad858ca25145cf68283e660cc905aae1c67dcf39cf9e2b9a6fc332e62be9afafae1664f02ffa53319a8da75d132ba6ebf1302bd305081e020ea66 SHA512 ade47a31a8d334e3464d893021a1ef91c76e10bdf96305eeb1b0a188e24749cc8f1b462fcaf87edae4c71045b13da40c8dfe5a7ec8133737230d7922c3a3a7b6
diff --git a/dev-libs/libpy/files/libpy-0.2.5-cflags.patch b/dev-libs/libpy/files/libpy-0.2.5-cflags.patch
new file mode 100644
index 000000000000..be8dd1f21726
--- /dev/null
+++ b/dev-libs/libpy/files/libpy-0.2.5-cflags.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 09e6e39..9addb5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,9 +46,8 @@ CLANG_WARNINGS := \
+ 	-Wno-self-assign-overloaded
+ WARNINGS := $(BASE_WARNINGS) $($(COMPILER)_WARNINGS)
+ 
+-BASE_CXXFLAGS = -std=gnu++17 -g -O$(OPTLEVEL) \
++BASE_CXXFLAGS = -std=gnu++17 -g \
+ 	-fwrapv -fno-strict-aliasing -pipe \
+-	-march=x86-64 -mtune=generic \
+ 	-fvisibility=hidden \
+ 	$(WARNINGS) \
+ 	-DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) \
+@@ -58,7 +57,7 @@ BASE_CXXFLAGS = -std=gnu++17 -g -O$(OPTLEVEL) \
+ 	-DLIBPY_MICRO_VERSION=$(MICRO_VERSION)
+ GCC_FLAGS = -fmax-errors=$(MAX_ERRORS)
+ CLANG_FLAGS = -ferror-limit=$(MAX_ERRORS)
+-CXXFLAGS = $(BASE_CXXFLAGS) $($(COMPILER)_FLAGS)
++CXXFLAGS += $(BASE_CXXFLAGS) $($(COMPILER)_FLAGS)
+ 
+ # https://github.com/quantopian/libpy/pull/86/files#r309288697
+ INCLUDE_DIRS := include/ \
diff --git a/dev-libs/libpy/files/libpy-0.2.5-no-werror.patch b/dev-libs/libpy/files/libpy-0.2.5-no-werror.patch
new file mode 100644
index 000000000000..214d1764b182
--- /dev/null
+++ b/dev-libs/libpy/files/libpy-0.2.5-no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 09e6e39..bed335b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ endif
+ OPTLEVEL ?= 3
+ MAX_ERRORS ?= 5
+ BASE_WARNINGS := \
+-	-Werror -Wall -Wextra \
++	-Wall -Wextra \
+ 	-Wno-register \
+ 	-Wno-missing-field-initializers \
+ 	-Wsign-compare \
diff --git a/dev-libs/libpy/files/libpy-0.2.5-permissions.patch b/dev-libs/libpy/files/libpy-0.2.5-permissions.patch
new file mode 100644
index 000000000000..8e5fc2762a9f
--- /dev/null
+++ b/dev-libs/libpy/files/libpy-0.2.5-permissions.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 61bc3da..a00b565 100644
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,7 @@ class build_py(_build_py):
+         )
+ 
+         p = pathlib.Path(self.build_lib) / 'libpy/_build-and-run'
+-        p.chmod(p.stat().st_mode | stat.S_IEXEC)
++        p.chmod(p.stat().st_mode | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
+ 
+ 
+ setup(
diff --git a/dev-libs/libpy/libpy-0.2.5-r1.ebuild b/dev-libs/libpy/libpy-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..a0d5be7d1dcb
--- /dev/null
+++ b/dev-libs/libpy/libpy-0.2.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic distutils-r1
+
+GTEST_VER="23b2a3b1cf803999fb38175f6e9e038a4495c8a5"
+
+DESCRIPTION="Utilities for writing C++ extension modules"
+HOMEPAGE="https://quantopian.github.io/libpy/
+	https://github.com/quantopian/libpy"
+SRC_URI="
+	https://github.com/quantopian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sparsehash test"
+
+COMMON_DEPEND="
+	>=dev-python/numpy-1.11.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${COMMON_DEPEND}
+	sparsehash? ( dev-cpp/sparsehash )
+	test? (
+		dev-cpp/gtest
+		>=dev-python/pytest-4.4.1[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( sparsehash )"
+
+PATCHES=(
+	"${FILESDIR}/libpy-0.2.5-no-werror.patch"
+	"${FILESDIR}/libpy-0.2.5-permissions.patch"
+	"${FILESDIR}/libpy-0.2.5-cflags.patch"
+)
+
+python_test() {
+	emake GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}" test || die "Tests failed with ${EPYTHON}"
+}
+
+python_configure() {
+	replace-flags '-O*' '-O3'
+}
diff --git a/dev-libs/libpy/metadata.xml b/dev-libs/libpy/metadata.xml
new file mode 100644
index 000000000000..aa65be8a5969
--- /dev/null
+++ b/dev-libs/libpy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="sparsehash">Include libpy wrappers for <pkg>dev-cpp/sparsehash</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index f27e5bb5cd2a..b694616d4e42 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,5 @@
 DIST libqtxdg-3.5.0.tar.xz 73248 BLAKE2B 0e587e640abda9cdf55cbeac270382386be2bc26b291bb9f655d845acb381b7f65048d213039a6e7ae9cc5d03fa29911bc2277140524d73f0e005745759a39b6 SHA512 014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653
+DIST libqtxdg-3.6.0.tar.xz 76028 BLAKE2B 138f0f8bf9889c7f6aa0d4016c52d4c7745a9f3b34b53babba5d0be457485157d66884395488d4e978ba953332696b977bb60c1d04b6b0a53086ab7f3b0b4492 SHA512 8574bb6834c0a44c983e906c3d84fb5cfd6e2f40ec2ac70f4998ec5fe213aeb0d4439ff294f56c1988cb9d1b311c4e074906ba66b21d24190a911d0e643d1a16
 EBUILD libqtxdg-3.5.0.ebuild 971 BLAKE2B ba8dcbe7eb4f8441654230ebe921ceb6e22a23fa70e825746eb32a4dd4b9326d4f4e37bfa65f1648377118d5aeac767fa73fb1d814d326a9955110e77b41ca86 SHA512 f28619a05a2a9dd692e5bb9cac66ffd7bc91807c54f7fab2e70ae49f9f64adf7e11b6823ba3b5b89f593d91905fcc48381b298e55ee7390964ab48468ce9b8b2
+EBUILD libqtxdg-3.6.0.ebuild 973 BLAKE2B 4005ae0958da2945c734fe55d764206fba52eaa9aaf8e1acd068b0884e524d789cac40f8299429e0057b3e401ccc635b34728185a23ae380fe9820e8005e4022 SHA512 b9266c040e68c033e4a0dd44f22fd074d17adec1d7ec1a298bf3d244b8547eb61942f679c53a665d12c3c8b171ca6f5b0e4012ff09939ecbcbd744f001028221
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
new file mode 100644
index 000000000000..1ba3a1afd409
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake virtualx
+
+DESCRIPTION="Qt Implementation of XDG Standards"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.8.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake_src_test
+}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 3e1b163e864f..42162ead2a77 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,7 @@
 DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d
 DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
+DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
 EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559
 EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
+EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.5.2.ebuild b/dev-libs/librdkafka/librdkafka-1.5.2.ebuild
new file mode 100644
index 000000000000..86b1ca559964
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.5.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 703580ecf7b7..6d9164320e20 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -2,7 +2,9 @@ AUX librelp-1.7.0-missing-files.patch 10718 BLAKE2B 83c4621bbb5e896464d0ec3f8c2c
 DIST librelp-1.6.0.tar.gz 522827 BLAKE2B 04e608a3afe4e6e0109cc9bf753de34e9486595e33bc57387b9428bcf50f8d56177e8f849870611778636be5a58714e4640048758c83a041a354f70442d55cf0 SHA512 1bf96b700fa5ab648ed671b341ae7101fc1db4107f178abd507647afe4f12d59a94c821cc0e06998ac7b344ed41a5e3821843c722c82bf5284c6556995391228
 DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
 DIST librelp-1.8.0.tar.gz 539467 BLAKE2B 3d1d396059955d2b83a21a42838b56c6a18cde296e6b7c4beb79ba9a8d222d7e5d738419b87b24ed05da553cb16fd827e8820c4c81c50d5a3770ad745efe3ef5 SHA512 aa3e02010cdd4587ff28987f00291708e752b2e2f5f37f5a5239bda6992f55cf428cf1b6e06847062be31844cfdda6b654bcbb9024dff943d140b405ec93c0f4
+DIST librelp-1.9.0.tar.gz 540477 BLAKE2B b42e35e2f3e310cc4a978a6d2f0a127317414d93d87bede5e1bbe69e3031482b4d895bba2256668d383911e2ef55cc3086a44d8bebb15ea56c6ebd28e64e545b SHA512 3cb8cf2707cff662bd0b9100c737458b6b96820db7e362094c77cdb50455fcb944d7760921e0b758a3a6cd15d685f488a976fe909de034c289635c660caae723
 EBUILD librelp-1.6.0.ebuild 1411 BLAKE2B 5922b8be561df56c0b687cb6ffc62a43fb907034174341ac6f0fbf60edaf802d4a540ea96472444ef6cbcf7750d2cd40a89be76735a1b5e7eaa5f625ef138909 SHA512 a353bd623a5eeb17a25ff4e45296526c03e92ba8879afeb9548d9431a27c40b04b61814b8fad61d25809a08a8517a388d75602516da75cd9057e10b44eb09334
-EBUILD librelp-1.7.0.ebuild 1468 BLAKE2B 5ca89a754028fd81f9e0edea6f9499814ac2e72d5575b7fa95357dc6af1920537cbbe6587ebbf50a2eb6f15c6f2c46d16afa8b43e5c207ca3fb5b88945acb226 SHA512 245346686a1c09ebf0f891a354354a8d4be5673969bc2800b15a09dfd92b9396cddf4f86336e48f013fe7d274877e7b4f399ddfc4f6903d613dc40bf436591f9
+EBUILD librelp-1.7.0.ebuild 1464 BLAKE2B 3c5d3e7da2230b283a2f1a7e8e62535b65464e39fb1a52577133db2aeb4021a4257ea20ae9611135d67c5cefdc924923744f43882a146d4fdab064e62f00d3e3 SHA512 379b20e0fce52b9b84a338d8b12f696d9bfc4797feb82ec99782f6ee4b503e1bc5564bffc1ba4af262a548ce9dea2f9cbd4aba72b29bb940e60e9ce6d5d31c2c
 EBUILD librelp-1.8.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
+EBUILD librelp-1.9.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
index 75ccacffeaa3..bb0d12963269 100644
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ b/dev-libs/librelp/librelp-1.7.0.ebuild
@@ -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/librelp/librelp-1.9.0.ebuild b/dev-libs/librelp/librelp-1.9.0.ebuild
new file mode 100644
index 000000000000..edacd29ee8ed
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="An easy to use library for the RELP protocol"
+HOMEPAGE="https://www.rsyslog.com/librelp/"
+SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ doc? ( FDL-1.3 )"
+
+# subslot = soname version
+SLOT="0/0.5.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
+
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/ -g"/"/g' \
+		configure.ac || die "sed failed"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-valgrind
+		$(use_enable debug)
+		$(use_enable gnutls tls)
+		$(use_enable openssl tls-openssl)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	local DOCS=( ChangeLog )
+	use doc && local HTML_DOCS=( doc/relp.html )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 4bdc8ed532f9..0a6586fbf8fe 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,9 +1,3 @@
-DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
-DIST libreport-2.12.0.tar.gz 1842875 BLAKE2B 930666ec0c675a8ff457412a80511652dfa3bd3d771115506370432a7b74f3d1d9f6264dc3696c582b4a0939b2493137a18e1379eca268f25bc787a03a7d6c39 SHA512 d85c1beea330e4b21ce66b6f4acadaa132010738496a6701d161ee75b2254e629c496270145a6167e8eb81cf2204b0488aa0eb15c1e898f49aa3aec1331bff0c
-DIST libreport-2.13.0.tar.gz 1840841 BLAKE2B 822bbbfb1e03a6e486f12263fe60231045c9b2153dc743168b93c976b2db76f2bbff3c98da0107e660d713a0d9bac25bf36ee55064a15e0c72ae66fa7fdf0aaa SHA512 f650ba83bfa48d3c897ec4415d4942ed3412a55240d950d78e15b935ea71c3665cdfe1c155f3eee202911e7bb4c09a0a50fbfdc2b54f4d32d00da1a98c1fe7e2
 DIST libreport-2.13.1.tar.gz 1841698 BLAKE2B e0fbebbb557fb9fb320dea0a8face6a2eabdb0ad80b5de092e5e4dfe2a0439a4804d4ec99c1286aaafa31064496a94fabce5e26f851001eb9c3bb9989a46e4bb SHA512 6c2ea47e6efa36f23030fbe08946d1e524690e5f6279cbfdaf7c463ef71b23ae82a5e4471ddce89b35d4024f58197cef9f58a07dfcf5bbc1a9b310e39966f81a
-EBUILD libreport-2.10.0.ebuild 1940 BLAKE2B 93d61e530d0160f88733545e2283c7af8e421311a6c8665b572739acc7635aa90ba69d8b3aaf45fa59dc3d76543203dcdd1b9edccd334ea1b6fd67d9b4951c29 SHA512 cbaac321369f9a593ee2be582d0d7cd6e71b2326a825e7ef7b9afcecb73523172a77007b1e24b96e5293299cb770f99381373b16b22a2399d818687b7c1a4a34
-EBUILD libreport-2.12.0.ebuild 1916 BLAKE2B 8ec2dc277b78ab3a2c172751b43725ff81fcb2d715c6cad62431658b8f37d7ff3d0958c04e3710c12e6e5331f16398a4d8f70c29c341d5619b910556155a00a9 SHA512 ce5d6044877d9f86244152577dbc604802f1cc68378e9dc47748e9e34456d66a31cbbe0b5492fb5c4542352e277e0484d6a9aa24110285067f02f72d9fb1a331
-EBUILD libreport-2.13.0.ebuild 1931 BLAKE2B a2d753b2b0b1520b096059908128f58e26f1736cb500762161680b4052c9428b0e3a82e4d7fecebb8a388966327ba11f23c1a72272eb1faa25c64a1c5de16a2b SHA512 dc6cd714f7cc7b2a42022b3d041c5596fb5e6f19d5729e4bea60f7537d277c0ce338a00fd8896137b7da5e4338ded609feeaa674f39304ac9c8c39f262b75b74
 EBUILD libreport-2.13.1.ebuild 1932 BLAKE2B b1b0ac62d7a18a8574de59aefabc42b709e0383f709ffc3a0d237c55c7b85fbede70845062a4e5e3597de5a6628a5167765eed6df8086d87c49067b8fdfdba28 SHA512 df3cc87bb015cad4a3e806d6aa91b2c6894fa40006c6122c973e97467e00c689e8d7dfdd5d9aff152fdb46af6beafd83ef555d656c2eb0c7a6793b0ce87054da
 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
deleted file mode 100644
index 16e818b499dc..000000000000
--- a/dev-libs/libreport/libreport-2.10.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-r1 user
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+gtk python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	>=dev-libs/glib-2.43.4:2
-	dev-libs/satyr:0=
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--without-python2
-		$(usex python "--with-python3" "--without-python3")
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir \
-			econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	use python && python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	use python && python_foreach_impl run_in_build_dir default
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libreport/libreport-2.12.0.ebuild b/dev-libs/libreport/libreport-2.12.0.ebuild
deleted file mode 100644
index 4c4304d9da2c..000000000000
--- a/dev-libs/libreport/libreport-2.12.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk +python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	>=dev-libs/glib-2.43.4:2
-	dev-libs/satyr:0=
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/nettle:=
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		$(use_with gtk)
-		$(use_with python python3)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libreport/libreport-2.13.0.ebuild b/dev-libs/libreport/libreport-2.13.0.ebuild
deleted file mode 100644
index 7be927077753..000000000000
--- a/dev-libs/libreport/libreport-2.13.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk +python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	>=dev-libs/glib-2.43.4:2
-	dev-libs/satyr:0=
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/nettle:=
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		$(use_with gtk)
-		$(use_with python python3)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 250619157c0c..0251877936aa 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,15 +1,18 @@
 AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
 AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c
+AUX libressl-3.2.2-build.patch 2096 BLAKE2B 751a874e6d812ab42326ceb2b304d3910830edc50feca2ff388994b03618e0ec27f269dee43655e49e0a296967cb9f8c2bb80abdfe08a3eaeb76424de0a68fa9 SHA512 2c59af34de6608421371b1b8f8371cf27b22918370e39d3c9c70277905169a3e0f26f584cf0491ec8a0df28dfa4dce3f46250038048ba6cab58355e7afbfd2bb
 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
 DIST libressl-3.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895
 DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
 DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5a8210b2b127b7d49ef0e96e1a20a45f60e6231dcbe379f57f19c1ca8a4dde6205b1cc52ee44d17a4a21da34c98a SHA512 0204177ad0291f3fce4c77ab21cce17785d0239f2ae4be8fbdce5575cc98775186caa0e1851b211c05be07e3cc603111eeaac4379c8977e7b140fedee2551f93
+DIST libressl-3.2.2.tar.gz 3839529 BLAKE2B b5c35c85bf9914b49d828963e5089e77ec0b370227f8e36c70eac9a4c9176e90ebec1dccd19fc4d99d58caaba545b78cc5570751bd73a7488e502a9bcca2c5ed SHA512 708f347ec88f0501b5937f1efc8dc15e76a2f99a54f024e21a006349abc9305f64796f7df9fcbc875e13f999a620253b62b138d76f67586f1e432f3956da25e1
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.3.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.1.4.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 EBUILD libressl-3.2.1.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.2.2.ebuild 1750 BLAKE2B 94c6d20bb8ad277951d2eca51cd5231e871073e919a4a0d545ac65e2c2c82873035beec234fab422106f11865324fe5009c6c4178ced6c5949bacbed83f65251 SHA512 6625fea4cf20deaa6c105181d84753d6866a2a19fa4b25fe840766ee10e8547116d7e41dbaf20d5640bb936af11bd62a9d5fcf3dc8bb379e46db159d26faa96f
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-3.2.2-build.patch b/dev-libs/libressl/files/libressl-3.2.2-build.patch
new file mode 100644
index 000000000000..586e7a7a423a
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-3.2.2-build.patch
@@ -0,0 +1,56 @@
+From 9abd36e3af5876f67c633f27496ad5660ab7fe24 Mon Sep 17 00:00:00 2001
+From: Brent Cook <busterb@gmail.com>
+Date: Sun, 18 Oct 2020 22:14:03 -0500
+Subject: [PATCH] modify nc build to link libcompat objects directly
+
+Rather than assuming the static version of libcrypto exists for pulling in the compatibility functions, link the compat objects directly. This modifies the object file generation script a bit to handle the empty-case properly as well.
+---
+ apps/nc/Makefile.am | 8 ++++++--
+ crypto/Makefile.am  | 4 ++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
+index d678f1eda..58b5c0118 100644
+--- a/apps/nc/Makefile.am
++++ b/apps/nc/Makefile.am
+@@ -1,5 +1,7 @@
+ include $(top_srcdir)/Makefile.am.common
+ 
++-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
++
+ if BUILD_NC
+ 
+ if ENABLE_NC
+@@ -12,11 +14,13 @@ endif
+ EXTRA_DIST = nc.1
+ EXTRA_DIST += CMakeLists.txt
+ 
+-nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
+-
+ nc_LDADD = $(abs_top_builddir)/tls/libtls.la
+ nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
+ 
++nc_LDADD += $(libcrypto_la_objects)
++nc_LDADD += $(libcompat_la_objects)
++nc_LDADD += $(libcompatnoopt_la_objects)
++
+ AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
+ 
+ nc_SOURCES = atomicio.c
+diff --git a/crypto/Makefile.am b/crypto/Makefile.am
+index 97a84e1a7..e32ca96c3 100644
+--- a/crypto/Makefile.am
++++ b/crypto/Makefile.am
+@@ -99,10 +99,10 @@ libcrypto_la_objects.mk: Makefile
+ 	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
+ 	  > libcrypto_la_objects.mk
+ 	@echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
+-	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
++	  | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
+ 	  >> libcrypto_la_objects.mk
+ 	@echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
+-	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
++	  | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
+ 	  >> libcrypto_la_objects.mk
+ 
+ libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym
diff --git a/dev-libs/libressl/libressl-3.2.2.ebuild b/dev-libs/libressl/libressl-3.2.2.ebuild
new file mode 100644
index 000000000000..d6e5a198531c
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply "${FILESDIR}"/${PN}-3.2.2-build.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 5b7821d02b84..8b1791fab200 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,17 +1,7 @@
-AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
-AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459
 AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
-DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
-DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
-DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
-DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
 DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2
 DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d
-EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
-EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
-EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6
-EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78
 EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c
 EBUILD libsavitar-4.7.0.ebuild 1753 BLAKE2B 83e91f17eacb614bdfc25f75bfc3bf25fb79e5bf332aa3246c161beaf0894feb9d8990ffd4a5361b7f1b1a359351d2321f2f90a31fe982a6f6bcd0f8ac5297b2 SHA512 313398f3ee57a42ed7e572d6befe1f5b7da862ae8b51b88cf95cbda95f00b8bdb10609f7c507fda8a8a7198c16138489cbc4b59166d578f6c8b35d1bc70ed493
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
deleted file mode 100644
index 629e8edb51a2..000000000000
--- a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 91aa70c6320461ae65600dce954b5ffb905b7039 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 9 Apr 2018 12:36:35 -0400
-Subject: [PATCH] Do not vendor the pugixml library
-
-This prevents trying to co-install pugixml with existing system
-libraries, and also fixes the includes for pugixml.hpp to actually use
-the include path added by find_package/add_subdirectory instead of a
-hardcoded relative path.
----
- CMakeLists.txt             |     3 +-
- pugixml/CMakeLists.txt     |    80 -
- pugixml/src/pugiconfig.hpp |    74 -
- pugixml/src/pugixml.cpp    | 12622 -------------------------------------------
- pugixml/src/pugixml.hpp    |  1434 -----
- src/MeshData.cpp           |     7 +-
- src/Scene.cpp              |     2 +-
- src/SceneNode.cpp          |     3 +-
- src/ThreeMFParser.h        |     4 +-
- 9 files changed, 7 insertions(+), 14222 deletions(-)
- delete mode 100644 pugixml/CMakeLists.txt
- delete mode 100644 pugixml/src/pugiconfig.hpp
- delete mode 100644 pugixml/src/pugixml.cpp
- delete mode 100644 pugixml/src/pugixml.hpp
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5e991a7..1077c7f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,8 +7,7 @@ include(CMakePackageConfigHelpers)
- option(BUILD_PYTHON "Build " ON)
- option(BUILD_STATIC "Build as a static library" OFF)
- 
--
--add_subdirectory(pugixml)
-+find_package(pugixml REQUIRED)
- 
- if(BUILD_PYTHON)
-     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-diff --git a/src/MeshData.cpp b/src/MeshData.cpp
-index 03e5089..701122d 100644
---- a/src/MeshData.cpp
-+++ b/src/MeshData.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- 
- using namespace Savitar;
-@@ -85,7 +85,7 @@ bytearray MeshData::getFlatVerticesAsBytes()
-         int v1 = faces.at(i).getV1();
-         int v2 = faces.at(i).getV2();
-         int v3 = faces.at(i).getV3();
--        
-+
-         // Add vertices for face 1
-         float x = vertices.at(v1).getX();
-         float y = vertices.at(v1).getY();
-@@ -188,6 +188,3 @@ std::vector< Vertex > MeshData::getVertices()
- {
-     return vertices;
- }
--
--
--
-diff --git a/src/Scene.cpp b/src/Scene.cpp
-index 4612f78..f218b71 100644
---- a/src/Scene.cpp
-+++ b/src/Scene.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
-diff --git a/src/SceneNode.cpp b/src/SceneNode.cpp
-index 5c95b6f..c4782bc 100644
---- a/src/SceneNode.cpp
-+++ b/src/SceneNode.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
- 
-@@ -121,4 +121,3 @@ std::vector< SceneNode*> SceneNode::getAllChildren()
-     }
-     return all_children;
- }
--
-diff --git a/src/ThreeMFParser.h b/src/ThreeMFParser.h
-index 3394683..89da659 100644
---- a/src/ThreeMFParser.h
-+++ b/src/ThreeMFParser.h
-@@ -21,7 +21,7 @@
- 
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- 
- #include <string>
- namespace Savitar
-@@ -44,4 +44,4 @@ namespace Savitar
-         std::string sceneToString(Scene scene);
-     };
- }
--#endif
-\ No newline at end of file
-+#endif
diff --git a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
deleted file mode 100644
index 1d5744aebf06..000000000000
--- a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
---- libSavitar-4.2.0_old/CMakeLists.txt	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/CMakeLists.txt	2019-08-04 17:23:27.099395645 +0300
-@@ -15,7 +15,7 @@
-     find_package(Threads QUIET)
- endif()
- 
--add_subdirectory(pugixml)
-+find_package(pugixml REQUIRED)
- 
- if(BUILD_PYTHON)
-     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-diff -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp
---- libSavitar-4.2.0_old/src/MeshData.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/MeshData.cpp	2019-08-04 17:23:59.891051757 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <cstring>
- #include <iostream>
- #include <stdexcept> //For std::runtime_error.
-diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
---- libSavitar-4.2.0_old/src/Scene.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/Scene.cpp	2019-08-04 17:24:10.425265944 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
-diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp
---- libSavitar-4.2.0_old/src/SceneNode.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/SceneNode.cpp	2019-08-04 17:24:31.617696840 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
- 
-diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h
---- libSavitar-4.2.0_old/src/ThreeMFParser.h	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/ThreeMFParser.h	2019-08-04 17:24:53.996151843 +0300
-@@ -21,7 +21,7 @@
- 
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- 
- #include <string>
- namespace Savitar
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
deleted file mode 100644
index 1ee1e2a50841..000000000000
--- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
deleted file mode 100644
index 1ee1e2a50841..000000000000
--- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
deleted file mode 100644
index 55f2b677a7ef..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
deleted file mode 100644
index 599349de9add..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index ad4beee19dfc..b82fa7d8a375 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -4,5 +4,5 @@ DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
 EBUILD libsigc++-1.2.7.ebuild 1020 BLAKE2B 4a0e128fe3c38b560a9b0dfaae0c7082de216812457bbb2353c8fb41751e098cae3c49207899428f30a780aacdf40b9177a99ec193ae8bb45a6f396e919a8e6d SHA512 d1a6143530faa508319b099b2e862f9212fc9e091c83f5e23f400aff4249a674f6251aaeedf4876a8e3242905820f07e67d00521d852d71cf0707d0abbb45239
 EBUILD libsigc++-2.10.1.ebuild 1595 BLAKE2B 8476d67d22ba99a8c6b66a44ba841d2066a4ea6e1c5894cbea1e393f42e0fa03a29f72d0419f5f4db13f582cef1a5ea7ff2116ee62b8e7e9f587495da311895e SHA512 b797be5a64fefbc7438f838b4d6957f407ea1d8ecfbe9ce6e96679de449fe7ce6278f4ab90591810be082452c10deb0eea50780219a20ea46faf58e731be3fa8
-EBUILD libsigc++-2.10.3.ebuild 1596 BLAKE2B e38f5a9fe49ac25f0d5b169c31a742961cf2f5cd096ae950a4f9aef13c1e0f8896b67fe38da650d8fea5ae78c3a5d0b414a0ad85f0711e8a239fa04868a407ca SHA512 ca2ac8b4258bebfaa727758ba92ded9393dba38a15e8b6ec9ac6fc927af4a993cf648f62ce762367cc4edd7d0b8dde265b3ee3575463e561f07bc76fa8ab237c
+EBUILD libsigc++-2.10.3.ebuild 1595 BLAKE2B 0a9b863d248c45eb5b008a20f56c145fbdf29ecdf8251b1a76dcfafa1ea9090f32a07087a63dea42c9a5a2e954dbd363e7f3b184559c7018a5108285a4da5f74 SHA512 50109e5c11b98facac6270047abd9cde1cab31bd89b024d9f4bbe482821ef3714c924e801391ed5ee7c69027e16ffbb619d0a808cdca983cc058ab5686724303
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
index f9366ae1ce03..594c6195e8b8 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index f264491351f0..41b23ca40c47 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,4 +1,4 @@
 AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
 EBUILD libsodium-1.0.18.ebuild 1293 BLAKE2B 2d89dbca673bd4fd6e96ab0a6d3c0a593d1d1241b79eee192ed4e7fa9fe42198ffa11e6a084dd8123e2552bad7fd022b8473fd82e525cd4f1009fc7843d66d7a SHA512 ac3c70c9886ca828288d108bd977a30d77c434936eff09ff03019461328dae5142f410b10de7f04b060b3735735f474d223a3047fd0f801ca94b9c07bd10d37a
-MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
+MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/metadata.xml b/dev-libs/libsodium/metadata.xml
index 7da2eca7cb2f..2a28154ab90f 100644
--- a/dev-libs/libsodium/metadata.xml
+++ b/dev-libs/libsodium/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<longdescription>
 		NaCl (pronounced "salt") is a new easy-to-use high-speed software
 		library for network communication, encryption, decryption,
diff --git a/dev-libs/libstrl/Manifest b/dev-libs/libstrl/Manifest
index 801578a5b1db..773d3dc4dbe5 100644
--- a/dev-libs/libstrl/Manifest
+++ b/dev-libs/libstrl/Manifest
@@ -1,3 +1,3 @@
 DIST libstrl-0.5.1.tar.bz2 259026 BLAKE2B 9f2b576b1a86361f982069a1e7b1c12e0f47918637ed43add261379c195ba9ddeb5b8ca04b0811b75373235c79ff5b254a42c2e3ed360da410039a913137dd60 SHA512 c79b37aef2cf909529e3afabdf472730f9df2eb3605eeb41a74b56f1c9c43a5be1f23c7f383c4b1c2aacb81b9df1d455a3fe9ec1083d5fcabae4c82ef916df92
 EBUILD libstrl-0.5.1-r1.ebuild 736 BLAKE2B 1f87b29a0e88d58fd8a8ed52af3b036c9bd9016cbeb852bb1372ef0915ab71ae856e3178ee7c5c49bb434c4f51ec9437c1ec3c7347eb6ce4e22dfb26667c1b3e SHA512 8a3635c85bde10411e6ddbf1809f16920c84915faa7760fb1255666020c3fa655f4768a230df6d204d07966383cf85a8068f4d63f3a23f0bed8ba25405fa1154
-MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libstrl/metadata.xml b/dev-libs/libstrl/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/dev-libs/libstrl/metadata.xml
+++ b/dev-libs/libstrl/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>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 0d5376b24781..243fb4dbda8e 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1-r1.ebuild 702 BLAKE2B cd8ea4dada0945c509a92173ee42f3392631e33fcd8bf1b46f820ee4a3388ac2025477e14cdb9b6b07350a05ae7daa5bcdbba852bc6d01205ae7e1228da663cd SHA512 4d26fcb6bf6ac043cdb2e0c7d58d1681801577d7b751c27165d9da1e0100ca23775dcb17f621c61e9523e4cc09210151c7ba2482815eafbef0ff362e3dc627b1
+EBUILD libstroke-0.5.1-r1.ebuild 740 BLAKE2B 378f3d67aafe339e3b8860a726ce744a51d617adfdf6c841d961b792c31fbf554bb3076b263374da91b359727b9f25d18a4a360c8040bea05d42be8efd283431 SHA512 f18e43d3fc667fe0920daadd33a6909087b9ffa1732ad806f456b8c0f75162854a5f9789450f94106607d30b82d744c903b0a74031a3f767e02791581cecf470
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index 1eb5fa30dc6c..cb4bde34cb74 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A Stroke and Gesture recognition Library"
 HOMEPAGE="http://www.etla.net/libstroke/"
@@ -12,21 +12,29 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
-DEPEND="x11-base/xorg-proto
-	${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-m4_syntax.patch
+	"${FILESDIR}"/${P}-no_gtk1.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-m4_syntax.patch
-	eapply "${FILESDIR}"/${P}-no_gtk1.patch
-	eapply "${FILESDIR}"/${P}-autotools.patch
-	eapply_user
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS ChangeLog README
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 040d750ea9e1..9d92179d21cf 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -2,7 +2,7 @@ AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bd
 DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
 DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
-EBUILD libstrophe-0.10.0.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
+EBUILD libstrophe-0.10.0.ebuild 1091 BLAKE2B 92e16fd9289e8273722995302d698793b8534750f4622b0cd603f4096133292bb2b7da6c99f1d5f27202349bbb74446f11f55db621eb8299f3da62e2806dafe1 SHA512 60c666e19088958b26149161ab4464b786659eaa2a219ab7b38be3f7eec73f97dc927f67ca6472726e79be0773391ee1f48844ad18db6658143688709eb50188
 EBUILD libstrophe-0.9.2.ebuild 1150 BLAKE2B 307a9eb08191ad50f3c9c43d6b9ba6ad1f4ea695a9ca904355218f359a50cd4cb49d41c170b058d9aa898a2e9a37a00fa6b561928d522ee437e35ce2a15e93cf SHA512 00c14fb2236618196b874fc16ecaa8c58e12996f702c76db46ebaa179fc0920a989c3492657e85c0e54f4369acde9e1a3731df08d048bedc30dc390892a939f6
 EBUILD libstrophe-0.9.3.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
index 5757ff621942..b6501c3abcab 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="http://strophe.im/libstrophe/"
 SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc expat libressl"
 
 RDEPEND="
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 5da2d92b2b18..51120026417d 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,3 +1,4 @@
-DIST libtpms-0.7.3.tar.gz 1206014 BLAKE2B 32636be3e15e27a53de1c935144d2363a80689456bd70493b4eef38214ef1b9ef84ae43d1da253c9dd3e362d385b6e1638eace7a1f105736ca54f581a5f474f0 SHA512 bfd573f909965991e266434391de5f1e52c724e679e5580b7839032a1ee57f8d36cdec6d892b1d22fb7285335801a6fe17ea8559ea7ba43704fbf57c6a06dd05
-EBUILD libtpms-0.7.3.ebuild 685 BLAKE2B 68f92d960b69dcf47f7857c5dcffb1779ca0590f55376dfd02fcc8aa2d0d59b12e378c575d4cdf43be97693a88f48c4cd306c0eb612d63e475a28381f4ba7221 SHA512 59ab00ed93f3fbcede655b7329ed028cc8cb25dc0f28234bc11b083916db6deaf821a82413f416b8811c4a67f4173d204a2a0efc0e68238cc9b83cc8ab970dbc
+AUX libtpms-0.7.3-Remove-WError.patch 479 BLAKE2B b0cf706227212f8cdf15b41ae516cb436ae21248454251121778c785a09ff98ac844ddabd5bbf4426020c7f5925c5cc1d3913af4dcc37f0d0c6beb136ff28a84 SHA512 b69c13d8c30fce436cecc091bc1bf201ed0ca049fd1f4a48af24b9cad7e7fdf8f7eff951c941ab0e93a94783e680ba3c7ab139e7283297d325ee016984787534
+DIST libtpms-0.7.4.tar.gz 1212986 BLAKE2B ff34a9c35167a251eb8ba222255f6be316503d67dde7fba46b6cbc32a1f4eb5ff5a2bb5f0c21963b8d879481f6f4b09646e8e0c5fcddb12cb73309c47505070f SHA512 5a396a7e8273bed1159b0c48d2bf9f02550fed06656240e336778587b7fbe53859dab8f2ba479683e02fedfde4260a9083641be161aec0cb38a605399300997a
+EBUILD libtpms-0.7.4.ebuild 742 BLAKE2B 8dbd305866a715b3191cb61db3e9e16a335f89a2d9c5f1c55e11d56cb41818d95c730598c3dd66113321b807e9bc5a1b2bcd9093f139ae1f13aaf5ca455775da SHA512 efebeca4aa086bf63dce3a493959a66326b5be2053a3914c8f914595385f046991c6d23413fa7a3f3ca7aef7849f58bbaa2d53cad258de0ad930d8b50b87d28e
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
new file mode 100644
index 000000000000..fe17f898f5e6
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1bb45d1..147aa84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,7 +283,7 @@ if test "x$enable_hardening" != "xno"; then
+ 	AC_SUBST([HARDENING_LDFLAGS])
+ fi
+ 
+-CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
++CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign"
+ LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
+ 
+ AC_CONFIG_FILES(Makefile                   \
diff --git a/dev-libs/libtpms/libtpms-0.7.3.ebuild b/dev-libs/libtpms/libtpms-0.7.4.ebuild
index 1daf31882dc5..e11a466ade7a 100644
--- a/dev-libs/libtpms/libtpms-0.7.3.ebuild
+++ b/dev-libs/libtpms/libtpms-0.7.4.ebuild
@@ -17,6 +17,10 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.3-Remove-WError.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -24,9 +28,9 @@ src_prepare() {
 
 src_configure() {
 	econf \
-	  --disable-static \
-	  --with-openssl \
-	  --with-tpm2
+		--disable-static \
+		--with-openssl \
+		--with-tpm2
 }
 
 src_install() {
diff --git a/dev-libs/libtreadstone/Manifest b/dev-libs/libtreadstone/Manifest
index e73d9b8f2af3..aaedbe2eebe8 100644
--- a/dev-libs/libtreadstone/Manifest
+++ b/dev-libs/libtreadstone/Manifest
@@ -1,3 +1,3 @@
 DIST libtreadstone-0.2.0.tar.gz 364127 BLAKE2B 803ae1b61be62b067219198de526bb5e23a2e25f91ca928a7e92a83222f3f921835310f2a101c29309889129d15c872e679e4a5779747db5cdf87473f781406b SHA512 dfa8a592b4dbe8106716160e3108ba62a24e15d9ec827a4086f95db7dc8216c4d571c065f0e6773776693a29cca3aee29991b95f9aafae20d175403374a96014
-EBUILD libtreadstone-0.2.0.ebuild 372 BLAKE2B a59d4b0e4ff5ae0c25f335b7430d9bef65632c1290d3aa41b86135572ac489f1c3a26c34acf9d60d0bccc0d347c462cc28042d3fd5fdd7888d3c3d961d2f4b70 SHA512 449f1d448cc087a05ed86d3f9a3ab97ed60b55e0c9a420f55cda1fc9539379aeebd6b89a228f5af65bb6c636e805606ffbb8d29ff824f886e5b53df84d136f77
+EBUILD libtreadstone-0.2.0.ebuild 487 BLAKE2B 166806d0e4470b2b7c0ccd444c85c53216532d824775e5883d8d1896b7ce89be473b4706bf2b126e9e47916f6f194968ed015a6d738a6908c9d5e768781a2b52 SHA512 ab34d9e622dd35ff0d2ad3b709ad89afd4d3d94355226b1f26f31975d7c8f50101258dcdd1a4e1d6dc52f71374df11166af7004a2edff0466450f1fd10f80f9a
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild b/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
index 1ab31ea5b9ff..cb7f1d335b75 100644
--- a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
+++ b/dev-libs/libtreadstone/libtreadstone-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=7
@@ -16,3 +16,12 @@ IUSE=""
 DEPEND=">=dev-libs/libpo6-0.7.0
 	>=dev-libs/libe-0.10.0"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtubo/Manifest b/dev-libs/libtubo/Manifest
index 598fa8148f46..4df7cfe2d8d0 100644
--- a/dev-libs/libtubo/Manifest
+++ b/dev-libs/libtubo/Manifest
@@ -1,3 +1,3 @@
 DIST libtubo0-5.0.15.tar.bz2 389945 BLAKE2B c43122bbba766da40130ea06e3209be47c42003ea2955b66c10d94f2e977d573040d0d7c41485b403a471966ff077033c9e4de0d3561ad73eb9b78cf79074014 SHA512 148147ef30b4f803ed3e45d07b85ce9fe68750938fd6a1f5e87f08e1da41d633b99934f0766ba0f62c793bd664ab43335e273068bbae1d2fe06f0cc9825d1d98
-EBUILD libtubo-5.0.15.ebuild 555 BLAKE2B b7b7053e6095a9095e36645a84c3bc76e74113a63c633e36d7bbd7b416a9030476e3a2f61d99b2b2422278163e9f1e0f937ba5f4778c1c6147196195befb8875 SHA512 e45aca60e609ac149da4eeae05bced23683410ad9eaa89aa1d4fe7e14c44ddb221f148b5c2bb23db262330b9edac79360da068839e5d07eb5982e85fa4e7c6e8
+EBUILD libtubo-5.0.15.ebuild 506 BLAKE2B ca2e26da6081c42d41d38c0ef36d44632ecc311267571aedf7ee686a2388fd4e2fdf1977ed1dd0247490d3135979f6fcd119646486148d44f61d13fe4b993ecb SHA512 a5aae5ea8ffe88cbf0163126b34f49c1ac369ede77f8101c734182beac42a4e2ea324461431ff68ed0d65be118f02198b789ffaa091a90dfb58579b33ab8c295
 MISC metadata.xml 239 BLAKE2B 3db5d07e4322fa5b0559623be6edcd78840caf77d64fcbd2bf4eb74d5fc2850e9e6287afbd59cc7d1a01ce4307462e37cb3158690de39be8f0294fe6e11f7201 SHA512 b0230e897c2fa3dfef69e8aca50d4775aeaa9f3c41986585ddd2f2fc0f8913221b2d6b57508aae6322b7b2916d05d2423f45de9dda9b9ef94d0fd753490ca248
diff --git a/dev-libs/libtubo/libtubo-5.0.15.ebuild b/dev-libs/libtubo/libtubo-5.0.15.ebuild
index 1cc59cccfbae..c6feb05d374e 100644
--- a/dev-libs/libtubo/libtubo-5.0.15.ebuild
+++ b/dev-libs/libtubo/libtubo-5.0.15.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
 MY_P=${PN}0-${PV}
 
@@ -13,19 +12,16 @@ SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 233f44313971..17f319b52d4a 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,4 +1,4 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r1.ebuild 1185 BLAKE2B 3c2e9a61874b7dfa95764572619e8d6500a71fea3c6b6af7a77dc9eeebf5d4808e0c90e7c54c4197b8ac6fe75c9afc3e75976b188df498d8ba77f3abbf0d672a SHA512 18dc8023dcce33b585b18a8fb1e365fe84e9faa384a66b6a328a0fda493ba433578a013e2bdc81533be47822191b3f394fed5bd6b2a01e7300cb5cb695b4d7f2
-EBUILD libucl-9999.ebuild 1185 BLAKE2B 3c2e9a61874b7dfa95764572619e8d6500a71fea3c6b6af7a77dc9eeebf5d4808e0c90e7c54c4197b8ac6fe75c9afc3e75976b188df498d8ba77f3abbf0d672a SHA512 18dc8023dcce33b585b18a8fb1e365fe84e9faa384a66b6a328a0fda493ba433578a013e2bdc81533be47822191b3f394fed5bd6b2a01e7300cb5cb695b4d7f2
+EBUILD libucl-0.8.1-r1.ebuild 1242 BLAKE2B 16135c6e37661c78ccfd62218b3d1ac08f782d6c41e391838c859d563675931297eaedeeec83c1c0c1940dd45b6f2ee5e006c8c073238a3c732a4e1a5eea3d6c SHA512 5247ea70efaed51aa54b3724d92f5ab46a7093db85c1b064b7ef4319b94bbd9454422e777b029bfe75114080d2d5c48fc41b6f4cf773e883bdff9da397bc4164
+EBUILD libucl-9999.ebuild 1242 BLAKE2B 16135c6e37661c78ccfd62218b3d1ac08f782d6c41e391838c859d563675931297eaedeeec83c1c0c1940dd45b6f2ee5e006c8c073238a3c732a4e1a5eea3d6c SHA512 5247ea70efaed51aa54b3724d92f5ab46a7093db85c1b064b7ef4319b94bbd9454422e777b029bfe75114080d2d5c48fc41b6f4cf773e883bdff9da397bc4164
 MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index 3a7e1f46c4f3..c4c4911fe043 100644
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
 
 src_prepare() {
 	default
+	rm tests/schema/{definitions,ref{,Remote}}.json || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 3a7e1f46c4f3..c4c4911fe043 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
 
 src_prepare() {
 	default
+	rm tests/schema/{definitions,ref{,Remote}}.json || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index 72ac5f535205..72b528abd7b8 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -1,4 +1,6 @@
 DIST libudfread-1.1.0.tar.gz 33506 BLAKE2B e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e SHA512 340a03fe90d26a8a5c78e1e4f558a0b448a14332a661494f44af7de3e6c98cd219125e19f69d2a611ecb4870648a5d5b55d794e665eb8ec4192c0b499a0701ed
+DIST libudfread-1.1.1.tar.gz 33546 BLAKE2B 2a9781d2db569ca5787b0fa27b75b790d21b78454727f7377fde511abe2426912d44fd14fc6954b59e8a6b152a1f4ca95dc0b4759cc7472490f42c0158e1f418 SHA512 7c7a4553f2cea82a4496799376380ba75285b82cdf37e701d28d723d760e936b7e625223cd162bccc5c65aca3ef721c6af839bd4c75928237cb3c77eaaeb23db
 EBUILD libudfread-1.1.0.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
-EBUILD libudfread-9999.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837
+EBUILD libudfread-1.1.1.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
+EBUILD libudfread-9999.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.1.1.ebuild b/dev-libs/libudfread/libudfread-1.1.1.ebuild
new file mode 100644
index 000000000000..f4fb055b98c6
--- /dev/null
+++ b/dev-libs/libudfread/libudfread-1.1.1.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 multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Library for reading UDF from raw devices and image files"
+HOMEPAGE="https://code.videolan.org/videolan/libudfread/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libudfread/libudfread-9999.ebuild b/dev-libs/libudfread/libudfread-9999.ebuild
index 6dd66e41c5cd..f4fb055b98c6 100644
--- a/dev-libs/libudfread/libudfread-9999.ebuild
+++ b/dev-libs/libudfread/libudfread-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 1aa98eb5e2fa..2e1c3244039c 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,5 +1,3 @@
-DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd
 DIST libugpio-0.0.7.tar.bz2 300015 BLAKE2B 430a17651f3c443424694d50817e562ab3c682ae2006c14d2ca46ee3078993e85214a0ca0b9323d148ca3aedaa758985cf5e2e45527e1d1278d3a36c3648ecf9 SHA512 27f8b00b13b4865635fa26e9b14c7fe217ee005c316500f0f344268d82f8d2858def524bd5cee11e9cca9c2a534a50546d5fc3504ecd1f88bd96c6fbefe1586e
-EBUILD libugpio-0.0.6.ebuild 605 BLAKE2B 48b6c2faca3a050d2624321f70507e56926b428d2bc11445a21d9b5a076e2b5059945c02e9bcaa22814291010504c0eb1878026a1efc1d6590dc9c655916d9c4 SHA512 346a2fad0ef0f6c1db939989520a7e8c290aa2399fd1a68f100c4826298147068ed4a8de249a7e17aa6438420efcb3151ea9a1165c235aff578493e5e7f27640
-EBUILD libugpio-0.0.7.ebuild 607 BLAKE2B c06a1642dcfefbc37c1a9a8c5493fc9e437f7f1625e54d4cfc323a1aadf5a6662c64571759949573272114c49cdab7b8d4a573f8453d6f2955f3964667d2c964 SHA512 f4256423ad931dfdfeb91654c44853d544b12775dec0e29c0a44f03a3bd200f0f8b210d887b9561dd90c769a7002d301af743a9665261f4eaeaa8a3cdd81b218
+EBUILD libugpio-0.0.7.ebuild 605 BLAKE2B 0dfdf4c9244fd34a79ca8713c6503a16beef07851b5bd1f89bebcbd555793146dcd9edb20f1a24e9d7d9edb5465192c3a2a223c68eb5d8503d4850e973543f96 SHA512 daf3dedd5f830e04ed23f087f3e10f8c15ae77979abba53cd66206260b1bc51987ef4f41fd05dc2c40d46198b12b8e399f5cf1cfc5a3f6a46810b8814d58e936
 MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14
diff --git a/dev-libs/libugpio/libugpio-0.0.6.ebuild b/dev-libs/libugpio/libugpio-0.0.6.ebuild
deleted file mode 100644
index 21229f6f0191..000000000000
--- a/dev-libs/libugpio/libugpio-0.0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Lib for the use of linux kernel's sysfs gpio interface from C programs"
-HOMEPAGE="https://github.com/mhei/libugpio"
-SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7.ebuild
index 39f1fe2de5e7..f36b3a392322 100644
--- a/dev-libs/libugpio/libugpio-0.0.7.ebuild
+++ b/dev-libs/libugpio/libugpio-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
 
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 8b3e59907822..271900105709 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -5,5 +5,5 @@ DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39
 EBUILD libusb-1.0.19-r1.ebuild 1579 BLAKE2B 3b00f91164578403ec4979817fa3d8c83af1f43dac4cb948168696cb04003ec5ef2238740b51710cded491c8faf42bd88cf40ce9868d8575ea62926c0f863e39 SHA512 7b1fcb903de409c4411e50e3e57f60169fa554e3a7004ab2cc9882a3210225a38b8fda5fe89487f86dd7743676a72ddd8f61729d0f69062faff397a24533637e
 EBUILD libusb-1.0.21-r1.ebuild 1609 BLAKE2B 559d47334b5fd2c0db4edf47e18c8a62b21a0bcba8ae79ccbb221710ae0f49c1969a8f35faa7f993f4f959540fddf137b35153cce53ffa18adf213bf68c85e8d SHA512 a8aab2d2a224cf9bae1e8cdaf8ec2640a1fb3337e9c003d6b7222300eb38d7d31cbbb8ea3e9ca6511e49c7e696503408b4b0f5ad7262d1b671aabb392c3d6e65
 EBUILD libusb-1.0.22.ebuild 1601 BLAKE2B 9aea4268a1867da5a882310840ec7be499d226aabc9a73754f0151b925e14fb1948dce1f36a7bb0e2e3b2d908da5cd90b793b453dc086f9ed177911218d8955a SHA512 72dc67e74bea8a8ba876a4332895a71ec461cff5cb59bc07a04693b6fddceb3b3fa1c33fcadd10519fcedcdd7fdf8c2a9e9a6900152782dc5f39e957d78a8c6d
-EBUILD libusb-1.0.23-r1.ebuild 1665 BLAKE2B bfd0d4be723bae49cdcdab6e04f61c174e50cd10805bbc7b051766639f7cd804481da89fc79705999e5ce25daf5cf71d143b3d984296f0de7f8fd8a419168d29 SHA512 8e253aa82d3865b94f1597b256c53a8170b73a3e959967bf62d09dc38d135e01a64943a5478641e0426e0ae510d41dbeec96379a8b90006427d8401999dc090e
+EBUILD libusb-1.0.23-r1.ebuild 1666 BLAKE2B acb498cdb1682515dc67021ded28199f0bf3f5313681c6f0cba3ed847fa7afe4dffd132210d9ee667cba6ce46b4ecf4943b9fc2cbd78dd5baefeac1516eff76f SHA512 4f2f4aedafdb2e0d9aaaaf9385663b870b030d0a8ca8e22aa5901c811e97b0fb4eebe017157ff4bee6c9165e509338834059a7af051724f7d237035538746c57
 MISC metadata.xml 335 BLAKE2B 8d1673cd194774a9e68e0f7458cceae03774fc5601925758a96406da4c41e9a399e42117b31b2dd23bdaf8626bfad3deb3c0a6c9b8af882aa3b4724a5bf017cd SHA512 e1040f513f81c769094c6b10e3b9bc4a64b55d281d9d97c8f3d33f1e95681b4f85070fb9731567629636b83243420320d63afba64ec7541c605f91d693f76ce0
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index 8aadb3658e98..565cbb6a7d73 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -10,14 +10,14 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 multilib_src_configure() {
 	local myeconfargs=(
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 07edfa3fe6ea..c003c49d8ed7 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,6 +1,4 @@
-DIST libuv-1.39.0.tar.gz 1272565 BLAKE2B a5ca826f99f2b7fc1736463df3c455caf2b63c8915fba61edd7b418639040910dfab6e170a089da0c18cd928d3b80c586cd10be4c5331a924a37105328960ca5 SHA512 b6aca197cbfc96125321ff071f6b2f3e56e99f85db8db6e20601019eae08056b42330ea7a73aa8c9960d142a1c8209910bc33050527f6fe0afaa8f7ed9f54066
 DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
-EBUILD libuv-1.39.0.ebuild 1222 BLAKE2B 1ea452b11211781bfbb0fb7566f737208a9ceb288b41f613ee1c2189fca091127322bbfc1e4a8f71bd6e62527bff66bec218cdef398f31f0d0f05d69ceadc318 SHA512 5d9a665b8267f7cf058f6f3b3afe4de75e214973c7a9d8d9c0eecf062f60dfb30de805e4ab1ffff02238219e70ec7149ad554ec712a5a759503a0a9e9c6a49ec
-EBUILD libuv-1.40.0.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
+EBUILD libuv-1.40.0.ebuild 1222 BLAKE2B 1ea452b11211781bfbb0fb7566f737208a9ceb288b41f613ee1c2189fca091127322bbfc1e4a8f71bd6e62527bff66bec218cdef398f31f0d0f05d69ceadc318 SHA512 5d9a665b8267f7cf058f6f3b3afe4de75e214973c7a9d8d9c0eecf062f60dfb30de805e4ab1ffff02238219e70ec7149ad554ec712a5a759503a0a9e9c6a49ec
 EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
-MISC metadata.xml 1392 BLAKE2B e4e8980feed751a6ddc0284d1bc0e56635707adad5ccedea3a78c9a22b0ef700f7554a62d7edc5a2d824dfd66036937e9056bd9db7cd302c5028469bbebbd3e9 SHA512 d2d709b7c1cfa4d83957365d62bf7fb95e1948129f499a907718228c067d871212c9b16f8272f000db92aad8eeb35505dd50a08357b8ae07dbbc9a4fe8534b3b
+MISC metadata.xml 1317 BLAKE2B dfa271e354ff7c8fb44eb02c8513f9069ff97f409caba0e171a598625732561e41208c61b1cd923f0d920cb7f91b982520c35f2306743b259b51c92247735e64 SHA512 43c3692fd4f7d9ab1e92bd6318782135e6e359c01da018525882f0ccd368814787203e0fedf650a48e3d57bff7f59d3d8418a7d2f72eb3ee061da7b5fb74d67b
diff --git a/dev-libs/libuv/libuv-1.39.0.ebuild b/dev-libs/libuv/libuv-1.39.0.ebuild
deleted file mode 100644
index 2bff012b3068..000000000000
--- a/dev-libs/libuv/libuv-1.39.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		cc_cv_cflags__g=no
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
index a9a8ca340c4c..2bff012b3068 100644
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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/metadata.xml b/dev-libs/libuv/metadata.xml
index 125e4a565071..79d3a05ac5ad 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		libuv is a platform layer for node.js. Its purpose is to abstract
 		IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems.
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 856e88aa6bb4..74222fdc041f 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,3 +1,4 @@
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
-EBUILD libvoikko-4.3.ebuild 944 BLAKE2B 4c9c0b33652517e7166a0cca18859837026f53e1151b7b48fbe5be41fba4dbf342c1d33f5cb36438dee736eafcd13679d0494b52e1f124615c979528aa6d6b2d SHA512 8958012840c2a1f1c8929885e204bcd40d7a68644e445cc83a3f671ad97d8506bd7a678ed4e7b6504b3247c070107b0b8dc40a1700360fbafa539dbc13f122a7
+DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
+EBUILD libvoikko-4.3.ebuild 1177 BLAKE2B a74dbb458f4be2685600e74597895635449042788bcb02f329759b659db341ac96d3382aa0a74622ac2e4f8f409af6b8d283161c841ab1bb5b68b97677b1ded2 SHA512 59aba71c46737d24414adc1ea9fbe7c7b9dcc89d14f136caa91cc97260b9de57a9d1f391dc8660cdb90d7d1c97066babd3cf45f150f9adf8bcf27530eab136a9
 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 d67f3b790b32..f4f7cb263a7e 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.ebuild
@@ -5,16 +5,18 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
 
-inherit python-r1
+inherit python-r1 verify-sig
 
 DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
 HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/${P}.tar.gz.asc )"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="+expvfst +hfst"
+IUSE="+expvfst +hfst verify-sig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -23,6 +25,9 @@ RESTRICT="test"
 DEPEND="${PYTHON_DEPS}
 	hfst? ( >=dev-util/hfstospell-0.5.0 )"
 RDEPEND="${DEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
 src_configure() {
 	local myconf=(
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index beca70622f44..9a885ca1924b 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,6 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
-DIST libxls-1.5.3.tar.gz 442217 BLAKE2B 4aab9acfaab96cb25e00ada599f607e5f448820d9cb32605ccd51454fd9f819c1426810f300fbf4a1c7523d5409d6f4fcb08e827c95775f3ec95bc65d7f8315a SHA512 75943e7bd3f1dbc28cc50ff7e4f21a9b6a9c97299c7594e0807b06e0bca9cca3d83f3e52086950422d67f175ae0c7c677222a1f716c5297e2f072b8e7b4fc52d
 DIST libxls-1.6.1.tar.gz 443736 BLAKE2B 47ed31bb16a65c764ee5882435ce11701e51b6ee5f03aa57ee7991e5445dc477143df48d757c618043a1abd864c46dacedeb1a18a608db1d5ae2b8fcab4a712f SHA512 99d4aa911bc12a52698e11c0592ed8ecb16fa055d4634e6bcc3e0a3900fd8311bade70d2cc8d2f60abbe72d644b6f30757b284544ca589e85c35eeb6f158b8cd
-EBUILD libxls-1.5.3.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2
-EBUILD libxls-1.6.1.ebuild 680 BLAKE2B 070063ec4ff0ad863a4b25731aa662a80f6e715e784d29506fd393506164f2d1d019ce10c9a1b030e767717d2dc2c7265623f05dab03efa2b7871b62cbbea5ef SHA512 d6fcef38bf9f374e22d4c2f3228a1e446d479bde04293b854f5603c5dfa93dbbb2121b521623960d2caf29f66019b6f01b746742e529465b125976631ba5247f
+EBUILD libxls-1.6.1.ebuild 678 BLAKE2B 8d2bfb9b828ebb21d08cbd23619923341f2fc735c1c544ba25930166fbf49f690448ed41a39e34589d56e910237173a33cefa52b09ca3cfd82abbdd143ec80f8 SHA512 56cc8948dd2324208272e4add158544282471766cbaafdd4ec8d1d9ab5666e61e2c5d4347dc42e101eb2e5acaf930bc0343d987ad35941a0d6757073d0054a0c
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.5.3.ebuild b/dev-libs/libxls/libxls-1.5.3.ebuild
deleted file mode 100644
index 4d19444a5b7a..000000000000
--- a/dev-libs/libxls/libxls-1.5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="A library which can read Excel (xls) files"
-HOMEPAGE="https://github.com/libxls/libxls"
-SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1" # libxlsreader.so.1
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT=test # test driver is missing
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
-)
-
-src_configure() {
-	econf \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
index 62b7241386cd..806445dbf160 100644
--- a/dev-libs/libxls/libxls-1.6.1.ebuild
+++ b/dev-libs/libxls/libxls-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 46f232f217ec..df2aa706eb11 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,16 +1,11 @@
-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.10-remove-TRUE.patch 942 BLAKE2B bd5272551189d21162366318b211965aca2da947e5bbadaa8a487821369c3f552005de243c4b110392908277144317bd64c86d8641b972cbdb338d7eaf93dd08 SHA512 6abc43b95baa5540c78435654f391858c8e72667afdf00c993907510204441aee4367d1d8a038961e65e9d4d25ac8d0c4f5b7a2ee8d8357737dce5b643898502
 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
-DIST libxml2-2.9.10-patchset.tar.xz 71584 BLAKE2B 4925a28570ed4f84da0407c3ce5b257d0959661855792160e4c534125fe0bbfa3749e7fc43b6c91a17206ac08a85922f4158bf40164c8a17ec940bf12b7dde1c SHA512 cd5a6aa86b6cf9ff852922ecfa23f34edeecab10a0e6d1bcd4dca56a6e17713b10af9387c7a6276bfec612f1d44fc06c16a7bdcab01ef9080f4dd10fab253b93
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
-DIST libxml2-2.9.9-patchset.tar.xz 16792 BLAKE2B f761b5cda41d57543dadf2cdd8915b69727a818f31badc1092903a9e4341b807852fed0887e9ec7a06a0c19c4a49f9afc2f3c048947f21a09006bb51ef8399ef SHA512 c8c0ee6d0a2833e5664aa7549999f8ba63b9f0bbfda4651050eeee7d3a958c33ef55daba8cfb1ca73ebffeb44d411b5f4259fe6e11ef0204ad2deebd1708ebfb
-DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f52eab6d8d9b96dc91f03a84baa132abeaf303a836ff9bbf04f832432a036077316c464398e433c9779d8519074b SHA512 cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r2.ebuild 6806 BLAKE2B 3b71125772ee4351c1c6870796cf204456f1f3d9b1d532e7f8625d6b77ca9e0f159d4d90907b08a33a9dba24eeabeb5843784d77d682360d66469bb2d0640e99 SHA512 ddd6ec3ccf0c0b6744b71e7c2906c86d05b721c7ad6c57266bfb9717bb96f612690b3270be675d684e60a6d12450040748bdfecb4b15c44e268726ab407eff2c
-EBUILD libxml2-2.9.10-r3.ebuild 6809 BLAKE2B 35bc0c4630c0f9ebd3c8da1b90b26eb33ab7388c62b95a7c2f4975d3d4932e654c6fca345cd79fb06acd347938bb4bdf1c9338bf4d0bd057f09022bc380fb3bb SHA512 509a4df958b37b040d4fc674311523f9c74dd310377a066ff9d094fa443b2c6ea6d318c77b674e9854f3c4661c5fbad6a01a38be3db82f36ee873bd4353b7083
-EBUILD libxml2-2.9.9-r4.ebuild 6933 BLAKE2B 49187c14be3109743739465ec89ca0bb01e6982d1dffcb8f68de2d55286c41262552abee8d01c774351f518f1eb723a84bcbc8a34e9eb76a70690b8153a83003 SHA512 5249bfd2def69de21b7b94b3134a7fd4102be75ede637c1df35d22b99dd362e83f7709e7adeb68b6009f7ad23e45a30143132e4af3f28047aaca7b549aa74b0b
+EBUILD libxml2-2.9.10-r3.ebuild 6855 BLAKE2B 1d0f7df5292447278e6a4d69cf8604b7a60a2b55b171c22c76c118b3da29f8b9831d1a0840930c9dcb3bb063bf8451aea163a4a345d3def3147ed716fd50ee15 SHA512 e223d55f9f854497ef3d50cf1caec72e0f4a27513517f275de8838c0e550c9fc0ad0d7f4476b9a1355076df16f1db4c543dab207f88c7c2d93d2a084ca1be0eb
 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
deleted file mode 100644
index e87dcdedf88c..000000000000
--- a/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch
new file mode 100644
index 000000000000..e405feb37c36
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/751922
+https://gitlab.gnome.org/GNOME/libxml2/-/issues/202
+
+From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 10:27:23 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index ad4d8a63..ea1fa99e 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
+-- 
+2.29.2
+
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
deleted file mode 100644
index 2993851ec4a0..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="xml"
-
-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 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patchset.tar.xz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${P}-patchset.tar.xz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		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
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
index 360bcffb2024..916abdd469c6 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
@@ -78,6 +78,8 @@ src_prepare() {
 	# Patches needed for prefix support
 	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
 
+	eapply "${FILESDIR}"/${P}-remove-TRUE.patch
+
 	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
 
 	# Fix build for Windows platform
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
deleted file mode 100644
index 6e250aac8ffe..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-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}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${P}-patchset.tar.xz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# 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
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		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
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 75fdb62ab7b5..04dff08c9cc2 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -3,5 +3,5 @@ DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40b
 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
 EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
 EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
-EBUILD libxmlb-0.2.1.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
+EBUILD libxmlb-0.2.1.ebuild 1260 BLAKE2B 25c67b3396fdcea722a2263f25c4be5c5912f443edd717adc6646879e698b178b2188e38bfb58cca63040538854bf62c00a84b45e55c0da0fd7022ed86f9d873 SHA512 8710006775f27af03c84e5f0b950e76df91f2ca6b1e64f4ac048ea89dda764dbbfa727de1696283af501a145eef0198f363b0c97c018da43b7291fe5b397c065
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
index eef8b51f8641..30f41ec4d836 100644
--- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # libxmlb.so version
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc introspection stemmer test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index bcda6e9f5fbd..d4d1116bde3c 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,10 +1,3 @@
-AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
-AUX libxslt-1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8
-AUX libxslt-1.1.34-simplify-python.patch 7174 BLAKE2B dfccd03cd286b1cedcce23234a7e5e1edceee7d41f86235c9ca55d9f9110a8a5f9314c169a26b8cf65b95e26d03e01d21ea7fd437f8aca70356897c048b76710 SHA512 55028c59048eb218dcff6e719dbd8a4af5874ef8562ca2cb6ebafbe72a123785cd5a08d3ae2c7fd8e49030612d1f7cddb5d525b4e3b07d141aebd775a8a19068
-DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
-DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.33-r1.ebuild 3476 BLAKE2B 8c01bf27c646b31949d5c7ae74ad40df43ddc227f885757a331901c5d055f5d3d9fa09593556dca3a8f49a73f48981e8988d2756252feb7255a23dbe905e83f0 SHA512 4656d28fdd1b1ef9f6145a7bafe01e44a6c77480bd966958e48ddd4911ae43663a56e7365f5e48639a28f4e58e966616ff5bc7bc81fe2e0a3c5e02d646ac44db
-EBUILD libxslt-1.1.34-r1.ebuild 1569 BLAKE2B 53889dddfff8f89a8e06131a57c2e48d1f6fe3a0e8799dc5241b29f74513a2fcc52a130d15386710fd3334bc870ed94cb6d1c0aabf1b6dfceaa98b3c5b341ca6 SHA512 9e7f57818be3dd997db77a940a8039b34dbc99d6201d4c90c28dcce59836658c17e4ea30593b7cbaf8cee237b695fc62cf45b594e68e480b24bd9bae736b48c0
-EBUILD libxslt-1.1.34.ebuild 3297 BLAKE2B b84091f764ebeb66ba56333d86f23704a6bb3a9ce6aa0b70e4d8aee00e3027dbe49f57a395bf8b1f97121e3e382c08e8c7e5f624b3ad49d8a5af89597ec626f8 SHA512 5a4249a65ad9536b6f842789e30070697f79f9d0dbb397a63bb7064dad18afccfd9abd3ab60a145be586871a82df4eb3d576b8d52cb8743e6857a54edb87da27
+EBUILD libxslt-1.1.34-r1.ebuild 1565 BLAKE2B b8918be6938410d428245f337972801959edd442487ce335d4c57f9fbea27bb5e361b9e1e39f85385ab9d245f54062ba1dac1ecfb0cc20d84c67b4177bcba6d9 SHA512 21ed88bf6a0639304cdb33796a3c6df08725644ce563a146f670014a31cdf5210e113080e9c695a2615509befa590bfdea9c70f265fad8c1a9c6e31c627ab881
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
deleted file mode 100644
index b30a08406d31..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 20:01:14 +0100
-Subject: [PATCH 3/3] Disable static module for python module
-
----
- python/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/python/Makefile.am b/python/Makefile.am
-index cc13c62..62afd1b 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py
- pyexec_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_CPPFLAGS = \
-+	-shared \
- 	-I$(top_srcdir)/libxslt \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libexslt \
-@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
--libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
-+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared
- 
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
--- 
-2.6.3
-
diff --git a/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch
deleted file mode 100644
index d5a4401afd61..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 17:49:07 +0100
-Subject: [PATCH] Simplify python setup in autoconf
-
-AM_PATH_PYTHON does most of the job without using pkg-config as expected
-from the rest of the autoconf script.
----
- Makefile.am        |  14 +++++--
- configure.ac       | 119 ++++++++++++++---------------------------------------
- python/Makefile.am |  28 ++++---------
- 3 files changed, 49 insertions(+), 112 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index ff10f574..65decb3c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,13 @@ SUBDIRS = \
- 	libxslt \
- 	libexslt \
- 	xsltproc \
--	doc \
--	$(PYTHON_SUBDIR) \
--	tests
-+	doc
-+
-+if WITH_PYTHON
-+SUBDIRS += python
-+endif
-+
-+SUBDIRS += tests
- 
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
- 
-@@ -51,7 +55,9 @@ tests: dummy
- 	@echo '## Running the regression test suite'
- 	@(cd tests ; $(MAKE) -s tests)
- 	@(cd xsltproc ; $(MAKE) -s tests)
--	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi)
-+if WITH_PYTHON
-+	@(cd python ; $(MAKE) -s tests)
-+endif
- 
- valgrind:
- 	@echo '## Running the regression tests under Valgrind'
-diff --git a/configure.ac b/configure.ac
-index d6aa3664..0a538944 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -293,90 +293,37 @@ dnl
- dnl check for python
- dnl
- 
--PYTHON_VERSION=
--PYTHON_INCLUDES=
--PYTHON_SITE_PACKAGES=
--pythondir=
--AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
--if test "$with_python" != "no" ; then
--    if test -x "$with_python/bin/python"
--    then
--        echo Found python in $with_python/bin/python
--        PYTHON="$with_python/bin/python"
--    else
--	if test -x "$with_python"
--	then
--	    echo Found python in $with_python
--	    PYTHON="$with_python"
--	else
--            if test -x "$PYTHON"
--            then
--                echo Found python in environment PYTHON=$PYTHON
--                with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
--	    else
--	        AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
--	    fi
--	fi
--    fi
--    if test "$PYTHON" != ""
--    then
--        echo "PYTHON is pointing at $PYTHON"
--        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
--	echo Found Python version $PYTHON_VERSION
--	LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
--except: print 0"`
--	if test "$LIBXML2_PYTHON" = "1"
--	then
--	    echo Found libxml2-python module
--	else
--	    echo Warning: Missing libxml2-python
--	fi
--    fi
--    if test "$PYTHON_VERSION" != ""
--    then
--	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
--	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
--	then
--	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	else
--	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
--	    then
--	        PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--		PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	    else
--		if test -r /usr/include/python$PYTHON_VERSION/Python.h
--		then
--		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--		    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--		else
--		    echo could not find python$PYTHON_VERSION/Python.h
--		fi
--	    fi
--	    if test ! -d "$PYTHON_SITE_PACKAGES"
--	    then
--		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
--	    fi
--	fi
--        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
--    fi
--    if test "$with_python" != ""
--    then
--        pythondir='$(PYTHON_SITE_PACKAGES)'
--    else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--    fi
--fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
--if test "$PYTHON_INCLUDES" != ""
--then
--    PYTHON_SUBDIR=python
--else
--    PYTHON_SUBDIR=
--fi
--AC_SUBST(pythondir)
--AC_SUBST(PYTHON_SUBDIR)
--AC_SUBST(PYTHON_LIBS)
-+AC_ARG_WITH([python],
-+    AS_HELP_STRING([--with-python], [Build Python bindings if found])
-+)
-+
-+AS_IF([test "$with_python" = "yes"],
-+      [AM_PATH_PYTHON
-+       AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
-+       AS_IF([test "$PYTHON_CONFIG" = "no"],
-+             [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
-+       AS_IF([test "$PYTHON_CONFIG" != "no"],
-+             [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
-+              PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-+              PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
-+             [AC_MSG_ERROR([Missing python development files.])])
-+       AC_MSG_CHECKING([libxml2 module in $PYTHON])
-+	   LIBXML2_PYTHON=`$PYTHON -c "import sys;
-+try:
-+    import libxml2
-+    sys.stdout.write('1')
-+except:
-+    sys.stdout.write('0')"`
-+       AS_IF([test "$LIBXML2_PYTHON" = "1"],
-+             [AC_MSG_RESULT([yes])],
-+             [AC_MSG_RESULT([no])
-+              AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
-+      ])
-+
-+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
-+AC_SUBST([PYTHON_CFLAGS])
-+AC_SUBST([PYTHON_LDFLAGS])
-+AC_SUBST([PYTHON_LIBS])
- 
- AC_ARG_WITH(crypto, [  --with-crypto           Add crypto support to exslt (on)])
- WITH_CRYPTO=0
-@@ -678,10 +625,6 @@ AC_SUBST(PYTHONSODV)
- AC_SUBST(XML_CONFIG)
- AC_SUBST(LIBXML_LIBS)
- AC_SUBST(LIBXML_CFLAGS)
--AC_SUBST(PYTHON)
--AC_SUBST(PYTHON_VERSION)
--AC_SUBST(PYTHON_INCLUDES)
--AC_SUBST(PYTHON_SITE_PACKAGES)
- 
- XSLT_LIBDIR='-L${libdir}'
- XSLT_INCLUDEDIR='-I${includedir}'
-diff --git a/python/Makefile.am b/python/Makefile.am
-index fa58b78f..3a5ecd6a 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -5,9 +5,9 @@ SUBDIRS= . tests
- 
- AM_CFLAGS = $(LIBXML_CFLAGS)
- 
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
-+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
- # libxsltclass.txt is generated
--DOCS = TODO
-+dist_docs_DATA = TODO
- 
- EXTRA_DIST = 			\
- 	libxslt.c		\
-@@ -16,10 +16,7 @@ EXTRA_DIST = 			\
- 	libxml_wrap.h		\
- 	libxslt_wrap.h		\
- 	libxsl.py		\
--	libxslt-python-api.xml	\
--	$(DOCS)
--
--libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
-+	libxslt-python-api.xml
- 
- if WITH_PYTHON
- mylibs = \
-@@ -28,31 +25,22 @@ mylibs = \
- 
- all-local: libxslt.py
- 
--python_LTLIBRARIES = libxsltmod.la
-+python_PYTHON = libxslt.py
-+pyexec_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_CPPFLAGS = \
--	-I$(PYTHON_INCLUDES) \
- 	-I$(top_srcdir)/libxslt \
- 	-I$(top_srcdir) \
--	-I../libexslt
-+	-I$(top_srcdir)/libexslt \
-+	$(PYTHON_CFLAGS)
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
-+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
- 
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(pythondir)
--	$(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
--	$(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
--	@(for doc in $(DOCS) ; \
--	   do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
--
--uninstall-local:
--	rm -f $(DESTDIR)$(pythondir)/libxslt.py
--	rm -rf $(DESTDIR)$(DOCS_DIR)
--
- GENERATE = generator.py
- API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
- GENERATED= libxsltclass.py \
--- 
-2.14.1
-
diff --git a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch
deleted file mode 100644
index ff7e263aca43..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 17:49:07 +0100
-Subject: [PATCH] Simplify python setup in autoconf
-
-AM_PATH_PYTHON does most of the job without using pkg-config as expected
-from the rest of the autoconf script.
-diff --git a/Makefile.am b/Makefile.am
-index 2c417d0..a65a2b7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,14 @@ SUBDIRS = \
- 	libxslt \
- 	libexslt \
- 	xsltproc \
--	doc \
--	$(PYTHON_SUBDIR) \
--	tests
-+	doc
-+
-+
-+if WITH_PYTHON
-+	SUBDIRS += python
-+endif
-+
-+SUBDIRS += tests
- 
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
- 
-@@ -52,7 +57,9 @@ tests: dummy
- 	@echo '## Running the regression test suite'
- 	@(cd tests ; $(MAKE) -s tests)
- 	@(cd xsltproc ; $(MAKE) -s tests)
--	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi)
-+if WITH_PYTHON
-+	@(cd python ; $(MAKE) -s tests)
-+endif
- 
- valgrind:
- 	@echo '## Running the regression tests under Valgrind'
-diff --git a/configure.ac b/configure.ac
-index 325a7be..ee1eabd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,90 +227,37 @@ dnl
- dnl check for python
- dnl
- 
--PYTHON_VERSION=
--PYTHON_INCLUDES=
--PYTHON_SITE_PACKAGES=
--pythondir=
--AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
--if test "$with_python" != "no" ; then
--    if test -x "$with_python/bin/python"
--    then
--        echo Found python in $with_python/bin/python
--        PYTHON="$with_python/bin/python"
--    else
--	if test -x "$with_python"
--	then
--	    echo Found python in $with_python
--	    PYTHON="$with_python"
--	else
--            if test -x "$PYTHON"
--            then
--                echo Found python in environment PYTHON=$PYTHON
--                with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
--	    else
--	        AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
--	    fi
--	fi
--    fi
--    if test "$PYTHON" != ""
--    then
--        echo "PYTHON is pointing at $PYTHON"
--        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
--	echo Found Python version $PYTHON_VERSION
--	LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
--except: print 0"`
--	if test "$LIBXML2_PYTHON" = "1"
--	then
--	    echo Found libxml2-python module
--	else
--	    echo Warning: Missing libxml2-python
--	fi
--    fi
--    if test "$PYTHON_VERSION" != ""
--    then
--	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
--	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
--	then
--	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	else
--	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
--	    then
--	        PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--		PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	    else
--		if test -r /usr/include/python$PYTHON_VERSION/Python.h
--		then
--		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--		    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--		else
--		    echo could not find python$PYTHON_VERSION/Python.h
--		fi
--	    fi
--	    if test ! -d "$PYTHON_SITE_PACKAGES"
--	    then
--		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
--	    fi
--	fi
--        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
--    fi
--    if test "$with_python" != ""
--    then
--        pythondir='$(PYTHON_SITE_PACKAGES)'
--    else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--    fi
--fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
--if test "$PYTHON_INCLUDES" != ""
--then
--    PYTHON_SUBDIR=python
--else
--    PYTHON_SUBDIR=
--fi
--AC_SUBST(pythondir)
--AC_SUBST(PYTHON_SUBDIR)
--AC_SUBST(PYTHON_LIBS)
-+AC_ARG_WITH([python],
-+    AS_HELP_STRING([--with-python], [Build Python bindings if found])
-+)
-+
-+AS_IF([test "$with_python" = "yes"],
-+      [AM_PATH_PYTHON
-+       AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
-+       AS_IF([test "$PYTHON_CONFIG" = "no"],
-+             [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
-+       AS_IF([test "$PYTHON_CONFIG" != "no"],
-+             [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
-+              PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-+              PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
-+             [AC_MSG_ERROR([Missing python development files.])])
-+       AC_MSG_CHECKING([libxml2 module in $PYTHON])
-+	   LIBXML2_PYTHON=`$PYTHON -c "import sys;
-+try:
-+    import libxml2
-+    sys.stdout.write('1')
-+except:
-+    sys.stdout.write('0')"`
-+       AS_IF([test "$LIBXML2_PYTHON" = "1"],
-+             [AC_MSG_RESULT([yes])],
-+             [AC_MSG_RESULT([no])
-+              AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
-+      ])
-+
-+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
-+AC_SUBST([PYTHON_CFLAGS])
-+AC_SUBST([PYTHON_LDFLAGS])
-+AC_SUBST([PYTHON_LIBS])
- 
- AC_ARG_WITH(crypto, [  --with-crypto           Add crypto support to exslt (on)])
- WITH_CRYPTO=0
-@@ -634,10 +581,6 @@ AC_SUBST(PYTHONSODV)
- AC_SUBST(XML_CONFIG)
- AC_SUBST(LIBXML_LIBS)
- AC_SUBST(LIBXML_CFLAGS)
--AC_SUBST(PYTHON)
--AC_SUBST(PYTHON_VERSION)
--AC_SUBST(PYTHON_INCLUDES)
--AC_SUBST(PYTHON_SITE_PACKAGES)
- 
- XSLT_LIBDIR='-L${libdir}'
- XSLT_INCLUDEDIR='-I${includedir}'
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 17a0d17..1c57a63 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -5,7 +5,7 @@ SUBDIRS= . tests
- 
- AM_CFLAGS = $(LIBXML_CFLAGS)
- 
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
-+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
- # libxsltclass.txt is generated
- DOCS=
- 
-@@ -16,10 +16,7 @@ EXTRA_DIST = 			\
- 	libxml_wrap.h		\
- 	libxslt_wrap.h		\
- 	libxsl.py		\
--	libxslt-python-api.xml	\
--	$(DOCS)
--
--libxsltmod_la_LDFLAGS =  -module -avoid-version
-+	libxslt-python-api.xml
- 
- if WITH_PYTHON
- mylibs = \
-@@ -28,31 +25,22 @@ mylibs = \
- 
- all-local: libxslt.py
- 
--python_LTLIBRARIES = libxsltmod.la
-+python_PYTHON = libxslt.py
-+pyexec_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_CPPFLAGS = \
--	-I$(PYTHON_INCLUDES) \
- 	-I$(top_srcdir)/libxslt \
- 	-I$(top_srcdir) \
--	-I../libexslt
-+	-I$(top_srcdir)/libexslt \
-+	$(PYTHON_CFLAGS)
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
-+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
- 
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(pythondir)
--	$(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
--	$(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
--	@(for doc in $(DOCS) ; \
--	   do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
--
--uninstall-local:
--	rm -f $(DESTDIR)$(pythondir)/libxslt.py
--	rm -rf $(DESTDIR)$(DOCS_DIR)
--
- GENERATE = generator.py
- API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
- GENERATED= libxsltclass.py \
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
deleted file mode 100644
index 86ee69d5cf80..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
-		https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch -> libxslt-1.1.33-CVE-2019-11068.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="crypt debug examples python static-libs elibc_Darwin"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=virtual/pkgconfig-1
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PN}-1.1.32-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-	eapply "${DISTDIR}"/${PN}-1.1.33-CVE-2019-11068.patch
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples && use python; then
-		rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	prune_libtool_files --modules
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index f5c38fbbede9..c7c189fff425 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
diff --git a/dev-libs/libxslt/libxslt-1.1.34.ebuild b/dev-libs/libxslt/libxslt-1.1.34.ebuild
deleted file mode 100644
index cbf9102e48c6..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.34.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools multilib-minimal python-r1 toolchain-funcs
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="crypt debug examples python static-libs elibc_Darwin"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=virtual/pkgconfig-1
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PN}-1.1.34-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples && use python; then
-		rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 1bbc0d71fac0..692139038ed8 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -2,6 +2,6 @@ DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb
 DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 EBUILD libzia-4.21.ebuild 838 BLAKE2B ff1f384a87ddb0b798b03c8f04b83f86168b4e45755f12d979825d4ffcc234784cfcd52773ca37eefc6cd04885946d25bab069b542faf6ccbeca3dfbc3c512f9 SHA512 edc8c49c7186755c8dd25cc0d2958c27c26d9f607804fccdb3a85debb8bba4edc3f124ba044712273411909781a06072f301db8e121d2df08a5389df3d5ed6d5
-EBUILD libzia-4.22.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
-EBUILD libzia-4.23.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
+EBUILD libzia-4.22.ebuild 963 BLAKE2B a2193135182336fdf555b83670eb02a97cc10aca94a4058b8cce044b3aafedc0c4126534ca3fc47ba5bfc3e5297def41c702de85a173ac1e678597ab4cd7a55d SHA512 68eddffdc4734b8e54f38e886f9bb8a510927210190c538f935f0da982b4ba850e4fa3234678804392c4ba21931d8f1dde5859aa1ef7817ea87c09573704a4d7
+EBUILD libzia-4.23.ebuild 963 BLAKE2B a2193135182336fdf555b83670eb02a97cc10aca94a4058b8cce044b3aafedc0c4126534ca3fc47ba5bfc3e5297def41c702de85a173ac1e678597ab4cd7a55d SHA512 68eddffdc4734b8e54f38e886f9bb8a510927210190c538f935f0da982b4ba850e4fa3234678804392c4ba21931d8f1dde5859aa1ef7817ea87c09573704a4d7
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.22.ebuild b/dev-libs/libzia/libzia-4.22.ebuild
index 4977fe81e7dc..732c9aaf2d9f 100644
--- a/dev-libs/libzia/libzia-4.22.ebuild
+++ b/dev-libs/libzia/libzia-4.22.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/libzia/libzia-4.23.ebuild b/dev-libs/libzia/libzia-4.23.ebuild
index 4977fe81e7dc..732c9aaf2d9f 100644
--- a/dev-libs/libzia/libzia-4.23.ebuild
+++ b/dev-libs/libzia/libzia-4.23.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/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 93aaee788264..79d9e75333be 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1,4 +1,4 @@
 AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee985a9931171e7651242e79029dd6c5c6a9aae03fb9aa9a3ec9c1d391763c7acc7d57c794904636a261b2ebefda4986fe4 SHA512 9771a43add0af52417d67f54c991d637928d5f8340e90a786f2e9714cbc206e4ce6e7cc55face0f2ed0ed2c34e0a52bd922fa11978b85ffa48f02235df7c2de9
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
-EBUILD log4cplus-1.2.0.ebuild 1683 BLAKE2B a19f50a56c22d195f2edcf15b178e747530bc29fa4ffa3c8452cd72a08c3582b53f7c0d81a08400d45b0703516db449abeb3f98c2b7c06c5a15c0b6018258e5b SHA512 71b2eb9df247609fb647d09ba464eb7743cf6886e5260bcf0f42965c36b977efb07a20493236b1d4a1c759b2b3aca75d5de9d07a17c5e75d25d1738b2c78b425
+EBUILD log4cplus-1.2.0.ebuild 1687 BLAKE2B a22648d292729eea0b04bc1033345c61de5b396bd4df2fc0cd41df94385ec044aedca317cb9cf4c1b69c24f9f57dedfe1673f15780c9f093b2310acb87a51851 SHA512 d7797ee4444d8e6b6610556ce15bdf93bed685fd909b5b043139a9eaf3611420bee88c4c0a4bf1953e21a3cc44697006725e6c057ff70a67a83dce377dc3fa09
 MISC metadata.xml 749 BLAKE2B 896a9b8fb91d74d3ddcad1b2d775ad65cb0de33a16961fd96096ba7ab59cf624a83a01c13f1263f17eaeb8ee578474fe067ac1e13d2a0f991b1988081c325ce5 SHA512 9fd7d13a36875f50fa784dd61b775cda0834d8e76302b9e6a6fec6e843131b869831ce4d9eb5c93c6b3eb1c58bf3514b4d5b6c3ac9bf70c95cd877d28b29fa96
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index 07cf88b00eb3..f3cc6f326475 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/1.2-5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="iconv qt5 threads working-locale working-c-locale"
 REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
 
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index fe74b06b068c..0fde4e55b3ff 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -3,5 +3,5 @@ AUX log4cxx-0.10.0-gcc44.patch 357 BLAKE2B b70ff78b141b6952bc8a5f1eca9e251a7dd7b
 AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4af43874c2640a0e7b0e0ed6b85424aa2e8d4d54d13d7eea1361c5b2d2d57f33cdc2260d6e3f5d6afd6b3d240fecc3565aab9f29f SHA512 8fb9017206bca39fa4481707cdb13b68195cc2fce66383a601bc8c7cc20869ca356f2616459b5f10615d5a40f0759c24058f22d7e08c02fee1ce367c34b2d707
 AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
 DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
-EBUILD log4cxx-0.10.0-r1.ebuild 1514 BLAKE2B ba4a6471a0c2ef3e2670cfcf16d9ae705e330df40b0d0f43ee46638e6202867a381497101d1950af861af6a94f17235c95ecbca66b23bc491b561bce3e439562 SHA512 1c9fd0e8de77870aadee0cfda237c115b66819e26af647e644cfb0f6d13a5ec6260085c17c3537b576cc17967a1c763a038662f0e2acd8238bdb13f08d6874db
+EBUILD log4cxx-0.10.0-r1.ebuild 1529 BLAKE2B e992a65f67e822180f2a47c1571fc62e3c4118ddd379c36436dd877852170f3a7f4a77d03d31621fd8b3cd82806b7356c4426f4ddd953229430aae38ad52b22e SHA512 8d392b861093fffc81624fe7331a5cff8ad9771a0220aeb1a3884509272e15e45c85bb39e88a89b2b3e7b01bdfdc999483394459e8442c53457797782d866a52
 MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
index a1756aaab0f3..adc8b749d16b 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=apache-${P}
 
@@ -13,26 +13,27 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="iodbc unicode odbc smtp"
+# test suite fails
+RESTRICT="test"
 
-RDEPEND="dev-libs/apr:1
+RDEPEND="
+	dev-libs/apr:1
 	dev-libs/apr-util:1
 	odbc? (
 		iodbc? ( >=dev-db/libiodbc-3.52.4 )
-		!iodbc? ( dev-db/unixODBC ) )
+		!iodbc? ( dev-db/unixODBC )
+	)
 	smtp? ( net-libs/libesmtp )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-# test suite fails
-RESTRICT="test"
-
 HTML_DOCS=( site/. )
 PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-missing_includes.patch"
-	"${FILESDIR}/${PN}-0.10.0-gcc44.patch"
-	"${FILESDIR}/${PN}-0.10.0-unixODBC.patch"
-	"${FILESDIR}/${PN}-0.10.0-fix-c++14.patch"
+	"${FILESDIR}"/${PN}-0.10.0-missing_includes.patch
+	"${FILESDIR}"/${PN}-0.10.0-gcc44.patch
+	"${FILESDIR}"/${PN}-0.10.0-unixODBC.patch
+	"${FILESDIR}"/${PN}-0.10.0-fix-c++14.patch
 )
 
 pkg_setup() {
@@ -43,9 +44,10 @@ pkg_setup() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--disable-doxygen \
 		--disable-html-docs \
-		--with-apr-util="${SYSROOT}${EPREFIX}/usr" \
+		--with-apr-util="${ESYSROOT}"/usr \
 		$(use_with smtp SMTP libesmtp) \
 		$(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \
 		--with-charset=$(usex unicode utf-8 auto)
@@ -59,5 +61,5 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/examples
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 3c2e91bafaf2..916b21797738 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,5 +1,7 @@
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.5.ebuild 2228 BLAKE2B 9016cc0ae3419ac26b864ad5dd07edfc0d13a2bbb34ba1c6c76b6ba1c40a4616a6c4f417252390c515253f62059677223f26187be02a0f12b9e429b5133ba20a SHA512 8db639b8a07201e062395540eb84dd108865a4ee18e090b06dea15ab93468758a3aa354f20d3b14800393ef7542e55babcfff18079e97c02092ae0b58f4ba548
-EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
-MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
+DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
+EBUILD marisa-0.2.5.ebuild 2266 BLAKE2B e836721e2037b072f10ce777fb0d8c9537d9dbee29a6b9f18557f5075ab1defca733602f404f3b456b1769a512e8db063582c36f2260995ca23b923edea750fe SHA512 be55ebe9def47cae022b93077fb4e1b10784ada22bbfa57a046bf60e1f1c32777400d4368d539304a835a71d0f82afeb182e44730e2ff7f4efe6935f37e9f8a1
+EBUILD marisa-0.2.6.ebuild 2837 BLAKE2B 8b142b74c27f5157541ec386d7ab72220ac39b028b7d2146eb71e5ba8dc40e7c544c5dd0288caf17df6cd9f9b2d27bf1c11c268719f9ca5d6afbd963af4d5bd8 SHA512 be53779909de5916e37d6abdbe1beafe438fd5a2f10bfd552a2d7e6693838dd98c07b11cf3ec38019fbd360079b8a18bac53fac46b305f7f60aa428cce84b404
+EBUILD marisa-9999.ebuild 2800 BLAKE2B 8ec417b61ffdf9b9157dce7bafd8096e29bddef82d4572a09073dfbbdef32569dfd1c01546acdbdb57869e31122d4d40984b1b3133b4296e1e5de13da24a5bef SHA512 1145f56bdb4c05854edbd3d711761f5dcd1eee3c3d9501d42d10baaa32fb4328cc9aabafe391576b8f652129b9ab63a46e91340b8af3ffe62379c39627401a10
+MISC metadata.xml 451 BLAKE2B 8aaf9cb592f2321adf8248800f6000e3988d55bacfbd8f880d3de788867262d921992cbdca3c449e2b4b2de7ecc152eff329cde05e54bea538d8fe0676d97e4a SHA512 d92d8194b791437a0e17e51f5678f852fc046785b495ce3aa95ead02ddd80d07dfca9d7cd7b43d0f061c9d4d0d45ca42852e0563dcef71204d352f977a78a6bd
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 4289f375ea65..11ab370eff6e 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1
 
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
new file mode 100644
index 000000000000..3f1328fe785d
--- /dev/null
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
+
+inherit autotools distutils-r1 toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+	cpu_instructions_option() {
+		local option="${1}"
+		local macros="${2}"
+		local result="--enable-${option}"
+		local macro
+		for macro in ${macros}; do
+			if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+				result="--disable-${option}"
+			fi
+		done
+		echo "${result}"
+	}
+
+	local options=(
+		$(cpu_instructions_option sse2 __SSE2__)
+		$(cpu_instructions_option sse3 __SSE3__)
+		$(cpu_instructions_option ssse3 __SSSE3__)
+		$(cpu_instructions_option sse4.1 __SSE4_1__)
+		$(cpu_instructions_option sse4.2 __SSE4_2__)
+		$(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+		$(cpu_instructions_option sse4a __SSE4A__)
+		$(cpu_instructions_option popcnt __POPCNT__)
+		$(cpu_instructions_option bmi __BMI__)
+		$(cpu_instructions_option bmi2 __BMI2__)
+		$(use_enable static-libs static)
+	)
+
+	econf "${options[@]}"
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		emake -C bindings swig-python
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	(
+		docinto html
+		dodoc docs/*
+	)
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 6942f85b198b..ac80bc2f0601 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,11 +1,12 @@
-# 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{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -54,16 +55,30 @@ src_prepare() {
 src_configure() {
 	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
 
+	cpu_instructions_option() {
+		local option="${1}"
+		local macros="${2}"
+		local result="--enable-${option}"
+		local macro
+		for macro in ${macros}; do
+			if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+				result="--disable-${option}"
+			fi
+		done
+		echo "${result}"
+	}
+
 	local options=(
-		# Preprocessor macros dependent on CPPFLAGS are checked.
-		--enable-sse2
-		--enable-sse3
-		--enable-ssse3
-		--enable-sse4.1
-		--enable-sse4.2
-		--enable-sse4
-		--enable-sse4a
-		--enable-popcnt
+		$(cpu_instructions_option sse2 __SSE2__)
+		$(cpu_instructions_option sse3 __SSE3__)
+		$(cpu_instructions_option ssse3 __SSSE3__)
+		$(cpu_instructions_option sse4.1 __SSE4_1__)
+		$(cpu_instructions_option sse4.2 __SSE4_2__)
+		$(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+		$(cpu_instructions_option sse4a __SSE4A__)
+		$(cpu_instructions_option popcnt __POPCNT__)
+		$(cpu_instructions_option bmi __BMI__)
+		$(cpu_instructions_option bmi2 __BMI2__)
 		$(use_enable static-libs static)
 	)
 
@@ -89,7 +104,7 @@ src_compile() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
 	(
 		docinto html
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 4aa8461d2b54..f8feae5e9c20 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
diff --git a/dev-libs/mongo-cxx-driver/Manifest b/dev-libs/mongo-cxx-driver/Manifest
deleted file mode 100644
index b9b5723b5851..000000000000
--- a/dev-libs/mongo-cxx-driver/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX mongo-cxx-driver-1.0.0-fix-scons.patch 1345 BLAKE2B 38d257b8a2a73caecf3932706ffaae5517d336ca9fd5cbae75948394deffd74ac233b21c435b371a46f03a594ea95cf2896ac715aedac84a5f39a9d12b9c761c SHA512 24031ed20354c98633887b57f513b0bd891370923fd5e6b9e668610e68875afcb64c01fb4d84dd01ab1629dcbce332f60822aa0ac7a8774cd06277cf02cb95b1
-AUX mongo-cxx-driver-1.1.0-fix-scons.patch 2126 BLAKE2B 78f7d00fa0b7c642854572ddc33856e166920c248e8169ebb204a35c473bc363e0c8edb1a76ac8a0078ace02f90bbe412ca364ec9296c86ada4b47597bd25979 SHA512 1a643dbfa20e1f53bd76b61487b7895daf165139d7264f3c6cee61d7bd30b8a583dee02e63f9c7295cc8a49028075c0f3066b0a57e7e1c4f2eb1a750f2249122
-AUX mongo-cxx-driver-1.1.2-boost-next.patch 482 BLAKE2B 298286d33ad6b5938ce9a79c699a8d782f0e9619e731146a0db57507c135c1b595d273150d782c2cf92f6f777fb549afc166677b60a51ce74f50ab8c6d852ab1 SHA512 e317c89f5f1701ff0b1a14a592bf4d2376955780067f1a84c5f4b6360ab10423635e50c70916edbbefdb29554641f7e10be60030843b449f136be7fcae3e8136
-AUX mongo-cxx-driver-1.1.2-boost-ref.patch 425 BLAKE2B 9bcc37f485e96989692b6ebd489cea8874fd70078fd7862822ce329fff2f3985be3a1383a17bf0876c64ddc35392960435065c70f280c16ba08f8fbf25e06f61 SHA512 613fb5c45c425c2ed2f907ff569741402f2ade0a11a2abb4183b5d05bc18c8b3d8143ac892d99b7561e04e0f74796f5ff7d32c385e78e08ec11415fd24ea697b
-AUX mongo-cxx-driver-26compat-fix-scons.patch 1478 BLAKE2B f69ee015f8b2bfe4149960016ffc34c53e56042115a65e5e88677eecc8382be4a1c6c92950b79e68710f5347310813f04f1914769384874c87b9dd5d2e9cf570 SHA512 3ba454dc193dfe0ab1a3727521a67f46c765a5e6f0a1fc04647d9ad52905899afd4d95ade632a9339fc3a5e5cb14473a812ea4772eecf4456874a49ff25bedd7
-DIST legacy-0.0-26compat-2.6.7.tar.gz 1512331 BLAKE2B 43735ef7be4d5f3094eccedb5ee70f9f9722a174513a10f2f5f7c3c5603766f85e13717ea8c68b935c0ba5914c8e4a9b6e6797cd1a10d0257b654473799070bc SHA512 edf13d5b7802c3b2e9772f08949fd0c412f2cd25ec6d05ff4e8c1f25c3e3506da6ebbd7b017ceec5478585c84e9fa44c66a5094ad3e7a7373187d3fb3c1c1222
-DIST legacy-1.0.0.tar.gz 1569156 BLAKE2B 6c231d6a4c9f6c54aaea2b6f5ce10c80537875e69508fbd3598a835b52ca2bd984d2d7bf3bd35bff83b78408d3c185715f2fb8d6eef3b697c864161479a016ab SHA512 e161972715fe45b777ee3d9c7e788ee3a808af789e2c1248af1dde3d3f3936e29f619e039f53210cdd3fc6a6bd8a02c101facf49c61759c6f108d25c5c03b59b
-DIST legacy-1.0.5.tar.gz 1573929 BLAKE2B 85476dddefdcbd7a4b8ac945a39633965ade0389131e554c04aab3d457a3651b79292b88882613af6bb07f56759e75f67eb72d27b23209cc0df36df9eec58846 SHA512 e904d73f78ffbc1ce18ffa11dd7e3dddd67c730b6e79bace0e48c0be4e8ffd7b5fe12e1373e42ad941d8fc239ef031a47d39ff04aaf3f0a5ecf88115c816bc70
-DIST legacy-1.1.2.tar.gz 1577527 BLAKE2B 277e5ed6d6897587d3d9f9681b6821d2cc4bba71191c27083306d3a4d7dd778fdb3707e5b70fe9f528be8142dd755ba8e2a19ee866f5583dc57d297c642e6e02 SHA512 a0b21719db8205a16c574ce21565577787ea00cf2492353bcd4dd79a7ef3b7d685287be47e6eee59fad46c6fa2ac3c6a0e00c26ef88be8b17e9d93fbc763cb10
-EBUILD mongo-cxx-driver-0.0.2.6.7-r1.ebuild 2196 BLAKE2B 90810e8dfa7c05752d0023cbf840a4942f411f8e718b8775a735086cf99ab5ec3ff6493e9acc731f479a509bf30a150c958598ad38296a9e3ebe029796f98092 SHA512 e362a47745cb2166b608b884c0e7c23e2798f0eda0383972352136de9beb83faedb7492290326ae6b79faeb7f40a441d7d7521830d7cb2e20582ae98f70d15d2
-EBUILD mongo-cxx-driver-1.0.0.ebuild 1598 BLAKE2B ad541dfdbf081fd7285b3435a200e15c33ab0fede51eef296a7ffd61c8220dccc6fcdf95969f274b4398c7756c0f35d386f19f417502e65073c4f0b50a6ebe0f SHA512 6c6b8016998d20b90491e841ad01e1f5eb26ecffa90638bfc0ce4edd95e421df76e400d6d083d198db70a6fb90d4b6b828ae44e4a15e3ce936b138d2a430a4d6
-EBUILD mongo-cxx-driver-1.0.5.ebuild 1598 BLAKE2B ad541dfdbf081fd7285b3435a200e15c33ab0fede51eef296a7ffd61c8220dccc6fcdf95969f274b4398c7756c0f35d386f19f417502e65073c4f0b50a6ebe0f SHA512 6c6b8016998d20b90491e841ad01e1f5eb26ecffa90638bfc0ce4edd95e421df76e400d6d083d198db70a6fb90d4b6b828ae44e4a15e3ce936b138d2a430a4d6
-EBUILD mongo-cxx-driver-1.1.2-r1.ebuild 1551 BLAKE2B 2aed7761319f8c1ca06fdd1fb84dc20af73f515348195e0b0fbf47b91b481bb897ad79a4be61d4f6d4f97df6a736ec5f5973add05cb9045937662ccd8bdb3da7 SHA512 ed99fd1996400bb5f1e3cae23fba9b13231e7f202e75fbd9becb0b88fa3059a331eb3cedbdbe11ea4754f03431155c8b9b1f4bd183b88d5206b11299408918fd
-MISC metadata.xml 336 BLAKE2B 8cd1026c27a1b598e3c49a9c11dbe0dc2a27bbe77b25223d7467ed9778b57743cab62e7703f988933e6a672506c996a1b8d75c71d2e2b306cb362c88a397a11a SHA512 b75e79f4e7e6ae6e596797bed26600142d8ec89bf15a5d71183d09835c3cdb5bcc4cdd625048fe5ba0e3ab04b8c36ae3cb30da97c185f1ee420040103c69ccf0
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.0.0-fix-scons.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.0.0-fix-scons.patch
deleted file mode 100644
index 319773c7d571..000000000000
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.0.0-fix-scons.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/SConstruct	2015-03-17 10:19:58.766530807 +0100
-+++ b/SConstruct	2015-03-17 10:27:58.400062874 +0100
-@@ -853,7 +853,6 @@
- 
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -861,13 +860,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-fPIC"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- 
-     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-     # startup.
-@@ -933,7 +932,6 @@
- except OSError:
-     pass
- 
--env.Prepend(CPPPATH=['$VARIANT_DIR/third_party/gtest-1.7.0/include'])
- 
- boostSuffixList = ["-mt", ""]
- if get_option("boost-lib-search-suffixes") is not None:
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch
deleted file mode 100644
index 2a8ce309b66c..000000000000
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -865,7 +865,6 @@
- 
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -873,13 +872,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-fPIC"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- 
-     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-     # startup.
-@@ -905,11 +904,6 @@
-         env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " )
-         env.Append( LINKFLAGS=" -fprofile-arcs -ftest-coverage " )
- 
--    if optBuild:
--        env.Append( CCFLAGS=["-O3"] )
--    else:
--        env.Append( CCFLAGS=["-O0"] )
--
-     if debugBuild:
-         if not optBuild:
-             env.Append( CCFLAGS=["-fstack-protector"] )
-@@ -932,7 +926,6 @@
- except OSError:
-     pass
- 
--env.Prepend(CPPPATH=['$VARIANT_DIR/third_party/gtest-1.7.0/include'])
- 
- boostSuffixList = ["-mt", ""]
- if get_option("boost-lib-search-suffixes") is not None:
-@@ -1143,6 +1136,7 @@
-         # Clang likes to warn about unused functions, which seems a tad aggressive and breaks
-         # -Werror, which we want to be able to use.
-         AddToCCFLAGSIfSupported(myenv, '-Wno-unused-function')
-+        AddToCCFLAGSIfSupported(myenv, '-Wno-unused-variable')
- 
-         # TODO: Note that the following two flags are added to CCFLAGS even though they are
-         # really C++ specific. We need to do this because SCons passes CXXFLAGS *before*
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
deleted file mode 100644
index 68bdc4dc1a4e..000000000000
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Add missing include for boost::next()
-
-https://bugs.gentoo.org/671422
---- a/src/mongo/client/command_writer.cpp
-+++ b/src/mongo/client/command_writer.cpp
-@@ -22,4 +22,6 @@
- #include "mongo/db/namespace_string.h"
- 
-+#include <boost/next_prior.hpp>
-+
- namespace mongo {
- 
---- a/src/mongo/client/wire_protocol_writer.cpp
-+++ b/src/mongo/client/wire_protocol_writer.cpp
-@@ -22,4 +22,6 @@
- #include "mongo/db/namespace_string.h"
- 
-+#include <boost/next_prior.hpp>
-+
- namespace mongo {
- 
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch
deleted file mode 100644
index 9997dd57a2c1..000000000000
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix missing implicit include.
-Patch by Jan-Matthias Braun
-See also: https://bugs.gentoo.org/show_bug.cgi?id=598340
-
---- a/src/mongo/client/examples/connect.cpp
-+++ b/src/mongo/client/examples/connect.cpp
-@@ -29,6 +29,8 @@
- #include "mongo/client/dbclient.h"
- #include "mongo/stdx/functional.h"
- 
-+#include <boost/core/ref.hpp>
-+
- namespace {
- 
- class OstreamAppender : public mongo::logger::MessageLogDomain::EventAppender {
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch
deleted file mode 100644
index be5408511bda..000000000000
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/SConstruct	2015-03-23 10:36:42.328921927 +0100
-+++ b/SConstruct	2015-03-23 10:37:37.599310414 +0100
-@@ -828,7 +828,6 @@
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -836,13 +835,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- 
-     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-     # startup.
-@@ -938,7 +937,6 @@
- if not use_system_version_of_library("snappy"):
-     env.Prepend(CPPPATH=['$BUILD_DIR/third_party/snappy'])
- 
--env.Prepend(CPPPATH=['$BUILD_DIR/third_party/gtest-1.7.0/include'])
- 
- env.Append( CPPPATH=['$EXTRACPPPATH'],
-             LIBPATH=['$EXTRALIBPATH'] )
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7-r1.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7-r1.ebuild
deleted file mode 100644
index 27e4b7ee9641..000000000000
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils flag-o-matic multilib scons-utils toolchain-funcs versionator
-
-MY_PV=$(get_version_component_range 3-5)
-MY_P=legacy-0.0-26compat-${MY_PV}
-
-DESCRIPTION="C++ Driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
-SRC_URI="https://github.com/mongodb/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos libressl ssl static-libs"
-
-RDEPEND="
-	app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.50[threads(+)]
-	>=dev-libs/libpcre-8.30[cxx]
-	dev-util/google-perftools[-minimal]
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-pkg_setup() {
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors --sharedclient"
-	scons_opts+=" --use-system-boost"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-yaml"
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-26compat-fix-scons.patch"
-
-	# stemmer/pcap are not used, strip them wrt #518104
-	sed -e '/stemmer/d' -e '/pcap/d' -i SConstruct || die
-
-	# fix yaml-cpp detection
-	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-}
-
-src_compile() {
-	escons ${scons_opts} mongoclient
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install-mongoclient --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	dodoc README.md CONTRIBUTING.md
-}
-
-pkg_preinst() {
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib64/ &>/dev/null
-	else
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
deleted file mode 100644
index 6775c8f379e7..000000000000
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils flag-o-matic multilib scons-utils toolchain-funcs
-
-DESCRIPTION="C++ Driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
-SRC_URI="https://github.com/mongodb/${PN}/archive/legacy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl sasl ssl static-libs"
-
-RDEPEND="!dev-db/tokumx
-	>=dev-libs/boost-1.50[threads(+)]
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-# Maintainer notes
-# TODO: enable test in IUSE with
-# test? ( >=dev-cpp/gtest-1.7.0 dev-db/mongodb )
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${PN}-legacy-${PV}"
-
-pkg_setup() {
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors --sharedclient"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use sasl; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.0-fix-scons.patch"
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-}
-
-src_install() {
-	escons ${scons_opts} install --prefix="${ED}"/usr
-
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
deleted file mode 100644
index 6775c8f379e7..000000000000
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils flag-o-matic multilib scons-utils toolchain-funcs
-
-DESCRIPTION="C++ Driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
-SRC_URI="https://github.com/mongodb/${PN}/archive/legacy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl sasl ssl static-libs"
-
-RDEPEND="!dev-db/tokumx
-	>=dev-libs/boost-1.50[threads(+)]
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-# Maintainer notes
-# TODO: enable test in IUSE with
-# test? ( >=dev-cpp/gtest-1.7.0 dev-db/mongodb )
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${PN}-legacy-${PV}"
-
-pkg_setup() {
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors --sharedclient"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use sasl; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.0-fix-scons.patch"
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-}
-
-src_install() {
-	escons ${scons_opts} install --prefix="${ED}"/usr
-
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
deleted file mode 100644
index 2dad30753129..000000000000
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCONS_MIN_VERSION=2.3.0
-
-inherit scons-utils toolchain-funcs
-
-DESCRIPTION="C++ Driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
-SRC_URI="https://github.com/mongodb/${PN}/archive/legacy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl sasl ssl static-libs"
-
-RDEPEND="
-	!dev-db/tokumx
-	dev-libs/boost:=[threads(+)]
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-# Maintainer notes
-# TODO: enable test in IUSE with
-# test? ( >=dev-cpp/gtest-1.7.0 dev-db/mongodb )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-fix-scons.patch
-	"${FILESDIR}"/${PN}-1.1.2-boost-ref.patch
-	"${FILESDIR}"/${PN}-1.1.2-boost-next.patch
-)
-
-S="${WORKDIR}/${PN}-legacy-${PV}"
-
-src_configure() {
-	scons_opts=(
-		--cc=$(tc-getCC)
-		--cxx=$(tc-getCXX)
-		--cpppath="${EPREFIX}"/usr/include
-		--libpath="${EPREFIX}"/usr/$(get_libdir)
-		--variant-dir=build
-		--disable-warnings-as-errors
-		--sharedclient
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use sasl && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-}
-
-src_compile() {
-	escons "${scons_opts[@]}"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" install --prefix="${ED%/}"/usr
-
-	# fix multilib-strict QA failures
-	mv "${ED%/}"/usr/{lib,$(get_libdir)} || die
-
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${D}" -name '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index fad529c7306a..db6534c04eb0 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,5 @@
 DIST mpc-1.2.0.tar.gz 840711 BLAKE2B 3609d299623a722ca90d4b04ff64becaaa399a5fa40fbc43a1d027692d8fbe6f4ebd24a3c8ea963963977952d130cd3993887da7b0b0c1613a27a24dd37e5831 SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
+DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
 EBUILD mpc-1.2.0.ebuild 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
+EBUILD mpc-1.2.1.ebuild 934 BLAKE2B e4765161a8e158fa072d76805adc7ad49d142265ebfde65b2c8616c7ddf2fa90d34dea798f549bd4266b7f91067f0f60760d2536f9d647179a8587170d4b8ef9 SHA512 45cb962e1ec46d559fa368688da6100b299ef6afec4684c6e5a4e4aebcfee8d9e53a00e83a51cfeb7560b09f57c164d08bc2ae832d8e9238a8a1d882151eb7b0
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
new file mode 100644
index 000000000000..1bdc785c2c6a
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="http://mpc.multiprecision.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3" # libmpc.so.3
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-4.1.0:0=[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 0106be35c171..09c668ca98ea 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
 EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8
-EBUILD msgpack-3.3.0.ebuild 1730 BLAKE2B d634a5064f4266b2b4d3be1625c1e9649b49105b63c658cfaa497c33482e69857bf982986bbc0aae1e4fdcb907e241965d2daa9ed21d8ec6ee3dff91d4a37959 SHA512 9b4d4947a34eefce90515841f676da14bc25213768e4c7226ca283f34adf979651581da9181b52082eb857d7235538de3dd2ac51ad16743574872cddd0bfa4e4
+EBUILD msgpack-3.3.0.ebuild 1728 BLAKE2B 96a4df7a2ef2daef460e04b71061a99fc9274732e86920425ee56cf6b2cff9d6a49d272f03d07f3bebf74d8885bb288cd880ee8221da5d2adc2c1d111417ce00 SHA512 5b5142bffac96a9568a1d815210a1bff217b988ed950a30254eff98cfc01813e91c96fc8afb7d121edf1ff67af10614b5f17d9f515e1e0dc5d9aa495a3a120b2
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index c21dd416d641..532685cbd1c1 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -11,7 +11,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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 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 415f6d30e4f0..1155f413b3e6 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,3 +1,3 @@
-DIST mxml-3.1.tar.gz 9267206 BLAKE2B d5cee24804978b474bf5b58c7a5932b50d7197a35e65da20c2517ce7db01d22027449348d6b15ddf0d186219ac81993055deaa4af9f48439273f8d2d74b27edd SHA512 8f8923b394093db5c471c52c17185916bc3c91f66c97de66919bfef2a09f271879a52f285e5fc4ded03484a3f83ba8fdb588d985b06e0c25ee001f1a80ffa586
-EBUILD mxml-3.1.ebuild 1402 BLAKE2B f97955c73de42b8fcb7675c84ec741b53ac46d3a6001e59c9bd8cdab0dbaf62474c338e43f748e7281f58e3edc52c1cd9a3833964af859e6194623e1f1d11894 SHA512 e9d28e45c82f56fe3e619cff830242350bcd1f689aecce628ac6fa6d111a16bed95bfd1a36f7de1abb32fa9f284c92fd1519421332ba5a5f0f2b341ed6f5ac03
+DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
+EBUILD mxml-3.2.ebuild 1409 BLAKE2B afdcf43d2aa69d1b0f6844d87081eb33321dedf69ae21a1ece4002250c189a6ca471c92cd2e23b100bcc7da776173099267be587a2883216f211c761baf79f32 SHA512 dae312aa29973a53c3f352330e6f86acb25e8610208e7d8f36c26de530a7476138f93a7c0a7ead4f6264c81ea0022660051670d7fac1be302ea119b76b651d06
 MISC metadata.xml 1379 BLAKE2B 9980eb701a13296c1f307c52427336ae892bd9905d86619bea889b3e4ad9fd3cd8dfbe23454c8a562a512628e83fd9cbd2100a2036e607bdf27585599481a9ec SHA512 d3a3de9e7b8ad130622bfa2e689bb1a944e1fb344961fda5ea39ad9fdba754e44bcb225a753834387e7bc490f25667a28422c79ef78ce4324ffb8706d0a71108
diff --git a/dev-libs/mxml/mxml-3.1.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
index 588f6e63e67c..710eb09a6790 100644
--- a/dev-libs/mxml/mxml-3.1.ebuild
+++ b/dev-libs/mxml/mxml-3.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 @@ 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 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 80e23b5ad562..aaaa64326f19 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
 EBUILD nanomsg-1.1.5.ebuild 805 BLAKE2B ae4b62ab7fa6ca8e8fe532d22d3ec2e6edc72a1529ce40a721774c6d354e5e20ac3fc17c6e33cba8157fa55b5e150df70b879007d5aab9f8a4d5316a8b381cfc SHA512 4747e6a3bff09f7fcbe217caadeefe3a9cc1adb689889d6178e7bd5948a3e5544b05fb335d6f303c90c2915140ce3a4201e971b732e175fc2f0a1ec1eb4f5773
-MISC metadata.xml 433 BLAKE2B e0f53ba20bd2976c331ffed8c188bd0bb4e90a6c703024ec7de86ca239733d9f080fbc3400e423afdd295d684b4d3b02790d9791c44da066868effc0ac716716 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d
+MISC metadata.xml 327 BLAKE2B 71ce5ebb7000c112f9e49bb621a5068f18619b04dea3fb556daabb0fdb9f6e9cb587b5809bda561e9bad6998f9866d65de6e367cc33a9f3218580b4d192fe591 SHA512 210c2febfa6cc50563269e1e386917959d24331d2226262084b19e6b7d24e49c38e79f31bb21d3c237ff4f9971135136007e33e99f1a9f37f1abd1419e3f85de
diff --git a/dev-libs/nanomsg/metadata.xml b/dev-libs/nanomsg/metadata.xml
index 5388d1835bb3..60d7533c2a19 100644
--- a/dev-libs/nanomsg/metadata.xml
+++ b/dev-libs/nanomsg/metadata.xml
@@ -5,10 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">nanomsg/nanomsg</remote-id>
 	</upstream>
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index da7cf57064c6..7fdb360326cb 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -4,5 +4,6 @@ DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b0
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
 EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
 EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
-EBUILD nettle-3.6-r2.ebuild 1804 BLAKE2B 57cb20e6bf266faf4a3bdbb1dfc9526737fa866f86c54b95a9d35d16b1f3871173e6e3bda3b27cf53bd4253cb66d8fe413e16e2c790f8e844107b12b24d8868e SHA512 eb4cedbd9bd966100beb1fd0c8757729c8f7f14aa50b9b739b947630f4a0e86313e1553da639149d572c11b200d053d586bca83f4a213d68a3b53a87b744a5cc
+EBUILD nettle-3.6-r2.ebuild 1803 BLAKE2B 99529ed7e701fdcb8cb391f9d94f302eb96ec02ebf94bdd49795d92b18d13221a5524f3eab55e9ca4ebcc3b10bfeb7b092b6a183244d4e71feaf390ae23b5762 SHA512 06c5c7922cd14e0448b368884dd7847b1bdc69a4340a0899cace6a18d2887f1016ca4317e866eaa246aade350c874f964ca224ee56085942d94f9a44b08f96ff
+EBUILD nettle-3.6-r3.ebuild 1716 BLAKE2B 623881563c09e6c2c257626d0348eb7d9adc670b44e9a3487290f02de24837ecb506736fc351dc1288e4ff52e08bc3ca8e13840c154a51f54da8c74a978aadc3 SHA512 3cecb277ec6f59f9c5ba355eac6de23f1b02c4c959dadbe07c5eb07b62d6c73a48f50efdbb49d95c7677ec7ff549888409952a5f2f2f009101610d4aa340be03
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index d813e7d1c276..57e545cca866 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild
new file mode 100644
index 000000000000..a09c279122eb
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.6-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
+RESTRICT="!test? ( test )"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-openssl bug #427526
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$(tc-is-static-only && echo --disable-shared) \
+		$(use_enable cpu_flags_x86_aes x86-aesni) \
+		$(use_enable cpu_flags_x86_sha x86-sha-ni) \
+		$(use_enable asm assembler) \
+		$(use_enable doc documentation) \
+		$(use_enable gmp public-key) \
+		$(use_enable cpu_flags_arm_neon arm-neon) \
+		$(use_enable static-libs static) \
+		--disable-fat \
+		--disable-openssl \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 62f35aa55e40..873ee486ba3e 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,10 +1,3 @@
-DIST npth-1.3.tar.bz2 295998 BLAKE2B 25c0176439a5be3766df15526b06dd07f318dca8b729eb5ec461a40b912132ebbf7bf6ddb2b57a064bfba73f3fe0ab59c00daf6138324f53f5e9e6df91941bf8 SHA512 97b0278cc9448adb42c4a83b8e7bafeed939acaf3dd3a201a1b103df4e48f24224d4bdaeb97903ad1884914ce363cbceffe948a7c1db4f19abf87ca5964f5699
-DIST npth-1.4.tar.bz2 299106 BLAKE2B ba5186de1371d08137e86ef1f6ad12a610a26b7ae3ca50d6fc49f685083380803b245acf01110a28ab25427208bab82de73f16d6f21011b1a0590d16c7c85cf7 SHA512 649009b4fbd2bbbb8fce2911c2f9070a758d037be0d147a63754e3c1f5a9ffb73b907cd09c79314fe60c25084ca7a7b3b387139dd83cc0e11a7e7ba64630ae1f
-DIST npth-1.5.tar.bz2 299308 BLAKE2B 1a3cef4475ad5440487151026889ef321626b372d1c6970c7482df92a702d02860589f7f1f541b1fccf0e8f39b194476ef91507e33a35e05ba3713465f9f11d1 SHA512 20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
-EBUILD npth-1.3.ebuild 670 BLAKE2B 5987fb8075ac5efd02a1980ff28666e38326ca43064628cd8af7ee04bad1bd0e90768ddbadfce11f812618d2e8ee0fdbec375d978a89ef80e9d8cbb1bdb24e33 SHA512 25e0f26a55c970b4d2974668cc8452468e95775f17d6456310be19aefae343539f8cb2ac7d619481d2179ad9acfe3a2859c39ac28a084c1701dbe10ff928d3bd
-EBUILD npth-1.4.ebuild 683 BLAKE2B 046f4e47d204fc077757524f5892a6cce5b7c2cc6663b87ca87500d21b1669b3c86cb463aaab5888c69ff98856a7fd060b5e7242193757b5617b385bbad1b8de SHA512 37c5dd04b5c51de81c8ff8c50f9ac1ce260b77ec45869c18cb98251dc2f7b1862a9f0d7ddbe6b386d3d825a1f309e66ea9824839ed8011710af071be6d350d2f
-EBUILD npth-1.5.ebuild 740 BLAKE2B b7f39e56382f5ec10b21a1e65d89a7d8d9ee74e456b11ed54d8744cd40b2ee023c7dbc4aca842d3079364ff0112c636260733c50d16a714c8c538ce15f4cde00 SHA512 602fc9d468a8b382f22c703855ccb36053e1964c98af0d437ce47e2ab8bb82569f56b0077a0a9e08226c1f486fc10a4af91b5e405a1f88792037676ca6431462
-EBUILD npth-1.6-r1.ebuild 754 BLAKE2B d3eda618befd465fd6f3aa821544a806656e27e6a815fe580450e44f037066b96eb4b7002d2f5faf1c3a1e563055a3dc2c71bb3d74eaeb713369039b7b1ae2f6 SHA512 4261d0146757782d42cf9b5e5c07fd9d9ca58678910a2aa6dcd553f8d7f7136249270739ca0f70911e645db23065f70efcfd3fcb22a107906669f0b134d6e8ed
-EBUILD npth-1.6.ebuild 752 BLAKE2B 41971a4ca71f49bd3386c90c1423ccdc1a9d28208868adfe0a4dffc8dcc48f140150e3591036ae427b91a3e5801203df0cb963398de46579c012d79d707b0d33 SHA512 45030582cbeeb0611d97a7934205e4cc421c341c38c02df4fb13d18ae2b3d67231705ee793ad079aad40704311ee77f012bcd5bf9ac29e0f61b71f335756e762
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD npth-1.6-r1.ebuild 618 BLAKE2B 9294ed2ca299c81b278ff3d48385ba68cfbb427a5b10daeda9a516b29b097f21d7575f8a0d51523bac7d08bb209410d6fa2edbd036e4a767e5e6c244c9b78826 SHA512 bf2095ec3c167040dcadced9a05b24ec0847f69133761d60258e9a0388b39e746fd3d8efeb7a077b8522c270e8260a5c7d9860dd4ceb3f9dc0cda150238b578f
+MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 7a38bb900964..9654d1c22bc0 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/npth/npth-1.3.ebuild b/dev-libs/npth/npth-1.3.ebuild
deleted file mode 100644
index b3f927034ec2..000000000000
--- a/dev-libs/npth/npth-1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/dev-libs/npth/npth-1.4.ebuild b/dev-libs/npth/npth-1.4.ebuild
deleted file mode 100644
index 92a5c882ed20..000000000000
--- a/dev-libs/npth/npth-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/dev-libs/npth/npth-1.5.ebuild b/dev-libs/npth/npth-1.5.ebuild
deleted file mode 100644
index b0c65eb0cfd5..000000000000
--- a/dev-libs/npth/npth-1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 6ba87239e32c..00b6f615b496 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool
+inherit autotools
 
 DESCRIPTION="New GNU Portable Threads Library"
 HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
@@ -12,19 +12,12 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
 
 src_prepare() {
 	default
-	elibtoolize  # for Solaris shared library
+	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+	econf --disable-static
 }
diff --git a/dev-libs/npth/npth-1.6.ebuild b/dev-libs/npth/npth-1.6.ebuild
deleted file mode 100644
index 07b25df22952..000000000000
--- a/dev-libs/npth/npth-1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index da4b17b5aef9..7a3133c35d9a 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -11,6 +11,6 @@ DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8
 DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
 EBUILD nspr-4.26.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
 EBUILD nspr-4.27.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150
-EBUILD nspr-4.28.ebuild 3937 BLAKE2B 52b092a14c9db35c49bfc994101c346a2a1d7b2684ec0918fbe3b7129dee341760be304b66789be1251deaca9e0984e0e3e3aeacb8447d59c672df9dc97831fb SHA512 028d21173695616be80358a84d8f3d279598be053c731f60f84e4327e2328b0d0e07519d66d4a91f500ac1a1013954ab4d255468ae9db782133419143d44dfa0
-EBUILD nspr-4.29.ebuild 3940 BLAKE2B 839c29c919a227df2372d3571a4c15b1b0e3e79a08939653f56c9b65165386e38863d04f3fd745e47faf3697b9bcaf75467e594d502aa4139157b268a3385709 SHA512 4e613e6e56bf61e5a5d06c9c0d02ae53666f4ae51836e9cf615b713695350f7a919a89ce49bb80bc5c38a7a7baac56e565de0e7fe50d6c4c654b6eb9845a8505
+EBUILD nspr-4.28.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
+EBUILD nspr-4.29.ebuild 3931 BLAKE2B 6bcf1dddec05c282cb21ad29e293098d348c71b01e8731f2eb79aeb23f976a3f31afb8d770b979b43e0eec1f493ccf510577563469618624193c86e2a18c4ed8 SHA512 5668b57eb9c9e191489ee9b39a2f58276ffa185e8c6f0dbe6cb47ff03eb7ab9e9cf8f312bfb0d4ac27795068150a4562f636b71b6e825c4c8cc782abef267f61
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
index 04ae9000980a..22a70f0cfde8 100644
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ b/dev-libs/nspr/nspr-4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
index bfc7d8e35a12..d16b52ec47cb 100644
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ b/dev-libs/nspr/nspr-4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 82ed331151cb..d34c255c9f8a 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,11 +2,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-DIST nss-3.55.tar.gz 81759883 BLAKE2B 5b663d2b1861eb74cf070f2711b4db1afbfbc40b08e1f117e6b4a62e9f997de06889de3afc654cf6547c371ab2a1183904a1a014d1dc4b3e94f734107c81e1cf SHA512 acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e
+AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
-DIST nss-3.57.tar.gz 81712830 BLAKE2B 998160fe16e13d1997f3d11a054148349b068214afb3c0cd3b9e82ce03999e46ca34b02907dc27e3f253653f6e57a9f1498e6c16f8665350c629f5c3c98ea0bc SHA512 7e312d7539a26f57b968548935a7715cfa895aa61da21d0542ae45b71cb16f63167728534cdfd15f8eca68c75753a0df3d05e87b4c5acaabbda63c736e552ea2
+DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
+DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.55.ebuild 8992 BLAKE2B 45d0ef7e3ecac0a19c75b5193cf3f21aad28fce9ee03d30785cd133c0357e3b71e62800154ce22df775e168a0eb5f99601db55f90bc3271d2ea5a8faee2a580f SHA512 8bbcd696bfd436eb76d4eee53db228c2d8c1351217ae9e171fd1e9a38e7c4903ff303c6931be733f3e2153e474f65668567bf720d6840f7325145b179d99b14f
-EBUILD nss-3.56.ebuild 9199 BLAKE2B c160f683fae9ad0164ff180a097128e1684e81c06304d53d54a0212c8e67df9e0ee7329a5bd52f98914281b1a18ffa09757978e024690110bd1fde6d7bfd2f3f SHA512 38b958860ec278b2140282454b7a3e2c280520188ec4cf295ade69efeda3cb31580128df7e9e1240cc5c20010a022364d1ac95d36771b4987f04cd732e4a53bf
-EBUILD nss-3.57.ebuild 9195 BLAKE2B 863b9a0187c0cff4ece023fcc84e90ba4560ad27a59b561ee48b2d2d3866ceea0b7fdfe6ee3ea8865264f98f4b44491f65ce7ef955064cb9606e21eaccb072a4 SHA512 5c5fa7be3f3e080310868e8458b64973f2c849eb28663bc7f7eced5fe8415a06fd5005c676a28eb494d0e7eda32fa05c1f5b3fea275b0fa8d0282e9f5e76e055
+EBUILD nss-3.56.ebuild 9192 BLAKE2B 159708f6fc8c0b2e55404b95bbe688798f3f691ecb6e62a87e9ae32b08c9e9ae6693bb959a7af3232694ee0c97e5b8bef1981156152c17d8ea4a7c121885bfc3 SHA512 56597eeacea300e066177e9fd83d646a0bc5f84e580ac4dfd952ffcfb67ab77f738126b21cae44966d12ec6bb6e9b50f44a8ac9cf2304bb2f95b41fbe144b78f
+EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B dc108ae1b31d12f42c34b1938e99438d4f7c7c62cc681c880f458ee8c90ae7b5e0374fa80528c95b1372489c7537059af68570901a72094d240ddb3860297eca SHA512 34c05b3c3cf11ab13b32c68e859aa23f573f4875be76279c6b814e2f750c7bc5329cc6b180e83b4322debfac5f48e0296af3611a23b83682f4d5e472309c0ac8
+EBUILD nss-3.59.ebuild 9195 BLAKE2B 863b9a0187c0cff4ece023fcc84e90ba4560ad27a59b561ee48b2d2d3866ceea0b7fdfe6ee3ea8865264f98f4b44491f65ce7ef955064cb9606e21eaccb072a4 SHA512 5c5fa7be3f3e080310868e8458b64973f2c849eb28663bc7f7eced5fe8415a06fd5005c676a28eb494d0e7eda32fa05c1f5b3fea275b0fa8d0282e9f5e76e055
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch b/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
new file mode 100644
index 000000000000..a92c03899360
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
@@ -0,0 +1,200 @@
+
+# HG changeset patch
+# User Daiki Ueno <dueno@redhat.com>
+# Date 1603691171 -3600
+# Node ID b03a4fc5b902498414b02640dcb2717dfef9682f
+# Parent  6f79a76958129dc09c353c288f115fd9a51ab7d4
+Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
+
+Summary:
+This flips the meaning of the flag for checking excessive CCS
+messages, so it only rejects multiple CCS messages while the first CCS
+message is always accepted.
+
+Reviewers: mt
+
+Reviewed By: mt
+
+Bug #: 1672703
+
+Differential Revision: https://phabricator.services.mozilla.com/D94603
+
+--- a/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
++++ b/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
+@@ -343,29 +343,28 @@ TEST_F(TlsConnectStreamTls13, ChangeCiph
+   // Client sends CCS before starting the handshake.
+   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+   ConnectExpectAlert(server_, kTlsAlertUnexpectedMessage);
+   server_->CheckErrorCode(SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER);
+   client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
+ }
+ 
+-// The server rejects a ChangeCipherSpec if the client advertises an
+-// empty session ID.
++// The server accepts a ChangeCipherSpec even if the client advertises
++// an empty session ID.
+ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
+   EnsureTlsSetup();
+   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+ 
+   StartConnect();
+   client_->Handshake();  // Send ClientHello
+   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));  // Send CCS
+ 
+-  server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+-  server_->Handshake();  // Consume ClientHello and CCS
+-  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
++  Handshake();
++  CheckConnected();
+ }
+ 
+ // The server rejects multiple ChangeCipherSpec even if the client
+ // indicates compatibility mode with non-empty session ID.
+ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
+   EnsureTlsSetup();
+   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+   EnableCompatMode();
+@@ -376,36 +375,37 @@ TEST_F(Tls13CompatTest, ChangeCipherSpec
+   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+ 
+   server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+   server_->Handshake();  // Consume ClientHello and CCS.
+   server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
+ }
+ 
+-// The client rejects a ChangeCipherSpec if it advertises an empty
++// The client accepts a ChangeCipherSpec even if it advertises an empty
+ // session ID.
+ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
+   EnsureTlsSetup();
+   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+ 
+   // To replace Finished with a CCS below
+   auto filter = MakeTlsFilter<TlsHandshakeDropper>(server_);
+   filter->SetHandshakeTypes({kTlsHandshakeFinished});
+   filter->EnableDecryption();
+ 
+   StartConnect();
+   client_->Handshake();  // Send ClientHello
+   server_->Handshake();  // Consume ClientHello, and
+                          // send ServerHello..CertificateVerify
+   // Send CCS
+   server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
+-  client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
+-  client_->Handshake();  // Consume ClientHello and CCS
+-  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
++
++  // No alert is sent from the client. As Finished is dropped, we
++  // can't use Handshake() and CheckConnected().
++  client_->Handshake();
+ }
+ 
+ // The client rejects multiple ChangeCipherSpec in a row even if the
+ // client indicates compatibility mode with non-empty session ID.
+ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterServerHelloTwice) {
+   EnsureTlsSetup();
+   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
+   EnableCompatMode();
+--- a/lib/ssl/ssl3con.c
++++ b/lib/ssl/ssl3con.c
+@@ -6640,21 +6640,17 @@ ssl_CheckServerSessionIdCorrectness(sslS
+         if (sentFakeSid) {
+             return !sidMatch;
+         }
+         return PR_TRUE;
+     }
+ 
+     /* TLS 1.3: We sent a session ID.  The server's should match. */
+     if (!IS_DTLS(ss) && (sentRealSid || sentFakeSid)) {
+-        if (sidMatch) {
+-            ss->ssl3.hs.allowCcs = PR_TRUE;
+-            return PR_TRUE;
+-        }
+-        return PR_FALSE;
++        return sidMatch;
+     }
+ 
+     /* TLS 1.3 (no SID)/DTLS 1.3: The server shouldn't send a session ID. */
+     return sidBytes->len == 0;
+ }
+ 
+ static SECStatus
+ ssl_CheckServerRandom(sslSocket *ss)
+@@ -8691,17 +8687,16 @@ ssl3_HandleClientHello(sslSocket *ss, PR
+         if (sidBytes.len > 0 && !IS_DTLS(ss)) {
+             SECITEM_FreeItem(&ss->ssl3.hs.fakeSid, PR_FALSE);
+             rv = SECITEM_CopyItem(NULL, &ss->ssl3.hs.fakeSid, &sidBytes);
+             if (rv != SECSuccess) {
+                 desc = internal_error;
+                 errCode = PORT_GetError();
+                 goto alert_loser;
+             }
+-            ss->ssl3.hs.allowCcs = PR_TRUE;
+         }
+ 
+         /* TLS 1.3 requires that compression include only null. */
+         if (comps.len != 1 || comps.data[0] != ssl_compression_null) {
+             goto alert_loser;
+         }
+ 
+         /* If there is a cookie, then this is a second ClientHello (TLS 1.3). */
+@@ -13061,25 +13056,24 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip
+          * will fail if the server fails to negotiate compatibility mode in a
+          * 0-RTT session that is resumed from a session that did negotiate it.
+          * We don't care about that corner case right now. */
+         if (ss->version >= SSL_LIBRARY_VERSION_TLS_1_3 &&
+             cText->hdr[0] == ssl_ct_change_cipher_spec &&
+             ss->ssl3.hs.ws != idle_handshake &&
+             cText->buf->len == 1 &&
+             cText->buf->buf[0] == change_cipher_spec_choice) {
+-            if (ss->ssl3.hs.allowCcs) {
+-                /* Ignore the first CCS. */
+-                ss->ssl3.hs.allowCcs = PR_FALSE;
++            if (!ss->ssl3.hs.rejectCcs) {
++                /* Allow only the first CCS. */
++                ss->ssl3.hs.rejectCcs = PR_TRUE;
+                 return SECSuccess;
+-            }
+-
+-            /* Compatibility mode is not negotiated. */
+-            alert = unexpected_message;
+-            PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
++            } else {
++                alert = unexpected_message;
++                PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
++            }
+         }
+ 
+         if ((IS_DTLS(ss) && !dtls13_AeadLimitReached(spec)) ||
+             (!IS_DTLS(ss) && ss->sec.isServer &&
+              ss->ssl3.hs.zeroRttIgnore == ssl_0rtt_ignore_trial)) {
+             /* Silently drop the packet unless we sent a fatal alert. */
+             if (ss->ssl3.fatalAlertSent) {
+                 return SECFailure;
+--- a/lib/ssl/sslimpl.h
++++ b/lib/ssl/sslimpl.h
+@@ -705,20 +705,17 @@ typedef struct SSL3HandshakeStateStr {
+     sslZeroRttIgnore zeroRttIgnore;       /* Are we ignoring 0-RTT? */
+     ssl3CipherSuite zeroRttSuite;         /* The cipher suite we used for 0-RTT. */
+     PRCList bufferedEarlyData;            /* Buffered TLS 1.3 early data
+                                            * on server.*/
+     PRBool helloRetry;                    /* True if HelloRetryRequest has been sent
+                                            * or received. */
+     PRBool receivedCcs;                   /* A server received ChangeCipherSpec
+                                            * before the handshake started. */
+-    PRBool allowCcs;                      /* A server allows ChangeCipherSpec
+-                                           * as the middlebox compatibility mode
+-                                           * is explicitly indicarted by
+-                                           * legacy_session_id in TLS 1.3 ClientHello. */
++    PRBool rejectCcs;                     /* Excessive ChangeCipherSpecs are rejected. */
+     PRBool clientCertRequested;           /* True if CertificateRequest received. */
+     PRBool endOfFlight;                   /* Processed a full flight (DTLS 1.3). */
+     ssl3KEADef kea_def_mutable;           /* Used to hold the writable kea_def
+                                            * we use for TLS 1.3 */
+     PRUint16 ticketNonce;                 /* A counter we use for tickets. */
+     SECItem fakeSid;                      /* ... (server) the SID the client used. */
+ 
+     /* rttEstimate is used to guess the round trip time between server and client.
+
diff --git a/dev-libs/nss/nss-3.56.ebuild b/dev-libs/nss/nss-3.56.ebuild
index db3bc67fd55f..fd9f45030fa8 100644
--- a/dev-libs/nss/nss-3.56.ebuild
+++ b/dev-libs/nss/nss-3.56.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
diff --git a/dev-libs/nss/nss-3.55.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index 827349d454c0..38528576dc70 100644
--- a/dev-libs/nss/nss-3.55.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.26"
+NSPR_VER="4.29"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+HOMEPAGE="https://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 )"
 
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
 	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
+	"${FILESDIR}/${PN}-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch"
 )
 
 src_prepare() {
@@ -161,6 +162,14 @@ multilib_src_compile() {
 	export USE_SYSTEM_ZLIB=1
 	export ZLIB_LIBS=-lz
 	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
 
 	local d
 
diff --git a/dev-libs/nss/nss-3.57.ebuild b/dev-libs/nss/nss-3.59.ebuild
index 37ab7c58696f..37ab7c58696f 100644
--- a/dev-libs/nss/nss-3.57.ebuild
+++ b/dev-libs/nss/nss-3.59.ebuild
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 6382df656204..935c74c94351 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,7 @@
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
+DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
 EBUILD oniguruma-6.9.4.ebuild 1506 BLAKE2B ee403b48d1fe7194b4780ba5dc8221dda58a63e6bdef9acd6aaa1b872520e5dd942111b314692f595ac5e492c4990f2a09d5a1d7f520bb4567f777a8bf68b1d2 SHA512 e697c3c94b3a1de3cea291e07933bdfce5f4c4a6c0c4148c23e3b25f252a0b741b4e8cb65573daeaaae23a0321aa14cb664e43af5e5471d06840677e8c2cf42b
-EBUILD oniguruma-9999.ebuild 1103 BLAKE2B 82646a83124feadc0ff37f9cec6f9664ca188814596bd2c4b739abf7055a133be7025710fcc195b4940d9637a552f75516f84a4054fe058b2af0bbaca982dd00 SHA512 65e62e9721012a8c8f582f90680246bbaa9050767a085ff0a87c809f818f2f5e7f501ae6e48a19129feb9279b884ce5bbebe9d9f691229ae8c655f66a9d908b0
-MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
+EBUILD oniguruma-6.9.6-r1.ebuild 1506 BLAKE2B a40ade4c00a47ba79b03f21f02ca641153fffd1f262b60946cee62e77212243024b70fa794f53936e71001d43a25c135d5a3f12a1aeeef02501b299dcc4740ea SHA512 a18a9b97c2beec525ef292f82c7e54c05ffc5af1c1d70bb1b73abe58c650a941b82d78752c75ed6c67e09540825c67216bd77e7487b598f847f251687201431e
+EBUILD oniguruma-6.9.6.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+EBUILD oniguruma-9999.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+MISC metadata.xml 899 BLAKE2B 3410f5e417f4f7e946b8f0485d39a9a03f8f007c3b37f329958939674a6d4648719d9d0366c4de2f06ded2a8e5b5f088f3830fde351a5f0c4a3b40f58b7ba01f SHA512 ed6a20a44390801a201994802059b22e4df1b2d3735e36cefb60ef91990d19a63486f09f5d5915d0f4d88f18b376df62a20a4b0dfd37ed77256691077f490ff5
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 2dc293268b64..597c459467b1 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription>
-    Oniguruma is a regular expression library.  The characteristics of
-    this library is that different character encoding for every regular
-    expression object can be specified.  (Supported character encodings:
-    ASCII, UTF-8, EUC-JP, Shift_JIS)
-  </longdescription>
-  <slots>
-    <subslots>Reflect ABI of libonig.so.</subslots>
-  </slots>
-  <use>
-    <flag name="crnl-as-line-terminator">
-      enable CR+NL as line terminator
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">kkos/oniguruma</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription>
+		Oniguruma is a regular expression library.  The characteristics of
+		this library is that different character encoding for every regular
+		expression object can be specified.  (Supported character encodings:
+		ASCII, UTF-8, EUC-JP, Shift_JIS)
+	</longdescription>
+	<slots>
+		<subslots>libonig.so soname version number</subslots>
+	</slots>
+	<use>
+		<flag name="crnl-as-line-terminator">Enable CR+NL as line terminator</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kkos/oniguruma</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
new file mode 100644
index 000000000000..e0a1c8d371cf
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	# https://github.com/kkos/oniguruma/issues/223
+	# https://github.com/kkos/oniguruma/commit/d177786282a618c76cdf2e993e3d0d9a684e9666
+	sed -e "/^AM_LDFLAGS[[:space:]]*=/s:-L\$(prefix)/lib:-L\$(libdir):" -i {sample,test}/Makefile.{am,in} || die
+
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
new file mode 100644
index 000000000000..4c0eebf2c0ca
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+	S="${WORKDIR}/onig-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+IUSE="crnl-as-line-terminator static-libs"
+
+DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} )
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild
index 8efae9394402..4c0eebf2c0ca 100644
--- a/dev-libs/oniguruma/oniguruma-9999.ebuild
+++ b/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -1,34 +1,27 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multilib-minimal
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
-
 	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+	S="${WORKDIR}/onig-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="Regular expression library for different character encodings"
 HOMEPAGE="https://github.com/kkos/oniguruma"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS=""
 IUSE="crnl-as-line-terminator static-libs"
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/onig-${PV}"
-fi
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} )
 
 src_prepare() {
 	default
@@ -46,5 +39,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 98453a7506a3..1e700a95dc11 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -2,10 +2,6 @@ AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
-DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
-EBUILD opencl-clang-10.0.0.1-r1.ebuild 1136 BLAKE2B d6f1bbe34d2af79dfd9aec8246ba785c0befd4da31948d86ef5bdc495e69b20fe3b9a1c3af3c0a535f90e782a7d02f51438bdb8f78b95f36e8976130b926259f SHA512 16f6191679ac3268e201b1d03c76473f1660bb9747dca49f6cbfa37826f8bb28150c2811294ab501d23aafc710ecf2040de67804d3ba1203711f04ec95da348e
-EBUILD opencl-clang-10.0.0.1.ebuild 977 BLAKE2B c999d6908707986a138485141b441eb95ca55d07e839bbd8d2b613ce846450f137aeb5bcaf2dd3e6c48f91202d70f0c7c640f8ad3a6e1c3c1cb043b1c41f32c9 SHA512 e484696df78c482232406c8fffae4e6af3d2c3b73a95ebc40b79608d3c67418f3adf241a91e2bebc2868722d62e3eb3fea56ea7a9e89ed91dc4199ef97761e6d
+EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
-EBUILD opencl-clang-10.0.0.2.ebuild 997 BLAKE2B 0dd9f22f085765e93f5652bcc2ee128950df801dc820a6c53a3cfc3dafe381afdf1985dd679b7484d12cacb8a2cfcec430d7b35be2338cffc6e94dd98243e80f SHA512 cb0a15b2a66830dfa2e45800b8a3e3430fa7edb32840efd51f7a1fe3c729376614c9e930d4fdcead87d38caaf2543ba718cc2d9f7b95cd5616266a78326f0ec6
-EBUILD opencl-clang-9.0.1.ebuild 869 BLAKE2B 4a19199ca6e9141ba8ecbfabe949d328aa54f51619aa8842f32cad1cd45d98ad2743a8b233db7b2e8bbe9f917bb4714656f2fcaa23772cec6b4eabd110316fca SHA512 2915ec087251d6ddcc3f24cd3fabfb03b8cdc05c99a62c1608e7d423ecc7521070ad1d56a993cde42edeba828e22c780ed8bcf21fbeb0e850a745ab2ff77a5a0
-MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
+MISC metadata.xml 251 BLAKE2B d59c954af9491cf4baaa1ef87798223542baa4d51b53d7efe06cd840bad610355371123af40858103530471987e6689863955eda4320e45add1964d64a2d3f10 SHA512 1f5116232dec742b8658c6296c94e33b014a4305a191fed50b9c840dd2613d3937a2405efd57b23d6bfeace5473a310bf36b087cf0b73817287043f6a2ff701e
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
index b4f521584bbd..251a7a75fe18 100644
--- a/dev-libs/opencl-clang/metadata.xml
+++ b/dev-libs/opencl-clang/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="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">intel/opencl-clang</remote-id>
 	</upstream>
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
index 362abf92b92f..8d0b22328075 100644
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="10"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
deleted file mode 100644
index 4089ce2a4788..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild
deleted file mode 100644
index c6bba058fc0e..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-9.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-9.0.1.ebuild
deleted file mode 100644
index 84ff6a4cc50a..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-9.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="9"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-vcs/git"
-DEPEND="sys-devel/clang:9=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:9=[${MULTILIB_USEDEP}]
-	dev-util/spirv-llvm-translator:9=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=9
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 66e4ea3bbdaa..08ce93af6d76 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
 EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
-EBUILD opencl-icd-loader-2020.06.16.ebuild 1070 BLAKE2B b24fac6217b7b8c5f23b1a6cb6d6556fc54736d9d3fd7e966a6cb96266a4b26950c46fc3b384fda608fa1d05d91f07ddd4d60573c1d40a9f12f3d9aaf8d86486 SHA512 ad6267973a1f4f4a8874f71525985f9394e83904e8ee5a66aff07fea0b8e01b04c0b66235b1e04ca65690f3a5c3cf50f92040ad0cec2e3565b312961def01027
+EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
index 47205d26a955..566faffb1de0 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pakchois/Manifest b/dev-libs/pakchois/Manifest
index a3b601eec2fd..f8043cafa1d8 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 487 BLAKE2B 68ef7cce51c14a62b231dbbf9914459c2d6df15e076b6166d116587a5df2f9e9a59e2d6ab1bd981e2674edefc98f43c197262c46df8cb67fa186bdfd7a257204 SHA512 6d67f3c72eebce3ad8a0fac79d7fdf6210e56505a71f633b1a1390b23805b4b7d77d8efeafd72bd726196da3e7df610124084e829791af82b769a6aa3a453e28
+EBUILD pakchois-0.4-r2.ebuild 587 BLAKE2B 7782a575d00d4020fa1820749da1b6473bf9a50457b52192caebdb0977a71b0dd953e03ea8e93bc184b3cd6f3e68a79073c7275e9b2d6c408d84f8602183170b SHA512 62ca19e4fd37434e60cd3a7bf9a62b7543c5fb457bdcee7753b70eed81e2bbeeda87b5a24d86708098adfec3ea55b735fd03a5305f0a4c6200802a60aa788a98
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index fdfc232a6bfa..fed0ff842a1f 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -16,5 +16,11 @@ IUSE="nls"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls)
+		$(use_enable nls) \
+		--disable-static
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index eb2fb41a3264..6c2b4075c3ad 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,3 +1,3 @@
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
-EBUILD pcl-1.12-r1.ebuild 310 BLAKE2B c0ffd022d260acc7ccb0f34ac48c15fd629e1061604f55a8dc91e8a48995bff1edadf555ff998b77911726c974ba8004d4015bfdf1ebc0e878bd8fe97606b760 SHA512 615c2b1db77b03a59d3969a3c92bc12746153082040b495664a46fe182be7dbde871c38958b2a39fff937d25269625c49bb8fdbf480c9dc9912ad333fa6244a9
+EBUILD pcl-1.12-r1.ebuild 425 BLAKE2B 8ce4917fc27781696f4fa70eb110fa6a1d0c654dd8eb4a67ed5d0c7dbe9ac5451bf19432940dd5fc025a8004fade25b464d9c4a32a6597d22e8aea52b801f4b6 SHA512 06dfe3e3611e1ccf0a3d8a4308367409baf0d68ce9f6907aeab54f2da2082932f756cd4d65f8aa61b521b5e20d0d90cb925b163fa9bfd4918905ff20af4fd4e6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pcl/pcl-1.12-r1.ebuild b/dev-libs/pcl/pcl-1.12-r1.ebuild
index d93b4eb3fb4a..e0413db80e0e 100644
--- a/dev-libs/pcl/pcl-1.12-r1.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r1.ebuild
@@ -10,3 +10,12 @@ SRC_URI="http://xmailserver.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/1"
 KEYWORDS="amd64 arm arm64 ppc64 x86"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index d794531df2e2..bf4255be0e24 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -3,6 +3,8 @@ AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
 DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c
+DIST pigpio-78.tar.gz 2900959 BLAKE2B 71a7ed89b247292718229955bf69bec1b7798040fb69b3d9d19a1143cd4fc6565b61deb6ed3bc40eb643a7987f88809125b4368b80aab2fe03bfbaa5fd665274 SHA512 893eefc4a5ab054d56df2c439539ab32a292050aa1fe4b062ba535921f1b12aeac9d509756d08986cd18ed512f52517fa64822422ea3f4dbf6e41fd364a75c3f
 EBUILD pigpio-76.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
 EBUILD pigpio-77.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
+EBUILD pigpio-78.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-78.ebuild b/dev-libs/pigpio/pigpio-78.ebuild
new file mode 100644
index 000000000000..a47a53d9b909
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-78.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio"
+SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index d5079102f779..a0da4e355d9e 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
-EBUILD plasma-wayland-protocols-1.1.1.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
+EBUILD plasma-wayland-protocols-1.1.1.ebuild 455 BLAKE2B 9072fb9f96bef5c5e3733242fb648b295f95bafe31d79a3142aca781765e5b05e73e9b9741e5de50179c0bf8634c5146086a41d1e4826874935ac8529c290d75 SHA512 b5c9738c1215e5bfbc914137b0746b880fecdc54024a88464254ab97e0311d34ac6482453ac74edbdbb6807df4ca0c6033c5d1f9fc477e834af709480cffd3c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
index d5505ca30efe..8a6dc27d5ba9 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index acf849271932..10177761ec8a 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,4 +1,7 @@
+AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
+DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
+EBUILD poco-1.10.1.ebuild 3835 BLAKE2B e9f3a497dc2abac87c1a8e12bd00b3f070c18f7c8fdf136973fc26e85c5d80f5255bf39b95943e3fd119d976c04d0d21fb830f2e4f04a4e2fc302ff4657c4b6a SHA512 45a2f75b1a60b5e69a59811fe6be0f1f9cbd983bab8e70045d3928e9f2d86339611bd92073d7e14a13fe784c5049d3501d38446fbeb672e1c69c5f59c62215c8
 EBUILD poco-1.9.0-r2.ebuild 3845 BLAKE2B db4139cd4bc0e7d133d32f6a25cdf740e9671c400a909599a05da83726183fdb932a91ba5f628dd6d1d3531186779ea1ec9f8eed351994aab0c6a33f35133952 SHA512 a85f82234f98f4a8b89a2f1e9bbf63b48f3580d8651a0c09d98fadaeba59136af0073ae370128a8ec2f9c19cde0121a5eafd680b95db6fd857a4339b29b0eab0
-MISC metadata.xml 2354 BLAKE2B c376c105867c39c9bd2fbeb553f40acd95d71307b5c89b0e2d685862fa901b06c3056ff7996b4a1bce8b70f70bad45678c6a0d41567564dc009841f520fe8b3e SHA512 9263939c5e0120e2687446859db4fbfd84072f1d1ae37cb993b1eb69c39dddc828aadf95ef9fed86f8bea65ce24e041740dd48523ad68756b45ef47454c64a8c
+MISC metadata.xml 2553 BLAKE2B 2de5210d62ca2df3a02187d592efc80ea4af5e0d2601885ceefc66079f8f7ecbd52535c4da7c4287f4232eca57947c890182cb497a99460733146bd3ea764000 SHA512 000dd91ec6f5bc139134ecb05b227c532c5efa81256f5302e71e22d9766ec48a629285a1895a6c731954ccda247c3962537dbfbc4d155ae8d0c882a725c3a4e1
diff --git a/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch
new file mode 100644
index 000000000000..afac9bc79229
--- /dev/null
+++ b/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake
+index 55318b520..fb7efbffe 100644
+--- a/cmake/FindODBC.cmake
++++ b/cmake/FindODBC.cmake
+@@ -34,7 +34,7 @@ find_path(ODBC_INCLUDE_DIR
+ 		${ODBC_ROOT_INCLUDE_DIRS}
+ 	PATHS
+ 		${PC_ODBC_INCLUDE_DIRS}
+-		/usr/include
++		/usr/include/iodbc
+ 		/usr/local/include
+ 		/usr/local/odbc/include
+ 		/usr/local/iodbc/include
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index 6c90e505339c..efd7d2d61160 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/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>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 POCO, the C++ Portable Components, is a collection of open source
 C++ class libraries that simplify and accelerate the development of
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild
new file mode 100644
index 000000000000..dcdec18fa2ef
--- /dev/null
+++ b/dev-libs/poco/poco-1.10.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="https://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}-release"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	7z? ( xml )
+	file2pagecompiler? ( pagecompiler )
+	iodbc? ( odbc )
+	mongodb? ( data )
+	mysql? ( data )
+	odbc? ( data )
+	pagecompiler? ( json net util xml )
+	pocodoc? ( cppparser util xml )
+	sqlite? ( data )
+	ssl? ( util )
+	test? ( data? ( sqlite ) json util xml )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-libs/libpcre-8.42
+	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
+		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
+	odbc? ( iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC ) )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xml? ( dev-libs/expat )
+	zip? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		# ignore missing tests on experimental library
+		# and tests requiring running DB-servers, internet connections, etc.
+		sed -i -e '/testsuite/d' \
+			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die
+		# Poco expands ~ using passwd, which does not match $HOME in the build environment
+		sed -i -e '/CppUnit_addTest.*testExpand/d' \
+			Foundation/testsuite/src/PathTest.cpp || die
+		# ignore failing Crypto test since upstream does not seem to care,
+		# see https://github.com/pocoproject/poco/issues/1209
+		sed -i -e '/RSATest, testRSACipherLarge/d' \
+			Crypto/testsuite/src/RSATest.cpp || die
+	fi
+
+	if use mariadb ; then
+		# Fix MariaDB detection
+		sed -i -e 's~/usr/include/mysql~~' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	else
+		# Fix MySQL detection
+		sed -i -e 's/mysqlclient_r/mysqlclient/' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	fi
+
+	# Add missing directory that breaks the build
+	mkdir -p Encodings/testsuite/data || die
+
+	if ! use iodbc ; then
+		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
+	fi
+}
+
+src_configure() {
+	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
+	local mycmakeargs=(
+		-DPOCO_UNBUNDLED=ON
+		-DENABLE_APACHECONNECTOR=OFF
+		-DENABLE_CPPPARSER="$(usex cppparser)"
+		-DENABLE_CRYPTO="$(usex ssl)"
+		-DENABLE_DATA="$(usex data)"
+		-DENABLE_DATA_MYSQL="$(usex mysql)"
+		-DENABLE_DATA_ODBC="$(usex odbc)"
+		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_JSON="$(usex util)"
+		-DENABLE_MONGODB="$(usex mongodb)"
+		-DENABLE_NET="$(usex net)"
+		-DENABLE_NETSSL="$(usex ssl)"
+		-DENABLE_NETSSL_WIN=OFF
+		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
+		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
+		-DENABLE_PDF="$(usex pdf)"
+		-DENABLE_POCODOC="$(usex pocodoc)"
+		-DENABLE_SEVENZIP="$(usex 7z)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_UTIL="$(usex util)"
+		-DENABLE_XML="$(usex xml)"
+		-DENABLE_ZIP="$(usex zip)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	POCO_BASE="${S}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		for sd in */samples ; do
+			docinto examples/${sd%/samples}
+			dodoc -r ${sd}
+		done
+
+		find "${D}/usr/share/doc/${PF}/examples" \
+			-iname "*.sln" -or -iname "*.vcproj" -or \
+			-iname "*.vmsbuild" -or -iname "*.properties" \
+			| xargs rm -v || die
+	fi
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index dc08ada43274..180202723a57 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -2,5 +2,5 @@ AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c07134
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
-EBUILD popt-1.18.ebuild 952 BLAKE2B a99b227262456ecd3feeb3d1c71973f0c97d099cf574bb9771f752328a1111ffec777d1538dd7ad37a4b5469186e4351ae99c59b780254cf839c33bdad2a5b75 SHA512 99260d125e99c9e76077b181cc26af53379cf182a3fb9e086e5acadcc66224f0d4cdfee2cf96b094e85d006a7e4562c60792cf011135dafd66c832f5083d2e07
+EBUILD popt-1.18.ebuild 943 BLAKE2B 466e5b7d19afd631656c45df1f0a4b5f8a005da83471a8cccde123ef52fe5dd68dd94b4fd2a996a6e4f2b2b369951059408c419ee396e5787317650c7cc16a50 SHA512 cef4a05181b9def83db96a1ffa02dd102dc207500f79a26270ed7353fd4d95a07ae28073d3883af1b0b9151f6221b506ea45880f2b066c259357b5037807604f
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 6130f1283417..d4da266cab41 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 073b7a6289c0..20042bb649da 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,7 +1,7 @@
-AUX disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 AUX disable-containsintegerpoint1.patch 1039 BLAKE2B c608e3e2e03350ac72b987284e4d05089bd4bcd3ae3aa53864eec21a3475c88a0c6f66062ff19f9fe9d84179d68e2acb9b979a2fc54e439878188604e7f98b86 SHA512 3fc14d9161e0b6ab0ea70bf3d35e85efcafa0a5fa62cf5c7d3af624517688ea2a0747cdd8e7859c500f03d6cda1fa958136b3322484de1450db8892191bdfa1a
 AUX disable-mipproblem2.patch 1098 BLAKE2B b15da536e0e46a2edbec44e4c68a97e57b96d71639b382aa5efe4032e788db241e49e717e3b7b99f602633980b7b269d1f743c1cc9eb21eca4c03aa6e54ba121 SHA512 430917cae1dcff8772643be468fe69116ba2b58c9d7cac505584e4bc27b830f7a61cc213d364a26ccf08196b594fe1552f5566e71184286dff1b56fd5a60a635
 AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8d6262609eccf70e29f6442a7b261b22ffc112ff30cfddc0b8f2a80ffd787d2e9f14f8bb1ba35c095110d695 SHA512 d802c597e408ca50fe01e240c868b2fb5cc2ca3ff00cf15ff1de1c1dc5d0cf0b88da25de0d1151f8011e331f85e343348150285bb515c9ffc17806ff4edd082d
+DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.2-r3.ebuild 1701 BLAKE2B ca22ab7dcd76d21907b06cac075799ac2f2b8f5a38ce28fa0b25bc24a6d006006f1744bf34572f0babb2a9d049077912c4a8ccd420a34507cc372875c69bf1a8 SHA512 be05c89d00c98ed1b57ee01b1f773c208cb50e743169c06200f4863365b49d3d03c97e60034ae328074d708d842d4af22cadbf73f603f83359d066406f21886f
+EBUILD ppl-1.2-r3.ebuild 1796 BLAKE2B 3539c5632cffcbd77a4d116637ea4d3aa737a33e4a47fa159a4af84b9c0d89abf67d6db70703c43e28b032dbcdcf3d83f28b1a3d029884889e666d220dd1f1cf SHA512 b3851d84685a7147c4eaf0282eb7fba643b0c1009684fd0b2ce145d8aade498de6846d74fd6077f7d47d056a7fce2ddbec00b4ec698d3a6c53ba86e38bbbe706
 MISC metadata.xml 859 BLAKE2B 73b368a2852176bfc7e38a89b8ec0c239fd4e96a838bad0fd883d50125cb25cbe2962fddd3c62d420a3bb97287d80c47c356f063dcacf39057d4bd07cb3b110b SHA512 a7f896a4a2a485c18df3cf03038621bfaf93057eefb43ff093f9cf89d0d71937e96de0ef0fd5dc20fd12580cc60bebd80d74e64fd40941e9f3bfe1f91d1666bb
diff --git a/dev-libs/ppl/files/disable-boeing-tests.patch b/dev-libs/ppl/files/disable-boeing-tests.patch
deleted file mode 100644
index ca208b8707ff..000000000000
--- a/dev-libs/ppl/files/disable-boeing-tests.patch
+++ /dev/null
@@ -1,1176 +0,0 @@
-From 14ceb43dee3c3a029dd5398d809796011dd3d772 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 14 Apr 2020 10:52:53 -0400
-Subject: [PATCH 1/1] demos/ppl_lpsol/examples: disable the boeing[12].mps
- tests.
-
-These two tests fail due to numerical noise on 32-bit systems, and
-this commit disables them to prevent build failures on Gentoo. This
-one is a bit trickier than the other test removals because we need to
-hack the expected output out of the expected_mpz file as well.
-
-Warning: this is only half of the solution. The boeing[12].mps files
-must still be deleted by the ebuild. The patch does not do this to
-avoid running afoul of the 20KiB patch size limit in Gentoo.
-
-Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=1078
-Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=2113
----
- demos/ppl_lpsol/Makefile.am          |   21 -
- demos/ppl_lpsol/examples/Makefile.am |    2 -
- demos/ppl_lpsol/expected_mpz         | 1070 --------------------------
- 3 files changed, 1093 deletions(-)
-
-diff --git a/demos/ppl_lpsol/Makefile.am b/demos/ppl_lpsol/Makefile.am
-index d6d6a38b2..7c73ba455 100644
---- a/demos/ppl_lpsol/Makefile.am
-+++ b/demos/ppl_lpsol/Makefile.am
-@@ -115,8 +115,6 @@ endif !ASSERTIONS_ENABLED
- TOUGH_EXAMPLES_FOR_ENUM = \
- adlittle.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- egout.mps \
- kb2.mps \
- lseu.mps \
-@@ -161,8 +159,6 @@ adlittle.mps \
- afiro.mps \
- bgprtr.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- kb2.mps \
- sample.mps \
- sc105.mps \
-@@ -172,13 +168,9 @@ ship08l.mps
- 
- DO_NOT_OUTPUT_OPTIMUM_LOCATION_PROBLEMS = \
- adlittle.mps \
--boeing1.mps \
--boeing2.mps \
- rout.mps
- 
- INDIVIDUALLY_CHECKED_PROBLEMS = \
--boeing1.mps \
--boeing2.mps \
- ex12.mps \
- mas74.mps \
- modglob.mps
-@@ -291,19 +283,6 @@ check-local: ppl_lpsol$(EXEEXT)
- 	  echo "*** ppl_lpsol -e -r $$m -oobtained $$file" >>obtained; \
- 	  ./ppl_lpsol$(EXEEXT) -e -r $(CHECK_OPTION) $$m -oobtained $$path >/dev/null; \
- 	done
--	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000518 boeing1.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000518 $(srcdir)/examples/boeing1.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.0000000105 boeing1.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -M -c0.0000000105 $(srcdir)/examples/boeing1.mps $$m >/dev/null
--	$(ECHO_SIMPLEX) "-n boeing1.mps" >>obtained
--	-$(SIMPLEX) -n $(srcdir)/examples/boeing1.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000863 boeing2.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000863 $(srcdir)/examples/boeing2.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.00000000213 boeing2.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -M -c0.00000000213 $(srcdir)/examples/boeing2.mps $$m >/dev/null
--	$(ECHO_SIMPLEX) "-n boeing2.mps" >>obtained
--	-$(SIMPLEX) -n $(srcdir)/examples/boeing2.mps >/dev/null
--
- 	$(ECHO_SIMPLEX) "-r -m mas74.mps" >>obtained
- 	-$(SIMPLEX) -r -m $(srcdir)/examples/mas74.mps >/dev/null
- 	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.000123 mas74.mps" >>obtained
-diff --git a/demos/ppl_lpsol/examples/Makefile.am b/demos/ppl_lpsol/examples/Makefile.am
-index f621a68d4..ce333c7c5 100644
---- a/demos/ppl_lpsol/examples/Makefile.am
-+++ b/demos/ppl_lpsol/examples/Makefile.am
-@@ -26,8 +26,6 @@ adlittle.mps \
- afiro.mps \
- bgprtr.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- egout.mps \
- ex12.mps \
- ex1.mps \
-diff --git a/demos/ppl_lpsol/expected_mpz b/demos/ppl_lpsol/expected_mpz
-index 2bb4f1658..5024da1f6 100644
---- a/demos/ppl_lpsol/expected_mpz
-+++ b/demos/ppl_lpsol/expected_mpz
-@@ -3937,1076 +3937,6 @@ Optimum value: 0
- Optimum location:
- x1 = 0
- x2 = 0
--*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000518 boeing1.mps
--Optimum value: -335.2135675
--Optimum location:
--PBOSHNL0 = 0
--PBOSHNL1 = 12
--PBOSHNL7 = 0
--PBOSHNL8 = 0
--PBOSLAX0 = 14
--PBOSLAX1 = 0
--PBOSLAX7 = 0
--PBOSSEA0 = 0
--PBOSSEA1 = 0
--PBOSSEA2 = 49
--PBOSSFO0 = 60
--PBOSSFO1 = 73
--PBOSTPE1 = 1
--PBOSTPE2 = 0
--PBOSTYO1 = 3
--PBOSTYO2 = 0
--PBOSYUL0 = 28.13380282
--PBOSYUL1 = 347.7678621
--PBOSYUL2 = 0.325
--PBOSYUL3 = 336.7733351
--PBOSYUL4 = 0
--PBOSYVR0 = 0
--PBOSYVR1 = 0
--PBOSYVR2 = 26
--PBOSYWG0 = 0
--PBOSYWG1 = 0
--PBOSYWG7 = 37
--PBOSYYZ0 = 19.03169014
--PBOSYYZ1 = 195.9683099
--PBUROAK0 = 11
--PBUROAK1 = 16
--PBURSEA0 = 83
--PBURSEA1 = 0
--PBURSFO0 = 278
--PHNLLAX0 = 104.0482353
--PHNLLAX1 = 33.04
--PHNLLAX2 = 68.20588235
--PHNLLAX3 = 98
--PHNLLON0 = 0
--PHNLLON6 = 5
--PHNLPAR0 = 0
--PHNLPAR6 = 1
--PHNLSEA0 = 0
--PHNLSEA1 = 157.7943925
--PHNLSEA2 = 0
--PHNLSFO0 = 35
--PHNLSFO1 = 0
--PHNLSFO7 = 0
--PHNLYVR0 = 94.20560748
--PHNLYVR1 = 0
--PHNLYVR7 = 39.79439252
--PLASSEA0 = 70.01327253
--PLASSEA1 = 342.9867275
--PLASYVR0 = 0
--PLASYVR6 = 37
--PLAXOAK0 = 32
--PLAXOAK1 = 0
--PLAXOAK2 = 46
--PLAXSEA0 = 0
--PLAXSEA1 = 0
--PLAXSEA2 = 0
--PLAXSEA3 = 546.0147059
--PLAXSEA4 = 3.720588235
--PLAXSEA5 = 139
--PLAXSEA6 = 66.26744186
--PLAXSEA7 = 0
--PLAXSEA8 = 57
--PLAXSEA9 = 5.415868673
--PLAXSFO0 = 33.04
--PLAXSFO1 = 260.8488372
--PLAXSFO2 = 839.9632721
--PLAXSFO3 = 87.90697674
--PLAXSFO4 = 168
--PLAXSFO5 = 98
--PLAXSFO6 = 1464.240914
--PLAXTPE0 = 8.581395349
--PLAXTPE1 = 0
--PLAXTPE2 = 18
--PLAXTPE8 = 4.418604651
--PLAXTYO0 = 41
--PLAXTYO1 = 0
--PLAXTYO2 = 0
--PLAXTYO8 = 0
--PLAXYVR0 = 0
--PLAXYVR1 = 153.755814
--PLAXYVR2 = 39.24418605
--PLONPAR0 = 0
--PLONPAR1 = 0
--PLONPAR2 = 2
--PLONSEA0 = 0
--PLONSEA1 = 151
--PLONYVR0 = 0
--PLONYVR1 = 0
--PLONYVR7 = 51
--POAKONT0 = 0
--POAKONT1 = 13
--POAKSEA0 = 37.89108456
--POAKSEA1 = 77.15303309
--POAKSEA2 = 6.955882353
--PONTSFO0 = 177
--PONTSEA0 = 23.10431985
--PONTSEA1 = 24.89568015
--PONTSEA2 = 0
--PPARSEA0 = 0
--PPARSEA1 = 68
--PPARYVR0 = 0
--PPARYVR1 = 0
--PPARYVR7 = 24
--PRNOSEA0 = 0
--PRNOSEA1 = 291
--PRNOYVR0 = 67
--PSEASFO0 = 0
--PSEASFO1 = 839.9632721
--PSEASFO2 = 146.6809139
--PSEASFO3 = 236.6
--PSEASFO4 = 0
--PSEASFO5 = 50.75581395
--PSEASFO6 = 168
--PSEATPE0 = 15.81395349
--PSEATPE1 = 0
--PSEATPE2 = 0
--PSEATPE3 = 49.60465116
--PSEATYO0 = 59.98837209
--PSEATYO1 = 0
--PSEATYO2 = 0
--PSEATYO3 = 95.01162791
--PSEAYVR0 = 164.8598131
--PSEAYVR1 = 0
--PSEAYVR2 = 0
--PSEAYVR3 = 392
--PSEAYVR4 = 0
--PSEAYVR5 = 70.01327253
--PSEAYVR6 = 0
--PSEAYVR7 = 50.75581395
--PSEAYVR8 = 47.16549296
--PSFOTPE0 = 0
--PSFOTPE1 = 0
--PSFOTPE2 = 0
--PSFOTPE8 = 6
--PSFOTYO0 = 0
--PSFOTYO1 = 0
--PSFOTYO2 = 0
--PSFOTYO8 = 17
--PSFOYVR0 = 260.8488372
--PSFOYVR1 = 37.15116279
--PTPETYO0 = 111
--PTPETYO1 = 0
--PTPETYO2 = 0
--PTPETYO3 = 0
--PTPEYVR0 = 57
--PTYOYVR0 = 91
--PYULYVR0 = 36.4084507
--PYULYVR1 = 134.1343917
--PYULYVR2 = 139.6904909
--PYULYVR3 = 4.766666667
--PYULYWG0 = 0
--PYULYWG1 = 271.3172923
--PYULYWG2 = 0
--PYULYWG3 = 178.6827077
--PYULYYZ0 = 0
--PYULYYZ1 = 266.6818464
--PYULYYZ2 = 0
--PYULYYZ3 = 431.9057717
--PYULYYZ4 = 1913.412382
--PYVRYWG0 = 14.67957746
--PYVRYWG1 = 271.3172923
--PYVRYWG2 = 138.0031303
--PYVRYYZ0 = 4.352112676
--PYVRYYZ1 = 241.2835753
--PYVRYYZ2 = 126.3643121
--PYWGYYZ0 = 14.67957746
--PYWGYYZ1 = 138.0031303
--PYWGYYZ2 = 0
--PYWGYYZ3 = 125.3172923
--PBOSOAK0 = 11
--PBOSOAK6 = 0
--PBOSBUR1 = 7
--PBOSBUR2 = 0
--PBOSONT1 = 4
--PBOSONT2 = 0
--PBURYVR1 = 26
--PBURTYO1 = 2
--PBURTPE1 = 1
--PBURHNL0 = 11
--PBURHNL6 = 0
--PHNLOAK0 = 0
--PHNLOAK1 = 24
--PHNLOAK2 = 0
--PHNLOAK8 = 0
--PHNLONT0 = 9.705882353
--PHNLONT6 = 6.294117647
--PHNLYWG1 = 3
--PHNLYYZ1 = 24
--PHNLYUL1 = 40
--PLASTYO1 = 5
--PLASTPE1 = 1
--PLAXLON0 = 13
--PLAXLON6 = 0
--PLAXLON7 = 0
--PLAXPAR0 = 8
--PLAXPAR6 = 0
--PLAXPAR7 = 0
--PBURLON1 = 1
--PBURPAR1 = 1
--PLONONT1 = 1
--PLONOAK1 = 1
--POAKPAR1 = 2
--POAKTYO1 = 7
--POAKTPE1 = 2
--PONTPAR1 = 2
--PONTTYO1 = 2
--PONTTPE1 = 1
--PPARSFO1 = 2
--PRNOTYO1 = 5
--PRNOTPE1 = 2
--PTPEYWG1 = 21
--PTPEYYZ1 = 13
--PTPEYUL1 = 6
--PTYOYUL1 = 7
--PTYOYYZ1 = 17
--PTYOYWG1 = 25
--PLAXONT0 = 6.294117647
--GRDTIMO1 = 0
--GRDTIMN1 = -49.01286158
--GRDTIMO2 = 0
--GRDTIMN2 = 0
--GRDTIMO3 = 0
--GRDTIMN3 = -47
--GRDTIMO4 = 0
--GRDTIMN4 = 0
--GRDTIMO5 = 0
--GRDTIMN5 = -47.24353963
--GRDTIMO6 = 0
--GRDTIMN6 = -81
--N1001AC1 = 0
--N1001AC2 = 0
--N1001AC3 = 0
--N1002AC1 = 0
--N1002AC2 = 0
--N1002AC3 = 2.355140187
--N1003AC1 = 0
--N1003AC2 = 0.1603208556
--N1003AC3 = 0.7214438503
--N1004AC1 = 0.28
--N1004AC2 = 0
--N1004AC3 = 0
--N1005AC3 = 0.0859375
--N1105AC3 = 0.8382352941
--N1006AC3 = 0.07582720588
--N1007AC1 = 0
--N1007AC2 = 0
--N1007AC3 = 0
--N1008AC1 = 0
--N1008AC2 = 0
--N1008AC3 = 0
--N1008AC4 = 0
--N1008AC5 = 0
--N1008AC6 = 4.65801495
--N1009AC1 = 0
--N1009AC2 = 0.07488107822
--N1009AC3 = 0
--N1009AC4 = 0
--N1009AC5 = 1.921947674
--N1010AC1 = 0
--N1010AC2 = 0
--N1010AC3 = 0
--N1010AC4 = 0
--N1010AC5 = 0
--N1010AC6 = 7
--N1011AC1 = 0
--N1011AC2 = 3.085065996
--N1011AC3 = 0.6951730236
--N1011AC4 = 0
--N1011AC5 = 3.897217244
--N1011AC6 = 0
--N1012AC1 = 1.510832058
--N1012AC2 = 0
--N1012AC3 = 0
--N1012AC4 = 0
--N1012AC5 = 2.417331293
--N1013AC3 = 0
--N1013AC4 = 0
--N1013AC5 = 0
--N1013AC6 = 0.9241727941
--N1014AC3 = 0
--N1014AC4 = 0
--N1014AC5 = 1.691245404
--N1014AC6 = 0.2228170956
--N1015AC3 = 0
--N1015AC4 = 0.7048194147
--N1015AC5 = 0.1595430366
--N1015AC6 = 2.135637549
--N1016AC3 = 0
--N1016AC4 = 0
--N1016AC5 = 0.7
--N1016AC6 = 3.3
--N1017AC3 = 0
--N1017AC4 = 0
--N1017AC5 = 0
--N1017AC6 = 0.1617647059
--N1018AC1 = 0
--N1018AC2 = 0
--N1018AC3 = 0
--N1018AC4 = 0
--N1018AC5 = 0
--N1018AC6 = 1.196428571
--N1019AC1 = 0
--N1019AC2 = 0
--N1019AC3 = 0
--N1019AC4 = 0.2345133807
--N1019AC5 = 0.7654866193
--N1020AC1 = 0.2228332753
--N1020AC2 = 0
--N1020AC3 = 0
--N1020AC4 = 0
--N1020AC5 = 3.200696136
--N1020AC6 = 0
--N1021AC1 = 0.664202377
--N1021AC2 = 0
--N1021AC3 = 0
--N1021AC4 = 0
--N1021AC5 = 2.453858782
--N1022AC1 = 0
--N1023AC1 = 0
--N1026AC1 = 1
--N1027AC1 = 0.476744186
--N1028AC1 = 0
--N1029AC1 = 0.523255814
--N1030AC1 = 1
--N1032AC1 = 0
--N1032AC2 = 0
--N1032AC3 = 0
--N1032AC4 = 0.8274647887
--N1032AC5 = 0
--N1033AC1 = 0.4860357964
--N1033AC2 = 0.5004769224
--N1033AC3 = 0
--N1033AC4 = 0
--N1033AC5 = 2.061996183
--N1034AC1 = 0
--N1034AC2 = 0
--N1034AC3 = 3.174783885
--N1035AC1 = 0.6827679474
--N1035AC2 = 0
--N1035AC3 = 0
--N1035AC4 = 0.7269371829
--N1035AC5 = 0.2529831862
--N1036AC1 = 0.1083333333
--N1036AC2 = 0
--N1036AC3 = 0
--N1037AC4 = 0
--N1037AC5 = 0
--N1038AC4 = 0.2383968781
--N1038AC5 = 1.271450017
--N1039AC4 = 0
--N1039AC5 = 2.077705904
--N1040AC4 = 0
--N1040AC5 = 0
--N1040AC6 = 9.513243659
--N1041AC4 = 8.856901224
--N1041AC5 = 0
--N1041AC6 = 20
--N1042AC4 = 0
--N1042AC5 = 0
--N1042AC6 = 0
--N1043AC1 = 0.1725352113
--N1043AC2 = 0
--N1043AC3 = 0
--N1044AC1 = 0
--N1044AC2 = 0
--N1044AC3 = 1
--N1046AC3 = 1
--N1047AC1 = 0
--N1047AC2 = 0
--N1047AC3 = 1
--N1050AC3 = 0
--N1050AC4 = 0
--N1050AC5 = 0.0731874145
--N1051AC1 = 0
--N1051AC2 = 0
--N1051AC3 = 0
--N1051AC4 = 0
--N1051AC5 = 4.651904242
--N1051AC6 = 20
--*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.0000000105 boeing1.mps
--Optimum value: 286.9746573
--Optimum location:
--PBOSHNL0 = 0
--PBOSHNL1 = 10
--PBOSHNL7 = 0
--PBOSHNL8 = 0
--PBOSLAX0 = 0
--PBOSLAX1 = 0
--PBOSLAX7 = 12
--PBOSSEA0 = 0
--PBOSSEA1 = 40
--PBOSSEA2 = 0
--PBOSSFO0 = 48
--PBOSSFO1 = 73
--PBOSTPE1 = 0
--PBOSTPE2 = 0
--PBOSTYO1 = 0
--PBOSTYO2 = 0
--PBOSYUL0 = 372
--PBOSYUL1 = 224.0530973
--PBOSYUL2 = 0
--PBOSYUL3 = 11.94690265
--PBOSYUL4 = 0
--PBOSYVR0 = 0
--PBOSYVR1 = 23
--PBOSYVR2 = 0
--PBOSYWG0 = 33
--PBOSYWG1 = 0
--PBOSYWG7 = 0
--PBOSYYZ0 = 193
--PBOSYYZ1 = 0
--PBUROAK0 = 9
--PBUROAK1 = 15
--PBURSEA0 = 69
--PBURSEA1 = 0
--PBURSFO0 = 243
--PHNLLAX0 = 0
--PHNLLAX1 = 126.296875
--PHNLLAX2 = 100.03125
--PHNLLAX3 = 104.4375
--PHNLLON0 = 0
--PHNLLON6 = 0
--PHNLPAR0 = 0
--PHNLPAR6 = 0
--PHNLSEA0 = 0
--PHNLSEA1 = 135.2523364
--PHNLSEA2 = 0
--PHNLSFO0 = 0
--PHNLSFO1 = 0
--PHNLSFO7 = 31
--PHNLYVR0 = 80.74766355
--PHNLYVR1 = 0
--PHNLYVR7 = 35.25233645
--PLASSEA0 = 365
--PLASSEA1 = 0
--PLASYVR0 = 0
--PLASYVR6 = 33
--PLAXOAK0 = 42.765625
--PLAXOAK1 = 0
--PLAXOAK2 = 46
--PLAXSEA0 = 543.96875
--PLAXSEA1 = 0
--PLAXSEA2 = 0
--PLAXSEA3 = 0
--PLAXSEA4 = 6
--PLAXSEA5 = 139
--PLAXSEA6 = 0
--PLAXSEA7 = 0
--PLAXSEA8 = 66
--PLAXSEA9 = 12.03125
--PLAXSFO0 = 164.828125
--PLAXSFO1 = 842
--PLAXSFO2 = 0
--PLAXSFO3 = 168
--PLAXSFO4 = 168
--PLAXSFO5 = 144
--PLAXSFO6 = 1212.171875
--PLAXTPE0 = 0
--PLAXTPE1 = 18
--PLAXTPE2 = 9
--PLAXTPE8 = 0
--PLAXTYO0 = 0
--PLAXTYO1 = 0
--PLAXTYO2 = 0
--PLAXTYO8 = 36
--PLAXYVR0 = 116
--PLAXYVR1 = 0
--PLAXYVR2 = 57
--PLONPAR0 = 0
--PLONPAR1 = 0
--PLONPAR2 = 0
--PLONSEA0 = 0
--PLONSEA1 = 127
--PLONYVR0 = 0
--PLONYVR1 = 0
--PLONYVR7 = 45
--POAKONT0 = 0
--POAKONT1 = 11
--POAKSEA0 = 41
--POAKSEA1 = 57
--POAKSEA2 = 0
--PONTSFO0 = 155
--PONTSEA0 = 25
--PONTSEA1 = 12
--PONTSEA2 = 0
--PPARSEA0 = 0
--PPARSEA1 = 53
--PPARYVR0 = 0
--PPARYVR1 = 0
--PPARYVR7 = 21
--PRNOSEA0 = 255
--PRNOSEA1 = 0
--PRNOYVR0 = 60
--PSEASFO0 = 574
--PSEASFO1 = 0
--PSEASFO2 = 156
--PSEASFO3 = 224
--PSEASFO4 = 0
--PSEASFO5 = 168
--PSEASFO6 = 168
--PSEATPE0 = 0
--PSEATPE1 = 0
--PSEATPE2 = 42
--PSEATPE3 = 0
--PSEATYO0 = 0
--PSEATYO1 = 0
--PSEATYO2 = 126
--PSEATYO3 = 27
--PSEAYVR0 = 104.2523364
--PSEAYVR1 = 0
--PSEAYVR2 = 0
--PSEAYVR3 = 0
--PSEAYVR4 = 0
--PSEAYVR5 = 0
--PSEAYVR6 = 0
--PSEAYVR7 = 0
--PSEAYVR8 = 545
--PSFOTPE0 = 0
--PSFOTPE1 = 0
--PSFOTPE2 = 0
--PSFOTPE8 = 0
--PSFOTYO0 = 0
--PSFOTYO1 = 0
--PSFOTYO2 = 0
--PSFOTYO8 = 15
--PSFOYVR0 = 268
--PSFOYVR1 = 0
--PTPETYO0 = 0
--PTPETYO1 = 0
--PTPETYO2 = 0
--PTPETYO3 = 99
--PTPEYVR0 = 44
--PTYOYVR0 = 74
--PYULYVR0 = 182
--PYULYVR1 = 88
--PYULYVR2 = 0
--PYULYVR3 = 0
--PYULYWG0 = 161.3018868
--PYULYWG1 = 178
--PYULYWG2 = 31.69811321
--PYULYWG3 = 0
--PYULYYZ0 = 0
--PYULYYZ1 = 0
--PYULYYZ2 = 245.3018868
--PYULYYZ3 = 2104.698113
--PYULYYZ4 = 0
--PYVRYWG0 = 194.3018868
--PYVRYWG1 = 178
--PYVRYWG2 = 4.698113208
--PYVRYYZ0 = 328.6981132
--PYVRYYZ1 = 0
--PYVRYYZ2 = 4.301886792
--PYWGYYZ0 = 0
--PYWGYYZ1 = 4.698113208
--PYWGYYZ2 = 245.3018868
--PYWGYYZ3 = 0
--PBOSOAK0 = 9
--PBOSOAK6 = 0
--PBOSBUR1 = 0
--PBOSBUR2 = 0
--PBOSONT1 = 0
--PBOSONT2 = 0
--PBURYVR1 = 23
--PBURTYO1 = 0
--PBURTPE1 = 0
--PBURHNL0 = 9
--PBURHNL6 = 0
--PHNLOAK0 = 0
--PHNLOAK1 = 2.234375
--PHNLOAK2 = 0
--PHNLOAK8 = 18.765625
--PHNLONT0 = 0
--PHNLONT6 = 14
--PHNLYWG1 = 0
--PHNLYYZ1 = 21
--PHNLYUL1 = 35
--PLASTYO1 = 0
--PLASTPE1 = 0
--PLAXLON0 = 11
--PLAXLON6 = 0
--PLAXLON7 = 0
--PLAXPAR0 = 0
--PLAXPAR6 = 0
--PLAXPAR7 = 0
--PBURLON1 = 0
--PBURPAR1 = 0
--PLONONT1 = 0
--PLONOAK1 = 0
--POAKPAR1 = 0
--POAKTYO1 = 0
--POAKTPE1 = 0
--PONTPAR1 = 0
--PONTTYO1 = 0
--PONTTPE1 = 0
--PPARSFO1 = 0
--PRNOTYO1 = 0
--PRNOTPE1 = 0
--PTPEYWG1 = 18
--PTPEYYZ1 = 11
--PTPEYUL1 = 0
--PTYOYUL1 = 0
--PTYOYYZ1 = 15
--PTYOYWG1 = 22
--PLAXONT0 = 14
--GRDTIMO1 = 0
--GRDTIMN1 = -105
--GRDTIMO2 = 0
--GRDTIMN2 = -91
--GRDTIMO3 = 0
--GRDTIMN3 = -47
--GRDTIMO4 = 0
--GRDTIMN4 = -43.5
--GRDTIMO5 = 0
--GRDTIMN5 = -87
--GRDTIMO6 = 0
--GRDTIMN6 = -81
--N1001AC1 = 0
--N1001AC2 = 0
--N1001AC3 = 0
--N1002AC1 = 0
--N1002AC2 = 2.018691589
--N1002AC3 = 0
--N1003AC1 = 0
--N1003AC2 = 0
--N1003AC3 = 0
--N1004AC1 = 0
--N1004AC2 = 1.0703125
--N1004AC3 = 0
--N1005AC3 = 0.0703125
--N1105AC3 = 0.9296875
--N1006AC3 = 0
--N1007AC1 = 0
--N1007AC2 = 0
--N1007AC3 = 0
--N1008AC1 = 5.28156777
--N1008AC2 = 0
--N1008AC3 = 1.986798016
--N1008AC4 = 0
--N1008AC5 = 0
--N1008AC6 = 0
--N1009AC1 = 0
--N1009AC2 = 0
--N1009AC3 = 0
--N1009AC4 = 0
--N1009AC5 = 0
--N1010AC1 = 7
--N1010AC2 = 7
--N1010AC3 = 7
--N1010AC4 = 7
--N1010AC5 = 7
--N1010AC6 = 7
--N1011AC1 = 0
--N1011AC2 = 0
--N1011AC3 = 0
--N1011AC4 = 0
--N1011AC5 = 0
--N1011AC6 = 0
--N1012AC1 = 0
--N1012AC2 = 0
--N1012AC3 = 0
--N1012AC4 = 0
--N1012AC5 = 0
--N1013AC3 = 0
--N1013AC4 = 0
--N1013AC5 = 0
--N1013AC6 = 1
--N1014AC3 = 0
--N1014AC4 = 0
--N1014AC5 = 0
--N1014AC6 = 1.909090909
--N1015AC3 = 0
--N1015AC4 = 0
--N1015AC5 = 0
--N1015AC6 = 3
--N1016AC3 = 0
--N1016AC4 = 0
--N1016AC5 = 0
--N1016AC6 = 4
--N1017AC3 = 0
--N1017AC4 = 0
--N1017AC5 = 0
--N1017AC6 = 0.09090909091
--N1018AC1 = 3.782713663
--N1018AC2 = 6.749720385
--N1018AC3 = 7
--N1018AC4 = 0
--N1018AC5 = 4.039001305
--N1018AC6 = 0
--N1019AC1 = 0
--N1019AC2 = 1.412371134
--N1019AC3 = 0
--N1019AC4 = 2.587628866
--N1019AC5 = 0
--N1020AC1 = 0
--N1020AC2 = 0
--N1020AC3 = 0
--N1020AC4 = 0
--N1020AC5 = 0
--N1020AC6 = 0
--N1021AC1 = 0
--N1021AC2 = 0
--N1021AC3 = 0
--N1021AC4 = 0
--N1021AC5 = 0
--N1022AC1 = 0
--N1023AC1 = 0
--N1026AC1 = 1
--N1027AC1 = 0
--N1028AC1 = 0
--N1029AC1 = 1
--N1030AC1 = 1
--N1032AC1 = 1
--N1032AC2 = 1
--N1032AC3 = 1
--N1032AC4 = 1
--N1032AC5 = 1
--N1033AC1 = 0
--N1033AC2 = 1.371681416
--N1033AC3 = 0
--N1033AC4 = 0.6283185841
--N1033AC5 = 0
--N1034AC1 = 0
--N1034AC2 = 0
--N1034AC3 = 0
--N1035AC1 = 0
--N1035AC2 = 0.04608448823
--N1035AC3 = 0
--N1035AC4 = 0.01051928536
--N1035AC5 = 0
--N1036AC1 = 0
--N1036AC2 = 0
--N1036AC3 = 0
--N1037AC4 = 0
--N1037AC5 = 3.220930233
--N1038AC4 = 0
--N1038AC5 = 0
--N1039AC4 = 0
--N1039AC5 = 0
--N1040AC4 = 10
--N1040AC5 = 10
--N1040AC6 = 10
--N1041AC4 = 5.79377625
--N1041AC5 = 20
--N1041AC6 = 20
--N1042AC4 = 20
--N1042AC5 = 20
--N1042AC6 = 20
--N1043AC1 = 0
--N1043AC2 = 0
--N1043AC3 = 0
--N1044AC1 = 0
--N1044AC2 = 1
--N1044AC3 = 0
--N1046AC3 = 1
--N1047AC1 = 0
--N1047AC2 = 1
--N1047AC3 = 0
--N1050AC3 = 0.109375
--N1050AC4 = 0
--N1050AC5 = 0
--N1051AC1 = 20
--N1051AC2 = 20
--N1051AC3 = 20
--N1051AC4 = 0
--N1051AC5 = 20
--N1051AC6 = 11.52971853
--*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing1.mps
--Feasible problem.
--*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000863 boeing2.mps
--Optimum value: -315.018728
--Optimum location:
--PBOSORD0 = 302
--PBOSORD1 = 0
--PBOSORD2 = 0
--PBOSORD3 = 0
--PBOSORD4 = 0
--PBOSLGA0 = 712
--PBOSLGA1 = 268
--PBOSLGA2 = 0
--PBOSLGA3 = 1372
--PBOSCLE0 = 4.108024927
--PBOSCLE1 = 137.8919751
--PBOSCLE2 = 0
--PBOSCLE3 = 0
--PORDBOS0 = 34
--PORDBOS1 = 0
--PORDBOS2 = 0
--PORDBOS3 = 268
--PORDBOS4 = 0
--PORDLGA0 = 0
--PORDLGA1 = 515
--PORDLGA2 = 0
--PORDLGA3 = 0
--PORDCLE0 = 470.294686
--PORDCLE1 = 148.705314
--PORDCLE2 = 0
--PORDCLE3 = 0
--PLGABOS0 = 1162
--PLGABOS1 = 0
--PLGABOS2 = 458
--PLGABOS3 = 0
--PLGABOS4 = 0
--PLGABOS5 = 1123
--PLGAORD0 = 712
--PLGAORD1 = 0
--PLGAORD2 = 0
--PLGAORD3 = 0
--PLGACLE0 = 0
--PLGACLE1 = 249
--PLGACLE2 = 268
--PCLEBOS0 = 131
--PCLEBOS1 = 0
--PCLEBOS2 = 0
--PCLEBOS3 = 0
--PCLEBOS4 = 0
--PCLEORD0 = 178.5972891
--PCLEORD1 = 249
--PCLEORD2 = 16.40271092
--PCLEORD3 = 268
--PCLEORD4 = 0
--PCLELGA0 = 0
--PCLELGA1 = 0
--PCLELGA2 = 409
--PCLELGA3 = 0
--BBOSORD0 = 0
--BBOSORD1 = 0
--BBOSCLE0 = 0.1616272102
--BBOSCLE1 = 7.026778587
--BORDBOS0 = 0
--CBOSORD0 = 12
--CBOSORD1 = 0
--CBOSORD2 = 0
--CBOSORD3 = 0
--CBOSORD4 = 0
--CBOSCLE0 = 0
--CBOSCLE1 = 8.811594203
--CBOSCLE2 = 0
--CBOSCLE3 = 0
--CORDBOS0 = 1.5
--CORDBOS1 = 22.5
--CORDBOS2 = 0
--CORDBOS3 = 0
--CORDBOS4 = 0
--CORDLGA0 = 13
--CORDLGA1 = 0
--CORDLGA2 = 0
--CORDLGA3 = 0
--CLGAORD0 = 22.5
--CLGAORD1 = 22.5
--CLGAORD2 = 0
--CLGAORD3 = 0
--CLGACLE0 = 16
--CLGACLE1 = 0
--CLGACLE2 = 0
--CCLELGA0 = 0
--CCLELGA1 = 5
--CCLELGA2 = 0
--CCLELGA3 = 0
--GRDTIMO1 = 0
--GRDTIMN1 = 0
--GRDTIMO2 = 0
--GRDTIMN2 = -76.79770851
--GRDTIMN3 = -10.27177739
--GRDTIMN4 = -21.60844089
--N1003AC1 = 0
--N1003AC2 = 6.724489796
--N1003AC3 = 0.4
--N1003AC4 = 0
--N1005AC1 = 0.01346893419
--N1005AC2 = 0
--N1005AC3 = 0
--N1005AC4 = 0
--N1011AC1 = 0.5855648822
--N1011AC2 = 0
--N1011AC3 = 0.2937198068
--N1011AC4 = 0
--N1013AC2 = 7.265306122
--N1013AC4 = 2
--N1015AC2 = 0
--N1015AC4 = 1.422222222
--N1017AC2 = 0
--N1017AC4 = 2
--N1019AC2 = 2.540816327
--N1019AC4 = 0
--N1021AC1 = 0.01346893419
--N1021AC2 = 0.1254559795
--N1021AC3 = 0
--N1021AC4 = 0
--N1002AC1 = 0
--N1002AC2 = 4.798925367
--N1002AC3 = 0
--N1002AC4 = 0
--N1004AC2 = 0
--N1004AC4 = 2
--N1006AC1 = 0.5990338164
--N1006AC2 = 0
--N1006AC3 = 0.6937198068
--N1006AC4 = 0
--N1008AC2 = 11.85714286
--N1008AC4 = 2
--N1010AC2 = 0
--N1010AC4 = 0
--N1012AC2 = 0
--N1012AC4 = 1.422222222
--N1014AC2 = 4.673469388
--N1014AC4 = 0
--N1100AC2 = 2.734693878
--N1100AC4 = 0
--N1102AC2 = 0
--N1102AC4 = 0
--N1200AC2 = 14
--N1200AC4 = 0
--N1201AC2 = 11.45918367
--N1201AC4 = 0
--*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.00000000213 boeing2.mps
--Optimum value: -73.3689691
--Optimum location:
--PBOSORD0 = 28
--PBOSORD1 = 0
--PBOSORD2 = 0
--PBOSORD3 = 0
--PBOSORD4 = 249
--PBOSLGA0 = 258.2518986
--PBOSLGA1 = 686
--PBOSLGA2 = 35.74810145
--PBOSLGA3 = 1372
--PBOSCLE0 = 0
--PBOSCLE1 = 0
--PBOSCLE2 = 0
--PBOSCLE3 = 142
--PORDBOS0 = 302
--PORDBOS1 = 0
--PORDBOS2 = 0
--PORDBOS3 = 0
--PORDBOS4 = 0
--PORDLGA0 = 0
--PORDLGA1 = 0
--PORDLGA2 = 515
--PORDLGA3 = 0
--PORDCLE0 = 0
--PORDCLE1 = 619
--PORDCLE2 = 0
--PORDCLE3 = 0
--PLGABOS0 = 0
--PLGABOS1 = 712
--PLGABOS2 = 0
--PLGABOS3 = 686
--PLGABOS4 = 426.7481014
--PLGABOS5 = 918.2518986
--PLGAORD0 = 258.2518986
--PLGAORD1 = 0
--PLGAORD2 = 453.7481014
--PLGAORD3 = 0
--PLGACLE0 = 517
--PLGACLE1 = 0
--PLGACLE2 = 0
--PCLEBOS0 = 131
--PCLEBOS1 = 0
--PCLEBOS2 = 0
--PCLEBOS3 = 0
--PCLEBOS4 = 0
--PCLEORD0 = 0
--PCLEORD1 = 0
--PCLEORD2 = 712
--PCLEORD3 = 0
--PCLEORD4 = 0
--PCLELGA0 = 197
--PCLELGA1 = 70
--PCLELGA2 = 0
--PCLELGA3 = 142
--BBOSORD0 = 0
--BBOSORD1 = 0
--BBOSCLE0 = 0
--BBOSCLE1 = 0
--BORDBOS0 = 0
--CBOSORD0 = 0
--CBOSORD1 = 0
--CBOSORD2 = 0
--CBOSORD3 = 0
--CBOSORD4 = 0
--CBOSCLE0 = 0
--CBOSCLE1 = 0
--CBOSCLE2 = 12.8
--CBOSCLE3 = 0
--CORDBOS0 = 19.2
--CORDBOS1 = 0
--CORDBOS2 = 0
--CORDBOS3 = 0
--CORDBOS4 = 0
--CORDLGA0 = 0
--CORDLGA1 = 0
--CORDLGA2 = 10.4
--CORDLGA3 = 0
--CLGAORD0 = 0
--CLGAORD1 = 0
--CLGAORD2 = 10.4
--CLGAORD3 = 25.6
--CLGACLE0 = 12.8
--CLGACLE1 = 0
--CLGACLE2 = 0
--CCLELGA0 = 0
--CCLELGA1 = 0
--CCLELGA2 = 0
--CCLELGA3 = 0
--GRDTIMO1 = 73.01076
--GRDTIMN1 = -100
--GRDTIMO2 = 0
--GRDTIMN2 = -90
--GRDTIMN3 = -45
--GRDTIMN4 = -45
--N1003AC1 = 7
--N1003AC2 = 0
--N1003AC3 = 0.6856076556
--N1003AC4 = 0
--N1005AC1 = 0
--N1005AC2 = 0
--N1005AC3 = 0
--N1005AC4 = 0
--N1011AC1 = 0
--N1011AC2 = 0
--N1011AC3 = 1.314392344
--N1011AC4 = 0
--N1013AC2 = 2.635223455
--N1013AC4 = 0
--N1015AC2 = 5.275510204
--N1015AC4 = 2
--N1017AC2 = 0
--N1017AC4 = 0
--N1019AC2 = 4.630082668
--N1019AC4 = 0.9244444444
--N1021AC1 = 7
--N1021AC2 = 0
--N1021AC3 = 2
--N1021AC4 = 2
--N1002AC1 = 7
--N1002AC2 = 0
--N1002AC3 = 2
--N1002AC4 = 2
--N1004AC2 = 0
--N1004AC4 = 0
--N1006AC1 = 7
--N1006AC2 = 0
--N1006AC3 = 2
--N1006AC4 = 0
--N1008AC2 = 0
--N1008AC4 = 0
--N1010AC2 = 7.265306122
--N1010AC4 = 0.9244444444
--N1012AC2 = 5.275510204
--N1012AC4 = 2
--N1014AC2 = 0
--N1014AC4 = 0
--N1100AC2 = 7
--N1100AC4 = 5.274621909
--N1102AC2 = 4.354572464
--N1102AC4 = 0
--N1200AC2 = 14
--N1200AC4 = 0.9244444444
--N1201AC2 = 9.369917332
--N1201AC4 = 0
--*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing2.mps
--Feasible problem.
- *** ./ppl_lpsol -s -p1 -c -oobtained -r -m mas74.mps
- Optimum value: 10482.79528
- Optimum location:
--- 
-2.24.1
-
diff --git a/dev-libs/ppl/ppl-1.2-r3.ebuild b/dev-libs/ppl/ppl-1.2-r3.ebuild
index ea74b3baa507..c3e4bc769be5 100644
--- a/dev-libs/ppl/ppl-1.2-r3.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r3.ebuild
@@ -7,7 +7,8 @@ inherit autotools
 
 DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
 HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz"
+SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch"
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
@@ -25,7 +26,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/disable-mipproblem2.patch"
 	"${FILESDIR}/disable-containsintegerpoint1.patch"
-	"${FILESDIR}/disable-boeing-tests.patch"
+	"${DISTDIR}/ppl-1.2-r3-disable-boeing-tests.patch"
 	"${FILESDIR}/fix-clang-build.patch"
 )
 
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index c6ce943bc5d8..53e57c4e4e00 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -2,5 +2,5 @@ AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc9
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
 EBUILD protobuf-c-1.3.2.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21
-EBUILD protobuf-c-1.3.3.ebuild 984 BLAKE2B b9e765514ce03a780f547c9d71067f496a833c856f1b1bf96a0f7b8c30863d34567b1d030d336d68cb057b5d531024a3b50d74eaaa3bedbcb6622f0288eecfd4 SHA512 770d882fdbef310e8fcfcf897721afe56600bccffae982b0b7ab243526a2fd61ab25d3200947066116d753692a050d8f2af8ebc884d9146dc1f950bff04b0aaf
+EBUILD protobuf-c-1.3.3.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index bc1e64a91cf2..b47188055827 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.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="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 7a3425a973b6..49cc36e3eea1 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -9,13 +9,16 @@ AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424f
 AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
 AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
 AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
+AUX protobuf-3.14.0-protoc_input_output_files.patch 10684 BLAKE2B 79b86a293fd48e3694327e772dbb7e7ecad2ceaa4d719e2eef5a6221face7bbc26ed00d1efdf9e73dedb9b437603ba6560b5812bbce1c4585bf2d4813afe3aa0 SHA512 35f0ffad2ed3c3d37ba832be4bafa59577e91fba7bef862581369ab92d8c4d3dd801f2e5ec486d989d5e8dfbd04d52d0a869aaecb62c716696a8e3ff6fb9c4db
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
 EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
-EBUILD protobuf-3.12.2.ebuild 3024 BLAKE2B 575045b6b9fb8b2354974b3a2e3e0e996817c873c97927e4d389199b7e91805b2f5317b3c75c7e0578740dd917b1059c939dcfeb2c28b6701b50a4897927bd8d SHA512 e34eace685e647ee0ed5a517aa08624e8687ef5dff9ffd42a76c9cb3de42625084ef075154eb0d110b3eba1a05670e21bd51883d90312bb23bdea9d3800beb22
+EBUILD protobuf-3.12.2.ebuild 3021 BLAKE2B aa95e12ed8b3c9e2afd27fee3751d61745a546c09933fd8b6041de5eb3da8c3667afe96324deba7c165fe7eaeb389e828489478c3dfb40c420ecf04f4fe11a75 SHA512 e504d11cb312f90ffb89a8cd82e4eed571c852ee1020684109b634cb49a21450bddb78a4f6f5b81bf754bfbb32d2d79067ed5aa34a63407c3e6c6cab28297725
 EBUILD protobuf-3.12.4.ebuild 3215 BLAKE2B 7a1325827898a6df817b6c5afecf49a5440825c76467497bd0fb89e4fc80b47b84730c384d2d7a9df02970286b4887a9280bf0ec2e3b6aa19de12e32316c2e2e SHA512 e68cf52f1f68c1d18c1b4bfcb537b95e843028f7b50ec5ba12da6fd6e5ff04da534f5ab71634c2159a30c272e6c5039e0f79df72f76e5e2ad325fc1fb5e17d69
-EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
+EBUILD protobuf-3.13.0.ebuild 3211 BLAKE2B 1a5361989f0bfda7e67dd9962a767eb67fb5e39f93fb59c7903f47545a9922244c7b6d69ba5fa7e83d48831877567738ebb5e4eccb45697e23b4b302facac2c7 SHA512 a5b6a1cac304ae2d6475279a9028408343efa1142a3dd665881c9bd8255d16652e92c4a298885b9298c8164d3b3b89e253fd5f8007fbdc8effc1b52c1be880fd
+EBUILD protobuf-3.14.0.ebuild 3021 BLAKE2B 0e35f27fba228ee5504205dc82049e03b35326a7d0a299e83d11a43b5b5e48ed99663334c031c2a69554049bd9f8e4ba07ea83e2e506379ff3bda9ce7bde6161 SHA512 9b284a5ce2666bcaf7d1fae8dba283b4ba00afe6337e167e7df0c67a1d0af31b15aafa10f0fa1f017a0f8d836bf99c44903b52c3385888032439667442160b19
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
new file mode 100644
index 000000000000..a36bdcb734a5
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
@@ -0,0 +1,268 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
++++ /src/google/protobuf/compiler/command_line_interface.cc
+@@ -1109,6 +1109,28 @@
+   }
+ 
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++    bool success = false;
++    int in_fd = STDIN_FILENO;
++    int out_fd = STDOUT_FILENO;
++
++    if (!protobuf_in_path_.empty()) {
++      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++      if (in_fd == -1) {
++        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++        return 1;
++      }
++    }
++    if (!protobuf_out_path_.empty()) {
++      out_fd = open(protobuf_out_path_.c_str(),
++                    O_WRONLY | O_CREAT | O_TRUNC,
++                    0644);
++      if (out_fd == -1) {
++        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++        close(in_fd);
++        return 1;
++      }
++    }
++
+     if (codec_type_.empty()) {
+       // HACK:  Define an EmptyMessage type to use for decoding.
+       DescriptorPool pool;
+@@ -1117,13 +1139,20 @@
+       file.add_message_type()->set_name("EmptyMessage");
+       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+       codec_type_ = "EmptyMessage";
+-      if (!EncodeOrDecode(&pool)) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(&pool, in_fd, out_fd);
+     } else {
+-      if (!EncodeOrDecode(descriptor_pool.get())) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++    }
++
++    if (in_fd != STDIN_FILENO) {
++      close(in_fd);
++    }
++    if (out_fd != STDOUT_FILENO) {
++      close(out_fd);
++    }
++
++    if (!success) {
++      return 1;
+     }
+   }
+ 
+@@ -1161,6 +1190,11 @@
+   for (int i = 0; i < proto_path_.size(); i++) {
+     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+   }
++  if (mode_ == MODE_COMPILE &&
++      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++         << "decode operations. Ignoring.";
++  }
+ 
+   // Map input files to virtual paths if possible.
+   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1904,6 +1938,12 @@
+   } else if (name == "--deterministic_output") {
+     deterministic_output_ = true;
+ 
++  } else if (name == "--protobuf_in") {
++    protobuf_in_path_ = value;
++
++  } else if (name == "--protobuf_out") {
++    protobuf_out_path_ = value;
++
+   } else if (name == "--error_format") {
+     if (value == "gcc") {
+       error_format_ = ERROR_FORMAT_GCC;
+@@ -2040,12 +2080,15 @@
+          "  -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"
+          "  --deterministic_output      When using --encode, ensure map fields "
+          "are\n"
+          "                              deterministically ordered. Note that"
+@@ -2053,22 +2096,40 @@
+          "                              canonical, and changes across builds"
+          "or releases of protoc.\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"
+@@ -2416,7 +2477,9 @@
+   return true;
+ }
+ 
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++                                          int in_fd,
++                                          int out_fd) {
+   // Look up the type.
+   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+   if (type == NULL) {
+@@ -2428,15 +2491,15 @@
+   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
+ 
+   if (mode_ == MODE_ENCODE) {
+-    SetFdToTextMode(STDIN_FILENO);
+-    SetFdToBinaryMode(STDOUT_FILENO);
++    SetFdToTextMode(in_fd);
++    SetFdToBinaryMode(out_fd);
+   } else {
+-    SetFdToBinaryMode(STDIN_FILENO);
+-    SetFdToTextMode(STDOUT_FILENO);
++    SetFdToBinaryMode(in_fd);
++    SetFdToTextMode(out_fd);
+   }
+ 
+-  io::FileInputStream in(STDIN_FILENO);
+-  io::FileOutputStream out(STDOUT_FILENO);
++  io::FileInputStream in(in_fd);
++  io::FileOutputStream out(out_fd);
+ 
+   if (mode_ == MODE_ENCODE) {
+     // Input is text.
+--- /src/google/protobuf/compiler/command_line_interface.h
++++ /src/google/protobuf/compiler/command_line_interface.h
+@@ -296,7 +296,9 @@
+       GeneratorContext* generator_context, std::string* error);
+ 
+   // Implements --encode and --decode.
+-  bool EncodeOrDecode(const DescriptorPool* pool);
++  bool EncodeOrDecode(const DescriptorPool* pool,
++                      int in_fd,
++                      int out_fd);
+ 
+   // Implements the --descriptor_set_out option.
+   bool WriteDescriptorSet(
+@@ -428,6 +430,13 @@
+   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
+   std::vector<std::string> descriptor_set_in_names_;
+ 
++  // When using --encode / --decode / --decode_raw absolute path to the output
++  // file. (Empty string indicates write to STDOUT).
++  std::string protobuf_out_path_;
++  // When using --encode / --decode / --decode_raw, absolute path to the input
++  // file. (Empty string indicates read from STDIN).
++  std::string protobuf_in_path_;
++
+   // If --descriptor_set_out was given, this is the filename to which the
+   // FileDescriptorSet should be written.  Otherwise, empty.
+   std::string descriptor_set_out_name_;
+--- /src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -97,7 +97,7 @@
+   virtual void SetUp();
+   virtual void TearDown();
+ 
+-  // Runs the CommandLineInterface with the given command line.  The
++  // 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 std::string& command);
+@@ -2638,6 +2638,17 @@
+               std::string::npos);
+   }
+ 
++  void ExpectBinaryFilesMatch(const string &expected_file,
++                              const string &actual_file) {
++    string expected_output, actual_output;
++    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++    // Don't use EXPECT_EQ because we don't want to print raw binary data to
++    // stdout on failure.
++    EXPECT_TRUE(expected_output == actual_output);
++  }
++
+  private:
+   void WriteUnittestProtoDescriptorSet() {
+     unittest_proto_descriptor_set_filename_ =
+@@ -2761,6 +2772,19 @@
+       "Can only use --deterministic_output with --encode.\n");
+ }
+ 
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++  string out_file = TestTempDir() + "/golden_message_out.pbf";
++  EXPECT_TRUE(
++      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++          " --encode=protobuf_unittest.TestAllTypes" +
++          " --protobuf_in=" + TestUtil::GetTestDataPath(
++              "net/proto2/internal/"
++              "testdata/text_format_unittest_data_oneof_implemented.txt") +
++          " --protobuf_out=" + out_file));
++  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
++}
++
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ }  // anonymous namespace
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index c0cc23a4b752..e62e90b99669 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
index ae5381a06924..b51d36579073 100644
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
new file mode 100644
index 000000000000..706e7d50e34a
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.14.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index c30e4aa6d464..ae36a439b162 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -35,7 +35,7 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 PATCHES=(
 	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
 	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.13.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.14.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 085346efa5ba..4d5794396651 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -3,7 +3,7 @@ AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
-EBUILD pugixml-1.10.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
+EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
 EBUILD pugixml-1.9-r1.ebuild 776 BLAKE2B 85ff23be70e107f4163ad8e518bf8ae3a8b4ff0ac37cfd24a2375317e09d538908b1d729822ed44547577c3d73e0b9bafbebc1a9ca87adf05e3b474d2f89cfad SHA512 8c560bda6ace8d80345c3fcbed113e06321828709a3f080826242303ec2c8d8664bfe7c18b19b123c22913f398337d4f223d39d34f7ae50e9eebda2e0b6302e0
 EBUILD pugixml-1.9.ebuild 586 BLAKE2B 96f5e5452308058f3cc2fbc102cf679b216d24807f89cea88c63685089dac7a4ace3e6ec26bf9d46c7f50da59200f62f91b838d5b919cc7a3660c1ba47375681 SHA512 a43e0e3e7c28274910daaa84f7f8b85d4dace40ca5b380175146f48c4b689bb567685132c001de439e979affa504593e230338f06cb25379a202c5511ec529d8
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
diff --git a/dev-libs/pugixml/pugixml-1.10.ebuild b/dev-libs/pugixml/pugixml-1.10.ebuild
index 0750359ebd79..514b88073ecc 100644
--- a/dev-libs/pugixml/pugixml-1.10.ebuild
+++ b/dev-libs/pugixml/pugixml-1.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/qrosspython/Manifest b/dev-libs/qrosspython/Manifest
deleted file mode 100644
index e8664dd1c03d..000000000000
--- a/dev-libs/qrosspython/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qrosscore-0.3.2.tar.gz 3963954 BLAKE2B c7553fc1a0a2f4fd3f41ae0dd8bbb8c752c790c8a79b95b9b05ee38260e1ab9b2a337cc8fdf9b9aa513cc178f1155e0f3d7e5e0238aca50c9c970b981c189418 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16
-EBUILD qrosspython-0.3.2.ebuild 727 BLAKE2B 8479b23e37eab8b80cb3828db9071af09fa2f6aee1a0885228c0714d76dbb64f31a76ba5792dfe930b6fa74cdf424f91f523127d74b3ce6dd7bf23b2fc57658f SHA512 c14ee98c2bd8aa92d534562ffd76acb8d6b8af1d2bc5262183bcc7987e1020973a6f9bc0cb5858770bc7de84f0bdaff28c25ed9895ff8e0ba2d37c122a4154fc
-EBUILD qrosspython-9999.ebuild 660 BLAKE2B 2f5e0c20867df434608f9909d16cb2842a834b4644104d47a293eab56f53de0507856dbd51cbc4b0e5b5d6b9b6a1f98165dfb053950ec49923d58cdeec1848f0 SHA512 3fc9f3dbdc99aa9499a0be7d9177eaab96099158d2e40c56a82e02451b0f825999aa018c432e180f9e448eaa4f89928b2d44ef1d0e5344dcb7d324461601f450
-MISC metadata.xml 445 BLAKE2B 86fa57a651c7a35cb86b98da098010f90f7d7fd38575ccbc7cd5505784929284a63b048b96b5033c3f181054fef6ab059a8a8bae859f420ab7277e999af6e68d SHA512 81fe8b05cfb46a512e708751b67314b183f320de6b85a0781c2a1ca93cec51862380290d0e10a671c3716a5e20ca5087a21a4dcbe90ed20ddf7a61166c879f0c
diff --git a/dev-libs/qrosspython/qrosspython-0.3.2.ebuild b/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
deleted file mode 100644
index dcd6a6097957..000000000000
--- a/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 cmake-utils
-
-DESCRIPTION="Python scripting backend for Qross"
-HOMEPAGE="https://github.com/0xd34df00d/Qross"
-SRC_URI="https://github.com/0xd34df00d/Qross/archive/${PV}.tar.gz -> qrosscore-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	~dev-libs/qrosscore-${PV}
-	dev-python/sip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/Qross-${PV}"
-CMAKE_USE_DIR="${S}/src/bindings/python/qrosspython"
-
-mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-libs/qrosspython/qrosspython-9999.ebuild b/dev-libs/qrosspython/qrosspython-9999.ebuild
deleted file mode 100644
index c7d265051246..000000000000
--- a/dev-libs/qrosspython/qrosspython-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit git-r3 python-single-r1 cmake-utils
-
-EGIT_REPO_URI="https://github.com/0xd34df00d/Qross.git"
-
-DESCRIPTION="Python scripting backend for Qross"
-HOMEPAGE="https://github.com/0xd34df00d/Qross"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-	~dev-libs/qrosscore-${PV}
-	dev-python/sip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CMAKE_USE_DIR="${S}/src/bindings/python/qrosspython"
-
-mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
new file mode 100644
index 000000000000..67d08d54031a
--- /dev/null
+++ b/dev-libs/qtcompress/Manifest
@@ -0,0 +1,6 @@
+AUX qtcompress-0_p20180513-nogui.patch 271 BLAKE2B 707ece6707c14e01119f7e31e07b6055af511897638a487b4a561ce7afb3bbb596c24c0496ab8114d1cb46ff71c0733b31f57475bae37d38eabc3b23f4894c31 SHA512 ba55a21fd90c59792ed95036828a3664888d51a3d602ebc81d9f50d841a0afdfd720602e1b27e4d4c3f2946c9a11d17b09382a6c0ff7d14ea07e80ecf4bfa16b
+AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99e64b7c7aa92997a903dc011547d79efef0c457b56b955c037ee73726238c75931dd25e13561a4744c8ca6cfa423bc076c2282881f SHA512 c99e0aacdf9e485f915d911b55e1824046345364c89e6a4fbc172687bd604b4eeff20bde22975ea5c65c103efda3c9af7e907b9599b6acdfad095fec9501670b
+AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
+DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
+EBUILD qtcompress-0_p20180513.ebuild 1456 BLAKE2B dfb3032b2d8a6862fba0db4c0cb8e4a2f3368fc93512a1c03d470f7f684dffcf69584f3f32b33ea6cd115d20ccb7c94a1eb9edfe9e0d9eda27c5d93ae773b58e SHA512 5595ffba5db197ad4267accbdd6677a9e6173903e2202be28304b9da2afec1071c5be844465c30ca951c1c6459b9a4ad65c5391b049271472c2c195513157b21
+MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
new file mode 100644
index 000000000000..1dd5f4f1ed8c
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/unit/qzip/qzip.pro	2018-05-13 08:44:01.000000000 -0000
++++ b/tests/auto/unit/qzip/qzip.pro	2020-10-10 14:23:34.377528668 -0000
+@@ -1,6 +1,7 @@
+ CONFIG += testcase
+ TARGET = tst_qzip
+ QT += compress testlib
++QT -= gui
+ SOURCES += tst_qzip.cpp
+ 
+ wince* {
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
new file mode 100644
index 000000000000..de89e7ac2ae4
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
@@ -0,0 +1,10 @@
+diff --git a/src/compress/compress.pro b/src/compress/compress.pro
+index 14ec502..3105a7f 100644
+--- a/src/compress/compress.pro
++++ b/src/compress/compress.pro
+@@ -11,5 +11,3 @@ HEADERS += \
+         qtcompressglobal.h
+ 
+ SOURCES += qzip.cpp
+-
+-include(../3rdparty/zlib.pri)
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
new file mode 100644
index 000000000000..cc7bec4ed1e1
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/unit/qzip/tst_qzip.cpp	2018-05-13 09:44:01.000000000 +0100
++++ b/tests/auto/unit/qzip/tst_qzip.cpp	2020-09-28 09:40:14.493025102 +0100
+@@ -41,8 +41,8 @@
+ 
+ #include <QtTest/QtTest>
+ #include <QDebug>
+-#include <QtCompress/qzipwriter.h>
+-#include <QtCompress/qzipreader.h>
++#include <qzipwriter.h>
++#include <qzipreader.h>
+ 
+ class tst_QZip : public QObject
+ {
diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qtcompress/metadata.xml
index 047a3d36582b..a07b3622f7d5 100644
--- a/dev-libs/qrosspython/metadata.xml
+++ b/dev-libs/qtcompress/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">0xd34df00d/Qross</remote-id>
+		<remote-id type="github">nezticle/qtcompress</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
new file mode 100644
index 000000000000..58e66c1c3c30
--- /dev/null
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs virtualx
+
+DESCRIPTION="A public API for QZip in an easy to use module"
+
+HOMEPAGE="https://github.com/nezticle/qtcompress"
+MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
+SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/qtcompress-${MY_COMMIT}"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
+SLOT="0/5.11.0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-zlib.patch"
+	"${FILESDIR}/${P}-test-include.patch"
+	"${FILESDIR}/${P}-nogui.patch"
+)
+
+src_prepare() {
+	default
+	# qtcompress is bundling its own zlib, remove it
+	rm -r src/3rdparty/ || die
+}
+
+src_configure() {
+	local pkg_config="$(tc-getPKG_CONFIG)"
+	eqmake5 \
+		"INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \
+		"LIBS+=$("${pkg_config}" --libs zlib)"
+}
+
+src_test() {
+	cd tests/auto/unit || die
+	eqmake5 \
+		"INCLUDEPATH+=${S}/src/compress"
+	emake
+	virtx qzip/target_wrapper.sh qzip/tst_qzip
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die
+	insinto /usr/include/qt5/QtCompress
+	doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h}
+}
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
new file mode 100644
index 000000000000..6b60b7b8fab6
--- /dev/null
+++ b/dev-libs/raft/Manifest
@@ -0,0 +1,3 @@
+DIST raft-0.9.25.tar.gz 313444 BLAKE2B a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55 SHA512 8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
+EBUILD raft-0.9.25.ebuild 955 BLAKE2B d526b496e487c1261c14a8fa36bf05ff4794c215229e067d4dfeb6af63bfd721fe8d3d4ebdd09d3d50294ede3474ca934f567c1ab845f20dcc9c9af8d47a7037 SHA512 dfc500d69652d498e9aee9c582200e6e66bdbd9616688c25da3084f39800c54eca90928e00a32b7141a209f8ce8b961b40abd5f897b998acfde8e3191decd9fb
+MISC metadata.xml 755 BLAKE2B df2f0d028fa7b8e27b29facf058e32cfcd3352415ed4a682499a8a9bfccab115b174d30750a66d9a811da90fe5deb68ab9c2344f7c691d158d48c36d76da9db4 SHA512 95093f3a838955c8a109dfea975d73698bc5aade34bd54fc5dbbe9ec6e5ec9f092cdb939c4f91290babacdd6ae5ef72027201bd731955f8337ec21e49713a3c7
diff --git a/dev-libs/raft/metadata.xml b/dev-libs/raft/metadata.xml
new file mode 100644
index 000000000000..c96395f90242
--- /dev/null
+++ b/dev-libs/raft/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
+  <longdescription>
+    The library has modular design: its core part implements only the core 
+    Raft algorithm logic, in a fully platform independent way. On top of that, 
+    a pluggable interface defines the I/O implementation for networking 
+    (send/receive RPC messages) and disk persistence (store log entries and 
+    snapshots).
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
new file mode 100644
index 000000000000..fc81de79a010
--- /dev/null
+++ b/dev-libs/raft/raft-0.9.25.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/canonical/raft"
+SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# ACCESS DENIED issue, #723208
+	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-uv
+
+		--disable-benchmark
+		--disable-debug
+		--disable-example
+		--disable-sanitize
+		--disable-static
+
+		$(use_enable test fixture)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index e394a1534357..f24f14ff7b14 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,7 @@
 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
+DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14 SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
+DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
 EBUILD re2-0.2020.08.01.ebuild 1345 BLAKE2B e5f9646ea36c54b50b5e4e5eced5fc37181f28dc1c951e6e07970f16ca88402531f233d17cc9b80a6c0ac835bf15860689277be1089b1e343c22a99ab97f36bc SHA512 1a83552bd446f1fa5e4e9eba72a60d22ee3e542a55ff798d7e6eef85d328f80dfc6a0e48afdc990e662c1aa6cbb5eea414209cb2601417496f8e27201356a5bb
+EBUILD re2-0.2020.10.01.ebuild 1349 BLAKE2B 48fb4a2195223380560e9e1f195752d7a050edcd4b83d283dd27271492573cac7f497760587b832da8ae444729ff891deec3776066c617b5f6f1a1d59bc25e71 SHA512 454ec92c6dc6549e6a57fe1c3653f565793f5f1baf6bee76ae3b05a1ed29c08d8ec9fe2b9b9f38948dc450bd111e2b653199787e82e516492a3fd685091724b2
+EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.10.01.ebuild b/dev-libs/re2/re2-0.2020.10.01.ebuild
new file mode 100644
index 000000000000..9b7e0bf86ea7
--- /dev/null
+++ b/dev-libs/re2/re2-0.2020.10.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2020 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="8"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild b/dev-libs/re2/re2-0.2020.11.01.ebuild
new file mode 100644
index 000000000000..48b29137b04d
--- /dev/null
+++ b/dev-libs/re2/re2-0.2020.11.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2020 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="9"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
diff --git a/dev-libs/rinutils/Manifest b/dev-libs/rinutils/Manifest
index 896d3dca5742..aa3faae5de1b 100644
--- a/dev-libs/rinutils/Manifest
+++ b/dev-libs/rinutils/Manifest
@@ -1,7 +1,3 @@
-DIST rinutils-0.4.0.tar.xz 17072 BLAKE2B 90cd40fca0f682b730457da04bb392eada83ee2ab2ae3287ffdfd2235776038d6597143ca60c51b9c8d13b366511a5cd084b90811c5cfc7663125952fa009105 SHA512 96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5
-DIST rinutils-0.4.1.tar.xz 17136 BLAKE2B 890b7201845609026577ab49b952db193480bd252c2798d3084610d29b1d62ddd9afb791150ad0ac951e6e1518c5711de11f8f7253c1c4ce115dd220cc27f5b0 SHA512 e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7
 DIST rinutils-0.6.0.tar.xz 16768 BLAKE2B a4fe413c6a4f18bd8c41a4d933a2515ba64f2dbe180d8a5868eadd8cd6ed7008d30f5b6cd5fa730edcb6548f6ea269ab419b912fd6c7346dd013a737320bb714 SHA512 2523747f9cf5f830e5fb5acc1e92691e8acfb59d6c4474d3768b68de9190dbc63c9e06cdd3c6ac67f8a853d37d1711d4c18550bb24446b2730198668f4ad0c45
-EBUILD rinutils-0.4.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc
-EBUILD rinutils-0.4.1.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
-EBUILD rinutils-0.6.0.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
+EBUILD rinutils-0.6.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/dev-libs/rinutils/rinutils-0.4.0.ebuild b/dev-libs/rinutils/rinutils-0.4.0.ebuild
deleted file mode 100644
index 84f476ca6c2e..000000000000
--- a/dev-libs/rinutils/rinutils-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Set of C headers containing macros and static functions"
-HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
-SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_APPLYING_RPATH=OFF
-		-DWITH_TEST_SUITE=OFF # tests require perl
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rinutils/rinutils-0.4.1.ebuild b/dev-libs/rinutils/rinutils-0.4.1.ebuild
deleted file mode 100644
index fa04b75970b8..000000000000
--- a/dev-libs/rinutils/rinutils-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Set of C headers containing macros and static functions"
-HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
-SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_APPLYING_RPATH=OFF
-		-DWITH_TEST_SUITE=OFF # tests require perl
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rinutils/rinutils-0.6.0.ebuild b/dev-libs/rinutils/rinutils-0.6.0.ebuild
index fa04b75970b8..84f476ca6c2e 100644
--- a/dev-libs/rinutils/rinutils-0.6.0.ebuild
+++ b/dev-libs/rinutils/rinutils-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 5e845a747e45..4797d1ed3936 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,5 +1,8 @@
 AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2
 DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb
+DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
+EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d
diff --git a/dev-libs/rocclr/rocclr-3.9.0.ebuild b/dev-libs/rocclr/rocclr-3.9.0.ebuild
new file mode 100644
index 000000000000..ffa5203065d2
--- /dev/null
+++ b/dev-libs/rocclr/rocclr-3.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute Common Language Runtime"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-libs/rocm-comgr-${PV}
+	virtual/opengl
+	>=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
+)
+
+S="${WORKDIR}/ROCclr-rocm-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=YES
+		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# This should be fixed in the CMakeLists.txt
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+}
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
new file mode 100644
index 000000000000..2f60ae4200a2
--- /dev/null
+++ b/dev-libs/rocksdb/Manifest
@@ -0,0 +1,3 @@
+DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
+EBUILD rocksdb-6.14.5.ebuild 1122 BLAKE2B 7c06c7485455c2b1b3c9a9fcad6e0570c6e2e2d953d6abefaa8bed72ab7716d0dc80b7f6293e26e777338a7a9fe9cabef8109e345c5865f2e0a1be4446080c76 SHA512 897a92f4682ddc4eebc110d66e39bc11737612987ba7786e1b8a33cc79d6cbba6f855dcd7110132725dda16cbb0189fa7830c7d5a1cd33e8767869e64bbb10be
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/mongo-cxx-driver/metadata.xml b/dev-libs/rocksdb/metadata.xml
index e27bea24f74d..cee379b15409 100644
--- a/dev-libs/mongo-cxx-driver/metadata.xml
+++ b/dev-libs/rocksdb/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ultrabug@gentoo.org</email>
-		<name>Alexys Jacob</name>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">mongodb/mongo-cxx-driver</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
new file mode 100644
index 000000000000..9b4a7a55f538
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	dev-python/zstandard:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gflags
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DPORTABLE=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm ${ED}/usr/$(get_libdir)/*.a || die
+	fi
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 0c0d3e41869d..e3403cb18db6 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1,4 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
-DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
-DIST rocm-comgr-3.8.0.tar.gz 95949 BLAKE2B af6f4f2961e0476be8aedae14fc7b3406cdd63759f456faa9c608c68a0c9578d5ad356b11713c1f5b943374f17ebfa043ee5294d3fb6f1a0047639136bc8b565 SHA512 5855825b24fffb3b503a0e2b6bd66a159b6b75a32902e9a428a3be0fa01d8b0c0b6e658c3f5b1520bf79e0dfd20cd453afb3d83d9946387f0ec636378f5129c6
-EBUILD rocm-comgr-3.7.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
-EBUILD rocm-comgr-3.8.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
+DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
+EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
deleted file mode 100644
index 097011983ea2..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
index 097011983ea2..4401982de06b 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
 		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
 	)
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index f88a1cf8178a..27850e53aaa0 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,6 +1,8 @@
 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
 DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436
+DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
+EBUILD rocm-device-libs-3.9.0-r1.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 377 BLAKE2B 70c60c2403ccd85e0aa3ddf762f7b7ac4e4c3f605b02007ec524afec9300c59927916f0169ad9e181bd4ea7491207ee8becde6320663bc5426b255da1941afeb SHA512 8f7ed414a90f2aaf8cf04368c24dc3b1f8360cedbc7474aa1249c29784c6dc8ad350cf47e717ee8c7662f129b8807c627bf825a5ebe8415d665a5bfe8ef15b85
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..507a68912932
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 48022dfdf07f..57cf975664ff 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -2,6 +2,9 @@ AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae42344
 AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
 AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
+AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
-EBUILD rocm-opencl-runtime-3.8.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
+DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
+EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
+EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
new file mode 100644
index 000000000000..e9341675d890
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
@@ -0,0 +1,12 @@
+--- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
++++ b/amdocl/CMakeLists.txt	2020-08-23 10:44:34.929831772 +0200
+@@ -23,6 +23,9 @@
+ include_directories(${CMAKE_SOURCE_DIR}/khronos)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
++include_directories(/usr/include/rocclr)
++include_directories(/usr/include/rocclr/compiler/lib/include/)
++include_directories(/usr/include/rocclr/elf/)
+ 
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
index 5a1a4386433c..a340ec574c82 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
new file mode 100644
index 000000000000..cd1f935e955a
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+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-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocclr-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+	"${FILESDIR}/${PN}-3.9.0-add-rocclr-include-directories.patch"
+	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
+	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index b52b81bc1872..59b25179bf80 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,7 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
-EBUILD rocr-runtime-3.8.0.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
+DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
+EBUILD rocr-runtime-3.8.0.ebuild 1466 BLAKE2B 263ba0bbd1cde48ce0a07b846e2f24193667766454aa1010e725867818f7becc666180d994143d91d69ab97b78a463f4037519bd8fecd5e61800fa2efc0a3f5e SHA512 b8aa8def450da878b5fafc4b4672f3c154106b5141bfd895bd29731e8fba3ba2941147c9f7ffab874470e270649a0b6eb66057031ae060b6b80671b52088d30f
+EBUILD rocr-runtime-3.9.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
 EBUILD rocr-runtime-9999.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
 MISC metadata.xml 500 BLAKE2B f56d759b8a8cf351a26095b51f7c48ebd9fb72d06f0a937aa23ea6c905a04d95c1de31c5ad176f5651a3b4c6a706f22e3ace3f4ec8a99a7f293be82de25b4e2b SHA512 33ee8984ef288b26e1315ccbebb03703e3d1648db220e0b3bbbadaef38ff414c938bf01a04c69ece7672cccb268f445a11b14d15da2939729c798ef8f8801719
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
index 2a972d7fd3d0..a53ba934d9c8 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="sys-process/numactl
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
+	~dev-libs/rocm-device-libs-${PV}"
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
new file mode 100644
index 000000000000..22be187e6afe
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index c4aeefdef4ea..201a92a19973 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,6 +1,8 @@
 DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135
 DIST roct-thunk-interface-3.8.0.tar.gz 2692624 BLAKE2B bb0d288da08081de63f3848987eb86a319c977250052b8bcccdd221b31167d2b344ecd17163aafe1fa5e7a4372248510af77c4ed992c39e71de05452b0b83a8c SHA512 b60461869f916791b702fb7a551978dd741873925154cb5980612f71bb19000f73fda8c1becb5e3482be872790d6cc8c34dfe3484349796c9fab2fedafef525b
+DIST roct-thunk-interface-3.9.0.tar.gz 2692605 BLAKE2B e256217aa8410eb3a1cbb430509c7426e2b00f4ad0a0a3d14879fc116a112e9d10e50b0e2d336f04bc52d98f0d98afda5195565995c6d8b64101132e9c71746c SHA512 eb0d3abaae1aa92f60eeb58ef07bf6dd0f954488e2e05bcf30cb75aa772430c49a3103b0498208c7f8f8fd35fb5d91f0f8c056064ce595263e1737e8f72ba462
 EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-3.8.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
+EBUILD roct-thunk-interface-3.9.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 643 BLAKE2B 97a92b285d79397e3b1f8e07d4c9fcea72613261901f70b016104ee7298a62981d2f54d70404bec0397d0e96c11182e5356e64fb6a30625af2ce8fcc1f6c5e3d SHA512 27da5fd910679ae0ba469d556df2110242432726d74ac19742936a3434ea4701b04bf920e5ee42f5a2154d44c76201c5369b0d4afb2c954efb2e49e08c872c18
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild
new file mode 100644
index 000000000000..ee5be506ed83
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index 55090435d0d3..4a135cf5fd82 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,7 +1,3 @@
-DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710
-DIST satyr-0.30.tar.gz 427940 BLAKE2B 97fedef59cc77b2ae81857c491532552c352a272658d02564d2661d06a4ccc99c18bcd57e5e68e5a612e9e65c5878f19b2f18bbe74066874a7295e2f65d64149 SHA512 ebc6e9c0fd8cd130cf1701573c8ecdadf73fe54efa563759a47f990a91b217cf1dec01045be624d15cfa96b1370ddf2412b0537e57ed628dc27e860be46e21cf
 DIST satyr-0.31.tar.gz 428719 BLAKE2B 23c6ea53db261fee366566101c2b0f1e23cf530728332fe752897ee982ffac057b98de3d9a52dbfc64932cdb73aaff7e35c976e7a55e30b4417f3880782f9125 SHA512 a5aafa1ca5f85a0a817c6fa9a3b428672c9f4f529fb7d73a3e819cc836b78c01a0ca44b47317fcdd4a40dc6386688a450bd78564b6e466091cdc9a2c730c3fda
-EBUILD satyr-0.27.ebuild 998 BLAKE2B 08132e235be3f21deab7abccc2ddb5021851839f4012d985144bd89a7078a09bcf0e854e6e6c4626f9817c20a2aded73303892451e26001792b812b1e007dfaf SHA512 4c8108312645f67c1da4aafdf5693295d4706c7ca1c2f63fe7933c2283488411c30e485d188b64eb9ccffd3caf5c0927608218de5075429309cd82e06d11388b
-EBUILD satyr-0.30.ebuild 1886 BLAKE2B e6e8fb8a9421368aa02a1531af1410c19779fac99b65dff38371e419bdf84de8a0ebb188f085634c41a2bcd05c9e59f25fc88978c686bf8f158a7043a770a388 SHA512 dcc30c7bb7722cdeaade213272bb457a9e3559178c5b81d10b98730acbe42f2619d38064eb69638672c953c97609255b25b818eaf2204a367076bc97f9930b60
 EBUILD satyr-0.31.ebuild 1887 BLAKE2B 43959691fae55eb28d620682361b6c641f6e0bce919475a8a4626b98479a744edf7e69edb28e7f47757740ee0212de8e64ca74dcf286148d73f6ad59c75d3db7 SHA512 69804e6a6df63996dd804c120ba94d7320491d497466db5b696a0eae25ce933ad91a82f126b6435372f9a49a5d1bd2c7dcd01cc8b895790aa2e02d06362b1865
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/satyr-0.27.ebuild b/dev-libs/satyr/satyr-0.27.ebuild
deleted file mode 100644
index face20cac54a..000000000000
--- a/dev-libs/satyr/satyr-0.27.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
-HOMEPAGE="https://github.com/abrt/satyr"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/3"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="amd64 x86"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/elfutils-0.158
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	./gen-version || die # Needs to be run before full autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-rpm
-		# Build breaks without and we aren't supporting Python2 anyway
-		--without-python2
-		$(usex python "--with-python3" "--without-python3")
-	)
-
-	econf "${myargs[@]}"
-}
diff --git a/dev-libs/satyr/satyr-0.30.ebuild b/dev-libs/satyr/satyr-0.30.ebuild
deleted file mode 100644
index 525f046328ca..000000000000
--- a/dev-libs/satyr/satyr-0.30.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools multiprocessing python-r1
-
-DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
-HOMEPAGE="https://github.com/abrt/satyr"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/4"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="amd64 x86"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/elfutils-0.158
-	dev-libs/json-c:=
-	dev-libs/nettle:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-util/gperf
-"
-
-src_prepare() {
-	default
-	./gen-version || die # Needs to be run before full autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-rpm
-		$(usex python "--with-python3" "--without-python3")
-	)
-
-	if use python; then
-		python_configure() {
-			econf "${myargs[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-
-}
-
-src_test() {
-	local extra_args
-
-	# In order to pass --jobs to the test runner
-	run_tests() {
-		cd tests || die
-		emake testsuite
-		./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
-
-		# Only run the python bindings tests for other python impls
-		extra_args=('-k' 'python3_bindings.*')
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir run_tests
-	else
-		run_tests SKIP_PYTHON3=yes
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index adc8c3b3000c..f9be89b93720 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,5 +1,7 @@
 DIST sdformat-6.2.0.tar.bz2 466373 BLAKE2B 67bbe429cbd9871493c29379563f0704b8a050eb8e80645d92a6dea47321e0853bfd4b8442893792a47d743d7b701add21b45fcb7dfd21b2747d43f3f4d19f68 SHA512 e81f0f73e628155ef929c6d7930611f02009a8a217a043e127506c1310ae892b846a8080906feb0932108e9cfa280f473573a5af5096b55b66619b2ac794b0d5
 DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
+DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
 EBUILD sdformat-6.2.0.ebuild 941 BLAKE2B 859761977cd44f2fdceeccc87026550ac66f114bb56116420cdd44f15c0b93dc90e34ca8bc7de95bb621d20bd6fb7eac5839ea7265f3be7d0bd598d9241aaf3c SHA512 7741cb4fb2b74ad2da944d03d71dfee65ecc5e677cd6f52827abbde8d2e628546d5fe35e3b0542f225eda5b448bdf0b13507c90c433f087772038ed869280031
 EBUILD sdformat-9.2.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
+EBUILD sdformat-9.3.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/sdformat-9.3.0.ebuild b/dev-libs/sdformat/sdformat-9.3.0.ebuild
new file mode 100644
index 000000000000..2e44e5b271f2
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index fb9aca0c2c71..2f2b15a2b6e3 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,3 @@
-DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
-DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
-EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
-EBUILD serd-0.30.4.ebuild 1154 BLAKE2B 1ceedd8b0824c3156c18a9b6acc593ff8922cc7e94992dd7cd3803dd106a3f6a94b61e5e7a659d377658ced82c2ecfb0d3b7f3b86d082bb85f5f25af5c802981 SHA512 679c97234694b2fd1757f5572b7e45cdd63de81ac280f3a07b334ad32c11445a96de39c2e2135e04ebfda7092de52672c69c5a590df7f58f50e041fd6993320f
+DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
+EBUILD serd-0.30.6.ebuild 1150 BLAKE2B 6b9b3acdc7f5a7526372c734ea4c387bc0d6dc3ceb96d640195d92e327c5063d70ac0836dc642a4a7837f2e366aa63d976d879f3466ef295cffd00eab37e677a SHA512 d0e51f23f55c53a3259476a8e6fcab1e253f358b209303cf62670eeabca7b69139921cc6437c91dbdd3f0f0aaec87b0a8500fae6cd1aa7d8bc73d305f334885e
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
deleted file mode 100644
index 2c0d9cab644c..000000000000
--- a/dev-libs/serd/serd-0.30.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 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/serd/serd-0.30.2.ebuild b/dev-libs/serd/serd-0.30.6.ebuild
index b373d009b2aa..cee52aeb17b6 100644
--- a/dev-libs/serd/serd-0.30.2.ebuild
+++ b/dev-libs/serd/serd-0.30.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index f9fcc1fcd431..c167e454fe84 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,5 +1,5 @@
-AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
-AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
+AUX serdisplib-2.02-disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
+AUX serdisplib-2.02-use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
-EBUILD serdisplib-2.02.ebuild 2556 BLAKE2B abbbf9c3e17ce00f2208664e62427d4fb91361ae16a7bc9b76e7f0917c7bd17518d95bf8eff374f5548276eaa5d49c0f152b16b877b16528920b356997499713 SHA512 80627f7f272a80678374611457131de45e6e80ed48b4e5cd0851b4aee3f41627ece004686dc939eb6ece718724f505b2e8423c42e6307886fddf62dabcd8d0df
+EBUILD serdisplib-2.02-r1.ebuild 2817 BLAKE2B 5b8a3bb31704f99a64523d6e5654162a0bb08457f22cbc2e450ec4bcb161679a664f34a3b17463c4839806546769d85be24af8cde68ca3f5f307e6615b53f7f7 SHA512 3c82e14965dc5e595039314cab3d89f84317216aea0edf25b8c7b0161abc8608df0ce74a54d8eb17df6eb6449068c4e2c7d3f939d4cc4d74aa3122b5fad33cda
 MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/files/disable-static-build.patch b/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
index 6364650a8207..6364650a8207 100644
--- a/dev-libs/serdisplib/files/disable-static-build.patch
+++ b/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
diff --git a/dev-libs/serdisplib/files/use-destdir.patch b/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
index 786d475cdd0f..786d475cdd0f 100644
--- a/dev-libs/serdisplib/files/use-destdir.patch
+++ b/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
index 9fb47346044d..7a1a31b7f338 100644
--- a/dev-libs/serdisplib/serdisplib-2.02.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
@@ -11,18 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.
 IUSE_LCD_DEVICES=(
-	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
-	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
-	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
+	acoolsdcm ddusbt directgfx displaylink dpfax framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544 remote
+	rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 vssdcp
 )
 
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'.
+# Also enable 'lcd_devices_directgfx' as default.
 IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+IUSE="${IUSE/lcd_devices_directgfx/+lcd_devices_directgfx}"
 REQUIRED_USE+="
 	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
 	lcd_devices_framebuffer? ( threads )
@@ -34,6 +36,7 @@ RDEPEND="
 	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
 	lcd_devices_directgfx? ( media-libs/libsdl )
 	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_dpfax? ( virtual/libusb:1 )
 	lcd_devices_glcd2usb? ( virtual/libusb:1 )
 "
 
@@ -41,7 +44,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
 
-PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.02-use-destdir.patch"
+	"${FILESDIR}/${PN}-2.02-disable-static-build.patch"
+)
 
 src_prepare() {
 	default
@@ -65,7 +71,7 @@ src_configure() {
 	done
 
 	local use_usb="--disable-libusb"
-	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
+	if use lcd_devices_acoolsdcm || use lcd_devices_dpfax || use lcd_devices_glcd2usb; then
 		use_usb="--enable-libusb"
 	fi
 
@@ -74,6 +80,7 @@ src_configure() {
 		$(use_enable lcd_devices_displaylink deprecated)
 		$(use_enable lcd_devices_displaylink libdlo)
 		$(use_enable lcd_devices_remote experimental)
+		$(use_enable lcd_devices_vssdcp experimental)
 		$(use_enable threads pthread)
 		$(use_enable tools)
 		${use_usb}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
new file mode 100644
index 000000000000..1e68838e9389
--- /dev/null
+++ b/dev-libs/simdjson/Manifest
@@ -0,0 +1,6 @@
+DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
+DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
+DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
+EBUILD simdjson-0.4.7.ebuild 622 BLAKE2B 591dc46e83afe30ff0aca4594a199302a237b078be207e3f7634bb76b1694319caf14ae83b3b7fff22c5bdd93cad5292c0e57ed5935c8c28c9931fae6bf75f80 SHA512 0bda85cfeb83a52657c9a127ae8711af162a92fe247f00e957896ba077509634654df11619c628cafc75fcd5efe528e57c69f69819582c91610e5e7b063d5cac
+EBUILD simdjson-0.6.1.ebuild 928 BLAKE2B c672740e77bc519b647d2f72efec2262b46629c3b9bdc429a647c0f08ecdb2fe3dd76ce81209d0359cdf9978086fe87e9428853369fd6f08de2698ccceb90364 SHA512 08daa7a4bae1325d3cd4dcc8bed8d44f86c2971404310dc013a0bc5ce4ccb9c61cead4dbc478cdc97f9bcb360289901ffa81abb7c29c592074f16de720f2da87
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/simdjson/metadata.xml b/dev-libs/simdjson/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/dev-libs/simdjson/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/simdjson/simdjson-0.4.7.ebuild b/dev-libs/simdjson/simdjson-0.4.7.ebuild
new file mode 100644
index 000000000000..77da37bac071
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/simdjson-0.6.1.ebuild b/dev-libs/simdjson/simdjson-0.6.1.ebuild
new file mode 100644
index 000000000000..2beaaf804e02
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-0.6.0-ppc64.patch.xz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# applies cleanly from master, can be dropped on next release
+	"${WORKDIR}/simdjson-0.6.0-ppc64.patch"
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 6ed1b1ea8999..19bec5b5cc40 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -5,6 +5,7 @@ DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd
 DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
 DIST skalibs-2.8.1.0.tar.gz 227598 BLAKE2B d5121299ee13cbc12908778e8fab2eb4b7ec3c6e3ed59fbda29a66e8e37b02dc3639c9f00628274f430f1c49ea1a2fb32459f2720686ee046016c7a6e200bc5c SHA512 d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86
 DIST skalibs-2.9.1.0.tar.gz 229792 BLAKE2B 82102e98ed87941b8653785a3a26b4dec01608d1b8d81b4caed4e0040d50c68ff31aa22f3f39382d8ecf6a646c50d0cdceaef3b79138222527348a85d5a2ae8f SHA512 a85a9397cdb10cbc42fd7ef4984a77802cf8c42abeabc8ff18de6d2e11ff97d950418aeda5f2dd66a04bd30004a5c4608e7cc6f4c7e23b91f56ef1ff59f4b6d5
+DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
 EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
@@ -12,4 +13,5 @@ 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
+EBUILD skalibs-2.9.3.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
new file mode 100644
index 000000000000..73dd8d6e2540
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 94d532e8d31f..cd0605b7581d 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -2,5 +2,5 @@ AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f07
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
 EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-EBUILD softhsm-2.6.1.ebuild 1069 BLAKE2B f4fb6078aba387cf3d6ccbc07b3be60a630e73a78e51685bf20f3be6b4b8a2cd60b60354c992f10562ee59d4dc5984ac2f09d80e66d15348d74a108e6de1d792 SHA512 85ed4dfdf6faf55ad5fbaecdaceeb32f64263f4dd141dcc33fadada396837de2265e7656ce54aff44cd0e66a708b853ebcb1b60161eb8f262e5f60b8e908a95f
+EBUILD softhsm-2.6.1.ebuild 1067 BLAKE2B c90af1b02338d1310db49aca835d41a9afdc4fd8f559637cd103555d057c1c1f395d99fa394f80499136e122df42e5cb55ca86efd4d5d61b80f7cad11afeb24c SHA512 44b14f9490af89e3e63d4ae700fe9bf0c1fb11b0c99114740db4b25830783fd37ca51e9968ce2b5ea6f1ce756541547b9ff20391768a78e54e766c60ba1ba457
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild
index 6d8c36701e27..0d7093bbaa85 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
-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="bindist gost libressl migration-tool test"
 RESTRICT="!test? ( test )"
 SLOT="2"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index b57b5aeac93c..7d472228c8bf 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,8 +1,5 @@
 AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
-DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
-DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
-EBUILD sord-0.16.4_p20200803.ebuild 1584 BLAKE2B 4c4c075c41f094bbc70054c63d423d9d0574c5fb103f1a45f3e5180e4ac1ab4cb67cbb801524dc10022ab58616c636d519c9035b4a62091769aae23b1ca00939 SHA512 1a28340237a91a4ed316b216b925459005eaccda7863e132682740d32916f5e4e2c0b77caa5f6fe3ac94d827a22fdf8ff9e2db5483b08f9ffa933d447ce9ae6e
-EBUILD sord-0.16.6.ebuild 1215 BLAKE2B 114775f3ed2e81a94e05049a5a5015252aa7c4aa28b7909a5e6a9c29eab8cc21de9acf40a9cd1616fdf099b1dd4f4a15ece3fad01380d9c36d66194884dd65bd SHA512 36bdfe99b243f3178ebd207100d47b78fb701ed6dab610d6764e40c608826030f572e4851f097dad190dbc629599c74b9cc1b23d5322996c8df402d6945a4efd
+EBUILD sord-0.16.6.ebuild 1209 BLAKE2B 50705d86ad1249edb4b50e98de14f3e688c695857a0dbd5164640e9faead3d4aca78ede2e5815eefe0d9d6e892a8be034a14d9de600041ffeebe9ca56774652c SHA512 776681996a5455ec35bdb2119c463072b70dc17b2357f90e8feac33dbe206ea8ceff92277559c7ea9a466b995a3b88d551f7c6ad2c1ac3c3678907768c01c1f2
 EBUILD sord-9999.ebuild 1169 BLAKE2B e814b98d57f0c12b816134b113417f4fb09923c56a275cd54086f54529242335cd3df8a8d7bb8ecb458f530c83ec2dd55bb10fd38483baa91773e6bb16d498d2 SHA512 4a88c8475943eb0bf4a487124c1cac7c891c3ffa53bf460656e170db13e9b55ab87a672a62d16833eb89c957718ca739ea6c12f1dc5c6e07315ee7231342d02b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.4_p20200803.ebuild b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
deleted file mode 100644
index 281dbee03007..000000000000
--- a/dev-libs/sord/sord-0.16.4_p20200803.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 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/"
-COMMIT="81e138633076c2d7ef7e1691845757208d02f478"
-COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
-SRC_URI="https://gitlab.com/drobilla/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz
-	https://github.com/drobilla/autowaf/archive/${COMMIT_AUTOWAF}.tar.gz -> drobilla-autowaf-${COMMIT_AUTOWAF}.tar.gz"
-
-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"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	# link in downloaded waf
-	rm -r "${S}/waflib" || die
-	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
-
-	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/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
index bd3d4f728ec6..5706599fc02a 100644
--- a/dev-libs/sord/sord-0.16.6.ebuild
+++ b/dev-libs/sord/sord-0.16.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0fa8abcafc23..4a256ea2d352 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,11 +1,8 @@
-AUX spdlog-1.6.1-libfmt-7.0.0.patch 1218 BLAKE2B 2d3dce85374db1489c5a94eab92b24e947334b7e56345eac17d0e71a0fcce9c99d886f36695023d3af872bf76d5e325b50f5b82cbe979ef539e4db52eb8db1ee SHA512 bc3beb83654ca6c69d6732ccc62c33df202e14e53e0ac5a762d163efb933ba6ebb0d169c53067ba724216886f4036ebfdea1a86a21c3ff3f06a26049e85fac32
-AUX spdlog-1.6.1-tests-fix.patch 486 BLAKE2B 07ba02aa06ce18ffa0cba7f6c7b1a981733161e118c2a19dae0a6efaaa59f449036d43e87fefbf3ae1e51ba13f164987b82f87fa2409d68035d88f4e0b98bfb5 SHA512 798529555072bca9f720678cd4b7a9da8c83802aadc5e88c183a4a1278759ae23b4759ae94f3008b90cf11bbc6df371fac03f4f12967e013165a06ad13647fe8
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e
 DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
+DIST spdlog-1.8.1.tar.gz 293528 BLAKE2B f5568a52489d9f6db459dd7733c493720551f7cb53be5f25fd7e02ec89de88b968bacd3eacb390473258cba2686e2614f21a700e3b3faf66d9b8eb74cfa263cb SHA512 ef855f4f91ed8aba89ef0191a9fd70f73a49567332f7eb42da1604e3a7dda3bbe48db3fd0fae317bb11ee95315d8cd62bf586d2de919ca0978d91e5a971b1c3f
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
-EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae
-EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
-EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
+EBUILD spdlog-1.8.1.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
+EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
deleted file mode 100644
index 422a507a6d86..000000000000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/gabime/spdlog/pull/1606
-
-From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 6 Jul 2020 13:01:52 -0400
-Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
-
-See: https://github.com/fmtlib/fmt/issues/1538
----
- include/spdlog/details/fmt_helper.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
-index cbc0bdf3..4f363858 100644
---- a/include/spdlog/details/fmt_helper.h
-+++ b/include/spdlog/details/fmt_helper.h
-@@ -34,7 +34,15 @@ template<typename T>
- inline unsigned int count_digits(T n)
- {
-     using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
--    return static_cast<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n)));
-+    return static_cast<unsigned int>(fmt::
-+// fmt 7.0.0 renamed the internal namespace to detail.
-+// See: https://github.com/fmtlib/fmt/issues/1538
-+#if FMT_VERSION < 70000
-+internal
-+#else
-+detail
-+#endif
-+::count_digits(static_cast<count_type>(n)));
- }
- 
- inline void pad2(int n, memory_buf_t &dest)
diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
deleted file mode 100644
index 8a6aa8020f7d..000000000000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
-index e974cf51..5393dcac 100644
---- a/include/spdlog/fmt/bin_to_hex.h
-+++ b/include/spdlog/fmt/bin_to_hex.h
-@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>>
-     auto parse(ParseContext &ctx) -> decltype(ctx.begin())
-     {
-         auto it = ctx.begin();
--        while (*it && *it != '}')
-+        while (it != ctx.end() && *it != '}')
-         {
-             switch (*it)
-             {
diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
deleted file mode 100644
index 6d996c6f8eae..000000000000
--- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libfmt-7.0.0.patch"
-	"${FILESDIR}/${P}-tests-fix.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.6.1.ebuild b/dev-libs/spdlog/spdlog-1.8.1.ebuild
index 6da33cbbf3c6..0cd2105637eb 100644
--- a/dev-libs/spdlog/spdlog-1.6.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.8.1.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-6.1.2:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 6da33cbbf3c6..0cd2105637eb 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-6.1.2:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index cae7e200abcb..624c9c1d5b0e 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,3 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6-r1.ebuild 2213 BLAKE2B b20a17ccca2213f77c03fb7f455a86422fa34c1f4f55e5eb3a29a1162ca21e33d5a27c7d3193bfcabc6fac6303547d39e54d6ffe9ab8cd0554ab839e7e0ad76d SHA512 0d4e34efb9ed2eac58b0de014ea8f11de63cebfe5599db91b9adb7a5c808aa43b1d89f9b543b5781145bdb35a134836aa52eb67debfda8ecafa3c52e0fe74f88
+EBUILD starpu-1.2.6-r1.ebuild 2212 BLAKE2B 32338f6e843bfc862cef8ff427ee1f735c8f1c82cab5bf840362d5e86e0f5132f7ad00016557993f52c6bd938a03bf85810b97eb596f202eb1824574905f5e31 SHA512 470c21b6819b5a2a294807814e5bb8bf380a4c532284fee4cdaaf433504ebf4292de8e9be0999309f010542344e1395eaaf3cab3f2859283e9d65b87cdefafa2
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 171c28305eb8..4465f97133e1 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 112ae61cdccf..0b94b32bf6e5 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -4,5 +4,5 @@ AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
 EBUILD stfl-0.24-r2.ebuild 3107 BLAKE2B 90afa189006aa5d0d2ff0ef68ef756fbdc17306e17084f1abbb60b80f5a6cb6a623ee598ecde37ef80094e9e2fd9499417199209dfb01442831bc5cba104517b SHA512 cfdcd3d32d292cf15b9349fb0c2f8352e952b8bcbd6270cfda137c7995a7825866e9100060337b3bcf50892828af48c7f6d069f94e5176a72c2fb83e81f35a71
-EBUILD stfl-0.24-r3.ebuild 3152 BLAKE2B 0c8182aa3696f3a716c40b3407d13293713fbdd8291a7944e39cbea6ef18ed0969a90bc9bfff02499ce3e7f055b28bf2f294d705852d35e5b5e49e5d4f4bd31c SHA512 fa5d9f91716a5b2d3df73c61364b05a2ed63f1d38d958686ab9df4b8e728a86131474a156a417280049a07bc5ff693e8fece30809b989966b9ea086f848362c5
+EBUILD stfl-0.24-r3.ebuild 3149 BLAKE2B ae31aae7985a1394da5ade144cc30085e4892a95c79495b7475e93ca7505ac039f7d2ead5c40515e6c21b931ac121aa7c1fec8829022383009390b428ca8252d SHA512 4e28be5bd189e4dfdcdb9cf1da36bc33a9efce0dd18366738595b43b5f8e1e5f67546005fa2624d078769c2ed66882583dec32969100474c1cd3f26ad3059b14
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r3.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
index f05ef3b01cb9..96858d99953f 100644
--- a/dev-libs/stfl/stfl-0.24-r3.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 2042260c3960..ea54168911e9 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,3 @@
-DIST template-glib-3.32.0.tar.xz 55152 BLAKE2B 53c5eda95f49d3358b1a52a8c821252efc28c823e92c03d387336aaff8540bab9f4762d9fb3f9694d0402dafb1cf09d56188bdcaca29343513b0b74d3c8d1684 SHA512 00e275c15e7daac4c3cf3cd85d8e0700e8ec504a02b68f46754a8f177c6a2cecbbc9b2b5701c85c94d0c06dfa9b51425b37decfa1f619ccb2c7351c0ce1643e7
 DIST template-glib-3.34.0.tar.xz 55348 BLAKE2B f5aa2b2032dce87a3091a7314012779f789ca6e4b1a8c7406ae92deb8283c9024ef33cf8d657741dbb175816371dd8082b7f0a2fff47b58842573248c12dfd6a SHA512 b89cc9890fd80a6858b34139ce1cd2394a43f598629e59f224f4db798a17457be9a2aa8307828af3591108ed6e9a953936a74df15ed1c8c8af2100306db5a497
-EBUILD template-glib-3.32.0.ebuild 1092 BLAKE2B 6882cec4ef4cf524b09a62bf1f5c03830d4c1bd2b736ae38523b98eec43999763357d573d93fb613ff0c17ae6fbbd8577738ae4a9a00063afa47ecfe50e1ecd3 SHA512 b9e508b5ad5d59f41f4c6176bdd7caa3e868395870a40f771f96fcecc92b0e6270d8014352e65ad96fc424ce1dec33aa6385043bd91e55264ee0514c4f03832b
 EBUILD template-glib-3.34.0.ebuild 1092 BLAKE2B b21750f52efc3ee82dc1c04edec5f3968fc0d8daafd116cbf9f34cef039c07dd822f4e49cd91b5ce2d14b842c2ac6ab4f8767770e2624e1d4b4215b481d596de SHA512 e3432ce2aa7dd4cae15915ff88fd61fb9705f7da929339b8e027f2f87b617527bee4062ede3216c1784e09e8aee9495060ef45b3744ea7e153469501edff1450
 MISC metadata.xml 644 BLAKE2B 76c8a25f64948739ac646ea100b365426db6b9f674502d2db83a93ad7203bcf2c6a49396daf959b4f3b3b89777e5f2a02c8a5a168041f6f93168f95c46fd7987 SHA512 272335daa1c3844c85dde4fe91b5020112c0652547d644fdb04126219ea39a3c0cfc16bb3d054cc362393507844e9a63d4c24e5e0f323d2bb3fc8b43e65810a6
diff --git a/dev-libs/template-glib/template-glib-3.32.0.ebuild b/dev-libs/template-glib/template-glib-3.32.0.ebuild
deleted file mode 100644
index 71f28d30e72b..000000000000
--- a/dev-libs/template-glib/template-glib-3.32.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 gnome.org meson xdg vala
-
-DESCRIPTION="Templating library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-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
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
new file mode 100644
index 000000000000..622a78ff36a5
--- /dev/null
+++ b/dev-libs/tree-sitter/Manifest
@@ -0,0 +1,5 @@
+AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
+DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269 SHA512 48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013
+EBUILD tree-sitter-0.17.3.ebuild 646 BLAKE2B c67c4ec09e70ad7ea3799cdb38c304a46494087f821967b2b28dd29d64a40858509a9d10513343991ff845c7f807a4cdbf597595fe69154de24a57880f6e72e9 SHA512 795feae856a3e42de92108a369f3b071c4a520eb5f365c8434a305a9442580813625204e36546f9eb20b90df59706c3b14d2cf2d3083eb148266224cb4a55590
+EBUILD tree-sitter-9999.ebuild 646 BLAKE2B c67c4ec09e70ad7ea3799cdb38c304a46494087f821967b2b28dd29d64a40858509a9d10513343991ff845c7f807a4cdbf597595fe69154de24a57880f6e72e9 SHA512 795feae856a3e42de92108a369f3b071c4a520eb5f365c8434a305a9442580813625204e36546f9eb20b90df59706c3b14d2cf2d3083eb148266224cb4a55590
+MISC metadata.xml 692 BLAKE2B e8a04ac2d2dbe16214d82067944baef692a4e8896fcbad7feca9e54565e603b0e5308bb4f1e4bc5aaf39f41b1ca0e10fa5710159ed1012c6ed47f2007fa19a69 SHA512 a319341832c189a845f1a757b17bbefc10a7c4b00c49e80b49745061112b91ebb80f2f96a99de27ed6aa5799f25bd56ddec3eb41bfb2507b037ee8e965525053
diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
new file mode 100644
index 000000000000..dd898b059612
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 764f411a..86aaefd8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+ 	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+ 
+-all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
++all: libtree-sitter.$(SOEXTVER)
+ 
+ libtree-sitter.a: $(OBJ)
+ 	$(AR) rcs $@ $^
+@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ)
+ 
+ install: all
+ 	install -d '$(DESTDIR)$(LIBDIR)'
+-	install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+ 	install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+ 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+ 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
diff --git a/dev-libs/tree-sitter/metadata.xml b/dev-libs/tree-sitter/metadata.xml
new file mode 100644
index 000000000000..dcfdb27e8a99
--- /dev/null
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>abdelqaderali@protonmail.com</email>
+		<name>Ali Abdel-Qader</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter</remote-id>
+	</upstream>
+	<longdescription>
+		Tree-sitter is a parser generator tool and an incremental parsing library. It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
new file mode 100644
index 000000000000..b50d6429cd9a
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install
+}
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
new file mode 100644
index 000000000000..b50d6429cd9a
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install
+}
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 8045824d4422..df362291022f 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -1,5 +1,5 @@
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-2.0.0-r1.ebuild 991 BLAKE2B e2534d3950b1398a4aef2985159eb52f80f7e5f4bc253e972044fbd4ba9d3c9ec8486715712a27937069553e394b6510953a596bc41ee788061b3d203ea5e039 SHA512 d05fd6971bcd8f7816eee1d6b44b07a35dd392322c2d2ac0a2d439688b8cf7c0be13d50ab3d4b4bc354628ea959862fe99b2bd62c11ab79716bc1967f727ec46
+EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
 EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
index 0da36ef58d5e..4744a8bd5dd9 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
@@ -32,6 +32,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		# Don't build with -Werror: https://bugs.gentoo.org/747583
+		-DUTPP_AMPLIFY_WARNINGS=OFF
 		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
index 4facc13f4667..a1f53206589d 100644
--- a/dev-libs/ustr/Manifest
+++ b/dev-libs/ustr/Manifest
@@ -1,7 +1,7 @@
 AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86
 AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab
+AUX ustr-1.0.4-inline-check.patch 1098 BLAKE2B d51410975458329f1587f747d03cfec52e212e8b22e20f159db254007fb2b29b30c335e3912443797c1c03132e7d4dc584b6d66962cb8982e3782b326c9af46d SHA512 08559671006e20f8cfb10e85738e420529822ec916acca29ab14f3f0ab77805b102ae5a60779f09978e334c167550a62eb960853d5821e308c056b4fec93117e
 DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
-EBUILD ustr-1.0.4-r5.ebuild 1255 BLAKE2B 8920416abdc8636b05b95573dba65bc88f7fc22d30c6deac8b3916a7f2fc59be42e0d437a8c81ba8af393a645d3ea6a01d7f060f1025a1aeede3c64fd60f1aaf SHA512 5275fb21937faafd1c03a4fddb9c568ba44d8db15ff6faa56293f0a38df42ba9412c444bef4da57700a76c6992592addb4ec1e87a8bbfa71476bc5bd9202faeb
-EBUILD ustr-1.0.4-r7.ebuild 1780 BLAKE2B 1ca34aca9a83d64f43729eb1c1eb5f85e640dd861d71c0b83e771067cfea7c39e2885fdb802b67a31618c00e7835baa6cb3ec21c8820b3909591a55b239f15d1 SHA512 68ae97b187d6a67e4ac54f0493f1e957d26a4fda38214c4ad34b1111b8936d09a953911d03ce058e8877133a1206195a4506c92bcb89d61ce7c7f3097d764ec6
-EBUILD ustr-1.0.4-r8.ebuild 2058 BLAKE2B 9e59a44c3468d4ca5da7bcf1bfc7dfaf8c4e4ddadd71a4a2a1fb527a2ab24b4d1e74cab0ecf8c08404c417ea66d86e7b345553150797063eea0748a7b1169eae SHA512 42d520b0307873fb899eb237a66c8f04a126cd067b501ac948b22743b80808272e84b7a9c6d04c0979d0032b02efb0326a999c85609e971e41a052392992dfe6
-MISC metadata.xml 280 BLAKE2B c3bf7b208a56dbbb5d3b3ed817937c68bad2240cf61761e138b678efbc019278b31f04d88b5950aa52847801ab1329bc0e81ece1bf25436dda6ba642f5f287cb SHA512 805e06bcd26f04facdcf6275f33d38b5981f25f0120fcb117a5c0e98e50a756bca0e258046bfbe76da17e5ec3f6d29fad0dade7d07b729a1874544a45a3a7406
+EBUILD ustr-1.0.4-r8.ebuild 2031 BLAKE2B 7580c709ff228617d1c44b8e576f60bd6d4227ae0a6b21cd261fa1d6a0c8f0d12eeb803b75620e6818bccaff5d1bee02b413cd22bb14609e656b0e731180cf8f SHA512 ca71a44e6e3ddd25a077712966aa711a83f27d3be129d2243a84bb4788e55dea94d100be948258ba5098ad239a4f5ed437c3df96235c1ecb92362a8a5a0e27a0
+EBUILD ustr-1.0.4-r9.ebuild 2039 BLAKE2B 1e24b6bd04be4535078479c7768b5c9434bed53d05f2711d0444a899262c53f35df90d5f155a5356e4461d570febc76e5cac244248327483c9679f0179997f89 SHA512 e58e53e73b4a8024a1531c19f13d919acf81d9714e60f7093a2b65c9ff1a857cabbe4ddd9c0854dc4d4e8acac7367630aa6082c1adb5573896c7c3f435849c9c
+MISC metadata.xml 479 BLAKE2B 4d19665a6413f27085ed035e5cd7fef83bae1d56dd2368079ec3166dd2a7e324ec1970aae754cec809014b5248fdc58053aff6277f3ae804d6f1e3300370984f SHA512 bf3530e0e77ddeaf0c97d4290d0f0a6101ceebfc41bc6df8758ed47938f2c791359ff723964bb8159e76fac6fb6ca64f1dee18a2e7fe445bbf59571a71d5bd3b
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
new file mode 100644
index 000000000000..b38cf7829c9f
--- /dev/null
+++ b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
@@ -0,0 +1,27 @@
+--- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
++++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
+@@ -4,13 +4,23 @@
+ /* this is the custom version for the library itself, for everyone else
+  * ustr-import generates one depending on the options. */
+ 
++/* Ustr relies on GCC's traditional handling of inline functions, not
++ * the version that was actually standardized in C99. GCC-compatible
++ * compilers define __GNUC_STDC_INLINE__ when using the standard
++ * behavior. When this is set we must restore the old inline behavior:
++ */
++#if defined(__GNUC__) \
++ && defined(__GNUC_STDC_INLINE__)
++#  define inline inline __attribute__ ((gnu_inline))
++#endif
++
+ /* The default is now to link against libc. */
+ #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
+ #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
+ #endif
+ 
+ /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
+- *  because by the time we've included a libc header it's too late. */ 
++ *  because by the time we've included a libc header it's too late. */
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE 1
+ #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 0fb02e2df52a..97b72ca3a65d 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/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>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
 </use>
diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
deleted file mode 100644
index dc3c5bb1983d..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		all-shared
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="/usr/share/man" \
-		SHRDIR="/usr/share/${P}" \
-		DOCSHRDIR="/usr/share/doc/${PF}" \
-		HIDE= \
-		install
-}
-
-multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 6fb52670f3b5..e625d492455c 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -29,7 +29,7 @@ src_prepare() {
 
 _emake() {
 	emake \
-		USE_STATIC=$(usex static-libs) \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
index 0d4f3ece9d89..184372af56b2 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs multilib-minimal
 
@@ -11,7 +11,8 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -20,13 +21,19 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ustr-conf-debug.h
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-inline-check.patch"
+	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
+	default
 	multilib_copy_sources
 }
 
 _emake() {
 	emake \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
@@ -66,6 +73,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	_emake DESTDIR="${D}" install
+
+	if ! use ustr-import ; then
+		rm -r \
+			"${ED}/usr/bin/ustr-import" \
+			"${ED}/usr/share/man/man1/ustr-import.1" \
+			"${ED}/usr/share/${P}" || die
+	fi
 }
 
 multilib_src_test() {
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 01434fe100d6..b07f53f3dd0e 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,4 +1,8 @@
+DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473 SHA512 720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
+DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
-EBUILD utfcpp-3.1.ebuild 947 BLAKE2B bbb927d26dc9cd404a3aaa41e3b6619f57b579b8845d7ddd75459d23596e5f4dc44634b7c0eef809aa2d38b9c62e5730ca04b4ddd7825f9fe32453836147139d SHA512 5f51e3bd6cebb0cf9846a59fe2ac348dd3f37815efb1901d3b2370685b7502b74f48ba1cfba3fd8472e51fba3fc1a0a1733cac038504c7c9daf1058d7e6a7203
-EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
+EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
+EBUILD utfcpp-3.1.2.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
+EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
+EBUILD utfcpp-9999.ebuild 898 BLAKE2B 3412683e554ceae20d79a57b4487f614175decaf501be0f4dc33f95ab81a822cdef2a3d736442f2fe7b1c8ecba30f62b9db3ed7638300d9fac3ae289dac7ba39 SHA512 3ddbc5569ebe18570ab9f6f437240c707706df91c23851761e8749c6b9efc11abd1ea1393ed2b9dd8bce497939715de56de8d0121810123773fc63f30496b812
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-3.1.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
new file mode 100644
index 000000000000..14032157c03c
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
new file mode 100644
index 000000000000..14032157c03c
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index 5afa6b050632..65c032f5f0ab 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -34,7 +34,7 @@ src_prepare() {
 	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
 	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -43,5 +43,5 @@ src_configure() {
 		-DUTF8_TESTS=$(usex test ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild
index 2b6fa17b5966..ca5002a61255 100644
--- a/dev-libs/utfcpp/utfcpp-9999.ebuild
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -34,7 +34,7 @@ src_prepare() {
 	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
 	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -43,5 +43,5 @@ src_configure() {
 		-DUTF8_TESTS=$(usex test ON OFF)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index c2d4f95121c4..570bbc0eaa90 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,7 @@
 AUX uthash-2.0.2-cflags.patch 250 BLAKE2B fc632cc23ffb5ddc89e3d91ea753f0a8f2803890203c7227a01b694603842490027e411e304e3db3960b0920f53f1390010f570bffa38d94a449864cbec938eb SHA512 d87dfbc7be1df49d5c6f06c413800693491f2bc4d0b4b0bddff5f1519a7de4d4ab95d3642e15273d6ddca6a19a9d511859ec999aebf81c8739bab4a7caaebfc3
+AUX uthash-2.1.0-cflags.patch 250 BLAKE2B a42296b08231b3eb31ce0830cc07e0287ad2439c9fa239ffea3a3594f3265e3299a8800c2d44387d05666685e4b5b980306e1ebac23c2b663620d8f19f348f8f SHA512 79ad3d9d4efddc51307b6e9ec37925c46c01fb0bacdfe7343fc08a4a99278de09bdc486b59c2348116ee7b5eb5cce47935953a182f5f520f713b6ef43c9f84d4
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
+DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0
 EBUILD uthash-2.0.2.ebuild 657 BLAKE2B f46b84a586d1ed7508316e8d9a196762eefe6e59fdc783d6404fad760b820e8f3c3d1ffe69b3a9354278223704c02c27438880a03da35fce21f4856879fd0c7c SHA512 c78a76a782147701bd6506967070150fbcf6c1f2ed9756572ab981826d6120888cef341c6f9adf4e0eb80d82474687a414ddcdf115fcfac02af9c4e8434adceb
+EBUILD uthash-2.1.0.ebuild 651 BLAKE2B d7a3c68953aae92fe62725c0ef767f6aa7134f153aad33b7fa542fe697f6359a7b0ee3a47e8d730bc999d20fa74c24cc5aec1f9ef34bd5913f477edc9d82464b SHA512 5a32950efb0bfeceb88c83d7e7d35fe5a16beb20235cbbc57e39f41b112134708f0788f62b26104c23242f728ad11efe7a60b8b1ca8691c0cf05f02bb418f582
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
new file mode 100644
index 000000000000..588ec26078c0
--- /dev/null
+++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
@@ -0,0 +1,11 @@
+--- uthash-2.1.0/tests/Makefile
++++ uthash-2.1.0/tests/Makefile
+@@ -18,7 +18,7 @@
+ CFLAGS += -I$(HASHDIR)
+ #CFLAGS += -DHASH_BLOOM=16
+ #CFLAGS += -O2
+-CFLAGS += -g
++#CFLAGS += -g
+ #CFLAGS += -Wstrict-aliasing=2
+ CFLAGS += -Wall 
+ #CFLAGS += -Wextra 
diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
new file mode 100644
index 000000000000..49f42356561e
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-lang/perl )"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+src_test() {
+	cd tests || die
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 20ec133c4d0c..2a1d0db26046 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,15 +1,9 @@
-DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
-DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
+DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
-DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
-DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.49.91.tar.xz 3506404 BLAKE2B 77a4e88d6718112747d6ceb0d70712db818fc175c2c4ef5755bc2c091469e32028d73467a7fda84748b3d29f87fc2f5af9601df8f59d96bcc55ce1bf01b25c7c SHA512 15817b032cce95a360b28a51509259b88e070a7ec6fd7a82452717ef98cd14b1fb60307a5bdd7f4b0627e59575a64c44fb41dad25327cecf8d9a56dbde01a820
-EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
+DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
+EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.6.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
-EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.9.ebuild 649 BLAKE2B 55d9b57e96bbbb1b815f516190f292b443baef2ba5e361d0cc69ce60fe178575d73a4dbf4f5f4ae2104bb6c18f9d04ba3a510087f0f21303cd03ab66ffa023e4 SHA512 5346d8890d211752b9dba04e300340b69961b2dbdc66e30a92db618d9b008f7a8664f6c276c78705ace54483c46abe9dcb5e0dabece9c8eb232c3bf784445ed7
-EBUILD vala-common-0.49.91.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
+EBUILD vala-common-0.50.1.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.46.7.ebuild b/dev-libs/vala-common/vala-common-0.46.7.ebuild
deleted file mode 100644
index 51429ad4aeb1..000000000000
--- a/dev-libs/vala-common/vala-common-0.46.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.46.10.ebuild b/dev-libs/vala-common/vala-common-0.48.11.ebuild
index ee55cfcad100..ee55cfcad100 100644
--- a/dev-libs/vala-common/vala-common-0.46.10.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.11.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.48.8.ebuild b/dev-libs/vala-common/vala-common-0.48.8.ebuild
deleted file mode 100644
index ee55cfcad100..000000000000
--- a/dev-libs/vala-common/vala-common-0.48.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
index 4df82e26bb72..51429ad4aeb1 100644
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.49.91.ebuild b/dev-libs/vala-common/vala-common-0.49.91.ebuild
deleted file mode 100644
index ee55cfcad100..000000000000
--- a/dev-libs/vala-common/vala-common-0.49.91.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.48.7.ebuild b/dev-libs/vala-common/vala-common-0.50.1.ebuild
index ee55cfcad100..ee55cfcad100 100644
--- a/dev-libs/vala-common/vala-common-0.48.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.50.1.ebuild
diff --git a/dev-libs/vc-intrinsics/Manifest b/dev-libs/vc-intrinsics/Manifest
index 6a3b5e43ac91..d7f314a64f3b 100644
--- a/dev-libs/vc-intrinsics/Manifest
+++ b/dev-libs/vc-intrinsics/Manifest
@@ -1,4 +1,4 @@
 AUX vc-intrinsics-0_p20200904-cmake_libdir.patch 717 BLAKE2B 7c3d72b87b0acc67c223a3468e96ce68c5c1a166bccacc045d73e5d29a063856b23ba959ff1e13d07333d20803cedfa3f55f490ee9ee7700c708876de1960f71 SHA512 927c89f748fa21d3ef9349749c3428014b055a88d557dfd310f2b76c7f9e263400267558a83871ab132c295a997dc0488b9df2167378b9c1dc691469e1554f4c
 DIST vc-intrinsics-0_p20200904.tar.gz 97118 BLAKE2B 7f1a4f0b3b5f8abba8972668877562fbc6835ce8cfa9e0b336541ee6db72ff1469917320b63dee7d193af89593bb318c9fcd000ba5e8d62df5729f69cfdcb9c7 SHA512 7b5f87dabcf1c093c50721390dba9c82a1f0da1a087d00af4bf1c2e080bffa531b8d16fe8faacfaeb4862b528929865263d0e84a5ebee6a76eef1436dc4e2ec9
 EBUILD vc-intrinsics-0_p20200904.ebuild 1355 BLAKE2B e4ebb93f1eb3b500027788d4dbb6d089411af2a443579ee60096b33a5e0421e3673a4503b435a452549077de2c309d18718fbd94f26ee3be4e4604c617456325 SHA512 836b14997f421581e21b2af7bb8a4866392f000610e09d792adefe85077f416fd5b3a40934f7a57e85bc1c0ebb555d6ec1f43e36be87e7a5ee9ba7936fbf2ee9
-MISC metadata.xml 330 BLAKE2B 9d8d85095925bb1363a4b5847506d2ec683ca09b552f93a74241375fe7eec80d98af2ec4de20d87c1a4d9bf61c35386934b28150b38167d15825b9e3dbb76325 SHA512 c7981ab0cf297687752233fb0425048d6b22d40867ced67dfce840f7914c8f2003787e21b31e08d80daadc2b0b05ed811bdbb5af00bf95d70bc5cd412a7be9c8
+MISC metadata.xml 252 BLAKE2B 9478a43631ab002f4eb32d800c24979b5b5c5225e4b54eef2457a040a86f0003442138e93723e678ad45ab346a7c84239725d007a09ae04fad1019ee42c9b689 SHA512 69ea8aaf02f2bebc26c2d4620cd15f20139454eb7e0f3ae25ad0d5d628e5f7cb013a7b2bd44ac24c09eaa2c952e280ad7f116f8714c768dfb7668abf3b894353
diff --git a/dev-libs/vc-intrinsics/metadata.xml b/dev-libs/vc-intrinsics/metadata.xml
index ce94ad6317e7..59d021249019 100644
--- a/dev-libs/vc-intrinsics/metadata.xml
+++ b/dev-libs/vc-intrinsics/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="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">intel/vc-intrinsics</remote-id>
 	</upstream>
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 59c4b3559745..b690c8eb8c06 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,3 +1,4 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-EBUILD voikko-fi-2.3.ebuild 635 BLAKE2B 82f2ed42dded10d4ade28fd967dae5a4c6970d15c548e347eb9c4d2465b9e0fe4d838fe9ac19426374284f2b9b76ccee8aad2f8b986b04322cd42080adbd87dd SHA512 f6d30fe1136fae9d9f18c56481fb5f7e7ea710bb983a4e77fbe206cab07197bcb7e58898f8308bd08e279defe3d14f71f9ddfea50aaf31a0835b2367e0d8fa8a
+DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc
+EBUILD voikko-fi-2.3.ebuild 847 BLAKE2B 3e56a0d3c4f2a32e7b17798b99f9c2452c093642b62007850e0b625a62892e6d8104187df2f456c599bf7eebdae53662e7bbfedbb89bd2dca4f81d35e199c4c7 SHA512 f7b38d806d87095af6dea361c45a501b2ed92975a5bb833240c9e5abca3c6ca79e1dc7470b335688e25e16543d5b49135f54348330a39cd45053c8fd894f1010
 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 a03999c04843..6fb107e5147f 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-any-r1
+inherit python-any-r1 verify-sig
 
 DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
 HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,7 +20,10 @@ DEPEND="dev-libs/foma
 	dev-libs/libvoikko"
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}
-	dev-libs/libvoikko"
+	dev-libs/libvoikko
+	verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
 src_compile() {
 	emake vvfst
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index c976dc367533..d1c9f78bbcff 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
 EBUILD wayland-1.18.0.ebuild 1738 BLAKE2B 9cfa25523f970b0f996070517f55a47495af1c0b88175f39af30c4773b803c6e60baf17aa08eb1895a5d8c77b163aaf75b6c5b5c69f72ca26ae0a9cfccd74a98 SHA512 5c723b771e25a5dad594d92e8d6aa4d81bf4d1ea4e222899a2c4bae4a29487e0ec6a945f5985c9e3d1bb163022e2b55680e1bcd514aa82f7b903d1b6984a4d68
-EBUILD wayland-9999.ebuild 1747 BLAKE2B 22e3835f0b5466b3e99e6651257bb3dd47b2c6e25e4f0798380a4c49c1265314f57a217d8d2e92c328b4015e6270fd98d0e5f70a6136775d5033af778356d0a4 SHA512 0a22fc2cc7d2f638bf023925e28c76c9bac922e90b2cc5d3bf8617b8ac9ff31d290d80c902585b9fe5218844f23d8500be4910e85f00b1d51e75c75f2d66e531
+EBUILD wayland-9999.ebuild 1717 BLAKE2B 21a7642f0ae18c9e50bac5e57c8515a1a3a366a33ca20077e6a1254b18757a8699c9d011bfa3ab50718c0c434c06c927b0b0586c051f48790d620945d10622b7 SHA512 dc371930037866a40ea11849594bec8b58ef157c3b9853829c07bae99f3e20c7c0aec015c5590308c51e7cd633d8aca7eb84ac6d3b1305ab48c6e32927b29477
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 4e06cf8a7a05..cc89001c551d 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -33,9 +33,7 @@ DEPEND="
 	dev-libs/libxml2:=
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}
-	!<media-libs/mesa-18.1.1-r1
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index fd0a312a832d..ed31ed762c54 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716
 EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db
 EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
 EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.17.ebuild 6453 BLAKE2B 918f0b17fd076f95991f6bfe5672d8c18a32de1f834d1d8c454c6bb552fd559cb9091ca70945c9338cb84a32e7e3562a071e5a51d88951fc205e71d9b7fc4dfb SHA512 d174d0ccca69c4dc900e81e202c3680974025f260da4ac5b3f3f6ba80d49e9cf9cabb601b0d4e98f940fa2ea55461598a717bdb825033e992f24c56f5f33ec83
+EBUILD xapian-bindings-1.4.17.ebuild 6448 BLAKE2B 6ed76719f2a11c06959fd34b62ddcc234c644fc3e21040eabb8bf55695392ce3ba394bc39244f02103a8843aff29c0a3724357c386b687d5b3494203f1ab8d54 SHA512 c6e021abbdbbfc08d9fd35cd89f2427fd8a5aacdf651333fa99c5f76e8eb88b8dd966eb01ebaddb9781d5d543aba8e202a11f50507fecc1e92864ea749d9a0e1
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index ac2ceee5d1d1..e95f5287bef7 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 1b8b31eb58f6..1166b7d2cfe8 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -7,5 +7,5 @@ EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a3
 EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f
 EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
 EBUILD xapian-1.4.16.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
-EBUILD xapian-1.4.17.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
+EBUILD xapian-1.4.17.ebuild 1799 BLAKE2B 578895100b9e628a46e82a58d0296015a9445372279a828cd32d1809a131c50ed7b31b5f5fd3a3e2d6c1dc75452d3d5b46869e9380f6806912a6c641f6ed08e4 SHA512 eaf3342493bc89367aeef080e71228290001ac78ba2b5b1ab1f56d9d5128880168b24c5f8810733e2092606613ba19889fe085014b4354cef52088ab1c51b8db
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index 669d3eb246de..7e15ee8d1093 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index a2eada927419..f0fb8e74b4b2 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,9 +1,9 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
-AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
+DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.2-r1.ebuild 2974 BLAKE2B 086f8a100869f89bc9bbf294c2c699f624a4fb55c028239b0978676ee0c84808c85de9f9cd8eaecb5858f9d14dc8bdd9bd11fe5c431e71cdfc986449d28d9c9a SHA512 1dddd35573dbd3687de506cdf2970779d05a13ee15cdf80e80e2bf046d591719b4835f1465c0da37ddd93a5997179bd47a02156deabdbcdc6afdcc9131777f9a
+EBUILD xerces-c-3.2.2-r1.ebuild 3058 BLAKE2B f1a78ed5f63f4cf075e834869eb5c9a9eea6a04303045704bfee06b1b772c8591e42bde551ffe4e67e88033adeb70516adf708ce0dd204c8b6d320e8c1510101 SHA512 a82817fe5f0735e5ae4d50509104675e6773e2f375355d12b66ed1379527eaa72c0ed443d045c80f8048378a08b868bba706325779c843a7c234a7a49c536e35
 EBUILD xerces-c-3.2.3.ebuild 2934 BLAKE2B 1630cf8cafc12ad4ef2924febd21891629bc0d9c963936711f01e492c52d582be42d8a40008d516d302234b1b79c4cd9b517ecabcba476c4d523cbc8e4f9f0d4 SHA512 d13356e7351c9766370500397833a123c49848d4ae883f4d91e535d9e729c27257cba0aa29f1ba00afb5849bd76ca21989b9694f2c199a855bd93787e1e5b402
 EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb
 MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
deleted file mode 100644
index f1a847c55699..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
+++ /dev/null
@@ -1,770 +0,0 @@
---- /dev/null	2018-12-04 16:29:46.857790926 -0500
-+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg	2018-12-07 14:18:19.183422991 -0500
-@@ -0,0 +1,767 @@
-+$quote "
-+$set 1
-+2  notation '{0}' has already been declared
-+3  attribute '{0}' has already been declared for element '{1}'
-+4  encoding '{0}' from XML declaration or manually set contradicts the auto-sensed encoding; ignoring
-+5  element '{0}' is referenced in a content model but was never declared
-+6  element '{0}' is referenced in an ATTLIST but was never declared
-+7  {0}
-+8  unable to include document '{0}'
-+9  unable to open text file target '{0}'
-+10  unable to include resource '{0}'
-+13  '{0}' is not allowed for the content of simpleType; only list, union, and restriction are allowed
-+14  globally-defined complex type must have a name
-+15  globally-declared attribute must have a name
-+16  attribute declaration must have name or 'ref' attribute
-+17  element declaration must have name or 'ref' attribute
-+18  group declaration must have name or a 'ref' attribute
-+19  attributeGroup declaration must have name or 'ref' attribute
-+20  anonymous complexType in element '{0}' has name
-+21  anonymous simpleType in element '{0}' has name
-+22  content of element declaration must match (annotation?, (simpleType | complexType)?, (unique | key | keyref)*)
-+23  invalid content in simple type '{0}'; only list, union, and restriction are allowed
-+24  expected simpleType in list definition for type '{0}'
-+25  list, union, or restriction content is invalid for type '{0}'
-+26  invalid content in list definition for type '{0}'
-+27  expected simpleType in restriction definition for type '{0}'
-+28  facet '{0}' is already defined
-+29  expected simpleType in union definition for type '{0}'
-+30  content in simpleType definition is empty
-+31  expected restriction or extension in simpleContent definition
-+32  base attribute must be specified for restriction or extension definition
-+33  expected restriction or extension in complexContent definition
-+34  invalid content in 'schema' element
-+35  invalid content for type '{0}'
-+36  unknown simpleType '{0}'
-+37  unknown complexType '{0}'
-+38  prefix '{0}' can not be resolved to namespace URI
-+39  referenced element '{0}' not found
-+40  type '{0}:{1}' not found
-+41  attribute '{0}' not found
-+42  invalid element '{0}' in complex type definition
-+43  base type '{0}' not found
-+44  unable to create validator for '{0}'
-+45  invalid element following simpleContent definition in complexType
-+46  invalid element following complexContent definition in complexType
-+47  attribute '{0}' cannot have both fixed and default values
-+48  attribute '{0}' with default value must be optional
-+49  attribute '{0}' declared more than once in the same scope
-+50  attribute '{0}' cannot have both 'type' attribute and simpleType definition
-+51  simpleType '{0}:{1}' for attribute '{2}' not found
-+52  element '{0}' cannot have both fixed and default values
-+53  invalid {0} name '{1}'
-+54  element '{0}' cannot have both 'type' attribute and simpleType/complexType definition
-+55  element '{0}' has fixed or default value and must have mixed simple or simple content model
-+56  simpleType '{0}' that '{1}' extends has a value of the final attribute that does not permit extension
-+57  type '{0}' specified as the base in simpleContent definition must not have complex content
-+58  type '{0}' is a simple type and cannot be used in derivation by restriction in complexType definition
-+59  invalid element following restriction or extension definition in simpleContent
-+60  invalid element following restriction or extension definition in complexContent
-+61  duplicate annotation in type '{0}'
-+62  type '{0}' cannot be used in its own union, list, or restriction definition
-+63  block value '{0}' is invalid
-+64  final value '{0}' is invalid
-+65  element '{0}' cannot be part of the substitution group headed by '{1}'
-+66  element '{0}' has a type which does not derive from the type of the element at the head of the substitution group
-+67  element '{0}' declared more than once in the same scope
-+68  value '{0}' invalid for attribute '{1}'
-+69  attribute '{0}' has both 'ref' attribute and inline simpleType definition or 'form' or 'type' attribute
-+70  duplicate reference attribute '{0}:{1}' in complexType definition
-+71  derivation by restriction is forbidden by either base type '{0}' or globally
-+72  derivation by extension is forbidden by either base type '{0}' or globally
-+73  base type specified in complexContent definition must be a complex type
-+74  imported schema '{0}' has different target namespace '{1}'; expected '{2}'
-+75  'schemaLocation' attribute must be specified in element '{0}'
-+76  included schema '{0}' has different target namespace '{1}'
-+77  at most one annotation is allowed
-+78  content of attribute '{0}' must match (annotation?, simpleType?)
-+79  attribute '{0}' must appear in global {1} declarations
-+80  attribute '{0}' must appear in local {1} declarations
-+81  attribute '{0}' cannot appear in global {1} declarations
-+82  attribute '{0}' cannot appear in local {1} declarations
-+83  minOccurs value '{0}' must not be greater than maxOccurs value '{1}'
-+84  duplicate annotation in anyAttribute declaration
-+85  global {0} declaration must have name
-+86  circular definition in '{0}'
-+87  global type '{0}:{1}' declared more than once or also declared as {2}
-+88  global {0} '{1}' declared more than once
-+89  invalid value '{0}' for whiteSpace facet; expected 'collapse'
-+90  namespace of import declaration must be different from target namespace of importing schema
-+91  importing schema must have target namespace if namespace in import declaration is not present
-+92  element '{0}' cannot have value constraint '{1}' if its type is derived from ID
-+93  element/attribute '{0}' is of NOTATION type
-+94  element '{0}' has mixed content type and the content type's particle must be emptiable
-+95  complexType definition has empty content but base type is not empty or does not have emptiable particle
-+96  content types of base type '{0}' and derived type '{1}' must both be mixed or element-only
-+97  derived content type is not a valid restriction of base content type
-+98  derivation by extension or restriction is forbidden by either base type '{0}' or globally
-+99  item type definition must have variety of atomic or union where all member types must be atomic
-+100  group '{0}' must contain all, choice, or sequence compositor
-+101  content of attributeGroup '{0}' must match (annotation?, ((attribute | attributeGroup)*, anyAttribute?))
-+102  top-level compositor in a group must not have 'minOccurs' or 'maxOccurs' attribute
-+103  {0} '{1}:{2}' not found
-+104  group with the all compositor must only appear as content type of a complex type
-+105  group with the all compositor constituting the content type of a complex type must have both minOccurs and maxOccurs equal 1
-+106  element declaration in the all compositor must have minOccurs and maxOccurs equal 0 or 1
-+107  attribute '{0}' is already defined in base
-+108  intensional intersection of attribute wildcards must be expressible
-+109  base type does not have any attributes
-+110  attribute '{0}' has incompatible use value in the base
-+111  type of attribute '{0}' must be derived by restriction from type of the corresponding attribute in the base
-+112  attribute '{0}' does not have a fixed value or has a different fixed value from that of the base
-+113  attribute '{0}' has invalid target namespace with respect to the base wildcard constraint or base has no wildcard
-+114  attribute wildcard is present in the derived type but not in the base
-+115  attribute wildcard in the derived type is not a valid subset of that in the base
-+116  attribute '{0}' cannot have different use value in the derived type if the base attribute use value is 'prohibited'
-+117  attribute wildcard in the derived type must be identical to or stricter than the one in the base
-+118  unexpected '{0}' in the content of the all compositor; only elements are allowed
-+119  redefined schema '{0}' has a different target namespace '{1}'
-+120  simpleType in redefine must have a restriction definition
-+121  simpleType base attribute in redefine must reference the original type with the same name
-+122  complexType in redefine must have a restriction or extension definition
-+123  complexType base attribute in redefine must reference the original type with the same name
-+124  group '{0}' must have minOccurs and maxOccurs equal 1
-+125  unable to find declaration in the schema being redefined corresponding to '{0}'
-+126  group declaration in redefine may only contain one reference to itself
-+127  attributeGroup declaration in redefine may only contain one reference to itself
-+128  redefine declaration cannot contain '{0}'
-+129  notation declaration '{0}:{1}' not found
-+130  more than one identity constraint has name '{0}'
-+131  identity constraint declaration must match (annotation?, selector, field+)
-+132  key reference declaration '{0}' refers to unknown key '{1}'
-+133  field cardinalities for keyref '{0}' and key '{1}' must match
-+134  XPath expression is missing or empty
-+135  fixed value in attribute reference is not set or differs from the fixed value of '{0}'
-+136  attribute '{0}' is of ID type or type derived from ID and cannot have default/fixed value constraint
-+137  attribute '{0}' is a subsequent attribute in this complex type with a type derived from ID
-+138  attribute '{0}' is a subsequent attribute in this attribute group with a type derived from ID
-+139  empty value illegal for 'targetNamespace' attribute; target namespace must be absent or contain non-empty value
-+140  {0}
-+141  '{0}' has already been included or redefined
-+142  namespace '{0}' is referenced without import declaration
-+143  all compositor that is part of a complex type definition must constitute the entire content of the definition
-+144  annotation can only contain appinfo and documentation declarations
-+145  invalid facet name '{0}'
-+146  root element name of XML Schema document must be 'schema'
-+147  circular substitution group in element '{0}'
-+148  element '{0}' must be from the XML Schema namespace
-+149  target namespace of attribute '{0}' cannot be http://www.w3.org/2001/XMLSchema-instance
-+150  invalid namespace declaration
-+151  namespace fix-up cannot be performed on DOM Level 1 node
-+152  more than one anyAttribute declaration found in complex type declaration
-+153  anyAttribute must not be followed by other declarations
-+156  parser has encountered more than '{0}' entity expansions in the document; this is the limit imposed by the application
-+157  expected comment or CDATA section
-+158  attribute name expected
-+159  notation name expected
-+160  illegal repetition of elements in mixed content model
-+161  default attribute declaration expected
-+162  equal sign expected
-+163  element name expected
-+164  comment must start with <!--
-+165  invalid document structure
-+166  expected version, encoding, or standalone declaration
-+167  invalid XML version declaration
-+168  unsupported XML version '{0}'
-+169  unterminated XML declaration
-+170  invalid XML encoding declaration '{0}'
-+171  invalid standalone declaration
-+172  unterminated comment
-+173  processing instruction name expected
-+174  unterminated processing instruction
-+175  invalid character 0x{0}
-+176  unterminated start tag '{0}'
-+177  attribute value expected
-+178  unterminated end tag '{0}'
-+179  expected type for attribute '{0}' of element '{1}'
-+180  expected end of tag '{0}'
-+181  expected tag name, comment, PI, or other markup
-+182  invalid content after root element's end tag
-+183  comment expected
-+184  comment or processing instruction expected
-+185  whitespace expected
-+186  expected root element in DOCTYPE declaration
-+187  quoted string expected
-+188  public id expected
-+189  invalid character 0x{0} in public id
-+190  unterminated DOCTYPE declaration
-+191  invalid character 0x{0} in internal subset
-+192  unexpected whitespace
-+193  invalid character 0x{1} in attribute value '{0}'
-+194  markup declaration expected
-+195  TEXT declaration is illegal at this point
-+196  conditional section in internal subset
-+197  parameter entity name expected
-+198  unterminated entity declaration '{0}'
-+199  invalid character reference
-+200  unterminated character reference
-+201  expected entity name for reference
-+202  entity '{0}' not found
-+203  unparsed entity reference '{0}' is invalid at this point
-+204  unterminated entity reference '{0}'
-+205  recursive entity expansion '{0}'
-+206  partial markup in entity value
-+207  unterminated element declaration '{0}'
-+208  expected content specification for element '{0}'
-+209  '*' expected
-+210  mixed content model '{0}' not terminated properly
-+211  system or public id expected
-+212  unterminated notation declaration
-+213  expected ',', '|', or ')'
-+214  expected '|' or ')'
-+215  expected ',', '|', or ')' in content model of element '{0}'
-+216  expected enumeration value for attribute '{0}'
-+217  expected '|' or ')'
-+218  unterminated entity literal
-+219  unmatched end tag detected
-+220  '(' expected
-+221  attribute '{0}' is already specified for element '{1}'
-+222  '<' character cannot be used in attribute value '{0}'; use &lt; instead
-+223  leading surrogate character is not followed by a legal second character
-+224  expected ']]>' sequence to end conditional section
-+225  expected INCLUDE or IGNORE at this point
-+226  expected '[' to follow INCLUDE or IGNORE
-+227  unexpected end of entity '{0}'
-+228  parameter entity propagated out of internal/external subset
-+229  unmatched ']' character detected
-+230  parameter entity references are not allowed inside markup in internal subset
-+231  entity propagated out of the content section into miscellaneous
-+232  expected &# to be followed by a numeric character value
-+233  '[' expected
-+234  ']]>' sequence is not allowed in character data
-+235  '--' sequence is illegal in comment
-+236  unterminated CDATA section
-+237  NDATA expected
-+238  NDATA is illegal for parameter entities
-+239  hex radix character references must use 'x', not 'X'
-+240  {0} declaration already seen
-+241  XML declarations must be in this order: version, encoding, standalone
-+242  external entity cannot be referred to from attribute value
-+243  XML or TEXT declaration must start with '<?xml ', not '<?XML '
-+244  expected literal entity value or public/system id
-+245  '{0}' is not a valid digit for the specified radix
-+246  input ended before all started tags were ended; last tag started is '{0}'
-+247  nested CDATA section illegal
-+248  prefix '{0}' can not be resolved to namespace URI
-+249  start and the end tags are in different entities
-+250  XML document cannot be empty
-+251  CDATA section is illegal outside the root element
-+252  unexpected trailing surrogate character
-+253  processing instruction cannot start with 'xml'
-+254  XML or TEXT declaration must start at line 1, column 1
-+255  version declaration is required in XML declaration
-+256  standalone declaration is only legal in the main XML entity
-+257  encoding declaration is required in TEXT declaration
-+258  colon is illegal in names when namespaces are enabled
-+259  {0}
-+260  schemaLocation does not contain namespace-location pairs
-+261  fatal error during schema scan
-+262  reference to external entity declaration '{0}' is illegal in standalone document
-+263  partial markup in parameter entity replacement text in complete declaration
-+264  invalid namespace value in prefix-namespace mapping '{0}'
-+265  prefix 'xmlns' cannot be explicitly bound to namespace
-+266  namespace for 'xmlns' cannot be explicitly bound to prefix
-+267  prefix 'xml' cannot be bound to namespace other than its canonical namespace
-+268  namespace for 'xml' cannot be bound to prefix other than 'xml'
-+269  element '{0}' cannot have 'xmlns' as its prefix
-+270  restriction must contain simpleType definition
-+271  invalid root element '{0}' in DOCTYPE declaration
-+272  invalid element name '{0}'
-+273  invalid attribute name '{0}'
-+274  invalid entity reference name '{0}'
-+275  DOCTYPE declaration already seen
-+276  fallback element is not a direct child of include element
-+277  include element without 'href' attribute
-+278  include element with XPointer specification; XPointer is not yet supported
-+279  invalid 'parse' attribute value '{0}'; expected 'text' or 'xml'
-+280  multiple fallback elements in document '{0}'
-+281  include failed and no fallback element found in document '{0}'
-+282  circular inclusion in document '{0}'
-+283  self-inclusion in document '{0}'
-+284  element '{0}' is not allowed as a child of include element
-+285  included notation '{0}' conflicts with notation already defined
-+286  included entity '{0}' conflicts with entity already defined
-+
-+
-+$set 2
-+2  no declaration found for element '{0}'
-+3  no declaration found for attribute '{0}'
-+4  notation '{0}' is referenced but was never declared
-+5  root element differs from that declared in DOCTYPE
-+6  missing required attribute '{0}'
-+7  element '{0}' is not allowed for content model '{1}'
-+8  ID attribute must be #IMPLIED or #REQUIRED
-+9  attribute cannot have empty value
-+10  element '{0}' has already been declared
-+11  element '{0}' has more than one ID attribute
-+12  ID value '{0}' has already been used
-+13  ID attribute '{0}' is referenced but was never declared
-+14  attribute '{0}' refers to undeclared notation '{1}'
-+15  element '{0}' is specified in DOCTYPE but was never declared
-+16  empty content is not valid for content model '{0}'
-+17  attribute '{0}' is not declared for element '{1}'
-+18  value '{0}' for attribute '{1}' of type ENTITY/ENTITIES must refer to external, unparsed entity
-+19  attribute '{0}' refers to unknown entity '{1}'
-+20  attribute of type ID/IDREF/IDREFS/ENTITY/ENTITIES/NOTATION cannot contain colon when namespaces are enabled
-+21  missing elements in content model '{0}'
-+22  no character data is allowed by content model
-+23  value '{0}' for attribute '{1}' does not match its type's defined enumeration or notation list
-+24  value '{0}' for attribute '{1}' is invalid Name or NMTOKEN value
-+25  attribute '{0}' does not allow multiple values
-+26  attribute '{0}' has value '{1}' that does not match its #FIXED value '{2}'
-+27  element types cannot be duplicated in mixed content model
-+28  {0} is not supported
-+29  '{0}' is not allowed in the {1} compositor; only element, group, choice, sequence, and any are allowed
-+30  base type '{0}' not found in '{1}' definition
-+31  {0} declaration with 'ref' attribute cannot have content
-+32  {0}
-+33  prohibited attribute '{0}' is present
-+34  illegal 'xml:space' declaration
-+35  schema document '{0}' has different target namespace from the one specified in instance document '{1}'
-+36  element '{0}' is of simple type and cannot have elements in its content
-+37  unable to find validator for simple type of element '{0}'
-+38  grammar not found for namespace '{0}'
-+39  {0}
-+40  'xsi:nil' specified for non-nillable element '{0}'
-+41  element '{0}' is nil and must be empty
-+42  content of element '{0}' differs from its declared fixed value
-+43  unable to find validator for simple type of attribute '{0}'
-+44  error during schema scan
-+45  element '{0}' must be qualified
-+46  element '{0}' must be unqualified
-+47  reference to external entity declaration '{0}' is not allowed in standalone document
-+48  attribute '{0}' in element '{1}' has default value and must be specified in standalone document
-+49  attribute '{0}' must not be changed by normalization in standalone document
-+50  whitespace must not occur between externally declared elements with element content in standalone document
-+51  entity '{0}' not found
-+52  partial markup in parameter entity replacement text
-+53  failed to validate '{0}'
-+54  complex type '{0}' violates the unique particle attribution rule in its components '{1}' and '{2}'
-+55  abstract type '{0}' cannot be used in 'xsi:type'
-+56  element '{0}' is abstract; use non-abstract member of its substitution group instead
-+57  type of element '{0}' is abstract; use 'xsi:type' to specify non-abstract type instead
-+58  type '{0}' specified in 'xsi:type' cannot be resolved
-+59  type '{0}' specified in 'xsi:type' does not derive from type of element '{1}'
-+60  element '{0}' does not permit substitution
-+61  complex type '{0}' does not permit substitution
-+62  attribute '{0}' must be qualified
-+63  attribute '{0}' must be unqualified
-+64  identity constraint field matches more than one value within the scope of its selector; field must match unique value
-+65  unknown identity constraint field
-+66  element '{0}' has identity constraint key with no value
-+67  element '{0}' does not have enough values for identity constraint key '{1}'
-+68  element '{0}' declares identity constraint key that matches nillable element
-+69  element '{0}' declares duplicate identity constraint unique values
-+70  element '{0}' declares duplicate identity constraint key values
-+71  keyref '{0}' refers to out of scope key/unique
-+72  identity constraint key for element '{0}' not found
-+73  non-whitespace characters are not allowed in schema declarations other than appinfo and documentation
-+74  element '{0}' declared EMPTY but has attribute '{1}' of type NOTATION
-+75  element '{0}' declared EMPTY and cannot have content, not even entity references, comments, PIs, or whitespaces
-+76  element '{0}' has more than one attribute of type NOTATION
-+77  attribute '{0}' has non-distinct token '{1}'
-+78  content model of element '{0}' does not allow escaped whitespaces
-+
-+
-+$set 3
-+2  unable to open primary document entity '{0}'
-+5  index is beyond array bounds
-+6  new array size is less than the old
-+7  index is beyond maximum attribute index
-+8  invalid AttType value
-+9  invalid DefAttType value
-+10  bit index is beyond set size
-+11  bit sets have different sizes
-+12  no more buffers available
-+13  buffer is not found in the manager's pool
-+14  NULL pointer
-+15  binary operation node has unary node type
-+16  content type must be mixed or children
-+17  PCDATA node is illegal at this point
-+18  unary operation node has binary node type
-+19  unknown content model type
-+20  unknown content spec type
-+21  parent element has no content spec node
-+22  invalid spec type for '{0}'
-+23  unknown creation reason value
-+24  element stack is empty
-+25  pop operation requested on empty stack
-+26  parent operation requested with only one element in stack
-+27  no more elements in enumerator
-+28  unable to open file '{0}'
-+29  unable to query file position
-+30  unable to close file
-+31  unable to seek to the end of file
-+32  unable to seek to the required position in file
-+33  unable to duplicate handle
-+34  unable to read data from file
-+35  unable to write data to file
-+36  unable to reset file position to the beginning
-+37  unable to get file size
-+38  unable to determine file base pathname
-+39  parsing in progress
-+40  DOCTYPE declaration was seen but installed validator does not support DTD
-+41  unable to open DTD document '{0}'
-+42  unable to open external entity '{0}'
-+43  unexpected end of input
-+44  zero hash modulus
-+45  hashing key produced invalid hash
-+46  no such key in hash table
-+47  unable to destroy mutex
-+48  internal error in NetAccessor
-+49  NetAccessor is unable to determine length of remote file
-+50  unable to initialize NetAccessor
-+51  unable to resolve host/address '{0}'
-+52  unable to create socket for URL '{0}'
-+53  unable to connect socket for URL '{0}'
-+54  unable to write to socket for URL '{0}'
-+55  unable to read from socket for URL '{0}'
-+56  specified HTTP method is not supported by NetAccessor
-+57  element '{0}' is already in pool
-+58  invalid pool element id
-+59  zero hash modulus
-+60  reader id not found
-+61  invalid auto encoding value
-+62  unable to decode first line in entity '{0}'
-+63  XML or TEXT declaration '{0}' cannot have NEL or lsep
-+64  current transcoding service does not support source offset information
-+65  EBCDIC file must provide encoding declaration
-+66  unable to open primary document entity '{0}'
-+67  unbalanced start/end tags
-+68  call to scanNext is illegal at this point
-+69  index is past top of stack
-+70  empty stack
-+71  target buffer cannot have zero max size
-+72  unsupported radix; expected 2, 8, 10, or 16
-+73  target buffer is too small
-+74  start index is past the end of string
-+75  string representation overflows output binary result
-+76  illegal string pool id
-+77  char 0x{0} is not representable in '{1}' encoding
-+78  invalid multi-byte sequence
-+79  code point 0x{0} is invalid for '{1}' encoding
-+80  leading surrogate followed by invalid trailing surrogate
-+81  unable to create converter for '{0}' encoding
-+82  malformed URL
-+83  unsupported protocol in URL
-+84  URL protocol '{0}' is unsupported
-+85  missing protocol prefix
-+86  expected '//' after protocol
-+87  base part of URL cannot be relative
-+88  port field must be 16-bit decimal number
-+89  invalid byte '{1}' at position {0} of a {2}-byte sequence
-+90  invalid bytes '{0}' and '{1}' of a 3-byte sequence
-+91  irregular bytes '{0}' and '{1}' of a 3-byte sequence
-+92  invalid bytes '{0}' and '{1}' of a 4-byte sequence
-+93  exceeded byte limit at byte '{0}' in a {1}-byte sequence
-+94  index is beyond vector bounds
-+95  invalid element id
-+96  internal subset is not allowed when reusing the grammar
-+97  unknown recognizer encoding
-+98  illegal character at offset {0} in regular expression '{1}'
-+99  invalid reference number
-+100  character expected after backslash
-+101  unexpected '?'; '(?:', '(?=', '(?!', '(?<', '(?#', or '(?>' expected
-+102  '(?<=' or '(?<!' expected
-+103  unterminated comment
-+104  ')' expected
-+105  unexpected end of pattern in modifier group
-+106  ':' expected
-+107  unexpected end of pattern in conditional group
-+108  back reference, anchor, lookahead, or lookbehind expected in conditional pattern
-+109  more than three choices in conditional group
-+110  character in the U+0040-U+005f range must follow '\c'
-+111  '{' expected before category character
-+112  property name must be closed with '}'
-+113  unexpected meta character
-+114  unknown property
-+115  POSIX character class must be closed with ':]'
-+116  unexpected end of pattern in character class
-+117  unknown name for POSIX character class
-+118  ']' expected
-+119  '{0}' is invalid character range; use '\{1}' instead
-+120  '[' expected
-+121  ')', '-[', '+[', or '&[' expected
-+122  range end code point '{0}' is less than start code point '{1}'
-+123  invalid Unicode hex notation
-+124  '\ x{' must be closed with '}'
-+125  invalid Unicode code point
-+126  anchor cannot be present at this point
-+127  '{0}' is invalid character escape sequence
-+128  invalid quantifier in '{0}'; digit expected
-+129  invalid quantifier in '{0}'; invalid quantity or missing  '}'
-+130  invalid quantifier in '{0}'; digit or '}' expected
-+131  invalid quantifier in '{0}'; min quantity must be less than or equal max quantity
-+132  invalid quantifier in '{0}'; quantity value overflow
-+133  XML Schema was seen but installed validator does not support XML Schema
-+134  SubstitutionGroupComparator has no grammar resolver
-+135  invalid length value '{0}'
-+136  invalid maxLength value '{0}'
-+137  invalid minLength value '{0}'
-+138  length value '{0}' must be a non-negative integer
-+139  maxLength value '{0}' must be a non-negative integer
-+140  minLength value '{0}' must be a non-negative integer
-+141  both length and maxLength cannot be present at the same time
-+142  both length and minLength cannot be present at the same time
-+143  maxLength value '{0}' must be greater than minLength value '{1}'
-+144  invalid facet tag '{0}'
-+145  length value '{0}' must be equal to length value '{1}' in the base
-+146  minLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+147  minLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+148  maxLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+149  maxLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+150  length value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+151  length value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+152  minLength value '{0}' must be less than or equal to length value '{1}' in the base
-+153  maxLength value '{0}' must be greater than or equal to length value '{1}' in the base
-+154  enumeration value '{0}' must be from the value space of the base
-+155  whiteSpace value '{0}' must be one of 'preserve', 'replace', or 'collapse'
-+156  whiteSpace value is 'preserve' or 'replace' while base type whiteSpace value is 'collapse'
-+157  whiteSpace value is 'preserve' while base type whiteSpace value is 'replace'
-+158  invalid maxInclusive value '{0}'
-+159  invalid maxExclusive value '{0}'
-+160  invalid minInclusive value '{0}'
-+161  invalid minExclusive value '{0}'
-+162  invalid totalDigits value '{0}'
-+163  invalid fractionDigits value '{0}'
-+164  totalDigits value '{0}' must be a positive integer
-+165  fractionDigits value '{0}' must be a non-negative integer
-+166  both maxInclusive and maxExclusive cannot be present at the same time
-+167  both minInclusive and minExclusive cannot be present at the same time
-+168  maxExclusive value '{0}' must be greater than minExclusive value '{1}'
-+169  maxExclusive value '{0}' must be greater than minInclusive value '{1}'
-+170  maxInclusive value '{0}' must be greater than minExclusive value '{1}'
-+171  maxInclusive value '{0}' must be greater than minInclusive value '{1}'
-+172  totalDigits value '{0}' must be greater than fractionDigits value '{1}'
-+173  maxInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+174  maxInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+175  maxInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
-+176  maxInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+177  maxExclusive value '{0}' must be less than or equal to maxExclusive value '{1}' in the base
-+178  maxExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+179  maxExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
-+180  maxExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+181  minExclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+182  minExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+183  minExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
-+184  minExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+185  minInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+186  minInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+187  minInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
-+188  minInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+189  maxInclusive value '{0}' must be from the base type value space
-+190  maxExclusive value '{0}' must be from the base type value space
-+191  minInclusive value '{0}' must be from the base type value space
-+192  minExclusive value '{0}' must be from the base type value space
-+193  totalDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
-+194  fractionDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
-+195  fractionDigits value '{0}' must be less than or equal to fractionDigits value '{1}' in the base
-+196  maxInclusive value '{0}' must be equal to fixed maxInclusive value '{1}' in the base
-+197  maxExclusive value '{0}' must be equal to fixed maxExclusive value '{1}' in the base
-+198  minInclusive value '{0}' must be equal to fixed minInclusive value '{1}' in the base
-+199  minExclusive value '{0}' must be equal to fixed minExclusive value '{1}' in the base
-+200  totalDigits value '{0}' must be equal to fixed totalDigits value '{1}' in the base
-+201  fractionDigits value '{0}' must be equal to fixed fractionDigits value '{1}' in the base
-+202  maxLength value '{0}' must be equal to fixed maxLength value '{1}' in the base
-+203  minLength value '{0}' must be equal to fixed minLength value '{1}' in the base
-+204  whiteSpace value '{0}' must be equal to fixed whiteSpace value '{1}' in the base
-+205  internal error while processing fixed facet
-+206  list itemType is empty
-+207  union memberTypes is empty
-+208  restriction union base is empty
-+209  restriction union base is '{0}' instead of union
-+210  value '{0}' does not match regular expression facet '{1}'
-+211  value '{0}' is invalid Base64-encoded binary
-+212  value '{0}' is invalid Hex-encoded binary
-+213  value '{0}' has length '{1}' which exceeds maxLength facet value '{2}'
-+214  value '{0}' has length '{1}' which is less than minLength facet value '{2}'
-+215  value '{0}' has length '{1}' which is not equal to length facet value '{2}'
-+216  value '{0}' not in enumeration
-+217  value '{0}' has '{1}' total digits which exceeds totalDigits facet value '{2}'
-+218  value '{0}' has '{1}' fraction digits which exceeds fractionDigits facet value '{2}'
-+219  value '{0}' must be less than or equal to maxInclusive facet value '{1}'
-+220  value '{0}' must be less than maxExclusive facet value '{1}'
-+221  value '{0}' must be greater than or equal to minInclusive facet value '{1}'
-+222  value '{0}' must be greater than or equal to minExclusive facet value '{1}'
-+223  value '{0}' is not whitespace replaced
-+224  value '{0}' is not whitespace collapsed
-+225  value '{0}' is invalid NCName
-+226  value '{0}' is invalid {1}
-+227  ID value '{0}' is not unique
-+228  value '{0}' is invalid ENTITY
-+229  value '{0}' is invalid QName
-+230  NOTATION '{0}' must be valid QName
-+231  value '{0}' does not match any member types of the union
-+232  value '{0}' is invalid anyURI
-+233  empty string encountered
-+234  string contains only whitespaces
-+235  more than one decimal point encountered
-+236  invalid character encountered
-+237  NULL pointer encountered
-+238  unable to construct URI with NULL/empty {0}
-+239  {0} '{1}' can only be set for a generic URI
-+240  {0} contains invalid escape sequence '{1}'
-+241  {0} contains invalid character '{1}'
-+242  {0} cannot be NULL
-+243  '{1}' is not conformant to {0}
-+244  no scheme found in URI
-+245  {0} '{1}' may not be specified if host is not specified
-+246  {0} '{1}' may not be specified if path is not specified
-+247  port number '{0}' must be in the (0,65535) range
-+248  internal error while validating '{0}'
-+249  result not set
-+250  internal error in CompactRanges
-+251  mismatched type in MergeRanges
-+252  internal error in SubtractRanges
-+253  internal error in IntersectRanges
-+254  argument must be RangeToken
-+255  invalid category name '{0}'
-+256  keyword '{0}' not found
-+257  reference number must be greater than zero
-+258  option '{0}' unknown
-+259  unknown token type
-+260  unable to get RangeToken for '{0}'
-+261  not supported
-+262  invalid child index
-+263  replace pattern cannot match zero-length string
-+264  invalid replace pattern
-+265  enabling NEL option can only be done once per process
-+266  out of memory
-+267  operation is not allowed
-+268  selector cannot select attribute
-+269  '|' at the beginning of XPath expression is illegal
-+270  '||' in XPath expression is illegal
-+271  missing attribute name in XPath expression
-+272  unexpected XPath token; expected qname, any, or namespace test
-+273  prefix '{0}' used in XPath expression can not be resolved to namespace URI
-+274  '::' in XPath expression is illegal
-+275  expected step following 'child' token in XPath expression
-+276  expected step following '//' in XPath expression
-+277  expected step following '/' in XPath expression
-+278  '/' not allowed after '//' in XPath expression
-+279  '//' only allowed after '.' at the beginning of XPath expression
-+280  '/' at the beginning of XPath expression is illegal
-+281  root element selection is illegal in XPath expression
-+282  empty XPath expression
-+283  XPath expression cannot end with '|'
-+284  invalid character '{0}' in XPath expression
-+285  unsupported XPath token
-+286  fractional values not supported in XPath expression
-+287  invalid dateTime value '{0}'
-+288  missing 'T' separator in dateTime value '{0}'
-+289  invalid gDay value '{0}'
-+290  invalid gMonth value '{0}'
-+291  invalid gMonthDay value '{0}'
-+292  invalid duration value '{0}'
-+293  duration value '{0}' must start with '-' or 'P'
-+294  duration value '{0}' must contain 'P'
-+295  duration value '{0}' can contain '-' only as the first character
-+296  duration value '{0}' contains invalid text before 'T'
-+297  duration value '{0}' has no time component after 'T'
-+298  duration value '{0}' must have at least one component
-+299  duration value '{0}' must have at least one digit after '.'
-+300  incomplete date value '{0}'
-+301  invalid date value '{0}'
-+302  incomplete time value '{0}'
-+303  invalid time value '{0}'
-+304  expected fractional seconds after '.' in time value '{0}'
-+305  incomplete gYearMonth value '{0}'
-+306  invalid gYearMonth value '{0}'
-+307  invalid gYear value '{0}'
-+308  year value '{0}' must follow 'CCYY' format
-+309  invalid leading zero in gYear value '{0}'
-+310  month component missing in gYearMonth value '{0}'
-+311  time zone expected in '{0}'
-+312  unexpected text after 'Z' in time zone value '{0}'
-+313  invalid time zone value '{0}'
-+314  illegal year value '{0}'
-+315  month value '{0}' must be between 1 and 12
-+316  day value '{0}' must be between 1 and {1}
-+317  hours value '{0}' must be between 0 and 23
-+318  minutes value '{0}' must be between 0 and 59
-+319  seconds value '{0}' must be between 0 and 60
-+320  minutes value '{0}' must be between 0 and 59
-+321  derived by restriction complex type has content while base type is empty
-+322  namespace of element '{0}' is not allowed by wildcard in the base
-+323  occurrence range of element '{0}' is not a valid restriction of base element's range
-+324  element name/namespace in restriction does not match that of corresponding element in the base
-+325  element '{0}' is nillable in the restriction while it is non-nillable in the base
-+326  element '{0}' is either not fixed or is fixed to a different value compared to corresponding element in the base
-+327  disallowed substitutions for element '{0}' are not a superset of those for corresponding element in the base
-+328  element '{0}' has type that does not derive from type of corresponding element in the base
-+329  element '{0}' has fewer identity constraints compared to corresponding element '{1}' in the base
-+330  element '{0}' has identity constraint that does not appear in corresponding element '{1}' in the base
-+331  occurrence range of group is not a valid restriction of occurrence range of base group
-+332  no complete functional mapping between particles
-+333  forbidden restriction of any particle
-+334  forbidden restriction of all compositor
-+335  forbidden restriction of choice compositor
-+336  forbidden restriction of sequence compositor
-+337  occurrence range of wildcard is not a valid restriction of base wildcard's range
-+338  wildcard is not a subset of corresponding wildcard in the base
-+339  occurrence range of group is not a restriction of base wildcard's range
-+340  no complete functional mapping between particles
-+341  no complete functional mapping between particles
-+342  invalid content spec node type
-+343  NodeIDMap exceeds largest available size
-+344  ProtoType has NULL class name
-+345  ProtoType name length '{0}' differs from expected '{1}'
-+346  ProtoType name '{0}' differs from expected '{1}'
-+347  InputStream read '{0}' is less than required '{1}'
-+348  InputStream read '{0}' is beyond available buffer size '{1}'
-+349  storing violation
-+350  store buffer violation '{0}', '{1}'
-+351  object tag '{0}' exceeds load pool upper boundary '{1}'
-+352  load pool size '{0}' does not tally with object count '{1}'
-+353  loading violation
-+354  load buffer violation '{0}', '{1}'
-+355  invalid class index '{0}', '{1}'
-+356  invalid checkFillBuffer size '{0}'
-+357  invalid checkFlushBuffer size '{0}'
-+358  invalid NULL pointer encountered '{0}'
-+359  createObject fails
-+360  object count '{0}' exceeds upper boundary '{1}'
-+361  grammar pool is empty
-+362  grammar pool is not empty
-+363  string pool is not empty
-+364  storer level '{0}' does not match loader level '{1}'
-+365  undefined prefix in QName value '{0}'
-+
-+
-+$set 4
-+2  dummy
-+3  index or size is negative, or greater than the allowed value
-+4  specified range of text does not fit into DOMString
-+5  attempt is made to insert a node where it is not permitted
-+6  node is used in a different document than the one that created it
-+7  invalid or illegal XML character
-+8  node does not support storing data
-+9  attempt is made to modify an object where modifications are not allowed
-+10  attempt is made to reference a node in a context where it does not exist
-+11  implementation does not support the requested type of object or operation
-+12  attempt is made to add an attribute that is already in use elsewhere
-+13  attempt is made to use an object that is not or is no longer usable
-+14  invalid or illegal string
-+15  attempt is made to modify the type of the underlying object
-+16  attempt is made to create or change an object in a way which is incorrect with respect to namespaces
-+17  parameter or requested operation is not supported by the underlying object
-+18  call to a method such as insertBefore or removeChild would make the node invalid with respect to document grammar
-+19  type of an object is incompatible with the expected type of the parameter associated with the object
-+20  dummy
-+21  boundary points of a range do not meet specific requirements
-+22  container of a range boundary point is set to a node of an invalid type or to a node with an ancestor of an invalid type
-+23  dummy
-+24  failed to load a document or an XML fragment using DOMLSParser
-+25  failed to serialize a DOM node using DOMLSSerializer
-+26  dummy
-+27  expression has incorrect syntax or contains XPath features not supported by the XML Schema XPath subset
-+28  requested result type not supported
-+29  no current result in the result object
-+30  nested CDATA sections
-+31  unrepresentable character
-+32  unrecognized node type
-+33  parsing in progress
-+34  parsing aborted by the user
-+35  parsing failed
-+
-+
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 135f708ab29d..65f5851feb4f 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -13,7 +13,8 @@ if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
 	inherit subversion
 else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
@@ -32,7 +33,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( CREDITS KEYS NOTICE README )
 PATCHES=(
-	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
+	"${DISTDIR}/${P}-fix-XERCESC-2161.patch"
 	"${FILESDIR}/${P}-fix-XERCESC-2163.patch"
 )
 
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index a5706d644399..4f299c3ed874 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,5 +1,5 @@
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
 DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d19588a28361f519d424c002345ba76b48d5adc0b600e34e595fed20a1ce8b8c5f22457cb05c4233810e9af9b823 SHA512 c3973b3c98bad44e1d8687ab4f9461aecd1c071bb3d320537a4c50fb7301edd13e990bab48cc6e5ca30536a814c8fa8cac24ceb1803a7e8eca30ef73d449373e
 EBUILD xxhash-0.7.3.ebuild 908 BLAKE2B afb6ab7cdf944fe2360ac959d9cd56444aa655d022e8bbc96418597baba42ae59a4b0aa5f46dff013c3de9b519d41159796493be302f0e525d10c73290d765a9 SHA512 e735864d13fc0ccd3d087f28fb5254d38c764377cb4c490068e986f1f4e79cff8249d97edd086995e8484e1a6c3dcbf150db0661838fc32535a4e83c3728b702
-EBUILD xxhash-0.8.0.ebuild 917 BLAKE2B 21a173f201fe946d152b2b9dc3b7f8cd0c8e1c73be3814919bc936ebed692ac37f106da8c4bcb245df9dbb6e603b1ae44bc86e12d37c4a0761c705709430714f SHA512 f0dd7cca98528af60bd36b5cad069f19321458fa694f99c266604fc787dea10a1f6a7fa4b549fc028ae553452559bafda88ce574dac48783537065bb4b47a8fc
+EBUILD xxhash-0.8.0.ebuild 915 BLAKE2B e53dc68af29b3b458be6e814d893c64605d1dcae248e0431cd688f2b3dd2c2ce69e07bd4868b682a6d2e31307eba4832863b3567dc42d99aaf4038ef9a0dcd2b SHA512 fc51837d2319ff529c246be0661e18b7a7faac6dd966a0d2dfe6f87635a8da5e4152da6f7d3c70063177dd60390c3cf1763af52b67ff150e929e62c04f6bf114
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.8.0.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild
index baba81c88143..6a5a61f5e4da 100644
--- a/dev-libs/xxhash/xxhash-0.8.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index bd23e08d4a18..6346c86311a6 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,11 +1,14 @@
 AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
+AUX zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch 828 BLAKE2B 3d9ba078b5c8a681ad0fd9edfa26f87fd9552b8dc41b8faec854e3d07a86415df95647b6e24a5c28b837131e8c7089922b6ab776bcf4b700ad543c6454790394 SHA512 2fc96de80f6bb54ea03245dae4d07f9b653cfa0eb4497834b380732ff0c0667d14358affb82c8c3c75c27be5554c57f571a9e0e3fc82392baf50f7de1a105bb2
+AUX zziplib-0.13.71-copy_directory_instead_of_unpacking.patch 2180 BLAKE2B 6b93641fa1aa0a1941e741a465236d92a006b89eadc9055937e5f703957be8365a62d543a5ac6002d2fb7455e16569ab237c3df330cf6d0c9183c18ab593352c SHA512 744f605157bf15ea6228c0463702e5c4fd985ae9b957e1d92fcbbde81d09f49fcb85272fae85d7a69aefd195c96e9cb4e747727428d495e829170c3301f19efc
 AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
 AUX zziplib-0.13.71-installing-man3-pages.patch 1588 BLAKE2B f2b00692d7a1c06cee51748242211c220e9a16da8f21cf33c26a2c2b8f708faa171e63218c8bc7d789794bea6fafe198e0f713400589524f0cd9bb7e49640589 SHA512 213732d9a6b0cb9bd20ffd7563fd9b0fe2f673ad44888b4c393afc8b37e5e207cedce8d71bb776a91089f61ca084917797b9e3206f0ee32cf443d9ee4abb62a2
 AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
+AUX zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch 12467 BLAKE2B c27c09ae00e2fa85771654db7f428755edc2d5b880c2462e525422ced0f1434b6ac0d41a153c750dd5cf1781c7073f2f8a9635f023a2d3b1e737b68bea5f42d4 SHA512 5f391e1c65fbc8d8114953ea3618d4e7398fe50585b8aed40ccdbd86bae7bb2be298e12c4642c55eb0573a80bf0d405dd3a65dddbc324d70beab84fd7080977c
 AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
 AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
+DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
 EBUILD zziplib-0.13.71-r2.ebuild 1700 BLAKE2B cfeba81175ad06f4ba3caafe065fd9e7922759338c6de1fe00553f13150737ff91278ef7bfc6745646720d94dd8667222e7b32abdb522129d63e345494305699 SHA512 eff9630a050fb3d492e44339e6109a57ce065bdca8a2084199803673c6d5781f37b1f99a9a5e7ae09771032daac7671be420e4668a842f2dd432b5ef3f2657bb
-EBUILD zziplib-0.13.71_p20200419.ebuild 1878 BLAKE2B 8a81295a1c2161b049b97eb379d0629ed5e01d3e1f975aac59af75dc3490551c1316cf9314b208d70de5c07e13a4a6502014c8f5aacc7e0b0c9f64263ab8c411 SHA512 4a240b12ac796847d985d5bc2fb50105ac251d63006e5e18646afc335262199744d6816ee5e8c9bf19d771cf537891eb1cb3d7c9d79344f0b6f8e189ee093c43
+EBUILD zziplib-0.13.71_p20201021.ebuild 1893 BLAKE2B 3ff0b5958e7aa2b3808842687f6bd018113c1f349d05ec2f1eab90a42023b6bcdebce621a79a8025f53b0294bdd8dad6f2cb71522bacb85b41e8594a7513e1c2 SHA512 f3e893fdefa9f49ffcb4cb77c85fe5fc3c4d3fc03973e3f9e2a359bf02e9e240a4aa1ad8e55ec28cda1293adc875464b1afdde907df8b1cbba86030f6f86f26b
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
new file mode 100644
index 000000000000..262d309d8d89
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
@@ -0,0 +1,19 @@
+commit 03ddd0ce0864e629256bc078eaadb0d21d0df6d9
+Author: Guido Draheim <guidod@gmx.de>
+Date:   Sat Apr 18 02:11:37 2020 +0200
+
+    #58 manvolnum should be in .so (see other) manpages
+
+diff --git a/docs/dbk2man.py b/docs/dbk2man.py
+index 49cac4e..e0d93d2 100755
+--- a/docs/dbk2man.py
++++ b/docs/dbk2man.py
+@@ -387,7 +387,7 @@ def refentry2(man, refentry, subdirectory = ".", title = ""):
+                 refentrytitle = manpage
+             filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
+             if manpage != refentrytitle:
+-                manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
++                manpagetext = ".so man%s/%s.%s\n" % (manvolnum, refentrytitle, manvolnum)
+                 writefile(filename, manpagetext)
+             else:
+                 manpagetext = text
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
new file mode 100644
index 000000000000..51059ed77be7
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
@@ -0,0 +1,54 @@
+commit 31d8a958610592bce683366c0808fb610f67a366
+Author: Guido Draheim <guidod@gmx.de>
+Date:   Sun Apr 19 18:25:16 2020 +0200
+
+    copy directory instead of unpacking manpages.tar to install-man #93
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 623da24..b679f7b 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -174,33 +174,28 @@ add_custom_target(install-site
+    DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
+    VERBATIM)
+ add_custom_target(install-htmpages
+-   COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
+-   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
++   COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
+    COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
+    DEPENDS htmpages.tar
+    VERBATIM)
+ add_custom_target(install-manpages
+-   COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir}  >&2 || ls -ld $DESTDIR${mandir} >&2"
+-   COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
++   COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
+    DEPENDS manpages.tar
+    VERBATIM)
+-
++if(ZZIP_HTMPAGES)
++   install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
++   install(DIRECTORY html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
++endif()
++if(ZZIP_MANPAGES)
++   install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
++   install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
++endif()
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
+-
+-if(ZZIP_MANPAGES)
+-add_custom_target(install-man ALL DEPENDS install-manpages)
+-else()
+ add_custom_target(install-man DEPENDS install-manpages)
+-endif()
+-
+-if(ZZIP_HTMPAGES)
+-add_custom_target(install-htm ALL DEPENDS install-htmpages)
+-else()
+ add_custom_target(install-htm DEPENDS install-htmpages)
+-endif()
+ 
+ # messages #######################################################
+ 
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
new file mode 100644
index 000000000000..a2567720bfad
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
@@ -0,0 +1,317 @@
+commit 5583ccc7a247ee27556ede344e93d3ac1dc72e9b
+Author: Guido Draheim <guidod@gmx.de>
+Date:   Sat Apr 18 01:39:56 2020 +0200
+
+    reorganize ZZIP_OPTIONFLAGS and make install-man ON by default if UNIX
+
+#	diff --git a/GNUmakefile b/GNUmakefile
+#	index 3571fd1..53077b0 100644
+#	--- a/GNUmakefile
+#	+++ b/GNUmakefile
+#	@@ -10,10 +10,16 @@ default:
+#	 	@ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
+#	 
+#	 .PHONY: build-am build-cm
+#	-build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
+#	 build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
+#	-cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
+#	+build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
+#	+build-nj: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNinja
+#	+build-nm: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNmake
+#	 am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
+#	+cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
+#	+nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
+#	+
+#	+build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
+#	+cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
+#	 
+#	 new: ; rm -rf build; $(MAKE) default
+#	 
+diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
+index 7ceba4a..c0d68d4 100644
+--- a/SDL/CMakeLists.txt
++++ b/SDL/CMakeLists.txt
+@@ -14,6 +14,15 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+ 
++if(UNIX)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
++
++
+ # Zlib library needed
+ find_package ( ZLIB REQUIRED )
+ # pkg_search_module ( ZZIP zzip )
+@@ -46,7 +55,7 @@ endif()
+ # pkgconfig ######################################################
+ 
+ if(SDL_FOUND)
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
+@@ -64,5 +73,11 @@ add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+-endif()
+-endif()
++endif(ZZIP_PKGCONFIG)
++endif(SDL_FOUND)
++
++# messages ##################################################
++
++message(STATUS "installing SDL_rwops_zzip example headers: ${SDL_FOUND}")
++message(STATUS "installing SDL_rwops_zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
++
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index d1284e6..623da24 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -9,6 +9,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
+ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
++option(ZZIP_HTMLSITE "Generate site html pages from docs" OFF)
++option(ZZIP_HTMPAGES "Generate html manpages from sources" OFF)
++
++if(UNIX)
++option(ZZIP_MANPAGES "Generate man3 manpages from sources" ON)
++else()
++option(ZZIP_MANPAGES "Generate man3 manpages from sources" OFF)
++endif()
+ 
+ # Zlib library needed
+ find_package ( ZLIB REQUIRED )
+@@ -132,14 +140,24 @@ add_custom_command(OUTPUT htmpages.tar
+     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+     VERBATIM)
+ 
+-add_custom_target(mans DEPENDS manpages)
+-add_custom_target(man DEPENDS manpages)
+-add_custom_target(htm DEPENDS htmpages)
+ add_custom_target(manpages DEPENDS manpages.tar)
+ add_custom_target(htmpages DEPENDS htmpages.tar)
+ add_custom_target(doc DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml site.html)
+ add_custom_target(docs DEPENDS doc manpages htmpages)
++add_custom_target(mans DEPENDS manpages)
++
++if(ZZIP_MANPAGES)
++add_custom_target(man ALL DEPENDS manpages)
++else()
++add_custom_target(man DEPENDS manpages)
++endif()
++if(ZZIP_HTMPAGES)
++add_custom_target(htm ALL DEPENDS htmpages)
++else()
++add_custom_target(htm DEPENDS htmpages)
++endif()
+ 
++# install ########################################################
+ 
+ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
+ string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
+@@ -168,13 +186,24 @@ add_custom_target(install-manpages
+    COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
+    DEPENDS manpages.tar
+    VERBATIM)
++
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
+-add_custom_target(install-man  DEPENDS install-manpages)
+ 
+-# install ########################################################
+-set(mandir ${CMAKE_INSTALL_FULL_MANDIR})
+-install(CODE "execute_process(COMMAND ${BASH} -c \"set -e
+-   mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir}
+-   cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar
+-   \")")
++if(ZZIP_MANPAGES)
++add_custom_target(install-man ALL DEPENDS install-manpages)
++else()
++add_custom_target(install-man DEPENDS install-manpages)
++endif()
++
++if(ZZIP_HTMPAGES)
++add_custom_target(install-htm ALL DEPENDS install-htmpages)
++else()
++add_custom_target(install-htm DEPENDS install-htmpages)
++endif()
++
++# messages #######################################################
++
++message(STATUS "html site to be generated: ${ZZIP_HTMLSITE}" )
++message(STATUS "man pages to be generated: ${ZZIP_MANPAGES}" )
++message(STATUS "htm pages to be generated: ${ZZIP_HTMPAGES}" )
+diff --git a/testbuilds/centos7-build.dockerfile b/testbuilds/centos7-build.dockerfile
+index 4509b68..0b7b656 100644
+--- a/testbuilds/centos7-build.dockerfile
++++ b/testbuilds/centos7-build.dockerfile
+@@ -19,4 +19,4 @@ RUN mkdir src/build
+ RUN cd src/build && cmake3 ..
+ RUN cd src/build && make
+ RUN $no_check || (cd src/build && make check)
+-RUN $no_install || (cd src/build && make install)
++RUN $no_install || (cd src/build && make install VERBOSE=1)
+diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
+index a9f6e3a..2f7eda5 100644
+--- a/zzip/CMakeLists.txt
++++ b/zzip/CMakeLists.txt
+@@ -18,8 +18,16 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+ option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
+ option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
+-option(ZZIPCOMPAT "Build compatibility with old libzzip releases" ON)
+-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
++
++if(UNIX)
++option(ZZIP_COMPAT "Build compatibility with old libzzip releases" ON)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_COMPAT "Build compatibility with old libzzip releases" OFF)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
+ 
+ # used in zzip/_config.h
+ set(ZZIP_PACKAGE "${PROJECT_NAME}lib")
+@@ -27,7 +35,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
+ set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
+ set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
+ 
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+ find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
+ endif()
+ 
+@@ -193,7 +201,7 @@ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEAS
+ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
+ endif()
+ 
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+ add_custom_command(OUTPUT compat/zzip.h
+    COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
+    COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING'     > compat/zzip.h"
+@@ -212,9 +220,9 @@ add_custom_command(OUTPUT compat/zzip.h
+    BYPRODUCTS compat/zziplib.h compat/zzip-io.h
+    VERBATIM)
+ add_custom_target(compat ALL DEPENDS compat/zzip.h)
+-endif()
++endif(ZZIP_COMPAT)
+ 
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zziplib.pc
+@@ -235,12 +243,12 @@ add_custom_command(OUTPUT zziplib.pc
+    BYPRODUCTS zzipmmapped.pc zzipfseeko.pc
+    VERBATIM)
+ add_custom_target(pkgconfig ALL DEPENDS zziplib.pc)
+-endif()
++endif(ZZIP_PKGCONFIG)
+ 
+ # install ########################################################
+ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ endif()
+@@ -264,7 +272,7 @@ install(TARGETS libzzipmmapped
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+-if(ZZIPCOMPAT)
++if(ZZIP_COMPAT)
+   install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h 
+           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+@@ -289,7 +297,7 @@ if(ZZIPCOMPAT)
+   endif()
+ endif()
+ 
+-if(ZZIPLIBTOOL)
++if(ZZIP_LIBTOOL)
+   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+     set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
+     set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
+@@ -340,4 +348,12 @@ if(ZZIPLIBTOOL)
+         ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
+         \")")
+   endif()
+-endif()
++endif(ZZIP_LIBTOOL)
++
++## messages ##############################################
++
++message(STATUS "lib zzipfseeko  to be compiled: ${ZZIPFSEEKO}")
++message(STATUS "lib zzipmmapped to be compiled: ${ZZIPFSEEKO}")
++message(STATUS "lib zzip symlinks as by libtool: ${ZZIP_LIBTOOL}")
++message(STATUS "installing zzip compat headers: ${ZZIP_COMPAT}")
++message(STATUS "installing zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
+diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
+index 220d93b..8ae0587 100644
+--- a/zzipwrap/CMakeLists.txt
++++ b/zzipwrap/CMakeLists.txt
+@@ -13,7 +13,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
+ option(BUILD_STATIC_LIBS "Build the static library" OFF)
+ option(BUILD_TESTS "Build test programs" OFF)
+ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
+-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
++
++if(UNIX)
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
++else()
++option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
++option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
++endif()
+ 
+ check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
+ # set ( ZZIP_HAVE_ZLIB_H 1 )
+@@ -48,7 +55,7 @@ add_executable(zzipwrap ${zzipwrap_SRCS} )
+ target_link_libraries(zzipwrap libzzipwrap )
+ target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zzipwrap.pc
+@@ -69,7 +76,7 @@ endif()
+ # install ########################################################
+ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-if(UNIX)
++if(ZZIP_PKGCONFIG)
+ install(FILES ${outdir}/zzipwrap.pc 
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ endif()
+@@ -79,7 +86,7 @@ install(TARGETS libzzipwrap
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+-if(ZZIPLIBTOOL)
++if(ZZIP_LIBTOOL)
+   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
+     set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
+     set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
+@@ -95,3 +102,8 @@ if(ZZIPLIBTOOL)
+         \")")
+   endif()
+ endif()
++
++# messages #######################################################
++
++message(STATUS "lib zzipwrap symlinks as by libtool: ${ZZIP_LIBTOOL}")
++message(STATUS "installing zzipwrap pkgconfig files: ${ZZIP_PKGCONFIG}")
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
index ffa83af37362..2c92b124db84 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit cmake flag-o-matic python-any-r1
 
-MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+MY_COMMIT="3921fc43bca7283f126bfb2e47ec7e7e24b5a5ea" # master Oct 21, 2020
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
 HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
 SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -15,16 +15,13 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl static-libs test"
-# Tests fail for now, only recently added.
-# Restricted to avoid blocking stabilisations.
-# https://github.com/gdraheim/zziplib/issues/97
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
 
 BDEPEND="
 	${PYTHON_DEPS}
-	test? ( app-arch/zip )
 "
 DEPEND="
 	sys-libs/zlib
@@ -35,38 +32,24 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
-	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+	"${FILESDIR}"/${PN}-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch # https://github.com/gdraheim/zziplib/commit/5583ccc
+	"${FILESDIR}"/${PN}-0.13.71-58_manvolnum_should_be_in_.so.patch	# https://github.com/gdraheim/zziplib/commit/03ddd0c
+	"${FILESDIR}"/${PN}-0.13.71-copy_directory_instead_of_unpacking.patch # https://github.com/gdraheim/zziplib/commit/31d8a95
+	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch # https://github.com/gdraheim/zziplib/issues/93#issuecomment-616219417
 )
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "/^topsrcdir/s:..\/..::" \
-		-e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \
-		-e 's:\(..\/\)\+{exe}:{exe}:' \
-		-i test/zziptests.py || die
-	cmake_src_prepare
-}
-
 src_configure() {
-	append-flags -fno-strict-aliasing # bug reported upstream
+	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+	append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
 		-DZZIPSDL="$(usex sdl)"
 		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DBUILD_TESTS="$(usex test)"
-		-DZZIPTEST="$(usex test)"
+		-DBUILD_TESTS=OFF
+		-DZZIPTEST=OFF
 		-DZZIPDOCS=ON
 		-DZZIPWRAP=OFF
 	)
 
 	cmake_src_configure
 }
-
-src_test() {
-	cd "$S"/test/ || die
-	"${EPYTHON}" "$S"/test/zziptests.py || die "Tests failed with ${EPYTHON}"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-libs
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)