gentoo resync : 27.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
commit: 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree: 4d26462d027b14926335894749d2e01d982234d0 /dev-libs
parent: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
155 files changed, 1782 insertions, 2910 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2137092551cd..d9626a8ca5ac 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 8ddaa3b2ca1b..b0733f46c691 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,3 @@
-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-18.20.684755.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
deleted file mode 100644
index 9a74bfe7877e..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-16.04.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="bindist mirror fetch strip"
-
-COMMON=">=virtual/opencl-3"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/amdgpu/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-16.04"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu 16 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into your distfiles directory."
-}
-
-src_unpack() {
-	default
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-multilib_src_unpack() {
-	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"
-	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"
-	dolib.so "opt/${SUPER_PN}/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"
-}
-
-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/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
deleted file mode 100644
index 74f04d50cda4..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.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
-
-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-navi-linux"
-SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.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-18.04"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 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.98"
-	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/Manifest b/dev-libs/appstream/Manifest
index c891451c4c79..78fc187409f6 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,9 @@
 AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743a3d958d8f86f8165045a4edff60d1c8c3d41eb8b705572843b3931f075c567fd3a6734d60dcf58133a1997ea841aa57414f50f4c2b36a SHA512 457f4cfcb2ab775bb5d64b239384fe2ebfbf99591fe38941c8208accedad1728c3bbabd637161d36dedda39b992ac8277b1d1432f117cf1277de469227e2f391
 AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b
 AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
+AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
 DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
+DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135
 EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
+EBUILD appstream-0.14.3.ebuild 1774 BLAKE2B 0aaee1797ff87ea8680803357e95bc262c837d73a77b2b60dcfac87a364f913e8d618a1c0862f5b43dc615c925879b06fca5130fb6a0be826c60e42016499cc7 SHA512 9058dbe92cc16fc1227b224a278225f51cec5fb969f90183783adc8ecb1e0e1f9bf4bb99dcd5c396305b7c5fd3a0558cd52dbb4d8ee9b1b547ccaf480065bd8f
 MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/appstream-0.14.3.ebuild b/dev-libs/appstream/appstream-0.14.3.ebuild
new file mode 100644
index 000000000000..7a8b4e4420b5
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.14.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/AppStream-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt doc +introspection qt5 test"
+RESTRICT="test" # bug 691962
+
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.58:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	net-misc/curl
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-disable-Werror-flags.patch # bug 733774
+)
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dcompose=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dinstall-docs=$(usex doc true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
new file mode 100644
index 000000000000..4e5a117061b4
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
@@ -0,0 +1,12 @@
+--- a/meson.build
++++ b/meson.build
+@@ -52,9 +52,6 @@
+     add_project_arguments(maintainer_c_args, language: 'cpp')
+ endif
+ 
+-# a few compiler warning flags we always want enabled
+-add_project_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c')
+-add_project_arguments('-Wno-unused-parameter', language: 'cpp')
+ add_project_arguments('-DAS_COMPILATION', language: 'c')
+ 
+ # Vendor extensions in system headers
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 3f80539234bc..1b07d9acd65d 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,11 +2,8 @@ AUX boost-1.71.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b48
 AUX boost-1.71.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
 AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0
 AUX boost-1.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-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
-DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
-EBUILD boost-1.74.0-r2.ebuild 11248 BLAKE2B d8d0e8792d13c8885d484201ee0255dbb0512f91a8c576f554e6ec60907ccabff2cf1c9941b45ef85701d3203525ac56dd9e74122920df9067e08119c75d5a74 SHA512 e9975bac036cede871bb60dece316fc4c48e6516084a4b4982b33a3a342f7c7c0deeeae6c5dbccaaaae8309b65f2425272475d93a666aa799938249174ffb8f0
-EBUILD boost-1.75.0.ebuild 11093 BLAKE2B d7d781f3860d7f06ca17bb6bed8c2e0c7bc3848b761ac12e79804332c03969ab792a01507cd4c10463a3fb9a229c4876540c13088e35ae203d5ba9e0fd371786 SHA512 13bf620f665992ac6afd29fd4b5d592308649dae67176293651239dfb1c25292b4c2e88654e4c09fedd237462df6830c4c25a203ae827011effea6273bbba095
+EBUILD boost-1.75.0.ebuild 11092 BLAKE2B 6ec533577d40edcdc62f2cd18a714366a2892a14c7bbcd183f99df1b346d222cd2034817da45d6c385fe60c92364c7765ae283f23401cf13ac037659070b96c0 SHA512 d4f0bfd53afd7077cc21248ce742005db00e2be99317dd4048496dd6d8e47575aeafad7fdc1db39c6f3d9baf859a6811a1d2ff1a76011f7855a100f39dbb2581
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.74.0-r2.ebuild b/dev-libs/boost/boost-1.74.0-r2.ebuild
deleted file mode 100644
index fd1743778977..000000000000
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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
-	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.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.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
index 1c866c8fba8f..8111a49dd6da 100644
--- a/dev-libs/boost/boost-1.75.0.ebuild
+++ b/dev-libs/boost/boost-1.75.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
@@ -350,7 +350,7 @@ pkg_postinst() {
 	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 "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/files/boost-1.73-boost-python-cleanup.patch b/dev-libs/boost/files/boost-1.73-boost-python-cleanup.patch
deleted file mode 100644
index 64c8eec814e3..000000000000
--- a/dev-libs/boost/files/boost-1.73-boost-python-cleanup.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From c1cae8e6b0480e046ea627679a3afe488ed02dc1 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 25 Dec 2019 12:37:35 +0100
-Subject: [PATCH] Remove Boost.Python-specific python-tag code
-
----
- libs/python/Jamfile       | 68 ---------------------------------------------------
- libs/python/build/Jamfile |  4 +--
- 2 files changed, 2 insertions(+), 70 deletions(-)
- delete mode 100644 Jamfile
-
-diff --git a/libs/python/Jamfile b/libs/python/Jamfile
-deleted file mode 100644
-index 32e87d80f..000000000
---- a/libs/python/Jamfile
-+++ /dev/null
-@@ -1,68 +0,0 @@
--# Copyright (c) 2018 Stefan Seefeld
--# All rights reserved.
--#
--# Distributed under the Boost Software License, Version 1.0.
--# (See accompanying file LICENSE_1_0.txt or copy at
--# http://www.boost.org/LICENSE_1_0.txt)
--
--import option ;
--import regex ;
--import python ;
--
--#
--# The `version-suffix` rule really belongs into python.jam, and
--# should be moved there. `split-version` is only duplicated here
--# as a prerequisite. (See https://github.com/boostorg/build/pull/290)
--#
--
--
--# Validate the version string and extract the major/minor part we care about.
--#
--local rule split-version ( version )
--{
--    local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)(.*)$" : $(version) : 1 2 3 ] ;
--    if ! $(major-minor[2]) || $(major-minor[3])
--    {
--        ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
--
--        # Add a zero to account for the missing digit if necessary.
--        major-minor += 0 ;
--    }
--
--    return $(major-minor[1]) $(major-minor[2]) ;
--}
--
--# Define a version suffix for libraries depending on Python.
--# For example, Boost.Python built for Python 2.7 uses the suffix "27"
--rule version-suffix ( version )
--{
--    local major-minor = [ split-version $(version) ] ;
--    local suffix = $(major-minor:J="") ;
--    return $(suffix) ;
--}
--
--
--# Python build id (for Python libraries only).
--python-id = [ option.get "python-buildid" ] ;
--if $(python-id)
--{
--    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
--}
--
--rule python-tag ( name : type ? : property-set )
--{
--    local result = $(name) ;
--    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
--    {
--        local version = [ $(property-set).get <python> ] ;
--        local lib-suffix = [ version-suffix $(version) ] ;
--        result = $(result)$(lib-suffix) ;
--    }
--    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
--    {
--        result = $(result)-$(PYTHON_ID) ;
--    }
--
--    # forward to the boost tagging rule
--    return  [ tag $(result) : $(type) : $(property-set) ] ;
--}
-diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile
-index d03d4dd08..dbc9fb203 100644
---- a/libs/python/build/Jamfile
-+++ b/libs/python/build/Jamfile
-@@ -95,7 +95,7 @@
-         <dependency>config-warning
-         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
-         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--        <tag>@$(__name__).python-tag
-+        <tag>@python-tag
-         <conditional>@python.require-py
- 
-     :   # default build
-@@ -123,7 +123,7 @@
-         <library>boost_python
-         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
-         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--	<tag>@$(__name__).python-tag
-+        <tag>@python-tag
-         <conditional>@python.require-py
- 
-     :   # default build
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 1f242a5395f8..a87f58fcccec 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,3 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
-EBUILD botan-2.17.3.ebuild 3099 BLAKE2B ebd1ed5e8c3f0349bdd7d6e304a218fab1781918f4af0325aee3cd25a8db7f0e91cc2b74ae8403b088b3e93ba9a113200f4e384893136e6a0c78ab78af97e221 SHA512 dd189641a29f33fc456c878f9e72fc7ff342f9c2c82383fa2992cfa88478603b1abff9d1efaec42c984cdfea3a6984ec966b3049d3e119cd23004aec73173d23
+EBUILD botan-2.17.3.ebuild 3099 BLAKE2B 218965706fb7d39380d3268bd416c2a35cec007fe9e4e8102a009e020716c00f4e2a930e681095d2bce998d277db2c280f051693652f95115285628b8028a2ed SHA512 968d68556f6203cdbe818514469ba59b5001375efd844177c9f036cb954e2caa833d08f7c34efa3912599093af08ff7a38e631db8c3c85ca7e666ed177b02dec
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3.ebuild
index fb15d09e9e4b..a43f0e5f4ccd 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+IUSE="bindist doc boost bzip2 libressl lzma python ssl static-libs sqlite zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index 701d1e8c72df..fdc6925a70a1 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 954 BLAKE2B c1ef5350723e0f9e902185c0fb4af1eb6a135efe3b02a139c9a8664254ae08405b29bd816732d03b9fbcf19ad2e6eb5352ef78d36105860e5f345419c59ebc39 SHA512 1a1dd166d91b25c6f9230995abbe70ecb6f65e236bfdc58a4b20333ef2e3413aa4d42b61a686649a736c13150d82256d0c569ba64fba39796e8e5da75c9265f4
-EBUILD boxfort-0.0.1_pre20200902.ebuild 938 BLAKE2B 96de7897b6009c7e6a4a8cdfc3008119a7c7a7146ffaa971b9dff0f44b1e882c2d2ba8314207bd896457badb21267bff342da4d1d9c5d94fe81415d4b481fb76 SHA512 abfddee4f5c4c46e7e95389c8529c4daf93586b82900b38b266b389127b3621d9dfc3acb36012c6192c9d44415c8f1392a8f1b29f706dd0d7f86cdfd65141a47
+EBUILD boxfort-0.0.1_pre20200902.ebuild 950 BLAKE2B 7617fc51f48ad733f2e6b56ed34746bd4430138a8e17e1a2b42a3d34f888b9cb4cccdca83fe95e98e97c0f45227488a81e4a7cfbd5c78e1a09cfd889458b5567 SHA512 dd6949f358583dfcc8cd4e68bbd28800fa58d0e8f3a60be4d1afccf6199eb078253d4171ee752165a8842f9676b13cb49dd9e64fde86d881b00811f07f5839fc
 MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
index ce7c590972fd..2fee581c239a 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 8f62e8251503..597e2b87235e 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,4 +1,5 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
+AUX check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch 887 BLAKE2B 7e3828af77a430ef366b2d7855c1fb5f909c9e8b13273e2d89b34711c95e5b930f95d39b21438e115b208f8eb1f4637aec0eb4ab0e6efb293174d9ddbd2946a2 SHA512 eae3e3b2d3f7f59c94af3c39797490247df827450999edadd363d99c373a465aeec913e90656e94d04215268742fb79d049a32bb3910b16b64175f1177de43f8
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.15.2.ebuild 1575 BLAKE2B 331471902e21335448ae4a5990fe77aebde2c1227cb5886fdc768a25cb9dff239b2d985adfa49265de8b16a416de3ebf04ca0e583a73ffa24723c779e9b3b9d7 SHA512 c024b7e069776b72ecadb07d619d9553ea35e366320ba90d63d2374879eb0699a8a4660073750fd9d1f716744d0b4c6bb81c752e9d46ae33240b5b7a0b77f183
+EBUILD check-0.15.2-r1.ebuild 1508 BLAKE2B b90bebd7e0176acd2c518b620667150eae6cf8879d2d2fc9f7621660ceb2868e51a7b01f563ec77adc49e968450e30aee7c8f970adb42fa329f492b9b5cdcd9d SHA512 a470c03eb155773df82692d9590e779eef9cc7372ad6ec9cbdef5fdb5a168572affae9493adc6562dc2f719c7f9f9523815b84be299686cf635e7772648fba25
 MISC metadata.xml 488 BLAKE2B 1cd690b0e4398779744c8a2efedabaa5e3355061032d88ebb2c23d1defdcc619e5924ba6d7ff6ad4e857e25923563b2f3ff0f1aa4dd449f5899b1a9b9d2008fb SHA512 6373c637eaec3cd674bb38bc8108fcda5715818b52b351b101d852f1a29630c5382e88a4759b7e6b8d3bb220b1b6b57eb4b4d9b525519dbec8d9f99b2e5e7365
diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild
index 884e1dffe112..cdad4dc1aee8 100644
--- a/dev-libs/check/check-0.15.2.ebuild
+++ b/dev-libs/check/check-0.15.2-r1.ebuild
@@ -25,14 +25,14 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix wrong libdir, probably caused by multilib
-	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
-}
+PATCHES=(
+	"${FILESDIR}"/check-0.14.0-r2-disable-automagic-dep.patch
+	"${FILESDIR}"/${P}-Fix-pkgconfig-file-s-libdir-value.patch
+)
+
+#src_prepare() {
+#	cmake_src_prepare
+#}
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
new file mode 100644
index 000000000000..195fcfb77599
--- /dev/null
+++ b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
@@ -0,0 +1,30 @@
+From a6de6b02e6f8b971149c477eeca04de7d0fa5d3c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 10 Mar 2021 17:00:33 -0500
+Subject: [PATCH] Fix pkgconfig file's libdir value
+
+And make a similar fix for includedir while we're here.
+
+Bug: https://bugs.gentoo.org/729642
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23311d8..9d3ac07 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -439,8 +439,8 @@ if(NOT THIS_IS_SUBPROJECT)
+   set(prefix_save "${PREFIX}")
+   set(prefix "${CMAKE_INSTALL_PREFIX}")
+   set(exec_prefix "\${prefix}")
+-  set(libdir "\${exec_prefix}/lib")
+-  set(includedir "\${prefix}/include")
++  set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++  set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+   set(VERSION "${PROJECT_VERSION}")
+ 
+   if (HAVE_SUBUNIT)
+-- 
+2.26.2
+
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 259903f20a18..f16400276a80 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -2,4 +2,4 @@ AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
 EBUILD chmlib-0.40-r1.ebuild 825 BLAKE2B a5a08db69dc608e4332d58e59373020cbc68b59498780dade5fb8e50734843384de5aebf606fae2ecb2d46e66cffc0aa25622a546bc712ebdec9dd15f8a94554 SHA512 023f8a4f05f0e173b4dc9a3f5412858de52bbef108e7e874299609f6d533de5673eff9b024ec7f704ccabb687a4fc7aeeaa27f7750fff28145eae6a2e47ee11d
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/dev-libs/chmlib/metadata.xml b/dev-libs/chmlib/metadata.xml
index 7a38bb900964..3e5026ee3754 100644
--- a/dev-libs/chmlib/metadata.xml
+++ b/dev-libs/chmlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest
new file mode 100644
index 000000000000..391e93f55ef0
--- /dev/null
+++ b/dev-libs/distorm3/Manifest
@@ -0,0 +1,5 @@
+DIST distorm3-3.5.1.tar.gz 137638 BLAKE2B cecd29dd30a78514e8f8275fef6d0d8338f8d3f5c22b9b48abf2a156b9dc14626455db92172a9bcf6ce36fab8975149395437697a464ce8dd7fb73e9acfcad9d SHA512 0f4cc669c0c562f8458f29d7d6c5d6c308e4681c1c1737d9d81dd2d02e11e5af236b7084d1b24980d1bd0fac514a043bb83d3b6c499b731d43cb4b7458172c48
+DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19
+EBUILD distorm3-3.5.1.ebuild 528 BLAKE2B f3ceacc416b85d7d3a1f6d63f33f6c99e9bf3a555a1e2af47c2f33c8699d7c893099bfb77d27d58ed68377805264ae0f6daa64f2265dd65cea5acafe1dea8e8f SHA512 4f8461ce074820af6b2b0aec5aa1dd12afae2f0636748c4213196b9f50e906a60b487b4e923c6eb6cce00c042c4ea604c4a9c694c1536394d23cb2e7ddc7a3a9
+EBUILD distorm3-3.5.2.ebuild 528 BLAKE2B b554e285b744047f91468cb9a4c0132ca0179cb354251d0d9afda88c2549594cd1361a6bda4dae48ad0b5b15188d8d461b910ef11268177dfd4fcabfa97df466 SHA512 75d186ec72e5c5e873c07fb1c40e276223d349e9a9b7a6bdef0cf0416e6b32f47d1a2da9ac2c3e41ca6dafe156197c777d79157bb97797858be8a054a9638bf2
+MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.5.1.ebuild b/dev-libs/distorm3/distorm3-3.5.1.ebuild
index 08a0d2721f4d..595dc882599f 100644
--- a/dev-libs/distorm64/distorm64-3.5.1.ebuild
+++ b/dev-libs/distorm3/distorm3-3.5.1.ebuild
@@ -9,12 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
 HOMEPAGE="http://www.ragestorm.net/distorm/"
-
-MY_PN=distorm3
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 DEPEND=""
 RDEPEND=""
diff --git a/dev-libs/distorm3/distorm3-3.5.2.ebuild b/dev-libs/distorm3/distorm3-3.5.2.ebuild
new file mode 100644
index 000000000000..ca0ec447e8d4
--- /dev/null
+++ b/dev-libs/distorm3/distorm3-3.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
+HOMEPAGE="http://www.ragestorm.net/distorm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+DEPEND=""
+RDEPEND=""
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_install() {
+	distutils-r1_python_install
+
+	# don't know why it does not happen by default
+	python_optimize
+}
diff --git a/dev-libs/distorm64/metadata.xml b/dev-libs/distorm3/metadata.xml
index a490a1ed469a..a490a1ed469a 100644
--- a/dev-libs/distorm64/metadata.xml
+++ b/dev-libs/distorm3/metadata.xml
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
deleted file mode 100644
index d4bca1131791..000000000000
--- a/dev-libs/distorm64/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST distorm3-3.5.1.tar.gz 137638 BLAKE2B cecd29dd30a78514e8f8275fef6d0d8338f8d3f5c22b9b48abf2a156b9dc14626455db92172a9bcf6ce36fab8975149395437697a464ce8dd7fb73e9acfcad9d SHA512 0f4cc669c0c562f8458f29d7d6c5d6c308e4681c1c1737d9d81dd2d02e11e5af236b7084d1b24980d1bd0fac514a043bb83d3b6c499b731d43cb4b7458172c48
-EBUILD distorm64-3.5.1.ebuild 597 BLAKE2B d755d0dc56fbb9a150d287aa12995219153b872535cab80fb36530a205bca4cec975de589583746594bce192b2c3651cb9e14f5789fab83e3289231890e6e860 SHA512 6c7b955a4ddf2d58aac97b19194b093fc699dcd3d168d878a26b40c532d488c7a46047a3bf03ab28d60180918f27a6096de1ef80062e33442e94411826577c1a
-MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index d681efc97454..cb425e7f4bd2 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -8,6 +8,6 @@ DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca97
 DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
-EBUILD elfutils-0.182.ebuild 2545 BLAKE2B 89299bc12196b2850a01426ce17afbf10066a2332ff0aefe2a91092e48f16e99b3ffb94757ad3cdda78276956ed34a180525a3b4c6916911268b2e653febadbd SHA512 c58bd0bbb091f7dcf885255269939ac28422fac08446f8409878e2cfe895e5895bb1efdbf7ce797e92e0575ebcc0968537d7f9437095570adeaedf00ce2d4f5a
-EBUILD elfutils-0.183.ebuild 2427 BLAKE2B c787a1c83ec4a14d048df88f7a935a5ce51968c6e30cf2621a41f46d8156bf5e42495f2c537a5c0d326a86afda0113a15ef86eba78611d34de429d0663398eaa SHA512 31ad20d6729d29387aa2c7371483a8dd68fdd7fa55edc4d3a1dbefd9023543755b2f86a6aeb845dd8715ce3f2539fba796b3658094a28e4ccbdc2abdb12b69e6
+EBUILD elfutils-0.182.ebuild 2544 BLAKE2B 823a32e0296d64970a15eabfe65c41eec5b6fa69eb1086a1fce79f5b45fbf26555fdda7d1438116a39225d32b7b9c8bbfa823565ff84e10e98094c53be59a83f SHA512 ef31def7b22c27baeaa6e2634ac69f24c90643e18a549a54ba48d18f4492a5ef2f68c3971877969b00d0e8cc0afcde57728c515cf805ff7102fb5e565e24a464
+EBUILD elfutils-0.183.ebuild 2426 BLAKE2B 16fcb915dd57c117584d17a02d9963b4f8bef874ea0b6d06cd255927f08abde3be07f6050218a6de81cdc213cfc868db3b4410038cf0589b9e4f5550bb4944ce SHA512 b3dcff33aecdfe71d8432ea18f400802b28638594a5ed2f72c0b18e0d665d66bb4f8ddb45e8dec4de88c8b1ac85f491c92802060d0ccde2bdd655fd95ff29a43
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index 3a2d05609627..52d48a39e1fa 100644
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
index fbbe87f8db75..b5b36cf44378 100644
--- a/dev-libs/elfutils/elfutils-0.183.ebuild
+++ b/dev-libs/elfutils/elfutils-0.183.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 zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index d6c22b5f577f..544b69e88d10 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c
 DIST ell-0.38.tar.xz 520744 BLAKE2B 24d552ed1bdd55c78aef7d427c40cb391ddedf8f06e77ddd188509a9eca71135b9fe282377bec1a225cb617c7a8bcc4efe6da6eb1dd86596e03ed6ba790b9619 SHA512 e482df8d810b866479c97a096efb8d2badb903bb7fda35ee3bbbaa65652c63f8058188a5ab9f477f835f6a5789a7c5d2eb7db2d9e30493ecd75bd7e71017b6c2
 EBUILD ell-0.36.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.38.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
+EBUILD ell-0.38.ebuild 1253 BLAKE2B 39c42d8c149bcae4b0ce4c886c2c83141d02a8dc8d0ccd2b4cdc2ae8af80befaf9af2f1a8b242363ea83a6095ee9616bc8eb2de37cd7d1e30ac6e99e7a7274e0 SHA512 67b5dd3428f4db0ae63145963c5678d2c75dd07150f771d3f31c9e09e004477115d139bead25bf188f0b59035408e1f0a9caac976601dad1be5d9453c6ce7ae7
 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.38.ebuild b/dev-libs/ell/ell-0.38.ebuild
index 752fd7b7e630..163c92118f1c 100644
--- a/dev-libs/ell/ell-0.38.ebuild
+++ b/dev-libs/ell/ell-0.38.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 d52026671d1e..867ecdbd3929 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,7 +1,5 @@
 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
+DIST expat-2.3.0.tar.xz 433508 BLAKE2B b547cbca23f2ca11bef326225b8e2958a3539dbb14789c33fb0f2aede35bfbe12981d151624b0497ab2ad488ec06529ae2a996e514b19b39622ae7fc29f47832 SHA512 dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
 EBUILD expat-2.2.10.ebuild 2502 BLAKE2B 07947eaabcbb85f59b000397fbd706f1ce50e130264bc3488f77dc1ff791743e7384d4599554c0755b7db4acee42f416d3f0dd72d31643323c965647604199f6 SHA512 8a4dc27c419ce5ae213fec3645da06f36a284d043d607aa573360c02a7711ed2376c138b49aca60a768e997ae105eb8181259a4f7d5b55033f6959c30dbf9029
-EBUILD expat-2.2.8.ebuild 2478 BLAKE2B 571787fa3029e338003c371ca09ed7032beec152ab014d120d87c97c7b34b08204dc4432659456e11f08f0ea2c3ae7b8b58950f4fcf07c4fe47d520080e6c5e0 SHA512 4523f35f71dc0fff08cb5395ae236900506071f4ec18e843b5e7322caabae5c07a7e71ecb7f2a2854aa2a4a899a37481ddb1c36e0c6beb37d96c75a23ad14f6e
-EBUILD expat-2.2.9.ebuild 2511 BLAKE2B eb303a5fc83dd273559bfc14c0d0b2fc501f2cf31af6a9266fcd2f9c2e2efd9ddf65d5b999b024a9f287b5553cc23def4cc1af3529fa61b9eb75e6dfe81895d4 SHA512 1022ecd3102ced90899e12574169d8295491ac3292a764ef28401d6de1a704b57a942f1360681ef482ac0d8f8a9a9fa50468d5314bfd43da26cfaaf1547672d5
+EBUILD expat-2.3.0.ebuild 2511 BLAKE2B eb303a5fc83dd273559bfc14c0d0b2fc501f2cf31af6a9266fcd2f9c2e2efd9ddf65d5b999b024a9f287b5553cc23def4cc1af3529fa61b9eb75e6dfe81895d4 SHA512 1022ecd3102ced90899e12574169d8295491ac3292a764ef28401d6de1a704b57a942f1360681ef482ac0d8f8a9a9fa50468d5314bfd43da26cfaaf1547672d5
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
deleted file mode 100644
index 6b489e1d460b..000000000000
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.2.9.ebuild b/dev-libs/expat/expat-2.3.0.ebuild
index 259918860d5c..259918860d5c 100644
--- a/dev-libs/expat/expat-2.2.9.ebuild
+++ b/dev-libs/expat/expat-2.3.0.ebuild
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 52718fa84f54..39dfc846beb2 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,5 @@
+DIST fribidi-1.0.10.tar.xz 1147588 BLAKE2B e40e16b4b6167d0c7cc26b72ed21a7b4b2ba78dcce56eaf5dee94835cd2d4770401ac17bc2b5f13227e41e8f19513a0616f49edab07ea8fb2969eab30e24f653 SHA512 cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
 DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
+EBUILD fribidi-1.0.10.ebuild 952 BLAKE2B ebf4dbc1024b485b26a40b96d729dd3bde2067040d34fd5dd34577b2733a85752cc26eba4e5bec5b053e1969918a8a4524dd26aa67042ff429cea0264588c1da SHA512 872c4d71dcace580aadcf204a34d374480073a2b587f7842de576db0f504d99ffc60f8c7e1d80f3c80c9951c9a472dda9e35fbd48ca626537300c2a325cb4ee7
 EBUILD fribidi-1.0.9.ebuild 978 BLAKE2B 906ea4d45f2c0dd17e61806495ce2c07b288f760802704010c7684e8296afc032f0d1fb19b060d061c1afe7a2c641ca80c0e413379f5552223d5afa128fbe16a SHA512 9e0773611eeadb41ebbe08bbdbbdabdf623bbdd3ab4b8d8c07f34bf91c108de50a59c30b4eac8a409b3145adbed9265fa54001ec3b738bab113f41b92b5813a5
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.10.ebuild b/dev-libs/fribidi/fribidi-1.0.10.ebuild
new file mode 100644
index 000000000000..76ff5d8a3ec1
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-debug
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index ccd23fe57183..b7a843e7161a 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,9 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f
 DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
+DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.66.1.ebuild 1114 BLAKE2B b2324eeaa60bb5a885e782fd5cf7b84534565d7470b153b30e972a5c624b1a83fd71d4eaafd72d01807a2035fb667d6c205c24f0db591c56df6cc043d1542f76 SHA512 9aaa7806c10fb4e27d23bf0c21575054d309dd2ccafdc88023e1543b083b61a53f4a1dd56395e0e53a90be552c51b0da64fdba21ec36a522844b78d4eff764db
 EBUILD gjs-1.66.2.ebuild 1113 BLAKE2B 4e1047bb670c2a98558699f476a8c99d784978ae531c42713b20a37aa67616df6ae4c51c140095f3cf387094e476504a8cc99cf4ca32ea1be4635abae0c45c99 SHA512 f4268bb5ab845fcabad639291c1a92f27f90900a57dc7a035d70ac642ef3f21d13e1c2b1d166ad424f36abdf3cb1ae70ca9de507df459894d1bc9c18b4fc9c58
+EBUILD gjs-1.68.0.ebuild 1114 BLAKE2B b491b84d6c4d291452f05d9ba8dc7b1066b7ccc4902f2eec42ccb2e4657468bfbfed1e3cdac021738279a75266293daac5689849e7de5da4e39e87b333438f43 SHA512 cd017ab7fa37b91149201287fcf7b3e5e262b6b5168fecba8522dffd02f6767bfff185cb5bfc50978542a5b65b47e5291ad020b587dbf5310981db25ed09888c
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.68.0.ebuild b/dev-libs/gjs/gjs-1.68.0.ebuild
new file mode 100644
index 000000000000..02c500d445f5
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.68.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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.66.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.66.1:=
+	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 5fa02a604225..3c131aed0a01 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,4 +1,6 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
+DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 EBUILD glib-2.66.7.ebuild 10439 BLAKE2B a6ddcde770682eeaa0908e335d66e7339234ba8e32d8ef670b1daa1f9a603dad17bd5c1a450e8488b34bb3ef13e3adfcc0c15990ecec1f3fad0eab871820a939 SHA512 110402fe5b3dacf806cf13355e05e6e76e6e50a012a21b4c12536f861dde7464a4bc2a97b7d28ca679945fad120146528c9d0ea83373f7079eb72e0fd6cc0540
-MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
+EBUILD glib-2.68.0.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
+MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.68.0.ebuild b/dev-libs/glib/glib-2.68.0.ebuild
new file mode 100644
index 000000000000..afd809960de6
--- /dev/null
+++ b/dev-libs/glib/glib-2.68.0.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf 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"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		-Dlibelf=$(multilib_native_usex elf enabled disabled)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index c1bb61a327bd..6dd9698460d5 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -10,6 +10,10 @@
 			Enable dependencies required by glib libraries
 			using dbus service to manage settings saving
 		</flag>
+		<flag name="elf">
+			Enable support for listing and extracting from
+			ELF resource files with gresource tool
+		</flag>
 		<flag name="mime">
 			Pull in shared MIME database that many glib-based
 			applications require at runtime to detect or open files. Warning:
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index c522324a89a2..69783f551b93 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,7 +1,9 @@
 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
+DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-common-1.62.0.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
 EBUILD gobject-introspection-common-1.64.1.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
-EBUILD gobject-introspection-common-1.66.1.ebuild 935 BLAKE2B 8a93a551942d909390987ffdf3dc2a3f7ffc349d7a5799c69b8561332c106f2f3bd6d6e04bc91fe15ba890e03e2d821d6b41cf62056c3f82a22038aee7a4a40b SHA512 f9c783eb557134b3b5bf88dbb48484d81a0993ba25c0def9b29a7150e0adfa85c99fb609600c70a5c3cb3e56f32898545089ae6ac7766b9872b6d1472e1ed2f2
+EBUILD gobject-introspection-common-1.66.1.ebuild 933 BLAKE2B 71ee79d00a27e507813d457e42cc47c0f1e1ea632658a00aa5a136f85c730f7c8eb139aae1bdfb1e6973f59c5592b6ba81698130e45c343b5edace9dfcdca605 SHA512 040b38d3f00bcd8971adc567f5001db0a4997305790b6cf8f490bc21ef4dbe664cf0745e28ba126fd50844c712273aeee463c3e365fc6529b75dd3ed750815b6
+EBUILD gobject-introspection-common-1.68.0.ebuild 936 BLAKE2B af10d956a35e545df5668677594a4f138f89d5fea027dc7b17ac5a54c9f7bd1f764b13445635809914adb1f6dd7ff1749fe40ee43d2550bb1240dba33858d1ce SHA512 d4a952192a343d32ea4c33ade3aebcf58efa6ebbe05c4234f4db2c1a0a12f1468f5815bacc01e0098f104b05ed61104f1a779c7db0580534b2451af7a23bce12
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
index 39009c802847..db1675cc69c9 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
new file mode 100644
index 000000000000..ff6157de2f64
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
+# 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 88967593d428..974c11af33d5 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,7 +1,9 @@
 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
+DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1859 BLAKE2B 795ef4666619c07a748877530d15eabfdd36b7f879c443302aa8e7a4df838ef4c5b542d05d7501ef327ae9d29122dc386c915b4349f3aa7148251c575a5436a8 SHA512 8907970414f5b476118aa1767723af2a89dbad574b367e3b1ab72ce6b6a7fb53b8514cf82edea6fa6626a529da2f0965cc8492a776f5bec7f9623ee816e62f0b
 EBUILD gobject-introspection-1.64.1-r1.ebuild 1991 BLAKE2B 08b7dba997ae74f49652ed88a627a9ee4a78b87bcae3c51f0965ee7b19955fd7e5f7be57658549ef058d41482b3168733b9ba38282d33397667406b323d8a65b SHA512 7d840f3d50e3bc413b0802d8d0fe2914b885b5bfb3f85f92e1cbff73a56d6d72c1ccfa511cd8f8c3e3d610e80b1ff931876a8b2444081cb867a6ee18ff4d908c
-EBUILD gobject-introspection-1.66.1.ebuild 2001 BLAKE2B 7cf0365b14a1aa8a7d0be775f52c98a246bfd16364679d4a3dc2158e1f040b2211416e124afcd2a674ffa3d064dbc78b93bccf37ede6899be7bb8f7aeae81d2a SHA512 436d5e09e79a9ac721623b99730fb7e3e94b6c2c9b68e8e433bc6d8ed9021cd90a3f2574bf211f3e9100d3acac684abe73f4b62b00c07fc8d49364092a257a7f
+EBUILD gobject-introspection-1.66.1.ebuild 1999 BLAKE2B 2725fbfeecf0e0409c534e849b320d5513967273f8c043a05878361634e4cc9966f1fa4e9451929fbcbc5da80c51f4473e76f070539408232586744b99808c94 SHA512 eb8d4dd24fc807a9cf2ece4b6b262b9a5f8145f44d026ec8747989bca59f50363bb67104c6d042e2ea1defdd435e0a6178592f7baeb8bb7ba561cc090e5b8502
+EBUILD gobject-introspection-1.68.0.ebuild 2002 BLAKE2B 7b07d4469f899141ab22f76b3ac2edc479bed6c0634b4da5b1486c54a51bc5d5caea1b85cfe5611155dae13e9ed42c673782accff1f14becbf967c38293df532 SHA512 05d809a40a9cac45ce04e0b9079fafa562ba38d1c6cae12ba144b7ddb0bab18e5f8c2d7954e541e6fda50b254b6330cfa33c409c55b6edbee4aad71bc8422c3e
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
index ce38bcb6a0ee..9a97f44f7394 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
new file mode 100644
index 000000000000..23eb08dfbd85
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+inherit 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 ~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/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 9c6eddce81b6..7ba1857c8d39 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -3,6 +3,6 @@ AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6
 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
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
-EBUILD hiredis-0.14.1.ebuild 1891 BLAKE2B 6a726c09ee27e8fe8a1aa11ec7f3ddbfb107dcb6921173999025db849124f63f72943ded24d31a1d419cbc829bd17b07e82239fa8f191e18e353177d6d37855b SHA512 9f0049bf99a2968dbcb122d4ad67b65ce27e0993a47bf26d8928b40f01889de4d3c725ab92b32b1bbab697fddbc08f4563091585dcdd4d1c0f292a061195f43c
-EBUILD hiredis-1.0.0.ebuild 1908 BLAKE2B 6f415c7c8e2723722cfdd0a425bab7a311966cdc90a2370dd8b19cfea1214649db5bcf10e944c19a9c728f7e392412d8a6e2d192230b44fafbe6b0294eb764ea SHA512 3036ed40a03d1c77a3b082abad14ec7dc2e221832af1b8a221a2fdd251a205d221efa8ef15ecd758c4d8b86772cbbb0cb91222f51c592dd9d6601045c8158353
+EBUILD hiredis-0.14.1.ebuild 1896 BLAKE2B bcd029d45988f3d9062c5a04280c3f32411675b11cddae223a5cf23131200449d0a0fbe671bf309d14a946d92cdb3a05dbe25ba8b22c4ae31d39e2b3b6ff92bd SHA512 d77e215352c7916fdaa6d48971b3996bed7cf11f9b8ce24269d1172387a368af582bf65b3f8943d92412e8943133751df5778aa96985deabf6ec1c0177b021c6
+EBUILD hiredis-1.0.0.ebuild 1920 BLAKE2B e9e52cfae8466badb34ab305bf3eae01bed4c0f2949305d7180f240b4b25ddab617ad652fc1d469210b4406b8930740532d879f01bc882a23dc8e4883b5a8395 SHA512 f8322d09b80a8e674859f6a2b3163fc89a15c2ae1173d8909ee4e6cf24d6f189f9d4cd604e6d3932d727dc232c21482c22f031d4eddb01d226f2df5cd028c326
 MISC metadata.xml 403 BLAKE2B 77095f90219f95263b17fa5413af441651aa6a56e8bb4f5a4c763ffa7d0524f1ecf2c2fa0819f214fd519fc783071da31cff6d2c329b36befa9cbac64ccd9072 SHA512 08e5981022c6e6b88243dca594b48733707d12ebbeefd3f41d7818d2bd46c362dc0869aad5757b8909d292493f4732834bec1e34cc438e401d57ee871421192a
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
index d3827b66b401..81bbbb4420c3 100644
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,11 +17,12 @@ RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-db/redis )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-0.14.1-honor-AR.patch
+)
+
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch
-		"${FILESDIR}"/${PN}-0.14.1-honor-AR.patch
-	)
 	default
 
 	# use GNU ld syntax on Solaris
@@ -58,17 +59,18 @@ src_test() {
 
 	_build hiredis-test
 
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	"${EPREFIX}"/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"
+	[[ ${ret} != "0" ]] && die "tests failed"
 }
 
 src_install() {
 	_build PREFIX="${ED}/usr" install
-	if ! use static-libs; then
+
+	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die
 	fi
 
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index 20d56c4f2ebd..b9046749771f 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,12 +17,14 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? ( dev-libs/openssl )
-	test? ( dev-db/redis )"
+	test? ( dev-db/redis )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-disable-network-tests.patch
+)
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-1.0.0-disable-network-tests.patch"
-	)
 	default
 
 	# use GNU ld syntax on Solaris
@@ -52,25 +54,28 @@ src_test() {
 	local REDIS_PID="${T}"/hiredis.pid
 	local REDIS_SOCK="${T}"/hiredis.sock
 	local REDIS_PORT=56379
-	local REDIS_TEST_CONFIG="daemonize yes
+	local REDIS_TEST_CONFIG="
+		daemonize yes
 		pidfile ${REDIS_PID}
 		port ${REDIS_PORT}
 		bind 127.0.0.1
-		unixsocket //${REDIS_SOCK}"
+		unixsocket //${REDIS_SOCK}
+	"
 
 	_build hiredis-test
 
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	"${EPREFIX}"/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"
+	[[ ${ret} != "0" ]] && die "tests failed"
 }
 
 src_install() {
 	_build PREFIX="${ED}/usr" install
-	if ! use static-libs; then
+
+	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die
 	fi
 
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index b499b5725f03..c222daf5ae43 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,5 +1,5 @@
 DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B 9bae28ced3eaf52f9994e9641bd8d68583422fb888f8c2bc407073a0dcae600a3a50f6aee20ada3892ed631a1f9bcd292728589c0ebcbc57dd434524bfd62cf4 SHA512 20efbf148f3b1c816696cf36b10e936021113c8f1b6e5d681b541ae323c84b2043619e7cd381e4aff033bbf80d7ab8b2d51224ac8a3aa17a4854375bd26bd5c9
-EBUILD hyperscan-5.4.0.ebuild 1265 BLAKE2B e7803d2a72e6e63216a08a76f6c0d0bafcaaec2a1f1414d6143b3b57b4f5f804fe55ffbf628730400392e661abbda37aa4b9faf44fd17e32b8349c540099539c SHA512 cb83991b397c87abb9966bad8ea4277ea979baf51432ac53f30533ef5ea840c26f54d4ff7f474a9d5796a14011e04090cba897da722a21bbd9b9b638bc2b1176
+EBUILD hyperscan-5.3.0.ebuild 1289 BLAKE2B 74be6787446cfe317f42518747191e76c732e6d74cefb93db6ab4dae5bc1253439aab7016a9e2b2e2d1fac6d705b35dc9e9784925352c0d6c5ec4676c27d693f SHA512 7677a01807bacbdfb054c4a77503ed86a86a1d865cdbf10737e830d7b2d4ff833b241bcf8c64c556581fc31db4e2987e6fca5d50d6cadd25440629d9260cdb1f
+EBUILD hyperscan-5.4.0.ebuild 1363 BLAKE2B adc6e8411b9d96faa2315242ad2bc072e84736791c9d5a2129d7120333213a57dc1d75b882afba16abc09d8dbafa4815538b983063809fa351b7f90b6a74868b SHA512 f3d4b3135c522b99c365b4cad575a7d92681896c3501e551a2cdbe2d35c8ae1eecb6af933a66634637f493804255afc306ae6fa975e9e284b1c5f6eee1225c42
 MISC metadata.xml 592 BLAKE2B 34be91efe23c3f15a33721893e48d8b963b9a27b6d2ce58eadfbc7a90cebbbf83f14231b9b843205d6906ceb69b5756b00326b32732a91b3abe0b49cf26e88a6 SHA512 c1a119770e21839d0775f898453e8dd7392fd248bec79a794702ade386edc7a1794359c1e4b368148f84603daca09f303c92d660473a5b45a0ab88e60b90e8b2
diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
index 84f3d508c036..e05b00364aaa 100644
--- a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}"
@@ -23,6 +23,8 @@ BDEPEND="
 	dev-util/ragel
 "
 
+# We can't default this to on as it's against the expectation of
+# how CPU_FLAGS_* work for users.
 REQUIRED_USE="cpu_flags_x86_ssse3"
 
 src_prepare() {
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index 6e40c26f0f8a..9cd4cf02b42e 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}"
@@ -23,6 +23,8 @@ BDEPEND="
 	dev-util/ragel
 "
 
+# We can't default this to on as it's against the expectation of
+# how CPU_FLAGS_* work for users.
 REQUIRED_USE="cpu_flags_x86_ssse3"
 
 src_prepare() {
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 35cba6ab6958..8f1c8ef1696b 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,5 +2,5 @@ AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
-EBUILD icu-68.2.ebuild 3357 BLAKE2B 2353fb90cddddafdbb9326ca3df2b337d752700c67cf79ace15fe1162587601800e68f6fbd03797539a2e69a11c807af9c9329f4d9ed205d5f53965870395fae SHA512 1a330211c93de87bf99cc5d05cccc56ec18520c91b1645ffe61e058d1537a3761fd3d056f32549ab89e2e8c4aedbe5d5f49c4834d7a71d7e52a76ac030e2b7a5
+EBUILD icu-68.2.ebuild 3513 BLAKE2B 96030ab9f3819d5c9d60adc9cb044150abf0adb958bef0925dae595ea4139bc80fc02d1743df56feb6b9a4ee8235d62a24280457710f6a51d720746535a50b1a SHA512 f1aba2f2669183077e5d46356ffaa570b7dcfab7531e0e4c33b6b6a4d1d8b19ef63422396b9dd8be03488089faafd4e66d61e60c763330f94dc03b9d83d55e63
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
index 9f6649c9de0e..1b834bbdc0ca 100644
--- a/dev-libs/icu/icu-68.2.ebuild
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -91,6 +91,11 @@ multilib_src_configure() {
 		--with-cross-build="${WORKDIR}"/host
 	)
 
+	# work around cross-endian testing failures with LTO #757681
+	if tc-is-cross-compiler && is-flagq '-flto*' ; then
+		myeconfargs+=( --disable-strict )
+	fi
+
 	# icu tries to use clang by default
 	tc-export CC CXX
 
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 1912978202b8..b3cb9eb45c24 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,4 +1,3 @@
-AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302dd01a1649263541e1ad0f330442f2b1dba61310304c13600e291692134c1f30ecd18c04c792eac491471e3408b7b96e9ef4d15 SHA512 7119f12154810cb1a898c83931d74e207ff0902ff4e4d97d06ebc374a78fb2e22b1f676bf9cdc7321b259cb9558b574e3cdd7cddcd5512992b4a83c57e643469
 DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
 EBUILD ivykis-0.42.4.ebuild 630 BLAKE2B 7de89f062795060831da10aa83dbb08e68009f348fc853e8258bb25e79418f8a576b08c1665fb105c06d85035e67e255a365796ffbb2a5677cebbf64004eeb28 SHA512 a09c7b0cde1c32ba6e0d176816d15a26aa8b8472b2f302df602af519c1ada3860a1908e1c28a69392fc6e5da0f030e473790880154e297c869d75859dc14b546
 MISC metadata.xml 492 BLAKE2B 145f6e7cabc3c05a06259ad6c5d2c6bdd594feb1d036625fd757f9c2d89098a6e723f1e35d20f54b7f8326384a82afa850fe3d25fe241f9f46dddd9a3e4cbaa2 SHA512 7b65e7b6446dd4e149221e872974bd06caa571dc49f7c29cdbc8fe68652419a1af984d401a9ceded7022b526779ef643517fb63e6892891cabc319ed7e36b50b
diff --git a/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch b/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch
deleted file mode 100644
index 5d7352669f21..000000000000
--- a/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# https://github.com/buytenh/ivykis/issues/15
-# https://github.com/buytenh/ivykis/pull/16
-
-diff --git a/configure.ac b/configure.ac
-index e9b10c0..56440d1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,6 +88,8 @@ esac
- # link in libpthread_nonshared.a if it is available.
- #
- AC_CHECK_LIB([pthread_nonshared], [pthread_atfork])
-+# the lib is gone in glibc 2.28, things are now in c_nonshared
-+AC_CHECK_LIB([c_nonshared], [pthread_atfork])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([process.h])
-diff --git a/src/pthr.h b/src/pthr.h
-index a41eaf3..32c1af2 100644
---- a/src/pthr.h
-+++ b/src/pthr.h
-@@ -42,7 +42,7 @@ static inline int pthreads_available(void)
-  * symbol because that causes it to be undefined even if you link
-  * libpthread_nonshared.a in explicitly.
-  */
--#ifndef HAVE_LIBPTHREAD_NONSHARED
-+#if !defined(HAVE_LIBPTHREAD_NONSHARED) && !defined(HAVE_LIBC_NONSHARED)
- #pragma weak pthread_atfork
- #endif
- 
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index b132aa639f9f..1245938b2259 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,4 +1,5 @@
 AUX jemalloc-5.2.0-gentoo-fixups.patch 1443 BLAKE2B 433f445195f13ad3932d3b0c86a4b3ab2adfe99711584c96d8377fddf31730d9a0a116b345dbb9f46e487df9d11b222625dd72238b828452be1fb3ab838c347f SHA512 6fe7419d4cbf68e4725e9a10b8f42af126be924b011aab09a6872b0bd59effec3c641f9df4c2ba9935fb1b7bbfb62c3f272bc63a5264fdc105351427fd739958
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
+EBUILD jemalloc-5.2.1-r1.ebuild 1435 BLAKE2B 9e9fdb48087a1e230f2e1d2c654fb4c37eb9a80af4cdc1320d9aeac97154827ab0ac49fd68a8294748d957a3396d4b94f8881f52804b9f0e409307771a33b0a4 SHA512 89716e2251317d2f30210abf011b323729949b6f7cad17ad5c1e7fb835c4690fd99c775694b140af1b25853b842f1b439489770a566ad0569e62c765446a122e
 EBUILD jemalloc-5.2.1.ebuild 1844 BLAKE2B 24a281ca1f56030555daa9ff4a6579ae47ee028fc620b52b77c027e94cb043d73a64c62c7493a28ce2a3cc42f02b497135a3bb30745d94048fec2b163ccc9ec3 SHA512 859ad5e39b236d091b3761264bb1b3966f9ea81ffa107d809a8c13817e89aef5a3141be309d47807fa2344aed9cc0e6e60686342d52bacc5bdb19ac1d705f60c
 MISC metadata.xml 637 BLAKE2B b46e5e87219f04586095e7fd74d9666ecd180b4fdfaf8bfc971ec9931d907090a6a4a2948d9dcda9d469f6cc575526016eb46bf21f55483b4bde4da3fdb255d2 SHA512 56781e13ba2ee54b398941fcb80df71de20d1fdf999b9dc3cbd47db7cf7193ea0a970dd29e69d839622da32906b67d845f4e543542633ce05359d92d467680a9
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..e66e9eae5177
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="debug lazy-lock prof static-libs stats xmalloc"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf  \
+		$(use_enable debug) \
+		$(use_enable lazy-lock) \
+		$(use_enable prof) \
+		$(use_enable stats) \
+		$(use_enable xmalloc)
+}
+
+multilib_src_install() {
+	# Copy man file which the Makefile looks for
+	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
+	fi
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index abda3fe87408..76fe8738bb03 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,7 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
+DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
 EBUILD libassuan-2.5.3.ebuild 1204 BLAKE2B 6e42c683176d3d20582599a7cf7e0415ecf9c582da9f0342fa71ae85d41c1c2b436383c38e2d1a49ea18fb9a5b5f8ada25ac864e2cb607fa47c31313dc05643a SHA512 6ef03b3e23e05b37a9befef849f8a593d43918448387faa8297fc39332c2eb15c562aa5f65c58f9dfbbbee75be1aa027061564bf90d1acc7903be623614588be
-EBUILD libassuan-2.5.4.ebuild 1214 BLAKE2B 0781a4a4af292712cac67400b78d06d04dacee6b2a0014f3aac6e2c80f7a7eed3870359b3e651c8aea176e158e25353002171d21bbb85735889da6805b6a7c9b SHA512 51faf23074d4436560e96d2fb1439b19d851e6760f3a469af9cdf2b9ed9205bf47e21bdda72568cab8993647b69e7b03a30afa5f680f3dbb05c6d50da9318b3a
+EBUILD libassuan-2.5.4.ebuild 1209 BLAKE2B bb0e81091e3b66cf35a48eee7b6aa389dea009c11f7c12952dd61f15e1d270f526ce854dabc03f3f8a2559b683469d8839a99693c26ca61eab3b4493d12d5ed6 SHA512 b0d95eee5fc77a64346954e66dbd52115b5a982e4d14bec913be38b13e31d6644781ffc587893d0bdca151cde8096246a8b9d9a36cf0155ea0e90a7ded83a4de
+EBUILD libassuan-2.5.5.ebuild 1214 BLAKE2B 0781a4a4af292712cac67400b78d06d04dacee6b2a0014f3aac6e2c80f7a7eed3870359b3e651c8aea176e158e25353002171d21bbb85735889da6805b6a7c9b SHA512 51faf23074d4436560e96d2fb1439b19d851e6760f3a469af9cdf2b9ed9205bf47e21bdda72568cab8993647b69e7b03a30afa5f680f3dbb05c6d50da9318b3a
 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
index f47712edfd6f..e0052e618097 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.17"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libassuan/libassuan-2.5.5.ebuild b/dev-libs/libassuan/libassuan-2.5.5.ebuild
new file mode 100644
index 000000000000..f47712edfd6f
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.5.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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="https://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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index ac92f7725dcc..569e8c0f1b83 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -8,7 +8,8 @@ AUX libcgroup-0.41-remove-umask.patch 975 BLAKE2B f9f377e840b972733f0aa5afb101d0
 AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b207403326236b22a05814349385833a887598014277e99744825e4d6ec0e64ccdf35bb19b470d685d5f2ebf1957130ea1af071a01 SHA512 4f8d4b49668dc0ddae373ab922422a0e933cb6c46af05d01da498c657b5a8df1ea62e644b8ac3db7e7818d33ba21c06d1902b7915f6aaf76f8f96107515433d4
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
+AUX libcgroup-0.41-slibtool.patch 1953 BLAKE2B 7c98c05ffe6e728dedce6b321a352eeb68af02876e91d197bbd235c4c6a16647465036766eb3622da1f4d17d360d5a85bc65e6e11ed9328b87b9aa7f5d732429 SHA512 bb42f491dfa75a29610ef968e23bd234c46e685c55e216e6bea9cb6a841aa9150ffd0476bbd72edca9bde35dc65005f80e0df07f618d2089d80205e89db82515
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
 EBUILD libcgroup-0.41-r5.ebuild 2425 BLAKE2B 4a45335e480bc6695cfcb2c497680c7e4c31784a2c2051e118faa0b1cce8af3ed078586398f7101f8321215460004750c6d0f17fa981d93422fd16ff5306231e SHA512 066c55cabd482d08fefa87a6e6a7a3c25e7b9b78c930ea28269eeb3043c9a5d194e660cf7a9a582ae4791ddf49d27811d138be6336ed7f344e2b522104f0ec2c
-EBUILD libcgroup-0.41-r6.ebuild 2665 BLAKE2B 7966175e3f4bfc4d331dac082d7926336ccb6b66d9b8d2b7c20c851ee60e1de5aaa65f0e0dd1125046dd2fa19c470e31baa80d96880346294318eb5d321db25b SHA512 200bf16ada36f18bd9ca33189ed5f1857498ea4e472391f6d7cc68fd64e3a25d14f3476e9d39a066574107bde913a5d18d720c8b25e499ef421af62c1dad6514
+EBUILD libcgroup-0.41-r6.ebuild 2700 BLAKE2B 54c0bbca0f686d66f693418a381e6379b1eb9ae7a9c391364a2f12e8a8cb50464dec76e1cb4a9856b33ec4f17602dffdd2563b2cbdeb64670f432f65f687d76b SHA512 08b530111a5e604f89353ebfc27acd05d6f9c8ce94d0850d8a591d8acb14618d91b1b2e80268a76392b01a2ef90c9480e4025cf69aaaad469856717e50061807
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch b/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch
new file mode 100644
index 000000000000..114209116bf6
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/777450
+
+commit 0c710d2f82184984e73b643a8e752f55371c6bc8
+Author: orbea <orbea@riseup.net>
+Date:   Sun Mar 21 13:24:23 2021 -0700
+
+    build: Remove .libs from Makefile.am files.
+    
+    Signed-off-by: orbea <orbea@riseup.net>
+
+diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
+index 8bb7334..c59641b 100644
+--- a/src/bindings/Makefile.am
++++ b/src/bindings/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = _libcgroup.la
+ _libcgroup_la_SOURCES = libcgroup.c
+ _libcgroup_la_LDFLAGS = $(shell python-config --ldflags) -module -avoid-version
+ _libcgroup_la_CFLAGS = $(shell python-config --cflags)
+-_libcgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la
++_libcgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la
+ SWIG=swig
+ 
+ 
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 2e08a4d..c8dbe67 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -4,7 +4,7 @@ if WITH_DAEMON
+ 
+ sbin_PROGRAMS = cgrulesengd
+ cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
+-cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt
++cgrulesengd_LDADD = $(top_builddir)/src/libcgroup.la -lrt
+ cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
+ 
+ endif
+diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
+index 852ceae..df173c2 100644
+--- a/src/pam/Makefile.am
++++ b/src/pam/Makefile.am
+@@ -5,6 +5,6 @@ if WITH_PAM
+ pamlib_LTLIBRARIES = pam_cgroup.la
+ pam_cgroup_la_SOURCES = pam_cgroup.c
+ pam_cgroup_la_LDFLAGS = -module
+-pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam
++pam_cgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la -lpam
+ 
+ endif
+diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
+index 0280d4a..cb0b8f3 100644
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
+-LDADD = $(top_builddir)/src/.libs/libcgroup.la
++LDADD = $(top_builddir)/src/libcgroup.la
+ 
+ if WITH_TOOLS
+ 
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
index 5aaf74bec12e..58ba8aad708f 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-replace_INLCUDES.patch
 	"${FILESDIR}"/${P}-reorder-headers.patch
 	"${FILESDIR}"/${P}-remove-umask.patch
+	"${FILESDIR}"/${P}-slibtool.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 10db1c3cc79a..6d0583b5d695 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 EBUILD libevdev-1.10.0.ebuild 1252 BLAKE2B 445b3ae22bb70fb6d4f4e9f36dcd1baec01d28b0b4c9c8f3efe26deb452767f6db4eaa1c2049acc0fe31b4a5c9228f7e2ee43cc6acc5a38f8053dd1255c35407 SHA512 2bbffed6d3693907dd99588b83a76db4c9b19c7c0eeb90976a4e4dc58d527097f540ba75a77c3f31e9e3cb0d144eb5cd2fab6e7db0b5e7225bb85a6cfc3d7894
-EBUILD libevdev-1.11.0.ebuild 1256 BLAKE2B 1e1727a33126d2d9fd859a54036cd8ddb2fed58b0f7ed885dfe89020f015d8ac84a6ebb70cb7cbd13749379e749bd11a2cc25d04d281c192a3f8d29fd8b1f4a2 SHA512 3af8253236cb5dc1fafbac26da71a6cad72b1b871577d7bf9faac907ccadf824dd9c25a0b5f1213ea04d3861fe75d9df0239c034fd7d69588c77b07e75a4a953
+EBUILD libevdev-1.11.0.ebuild 1253 BLAKE2B b3b3d4a9035d033fe36cbb51f3c72e2bd4ab4edba00833001220d8fdcebdda4bfb3c8793dead132e89987025371cc8a04f3d04c135423cb804a0a6df880e9c09 SHA512 9c8cc9469ae58eb1d1439ca3954b9b8259d43d49f797ddcc6c92bb158089218da669bcc5372273b30401cae07db0c79b94be765885a9be42bef0227b538e7ba1
 EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index 4f2cccf073d6..0330325b6d33 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 19d3b2b9f688..de0f68536d2d 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,7 +6,7 @@ DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808a
 DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
 DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
 EBUILD libgcrypt-1.8.6.ebuild 2306 BLAKE2B 0430932adb2cdd898c6dc95d54027360a412d31344467bb9798d156414da65813a6f99b5e1601a95f8a3d5394febdcead90b6e61bba5d5c7bb88689c283d8ed3 SHA512 a9b9fa4c02560843ff46a97f275693331df1b3d7cfc25e011ad36114294bca1c994985c0ee0b375c1685e1b2fc820351671107d7aa1eaa21c99c24c9832b7137
-EBUILD libgcrypt-1.8.7.ebuild 2315 BLAKE2B 91d3ccac5c4d422185742831f570befa6cc60125ceb33e33a9dbd334b7badd518152ebcdafdda083f1e051ce6c8e3a412874ea05d4e48aac0c5860d312324095 SHA512 28befd141be1ec44bbaa9430cfc279df5eab27573dfd15c6dc58387d1677d20a08cf3ea13c7eb110345f1aaee5328c49c6117a6b43e2902d72d8595a228d6a9f
+EBUILD libgcrypt-1.8.7.ebuild 2310 BLAKE2B 15132b9445970dd4d1936401053f6a04d48c10f2d7e64b6aaf460e50f910ff1fc49f070bc50267c68065c5fd296d4a627575939a397baf40f16ade97211f373c SHA512 0d62aa086533727166d44e01875d3817b4e2c17f491ead3abb5450d83d46b0c1a7d482a3041e3c214398d7396e1ca09963031fb654d4d3bf270e6b77469a7ca2
 EBUILD libgcrypt-1.9.1-r1.ebuild 2896 BLAKE2B 450a6eabffe65b2d7cac0f8e0495c9ff63ea041c3f7227bbcf729326d45ce57529f1cddcd4514a5533163fc10e2b1dc4edd612a7ce4f2d067ad404f53334cb0d SHA512 0d3c07a5893db2941d7c33c1f5465e5e04c62a7e0d457bc8143b4beb9a4afc8d53ff32166072837e56d2d941c1b7eb52a71a91ebc0d8831776530473a15cf736
 EBUILD libgcrypt-1.9.2.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 MISC metadata.xml 484 BLAKE2B 3e077dd32170cc7cec14a9b68ae2565d6eadb1e78566fc6462ca16e07cb20de6f058de037887654c3269160c069561c30c1c90e432c355663e6008741e1099c9 SHA512 0b8ff0cda84bf73068a89ab4164b164a34161146a6aeac73cfd4baf2420f41f3b352b3e80a1668f28c7221732f06e8366fffd806c53854ecf6e64c06fc7d3b9b
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index ecface3601d1..086e92fab044 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index ac9ea0f955aa..58b2f4436429 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,3 +1,5 @@
 DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
+DIST libgnome-games-support-1.8.0.tar.xz 44808 BLAKE2B e6195087e99a3d34f47af6b4e0d9f068aa7b0a80d545da11744173ff8c881c62f81c913f8d59f855a71f4754ca92d09afdf79e1571cb3adfcf90d60b589d73c9 SHA512 0de9523d590dcc00b628bf88115161da94d5f3e7b3e074f4db851b6cb711d65601c290ec6e0485aaf4e4759faf82e7b1c10a2a26656d44874adaa7e8358f7124
 EBUILD libgnome-games-support-1.6.1.ebuild 666 BLAKE2B 0bbf6c886e20d56785ced43dfb3ca8fd4fa5fe205c3a22c56aad82a179bb57e966e1dd6bc6c057e640ca29b7256ef91fbdb3c0da9cd53e7f2c2ed2615379cb27 SHA512 abb35787d23eb98d9cb36e4673af42b3f5208cda2476462a4775afbe510bc56bffe8ea26553ee7ab36779c06b8f007435a44e487bb5c09f469f5f9ac913b9a28
+EBUILD libgnome-games-support-1.8.0.ebuild 669 BLAKE2B 5fead8b825c9819b2e7b42d029a00e0eca35cdb10720ed16b79659c17a8587636cee3d3e15111d902d83d20279dbf185c3a2d874e6d1d1f5ccaf6ee01ad41a01 SHA512 ce730270c935e56421e2bae3c32dd04d8bfa46d59f9334f7c77db9c323bcc8a2f921b7cac9c1d122737ff12766a6c61630377fe557e896153c06b9af9f37289a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.0.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.0.ebuild
new file mode 100644
index 000000000000..38664f56d3d4
--- /dev/null
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library for code common to GNOME games"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
+
+LICENSE="LGPL-3+"
+SLOT="1/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# glib dep in meson is 2.40, but vala is passed 2.44 target
+RDEPEND="
+	>=dev-libs/libgee-0.14.0:0.8=
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.19.2:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 9b80d77b3e72..0c5aa4286545 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,10 +1,11 @@
 AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
 AUX libgpg-error-1.38-cross_compile.patch 1415 BLAKE2B 6cd0453ef8bd77bf945600c738aec60e3c271109fcbf85af95eaeec372d3a5295dbaa46a28c9d02bde9a9340885a710baaf52b3c76d60fecd0f4ae79118020fd SHA512 99b9ade767fd02bce4f7388d1a4c615ed1b959fe0416d1d49880ae3708482144de7219fed4aa5ef4f7ef18ec7fa047e05da6da53a13a2cab8a42f8298600b061
+AUX libgpg-error-1.42-cross_compile.patch 785 BLAKE2B 91dcb2dd4d44776dbf0f1bd0b7bb7df2d8855625e1de306583cb42a14f74b2daa015605a8af46fd2a659a81da9f312d20d02f49ff6042ec9ce8ab40f42b9776a SHA512 76a9bdfa85de81ba60eac771022f0b1daedc97097e281ca954381ed54b30a00e84ca2f0970f252ee735b1ef6f1ea2071a4df25ae1fbef0d380d964c577e2fd22
 DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
-DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
+DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 EBUILD libgpg-error-1.38.ebuild 2150 BLAKE2B 912412e589136e6b537967940954c084339726c43700f4dff5a5bb69e0792fe6a0b8832339ad81aa2df44555d7f95bdac7ad1e9a3b79ed9df9818bcad5d2aa42 SHA512 a301494ab2e81d6e94a6134124b047f1fbf37e448f1b141ea97d6c1bfbaab29b2b168fecaea683c63b42393626cd8487ac0aa2a9e26e6a5d4d5e5afc22846440
-EBUILD libgpg-error-1.39.ebuild 1722 BLAKE2B 4bfb541b61ec0b52d760b7ed80115c388754f2540d5256374409646dd26ab0377d899cfa2aba566f625006529c8b7ff3900c93bd50f342cf1936f0d09493ae72 SHA512 e82c9f0af8be9838e873b84260d7bbec05dd427763d5d22add627a5f3ca4d2f937a55e142e9a84349603aa284b75b683e33d922b01a12a387c99031e621f6027
-EBUILD libgpg-error-1.41.ebuild 1874 BLAKE2B 3ac41aac960f6e82388ab269a4c2eb29f34640d799dacc49efd648f9077ad0d84ca83510661001397f3a23c66513a6171955b8874ef95100c62a4b8787f2bc92 SHA512 be25c1a8e12ad3a2c0af586375096ad0a0f8b7fa14fa6f03b47e914c6345a62fcded6f0538329777ebc5b678cce39ae8806311ec7c4d610aac11ea8d737a0ed9
+EBUILD libgpg-error-1.41.ebuild 1869 BLAKE2B 07a8a532fc812e2fc3305a33151345c4be5644341642fcacde218d5fe9b103ff369a148bb02231a7381bb59c506f3c62388a22c6ded3089a698a4dcb6a16c02c SHA512 4aa2ef0af8471449d3070917793dfcbb81f5d0f1f4458a703c72c4f83ddfb22d5e8d07a6561e0c402ed8fa539d03935db29e3e29acc41559422c87ad4bd650f0
+EBUILD libgpg-error-1.42.ebuild 1914 BLAKE2B 1426f8dd59c37ce476f8955119aa8437e77435035a8842a23be1074c7a39d22c690136451992f74ebe92ad2e23c20f4c1f5031084b9e79f2ac1c4c1c136167dd SHA512 bbf1e315fe8d87f46c5b10a83833779cfcc925849b6535b87e3f4b107867f4b7e0b51763e3168971443b632b643d2a23d0a95654f4ad7d63685ec6aa86962469
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch
new file mode 100644
index 000000000000..78d98dd7b3d1
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch
@@ -0,0 +1,32 @@
+From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 26 Mar 2021 16:06:50 +0900
+Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
+ build.
+
+* src/gen-lock-obj.sh: Capture echo output with quotes.
+
+--
+
+Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+ src/gen-lock-obj.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
+index a710f0c..258eec6 100755
+--- a/src/gen-lock-obj.sh
++++ b/src/gen-lock-obj.sh
+@@ -38,7 +38,7 @@
+ #     AWK=gawk ./gen-lock-obj.sh
+ #
+ 
+-if test -n `echo -n`; then
++if test -n "`echo -n`"; then
+     ECHO_C='\c'
+     ECHO_N=''
+ else
+-- 
+2.11.0
+
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index c6202ddd30fc..1edca981c296 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
index 548ddb2954c2..2d6c54abbf78 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@@ -28,10 +28,17 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
+	"${FILESDIR}/${P}-cross_compile.patch"
 )
 
 src_prepare() {
 	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
 	# only necessary for as long as we run eautoreconf, configure.ac
 	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
 	# not a pure /bin/sh script, so it fails on some hosts
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index cddd8b4db9ca..c50752ed67a6 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,6 +1,5 @@
 AUX libindicator-12.10.1-no-werror.patch 5307 BLAKE2B 8c4c9a4277968c1598b0d5f2084727b5236afa729568f767e561225cf7e532d65a9cd3a8f916a47b401ee0e6b76560adc79d138310568ef02e46355c32948a7c SHA512 dce99a58fec589633ccd86b94558a89a5d42145d514ded782828fd8545660ce659d0c3eb469b32a67220ec20ef8b1a60b1074bc50282cced18960a948fac9424
 AUX libindicator-12.10.1-nonbash.patch 573 BLAKE2B ae6b2806c99d99c83b36056b0ece7335ab673339e8ba275366efed3bc68413563ef4baffed64a0e3113473e8ae6dc0a143ae388e5280abdd7b84be97ee9f2afa SHA512 8a436dc62fb70d857b2bf3489e576e72fe9e06639a6563cf528686b6646adf2dbd5418c0904d986e44f5a3f9bf41e3687ce7cb2ff7895680a0d2bac792c2bb74
-AUX libindicator-ldflags-spacing.patch 351 BLAKE2B fe395bb718f1393bdfad20fb572afebe531623b299c5dcd6e69f8bc87dad5545aef8bbd6fc4c28788984b334f97a0642c9802983aa6aa0b41fda83a46491479e SHA512 0762b32efce30e680116a3ab451a0b036c9d6e9d45f6894b745e211746ad13a2854e0ac58ecf32e7011b0269a50581070c9107a6140b15d10d537c37f6f3bf9b
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 EBUILD libindicator-12.10.1-r201.ebuild 1362 BLAKE2B af1856a0dcff13426d85530e178a7b8aa200342107d6dd14cb169664306b656b1fafa7fabda7f3237a78ed04abd2fca6551958bd4c5ed133af96179edd90b089 SHA512 2560bb73a841f80b401d0607e0843eabf2765f0f1e44483ea47dcd93a5dc98baf971b1aaa08e68308591fa0313787712e9d1d77d437880ba6e1730bd87540a78
 EBUILD libindicator-12.10.1-r301.ebuild 1275 BLAKE2B aa7aa82ff71d8ea1bd6c4fdc0a4d97aa86899dbfec020c132b40513f2492f85f60dd79ac145f1c339f4cd5441f0b1a9449cf038423a780eee81666f03e540fb4 SHA512 ef897424dde3a53e0966137e70d3a04a64ffb01d953290aa9353ea5964d376b2eb0e8ad5efe5370d8e077ed47f47feb617be65b6caea7c6822bd61986ff9e052
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
deleted file mode 100644
index 5bd2cf89d5a8..000000000000
--- a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.launchpad.net/libindicator/+bug/1502925
---- a/configure.ac	2012-07-11 14:07:33.167169453 -0400
-+++ b/configure.ac	2015-10-04 09:59:31.023669616 -0400
-@@ -66,7 +66,7 @@
- AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
- 
- LT_LIB_M
--LIBINDICATOR_LIBS+="$LIBM"
-+LIBINDICATOR_LIBS+=" $LIBM"
- 
- ##############################
- # Custom Junk
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 2ffb6ff1f07e..92e6287ba2bc 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,9 @@
 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
 DIST libinput-1.16.5.tar.xz 595000 BLAKE2B c325aac47a73992232cf7905935bb6ef0ace89d6e4e8d64feff3fcdde3aa9acb6c1470a07cc89430bfecf52df62a37617ced1cf5f05435eefa1902ee85e20a0e SHA512 b2fdd87375cbd5b212f76cefedfaa146966dde1d5e5d566beadd3167749dc3667214946178b157fa4b44360dc6b86a25ffb0356049cdf5a57d0fa2b8e3fcb1e9
 DIST libinput-1.17.0.tar.xz 612004 BLAKE2B 035b85115917804c032a4b0629b4cfee29513beff6cf84921d95d3f9d09d5f55574e1088256f72e271dbb6508b66c6a7271cf07be572a402e6c9ef02f075591f SHA512 490c7e59cbaa43e4190dbc421582dca887b6ae92304c4f8f3ea9df515bd76de41ca9a376e6f1cfe7b235dd2d5d8d8ef5982f5ddcf958e3b31b981e9440bb0888
+DIST libinput-1.17.1.tar.xz 611492 BLAKE2B 274312240fccc49a45dedc3d41018bc952f25040217f388fd461aebabe796be106dd4f34cb2e40ce91fc75219c47fbd605c6facdc4d47893420e5df199a7edb7 SHA512 2e7baa198fed9c673d28453efb066f9371f2b575a844e41cde455c636bbe1cc68faae7129026944a502cd5d7bfcc72272066b9e3cda5c959f7b464483f9dd860
 EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.16.5.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
 EBUILD libinput-1.17.0.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
+EBUILD libinput-1.17.1.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.17.1.ebuild b/dev-libs/libinput/libinput-1.17.1.ebuild
new file mode 100644
index 000000000000..610b570961f9
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.17.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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 ~riscv ~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/libksba/Manifest b/dev-libs/libksba/Manifest
index ac3e257d1749..fbac2c74d35b 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -4,5 +4,5 @@ DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b7
 EBUILD libksba-1.3.5-r1.ebuild 756 BLAKE2B d3185dbbfd55a7d298ec44aaa9c0b02167d6ea9783f19a5d8090b394d5291654b4518b6c0ff812ca09c8bad06ad2e2b50b1b4adc85837f702c7d46e8a832f78b SHA512 247e8b964e99f2d6c90ab459fcc50f482a99abed223011435bece555a1555e96ac81337d547af8083c87983652b67bf4e2427ff6da372b70f8369c070e8f32dd
 EBUILD libksba-1.3.5-r2.ebuild 1020 BLAKE2B 6d2b16b54418920f6523a0a40cebe8468b6c744e8e6b8533710e09445b4024957c9d16f51d5f57a1c1863dbf54d09370f6d6100602319f3ebd52a7a46ba12c5c SHA512 3b1eb99484ade6415cb226df36193e55d19446e5c0ced57149126098aa66ae2838ed6dfd6661ea2cd445ba5c6efcb85860aaa86efb9fe121d0ed6cb90701d0c0
 EBUILD libksba-1.4.0.ebuild 1046 BLAKE2B 4ebe4e7501cb4a327c13b71e0a84f37b3e563dde026af18815fe9e780dbabfa2802876ecdfa184a5e7b571e1cb00dab186ae26c6a1658f6f7bd8d0284d675b4e SHA512 5805d1dfafe5c0b04eba150a4367eb8ab827608348dd8cb19f5d0af808969d4786a4b10b2f6afed15d26ce741e5250b5d79fef201690671e9f0f5f99221d9871
-EBUILD libksba-1.5.0.ebuild 1046 BLAKE2B 4ebe4e7501cb4a327c13b71e0a84f37b3e563dde026af18815fe9e780dbabfa2802876ecdfa184a5e7b571e1cb00dab186ae26c6a1658f6f7bd8d0284d675b4e SHA512 5805d1dfafe5c0b04eba150a4367eb8ab827608348dd8cb19f5d0af808969d4786a4b10b2f6afed15d26ce741e5250b5d79fef201690671e9f0f5f99221d9871
+EBUILD libksba-1.5.0.ebuild 1038 BLAKE2B 9cc00a990c34fc839b28d73775e13796e0522eb6fd405743831b225ad32c50cff5fd5bf4ca410dd32fc0406515879a933fc19a88ffafc4249536d2897db45f46 SHA512 71ed1254ca0b7a7b4d6d0ec4e62c57a8ba1f1175e4a17cb7b49609e4e3e19bdb6b5289b5101e65d59f78f37e503a70614183adf54e7ed556a7eb58af387760d8
 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
index 788b29757356..f8c9d4dcc06d 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -9,7 +9,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 0e8b90f81277..940a32244316 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1,5 @@
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
 DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753
-EBUILD liblinear-242.ebuild 1450 BLAKE2B b5cc50baae5858e1ed68b6b4faaabee6b6e57301d0111b62e3615def56bce1d07d3bf909a133e445fc849d1899dcc8fdcadcfdeb22b6b96d4dde90aab594f190 SHA512 56360ecc14c2ffe1bf2712057b139e801bbac326c00194d53ff26c935db8be48c507f774e425bd5e9f6779bb4df022f09a16c6ad498e9a9369161dc3221b634a
-EBUILD liblinear-243.ebuild 1457 BLAKE2B 7c61ba2761e7e7614459d40899eab240fec2e9bb189fcbe878f9fc1b3f4747dfa9f6d6eba0614ad97f40308ab3fffdd65e6a6ac7ed7c760cf35454448048cc28 SHA512 c4173b415a3a1c9581b0723a3891d675c5b94180f57b7358d6d0a7389f52526e6d033d8da547b760d153d1a851350f6caf1313db1c9c0ebdaad55a22c2c569c1
+EBUILD liblinear-242.ebuild 1459 BLAKE2B ad59f7cc9e33ddd6ca95c9917fbe60e94c61fd37a01e2ea9f40ecaeba0b58db1ab8779800b16a3391495acac236797e8a273df47ca89440d43862265fd8e0cd8 SHA512 a539d6f4ec7eb498e08fa4dae3519ece15cf89e574ecd3c9e77ebbe747caea3a924406d8510b74331752fbf0b7059f526190c8d60d915f02b11c2f5766a16ef5
+EBUILD liblinear-243.ebuild 1466 BLAKE2B d89c1f0947d4b3176eba2e180a01f2d2e3cfd9df84c72f96b1e2062a7ccc8b6e7d96f9ef7288e4952829ddda9c91cd3c95a7eca4ede97c958647b8009bb1e451 SHA512 17f74636c94082a4db0021d5a50fae3816774f213d4f57f6784e0758c0eedb658200e6f928fe94228d364a63c3c50605d9b74cc800457525e6ee1ae06796e2aa
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-242.ebuild b/dev-libs/liblinear/liblinear-242.ebuild
index 3556ac556556..d05e7d8cc0df 100644
--- a/dev-libs/liblinear/liblinear-242.ebuild
+++ b/dev-libs/liblinear/liblinear-242.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A Library for Large Linear Classification"
 HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
diff --git a/dev-libs/liblinear/liblinear-243.ebuild b/dev-libs/liblinear/liblinear-243.ebuild
index bc03e36ab2dd..f30b1423cc71 100644
--- a/dev-libs/liblinear/liblinear-243.ebuild
+++ b/dev-libs/liblinear/liblinear-243.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A Library for Large Linear Classification"
 HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index ac3040f25cfd..10ed1821202d 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 841 BLAKE2B cfad1986e93b2ecea28b6c62cee7a9b5c43478cd5465c3905429361f1ac9bae4a0c85a40ce4f9abefacb8d7b5512e6406b111a9c9c867c75a5f95e084999d8a4 SHA512 25bc2ae7c30f6f373ec305aee9e840805871e01543527ef7c6427e339c379898ac32c4ca2a9206c17e4d5de5b5e11c8c12b5198094f6a05cd3180666868c8ce7
+EBUILD libmix-2.05-r7.ebuild 842 BLAKE2B 6120e359ecbfe1e967b36feb3567d25e105d6895ec44fb611d9a0d3503bedac87d7c8faa6f57803f333715bde640b045aeafde0876dcd3dd14e1e9d358e9a134 SHA512 811f39642386af86e791db5dd6a2c7ca4a84e71360a11b29c7689a459484b349f73d81f091b37cb5f6983dabea3262f53a0f418bbecf1cb9233ea4ccecb15a60
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 4e57713d01d4..b372ae36efaa 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC CXX
+
 	econf \
 		$(use_enable static-libs static) \
 		--without-net2
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index e042a0cf8543..f1236e50a8bc 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -1,7 +1,5 @@
 AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b5f08b7141bb918a81077606fe2860641b00fb562cd26457ab01285385fb4d71c7753715bf7371add9c0cb89366 SHA512 9a0fb4c4cd3c096d4f0a8910de63d594e8ae471543a65e62bcff102d98e25d1b8714eccb91570c8f778dc83659ac8e5e9a1fa3c8e7479153c58d41972661d56d
 AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
-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 880 BLAKE2B d962c91bfdc89354a5ebac62bc84a798429883c7cdefd69231bdc1509366eba49b3fc2efa9fcfc9de74eda864c8dbac301ab298cfdae73b9343bfe9bf05e5537 SHA512 613184bc7a21e0813339eb259589f815b2f0d0509df55da4ca6972581988d7d885f08b00dab2c7f66ae0397f5cd0f4e879e0860205f9d1cbecef7cfefb5f537b
 EBUILD libotf-0.9.16.ebuild 981 BLAKE2B 6e49a7562feebaf2c01f78accd5eedee7b9f27563114455f3429ea427fe4d125deea355ece3e769fed0735c189cc1c5b1fcdcde7bded5254d500d5cec3f8b5f1 SHA512 30d0348bfab4d007e78d68789ec9c452ae4557568d5b267aef03787eded1e0e423c06b75a552e0a8638013321b0557d0792b8a5a09cbfd304b0f88a942bdbea5
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild
deleted file mode 100644
index 5cac4a4f2d99..000000000000
--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Library for handling OpenType fonts (OTF)"
-HOMEPAGE="http://www.nongnu.org/m17n/"
-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"
-IUSE="static-libs X"
-
-RDEPEND=">=media-libs/freetype-2.4.9
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libICE
-		x11-libs/libXmu
-	)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_X11_Xaw_Command_h=$(usex X)
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 4b4f5248c829..bd90c3e3ab05 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -2,8 +2,8 @@ AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a4
 AUX libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
 DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f
 DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374
+DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
 EBUILD libpeas-1.26.0-r100.ebuild 1956 BLAKE2B bd378be55d13ca21fde9f6fa2f8c07f9a663d74d79557fba54c3a91a0403637de3f2cd9cc3b1f5b5e93547ef53ba372e39e3ca554e800d5be81720b9fcb26042 SHA512 c6916121ae64171904763a553584b35630c4b6ef3df12ee2343c6baf7080aff8c963822b4e50d5ae223b42b4f12ec743c21ba6eb7c5709fe75a4d40121c32688
-EBUILD libpeas-1.26.0.ebuild 1828 BLAKE2B a052f862f6df977647fae388d086f4a58e62ee8aa959a59a8f04955f5179ef88e50a438d2ad524abf64aaad1d2cac098e3f24b11a7ccad03dda117d444dfc8df SHA512 a60c7fe2b57869f6ffb09c3656843a6107c61c99d73c3e2150b5a2dedeea6b5527bc068fde600a346fc45899c7b014c27beb7c0ff7d5e512f9fcc3e80945c343
 EBUILD libpeas-1.28.0-r100.ebuild 2041 BLAKE2B 6a213c0d7428aca879da294e886f953afefbb29e46956f0e71f3d39f10858bb669665c007ee2760a6963ea7976bb0623d51e810b1829a92a0db0754bf53afeee SHA512 2796b1f8a6048f9ad98be9353a13d608dfb5376359a8ef41a62227a50452ec608e5fbd8a2674b547c619af0be53031410e7687876c610a48418a1399463dfbd9
-EBUILD libpeas-1.28.0.ebuild 1914 BLAKE2B 53b96b1de5fb90616095e8554161765267962b185cd0e2b435025a92bf3e8f1239455f5e3f4bd565f7060aa78c6fee63523d26fe0fa7f97cd496627ebf8efba6 SHA512 0308757a0f445917886290b6ef5ddc451439510b9656f8b07f48c42b65f3a06c1d11c33f77a13614bbb2b3858a4ec425012f076cc73f31edf6c7f27ab9a1f3ea
+EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 4a46bc3b4047f9597e5385f4366c6132bdaf0615dc6b0ff15ed4acd9081d16c542e3f2d7a3c54f3467fb2d379050b7ca74cb7a0652e863ac5885ebc00cbfdb6c SHA512 2175312d704f747450208ec0a423c985ad4d3de7ea5d92e2387acdd528a9428ffc8b5385a951721c4f82f38997566c499369747f016a7c35baeef323865f8775
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.26.0.ebuild b/dev-libs/libpeas/libpeas-1.26.0.ebuild
deleted file mode 100644
index 04ae731a6e92..000000000000
--- a/dev-libs/libpeas/libpeas-1.26.0.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
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit gnome.org meson python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua luajit +python vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	lua? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo-specific lua tweak hack
-	"${FILESDIR}"/${PV}-lua.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature $(usex lua !luajit lua) lua51)
-		$(meson_feature $(usex lua luajit lua) luajit)
-		-Dpython2=false
-		$(meson_use python python3)
-		# introspection was always enabled in autotools; would need readiness by consumers
-		# to USE flag it, but most need it for python plugins anyways
-		-Dintrospection=true
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use glade glade_catalog)
-		-Ddemos=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libpeas/libpeas-1.28.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index c9ab7549dba1..d011e421c633 100644
--- a/dev-libs/libpeas/libpeas-1.28.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit gnome.org meson python-single-r1 vala virtualx xdg
+inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
@@ -13,8 +15,9 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="glade +gtk gtk-doc lua luajit +python vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="glade +gtk gtk-doc lua +python vala"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -22,9 +25,11 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
 	glade? ( >=dev-util/glade-3.9.1:3.10 )
 	lua? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
+		')
+	)
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -44,10 +49,10 @@ BDEPEND="
 PATCHES=(
 	# Gentoo-specific lua tweak hack
 	"${FILESDIR}"/1.26.0-lua.patch
-	"${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
 )
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
@@ -58,8 +63,8 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature $(usex lua !luajit lua) lua51)
-		$(meson_feature $(usex lua luajit lua) luajit)
+		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
+		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
 		-Dpython2=false
 		$(meson_use python python3)
 		# introspection was always enabled in autotools; would need readiness by consumers
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 9ea0ae7b97dc..e14c9add95ea 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,5 +1,5 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
 EBUILD libpfm-4.10.1-r1.ebuild 898 BLAKE2B 5f6ea6c7e7e0620ab1dfe1c55630537500f1e70e479311b37d7c1a63518abadc324d664c394c6f87382462974bd0600bb532f43322989dbc2d916fc55316c528 SHA512 91fc7332530d754b3f6a9644df4b69c8cc49f60781a68fc83f5f45cb530722876884398b6cbc3a0ede8a1cd684db481fe1778d77819309f257a74420182b8b6d
-EBUILD libpfm-4.11.0.ebuild 957 BLAKE2B 8e5b3c7a2f1690d376fdf3c0f775b3550258a1c8549009244265b4aea3a17905a3035729e49f20d869e33750d515bb956cf048009cc4a364278401740173b915 SHA512 85d97627cb4ec14b4635160037bde3431384912440da73a8fd41a5b18327b2c4fd62b62aa89881e03d09b35c8650834b3f6a4a18e6fa5e01909808859b8d4de4
+EBUILD libpfm-4.11.0.ebuild 954 BLAKE2B c61b75632adc63256fc622613636b825f529466c6ae42862e74bd424ec54e8b9243fd9289cc225d638c9b81b4cc4557fc76936e546e64814deaa2dbae75b272b SHA512 28becc516f87911cb2239cb1f42241e36b8eee1a9880b128d96eaaf7da353b9317f549d8babdcbe83eac949d940ef7379d6e7d1e38c7595cd0579949f7ada76e
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
index b6483a94ff57..9240db60b044 100644
--- a/dev-libs/libpfm/libpfm-4.11.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 824ec35a3b48..49cda5537de3 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,7 +1,5 @@
 AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54932f968f1973aebe0541e50403e4154512772e9d625324e879a06ff4c5810bb90f3d2c968c09fa361067435e7e4bc6131ea78f6ad794 SHA512 6990cd9e79d6e9e42c9f377f1c9a9f48920310aaf47d9bc731fc133c743256874a613ad5740eb4bc25825b341e313f79c8cfa1160a58e6eda228b9ca6bfef2b2
-AUX libprelude-5.1.0-fix_awk_error.patch 3243 BLAKE2B 2be6fe51c2edfd85b851f7080cc6b205703ba8ff25752392f1bd1a6a33c9101e45c937160cc593b66d851aa010723cefaa50577e6760d421139d321e421fedd9 SHA512 be78d258e81ae010301ce29f5de5cadc44bca50a1f20a7de85e1f2dfdcda22acaa11d0a497f440a3aeea3bb1e34b74ce238af2da0d6854059c67c76b2bfaa90f
 AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
-AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634228898a951c2ea629c07a5df087f8998df27f532ea9d893df2b233ebb0dde094f1acd6c5bb7b95a6688fdcb5e805c449 SHA512 b35c74578a2e00358a7da8f7301f9c4d1055e53c99bea71cc3ef90020a93ff7d0d41f1cf6d3ea3a5c6fc18a3ca1bcc9ed0baafdd8110c1fa51db34e005a1c874
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
 EBUILD libprelude-5.2.0-r10.ebuild 2090 BLAKE2B 518d8b28c5fb2056510ba3f9c23046821ae6fac9883a5c9f10ae8484c12234a2639a28233b49ec98b36d239834dddd8f895df6cb45d46b65aa5ee91a88f18261 SHA512 b024355425efcb4a2a4746324de6d3bdc1087d03aa775281c8177bdf8c2c56bdf76647df7088cc5d2ff4c56a07e1bb336109117499089034b86aecfa3464929a
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
deleted file mode 100644
index c3dca1b93d1c..000000000000
--- a/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---+ a/src/libprelude-error/Makefile.am
-+++ b/src/libprelude-error/Makefile.am
-@@ -53,7 +53,7 @@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
-+	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
- 	$(srcdir)/errnos.in >$@
- 
- prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
---+ a/src/libprelude-error/Makefile.in
-+++ b/src/libprelude-error/Makefile.in
-@@ -1834,7 +1834,7 @@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
-+	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
- 	$(srcdir)/errnos.in >$@
- 
- prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
---+ a/src/libprelude-error/mkerrcodes.awk
-+++ b/src/libprelude-error/mkerrcodes.awk
-@@ -78,7 +78,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---+ a/src/libprelude-error/mkerrcodes1.awk
-+++ b/src/libprelude-error/mkerrcodes1.awk
-@@ -78,7 +78,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---+ a/src/libprelude-error/mkerrcodes2.awk
-+++ b/src/libprelude-error/mkerrcodes2.awk
-@@ -91,7 +91,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---+ a/src/libprelude-error/mkerrnos.awk
-+++ b/src/libprelude-error/mkerrnos.awk
-@@ -80,7 +80,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---+ a/src/libprelude-error/mkstrtable.awk
-+++ b/src/libprelude-error/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,14 +150,14 @@
-   else
-     print "  gettext_noop (\"" prefix last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-   print "    " pos[coded_msgs];
-   print "  };";
-   print "";
--  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
-+  print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
- 
- # Gather the ranges.
-   skip = code[0];
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
deleted file mode 100644
index 079a90125df3..000000000000
--- a/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bindings/python/_prelude.cxx
-+++ b/bindings/python/_prelude.cxx
-@@ -3132,7 +3132,7 @@
- 
- SWIGINTERN void
- SwigPyStaticVar_dealloc(PyDescrObject *descr) {
--  _PyObject_GC_UNTRACK(descr);
-+  PyObject_GC_UnTrack(descr);
-   Py_XDECREF(PyDescr_TYPE(descr));
-   Py_XDECREF(PyDescr_NAME(descr));
-   PyObject_GC_Del(descr);
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 2b66b1e6fcdd..ca78b86a5f59 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,3 @@
-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 971 BLAKE2B a4471147a7ae1f92b03f04c85b65d7950f6b4f26dbc7241583eab924ff53372e588f6a0f02c54e5ad9d56f0c34424b070ee229bb584cbc54c9169c1d3ce97ac3 SHA512 5953b841cef2438a9d47c8690a18e9d80160bc6117baf3f982a7fdbe51d542ba385e88896cb9df1dcd7608f6fafe6c6df286113e79ddb74584cab155e2df48f1
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
deleted file mode 100644
index b09cc5dd8cce..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-3.5.0.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 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.7.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/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 1c39368fd1bc..a61acb4955cb 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 1294 BLAKE2B 5725d374a2a95123d1e33f54e5e8173875dfe9212f58a0dc5a37fe56d758e2de26085a5fa91a93147ffbd43f7ede886aa75f0c4058f6b7a3aaf63145c9b282ce SHA512 90f66f40a40b994efc7c0bca40a4d6b5238f733a0489821e1b8bbaf7f7c1fb3345f8c5479643fb09c50e8f9f7546892a090ca3bbd0a470ea3c720605aa887ae6
+EBUILD libsodium-1.0.18.ebuild 1345 BLAKE2B 20eacf865ae5a6179a986da2a38f5a7bdea2caa28157c5a6968965766e40b8e46c53bf02072c75d33beeb9c4e38d6282714e4e7d8f81c51d49c35b0578250769 SHA512 30e01ab0c8f062506f9e6c241220578804f72fd0039f8fab74bf852b9cde74db24fe7053e53da92d48fc3a1d4a2ae80451c3c347977a3ec59aa0849c072f814a
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 181638171400..220e1a8d1c63 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,9 @@ SLOT="0/23"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
 
 src_prepare() {
 	default
@@ -32,15 +34,17 @@ multilib_src_configure() {
 	)
 
 	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then
 		myeconfargs+=( --disable-pie )
+
 		# --disable-ssp is needed on musl x86
-		if use elibc_musl; then
+		# TODO: Check if still needed? bug #747346
+		if use elibc_musl ; then
 			myeconfargs+=( --disable-ssp )
 		fi
 	fi
 
-	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 32c4ca270f38..2769a19e2c2d 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,3 @@
 DIST libthreadar-1.3.0.tar.gz 440695 BLAKE2B f4f08d27f6be640e44c9a3abb564c2f1b8faf5b10ec26931a77d6de9769b456e577902c8de378d6fc420e930f20a59081e6916e2b4aeb4f083e70a1565570112 SHA512 54257ebefa0473f78510a5add0241f1282e1f135037edeecc76edd0982b6cc279592ae86e1df263327e1e090b7905ab65847ccdc2afdd366c7bac5c3097abd9e
-EBUILD libthreadar-1.3.0.ebuild 933 BLAKE2B 95747b8fd659c15230863063b8a8eff254eca0f09297afcc1b231a6d033ef560f41fde2061f0cd129d0da40bf2830fbe7a89e71e48f1b39cb63757e1257abf64 SHA512 52edd7e75eb9a84a37fce263ac390cf245670ee017b0a69104fc5cf7e8d7e81a816587454556cc074073aaf257c8dcf3c619d8b6dd812108f2312f7fa8cf724f
+EBUILD libthreadar-1.3.0.ebuild 940 BLAKE2B d40987c8faf08383958d1ac697b8bb4cbc108f7621a0d44319f3f53fc0ab3d71c6e462e5c348842db43c3df1ec426b3aabde43e30849750a37081e93eb289c6e SHA512 5a0d662f7f4fe7751b278858f201ab4bb8eb7f52a9a1bc65056cdfa84061b0a736e7fe784da6d7808473974c9ae441095c34b43d8caaad74a0cd31f77a115c22
 MISC metadata.xml 889 BLAKE2B 461d6b835a6e98325f56d0287e302ed14e8cf2bd8ce16a918b2e2c041e7dccd39c62ea0426fe5f5b3ea40681077582cb130d816259d6b79ad8712e9b46bbdc48 SHA512 792b25f96d0107116a0ce2d2617356796052026aba471228e3c608c665c76f5f0319e38d6da2b5d0f4547ad6e31d8b7b8a1e9424a4b03f003806e1be5517a8b2
diff --git a/dev-libs/libthreadar/libthreadar-1.3.0.ebuild b/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
index a3caae2728ef..8d535391c7a5 100644
--- a/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index a672555e1fce..d7ed3b32f623 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
-EBUILD libtommath-1.2.0.ebuild 1825 BLAKE2B f5f3e9dc4a17a6754a306249be3d5e1f3274148a1d3402c0a47626e81a25f5071eef4a83e07d2a52963b1e941adfd1417db3c7a747657783b3eae5f31e5d0fa9 SHA512 213593bee4aa79af25e9eec6a77131d7d7c2c8aeddd469bccb0ca2aa5f67bdff630921af38829b000a9c5670a6a89d9c695af962182dc7e2a97ce0d8f44a1c48
+EBUILD libtommath-1.2.0.ebuild 1833 BLAKE2B 2eff38293dc8f9d275c6d2a8f17daf12d8033aa6c4b6199ce9df037e18bf546fee34c76156c116da0c29ca47100e9979ea3ede861beb556d454a8ea1e34ef74f SHA512 c484330dfe95bbbda9551f241017f20643769878acbaf22c5f5b4a72105a26ba5471cb681976bec61f545b8404a8c4822379934ac8e93d302dbac744e85e98cc
 MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f
diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild
index c72f2d4668d5..98ca746cc7d9 100644
--- a/dev-libs/libtommath/libtommath-1.2.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild
@@ -19,7 +19,7 @@ BDEPEND="sys-devel/libtool"
 src_prepare() {
 	default
 
-	# need libtool for cross compilation. Bug #376643
+	# need libtool for cross compilation, bug #376643
 	cat <<-EOF > configure.ac
 	AC_INIT(libtommath, 0)
 	AM_INIT_AUTOMAKE
@@ -28,9 +28,10 @@ src_prepare() {
 	AC_OUTPUT
 	EOF
 
-	touch NEWS README AUTHORS ChangeLog Makefile.am
+	touch NEWS README AUTHORS ChangeLog Makefile.am || die
 
 	eautoreconf
+
 	export LIBTOOL="${S}"/libtool
 }
 
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index e2c6cf5fa47c..fad14a59482e 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,5 +1,4 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r1.ebuild 1243 BLAKE2B 3a846ca9e36f8569185d9a92e2832b3569cc19f67aa5f4aeeed721c05e18c8a156759e778a81fe8d810364f1a1e77963d6896133d4a3c2cdf2e8f548d68267cd SHA512 a0b9f074d9539f5274ad98acff55ceb14ed823e6f6ae7fd2aa07e26855044857348e0e78f282b5de0e5c29b858d2db9a257101219e2a57f96f0e81d9d09bf5b6
 EBUILD libucl-0.8.1-r100.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
 EBUILD libucl-9999.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
 MISC metadata.xml 985 BLAKE2B b7b4f33a1c6a33751f246190f8b38cfdce778e37c70321760c173b61cfd1f8bbdb811930a8ecab46a3764e2f77f8908cda79e395885b322c8c3c599da31777b7 SHA512 3546d93841d932f75cd5352a4c06ef63ae30a106b7b44a2e2cc6bd99a0b703b1e2d5010671b46d29e7ec26d571c6f6f9c788e6f22a9a0a216752988559823aba
diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
deleted file mode 100644
index 8c59554dfc50..000000000000
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
-else
-	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-
-IUSE="lua +regex sign urls +utils static-libs"
-
-DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:0= )
-	urls? ( net-misc/curl )
-	sign? ( dev-libs/openssl:0 )
-"
-BDEPEND="${DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-src_prepare() {
-	default
-	rm tests/schema/{definitions,ref{,Remote}}.json || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"$(use_enable lua)"
-		"$(use_enable regex)"
-		"$(use_enable sign signatures)"
-		"$(use_enable urls)"
-		"$(use_enable utils)"
-	)
-	econf "${myeconfargs}"
-}
-
-src_install() {
-	default
-	DOCS+=( $(usex lua "doc/lua_api.md" "") )
-	einstalldocs
-	if ! use static-libs; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
-			die "error while deleting static library"
-	fi
-}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index adff40b04975..7452ea8067d9 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -3,6 +3,8 @@ AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c16
 AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b
 DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b
 DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066
+DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
 EBUILD libwacom-1.1.ebuild 1021 BLAKE2B 577fe004acb6e80e80dbb40f15ecd1d8d3cc0821c6b63286adb419679aa8ee91104ff62904125b5485848d6e1e4dcf14c519661026a318c8967b358b3f0aecdc SHA512 433e73ee88ee25a5fb70079bd3f8226819a805d5f16c48017dbfd164bfb7c3b7d448015ea3841e45c4adc1aecf8116f58763958d34de398843aff81bd4c6fc91
 EBUILD libwacom-1.7.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
+EBUILD libwacom-1.9.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-1.9.ebuild b/dev-libs/libwacom/libwacom-1.9.ebuild
new file mode 100644
index 000000000000..0c54c6c491e4
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1 toolchain-funcs udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 0322e6d88bad..bfc98adb266d 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,8 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
-DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
-DIST libwapcaplet-0.4.2-src.tar.gz 31492 BLAKE2B 1c3b74a15fddf895ac63c15302737915fcbff89d83e990d779d2874778d00c3ec453a7bf0e362f942216c68a3e006c6318ace83164c49cafede73af1ae7a2808 SHA512 296a5f4471366b58089632c10943c0a1c1da8bd3b54231f2204b1159052b5bd5f45769fb2e12e438a29bf39aeea9719773d0b38fbf40fce193c2fb4f0f70ab09
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.1-r2.ebuild 790 BLAKE2B 453612a1a3b03327fd590e56e5e5ceec3f9afeea26d0ba8e327f85fc86647f3a5a75980e1cce28fb1135bc3c4d89cd63908867abeb48badec38d8169ef8d7fee SHA512 64612fbb38426a4dfcf1e79f159c47a2c8cdb695ef15455272ef64b167b4080744f475ce8d9ca4e53377e5fadaeb71596b4276233e0c462f83dd82b242fa2a5d
-EBUILD libwapcaplet-0.4.2-r1.ebuild 802 BLAKE2B c9df38b6c3d96a78d9a63e701a65010393a429dbe80305b45d7165b4ae9ae5680bc4f928b82741cd2abf8682fea5f8d5d7f712bd1ef4d009051f1541a1c0ead1 SHA512 87a0226039479bde3b6c3049ce6d6d14ae8fc5021d8d32ab62e7706c8ba95ce7a9b3c9e62babbc378ee1a5b941df95dfe8a4c084c328d2b4cd49c40c2a33b009
 EBUILD libwapcaplet-0.4.3-r1.ebuild 802 BLAKE2B c9df38b6c3d96a78d9a63e701a65010393a429dbe80305b45d7165b4ae9ae5680bc4f928b82741cd2abf8682fea5f8d5d7f712bd1ef4d009051f1541a1c0ead1 SHA512 87a0226039479bde3b6c3049ce6d6d14ae8fc5021d8d32ab62e7706c8ba95ce7a9b3c9e62babbc378ee1a5b941df95dfe8a4c084c328d2b4cd49c40c2a33b009
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
deleted file mode 100644
index 9744331eb3b4..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-util/netsurf-buildsystem-1.7-r1
-	test? ( >=dev-libs/check-0.9.11 )"
-
-PATCHES=(
-	# bug 664288
-	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
-)
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
deleted file mode 100644
index 4bfd12648e23..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.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
-
-inherit netsurf
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( >=dev-libs/check-0.9.11 )"
-BDEPEND="
-	>=dev-util/netsurf-buildsystem-1.7-r1"
-
-PATCHES=(
-	# bug 664288
-	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
-)
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 7ac395e52bc7..1f8c1701886e 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,5 +10,5 @@ DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.10-r4.ebuild 6409 BLAKE2B 82a43ea7f6ffcf9e648c711db4beec9c6b82ab825fe0f676484fff6529bc00ed948758130919877ac01d12f16ba074f1036e940167e125069183726097ad4d50 SHA512 fea86142743f481018290de2282a06d1a7abe6a838ff745b563a01563db4c0272ae837e562c98ffaed6ba2ecac98f3569016ace7639d6b07194232c900ba0390
-EBUILD libxml2-2.9.10-r5.ebuild 6660 BLAKE2B dfe1ec621c431e4e1bdb28c833c0e701ebefce8b40f51465ce674d0279bd84b82abe38a83d268311aa6c6aec76ecb6bb8942be71b70661ca8db95781b120b0e2 SHA512 d55888cbbc77eac044e358689905845f533e3986a7f9fb46ed0025ee8c006ae389a44065122ecbc45a6a7edab2301d98e40b2cf8ad0ada262e53c0d8bb40bff0
+EBUILD libxml2-2.9.10-r5.ebuild 6654 BLAKE2B 03f733e1a13bbfdbb800f35fcd9c9dd4732673fdd80b6134c76050046c19464a6dc6c1d63904092359c2cfe835172a350e7df656e5d414d7a65d5e283dc509c9 SHA512 e084e118d5ef90c4cc9e9adaf6971d9a67e7526b910d6a78f84afd3c289b458d93a002bf9de9dd4828a2ccaadae29847614cbaafb1d844c4bb94eaf4dbbd2a4d
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
index 374ad6c9ad91..9c503eb4ff2c 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index e0e9d39a9754..8ad715403711 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,5 +1,5 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e
 EBUILD libyaml-0.2.2.ebuild 991 BLAKE2B 3ed138f98dad86894d6be8806a7f2155be731723d229a4936c533ce83bef958d9a194719e43dc6de509c4e5678455f874e4d5519227d90de9c4d4a3f04309034 SHA512 e3c9b38411b2c0dcea5a70cc9a170d278f9a4b9c00fdb8b66685921055b770ab27f96851accab0c6dea7fc537362cdd500e6736e8eda816c20b191ce0af7cbe5
-EBUILD libyaml-0.2.5.ebuild 991 BLAKE2B 3ed138f98dad86894d6be8806a7f2155be731723d229a4936c533ce83bef958d9a194719e43dc6de509c4e5678455f874e4d5519227d90de9c4d4a3f04309034 SHA512 e3c9b38411b2c0dcea5a70cc9a170d278f9a4b9c00fdb8b66685921055b770ab27f96851accab0c6dea7fc537362cdd500e6736e8eda816c20b191ce0af7cbe5
+EBUILD libyaml-0.2.5.ebuild 992 BLAKE2B 8d75b902e62f054adf08aad721cc32357be9ea13b4760ccd23d3593675457abadfe3bdcaebd9f6f7c5e6ccf887bb975476dc9cead46d6ba9af77db9e49f2c724 SHA512 11792abe80cbb8083b9d329529d3176ef858eca5494aa9fc35ecd36a3c73ec04311869cea032237fb9e924a869221bee50ccb40ae386fd9fe30c74f265b76df0
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index 75975f00a462..4cc51836cb2a 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 9d6e1c997aeb..2f2f4e81c0f5 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,8 +1,8 @@
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
 DIST nettle-3.7.1.tar.gz 2380974 BLAKE2B 2dbc0204623ca9d42d4e4fec0d96e3d1aa164ac63f046198c2827a9eb8946392cbf5dd48a2a77cb98d52591eb83b48092686e3f5eb5dc2ee5f5e92cfaa335f26 SHA512 25567c0546b68851a03741ea69a2959b07cab660a723b193a9043faf1fd9eb4cd7aea72de150bb0717fd2db28e417f03ad31b14e98aec40ad316f1bcf0caf50b
-DIST nettle-3.7.tar.gz 2375067 BLAKE2B 1e8a77db9b7e62dee9a01e3c3b476e206f36cc7235153b0a1a762276650c61d7c4c3be73b2ecae9313313e416e3c7a2bd999a3505c41b26e806f9b3eb486550f SHA512 be32eff0ea3c83abb8b6670d049a8ce21ea9c7cac3e1a5d41ae003d5160e2683572c7dd8930b869ac1db0b89f9423605e0a8ec0cff074c63e2a60c71996ef66c
+DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
 EBUILD nettle-3.6-r2.ebuild 1781 BLAKE2B e01bf5e416b31404c955406cc56094f192504a0a9f18e1de009af0376704279a24f7b61f4d6ab713690b81d97a4117ff67aa8f202c64f7dd3a13b736e0583329 SHA512 a34481eeaecaeb8928ec7185a14a747447ed6bccec1b275347a2f20c03c81fbf07dab3ea0b89d2d629234825ed9fc1c2f84997bc88121bb08b68b13064db46a2
 EBUILD nettle-3.6-r3.ebuild 1831 BLAKE2B 52f6b9858662beb73050485055be6eef7982d280bc8da67141a6077db7245c0162e176ebf722068dd6a3a711946070a233e6cb088740e8474eba055333da2bf5 SHA512 53de5e013ca2c84a211d694ff4495c22085a35698122f4b36b3a56444d69c5bb984a7e96d5ee91df0c091f473f864b3b19ba89fa20181ec759b67e4124c566b7
 EBUILD nettle-3.7.1.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
-EBUILD nettle-3.7.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
+EBUILD nettle-3.7.2.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.7.ebuild b/dev-libs/nettle/nettle-3.7.2.ebuild
index c99897e5e98a..c99897e5e98a 100644
--- a/dev-libs/nettle/nettle-3.7.ebuild
+++ b/dev-libs/nettle/nettle-3.7.2.ebuild
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index f82dc716fcba..48f150076d6c 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,7 +1,3 @@
-DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
-DIST nsgenbind-0.7-src.tar.gz 117110 BLAKE2B 9695a88f058aaf885853c1de62746d19219ad198508dadf8e6ffa602721c3eb4338a4d8f5a65b2c14434796f9f024e093e5a0975c745eb5462c81594bc70d92f SHA512 b96b10bc39b3db13f44802b0c70f0a8b197d4ee714a98f571ba4019bd9efb6460fb2cd6d22a7fd3c8a5cb25dcd85211122a45b02e17ee0f52bac1db0cf06b482
 DIST nsgenbind-0.8-src.tar.gz 117463 BLAKE2B 63ada11eb9e818bc864b8100d80fda5686d4b1cc2a1b021f6cf76d098f5c6551b2792da6dc8aba02774304d3e87bf9728a85d3c80ccb0c24e4bff5a4fee3f977 SHA512 850769fedc82c103b6d063ba25ec97638178e56f5b331a1e237566b3f3bd858aba270bcd37618c638575f5361ff88a09cdae92f6d2b5dc100491e5cc75c072e5
-EBUILD nsgenbind-0.6-r2.ebuild 623 BLAKE2B 23831455b338f7e61f68f9ef0440b96aa278cd2d1dfa1e4e5eb4f0df2e8db7f5fd6314e0b206ef7d846c75f0a2efeb521178b3e2e1fc7ea43240384b05d39397 SHA512 7efe9bf98769b9f35baf13e768cd5fb96a78b62f8af870dd723bc748d7fd3a169ab3d24a9ba5adc184e46092d3c458c6cc0fbdf1a8322adcf566892fbb0e5086
-EBUILD nsgenbind-0.7-r1.ebuild 623 BLAKE2B 23831455b338f7e61f68f9ef0440b96aa278cd2d1dfa1e4e5eb4f0df2e8db7f5fd6314e0b206ef7d846c75f0a2efeb521178b3e2e1fc7ea43240384b05d39397 SHA512 7efe9bf98769b9f35baf13e768cd5fb96a78b62f8af870dd723bc748d7fd3a169ab3d24a9ba5adc184e46092d3c458c6cc0fbdf1a8322adcf566892fbb0e5086
 EBUILD nsgenbind-0.8-r1.ebuild 624 BLAKE2B 494d4b6c14783c67a9df4c8e22ac8ff9e309dfcc430c7fa65ae204ba39a825603a0cb48106af65d2c16a897a9fc4251e03065787d2079d09ac01912f599eb2a7 SHA512 a5d73dbcf290f0094c3dfbf0332599301dfbd9a53f5af06e53810005267c1e9c85ce84757915e3d4c5e61fe58ae831665882da6ce112886264ce61b7935ae1bc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/nsgenbind/nsgenbind-0.6-r2.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6-r2.ebuild
deleted file mode 100644
index fd95f03f94fd..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-DEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/yacc"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/nsgenbind/nsgenbind-0.7-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.7-r1.ebuild
deleted file mode 100644
index fd95f03f94fd..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-DEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/yacc"
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 9eb9fe4e266b..3f88da05a328 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,4 @@
-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 1495 BLAKE2B 01218f0889e0d685a957b31a867312587dcf25f5604972150d5805f94b061824b521552dce092153da3c624c469cf1bb1687a01d38edbaa917d2e1fae5212237 SHA512 dbcbe8d9ebb2ed6bb0f73d45c05ff9a33aefd187ce1ada0d57771a3a57a8094ae24a392de7088d6c293d2b4b473551db7edb6b9d71546aab78d12c55f75b3a4e
 EBUILD oniguruma-6.9.6-r1.ebuild 1486 BLAKE2B 9196a06dc0641952398e978e142ebf212193dda3529edc2fc3bef52d32a7efec4b6350a8754434df02dd69291cd6cba0c8f25c239e8f629abd632b5854819a96 SHA512 db2c5faeb079d697872cf44e37648e8135d2da3c56e867820c5d58c2ef261cca2619978f6f5d0338c6ba6e21e4cad4f82ba6263a50fd0d59539918b782580ec6
-EBUILD oniguruma-6.9.6.ebuild 1151 BLAKE2B 530a1a31a2e640d9137bdef3008def0962ce52b4d22d8c7247e902bf77f4feeae129f2a8661b72a3647d62811c604afbe3d3db395720e827bc06108c04951781 SHA512 8495ec3fc1f3a8dd7de404d2e901f1c39910bee9b4cb73aa6b7c5d7c892bb7a4d4675479375b5687cbb02f11707911506a7b8e535ac34805de44633b5fffd65a
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B a501302d3a207054c966c8fb3bfc56fef6a301e8e33ffa406d4a2c5fc40d63d12babe0733a43322a7aed4894ab82f215a586b7f8038b4d38f0f73db6c855cc17 SHA512 1e261ffa3fa322957e5cbc4d78e7f7cc7b690f35e68af298d85bbefd673365a134d2b7c3637a741b427fc95b658e7e942f9cdf3a8958edb501d2098906ca025d
 MISC metadata.xml 913 BLAKE2B 1a3f13483acefa02561c779bd419f49dad5ea2abb5b6a1cf42825674bb3a9076fa7890de17b60dd8b10e975908add14575c166a00ce5e5e5c403fd29969c4cbb SHA512 c79b54199a79a798074aa0c52cf60dc2f019184c99f15a60b07adab2a34d65697fd864d5ce1405de2df1bc013defab86d4a2e1e27b2ea970aca0819dd8d967d0
diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
deleted file mode 100644
index 7cce5c844279..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2003-2021 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-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/167
-	# https://github.com/kkos/oniguruma/commit/603f4db48efb49307b7515500496e9e7a92fb779
-	sed -e "/^#define MATCH_AT_ERROR_RETURN(err_code)/s/best_len = err_code; goto match_at_end/do {&;} while(0)/" -i src/regexec.c || die
-
-	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 "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
deleted file mode 100644
index 82be720995e8..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2003-2021 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-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/openssl/Manifest b/dev-libs/openssl/Manifest
index dc6399d57fc9..d11a48814754 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,7 +7,9 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
 DIST openssl-1.1.1j.tar.gz 9823161 BLAKE2B e5699abeca83acd82546e74a0645f2a765d51f22226f8c537d92285eb0b11e12b0a9476cbd3cb6a594e9840433d713be39884fb4dcd5c3968b36ad4f582ed23a SHA512 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5
+DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
 EBUILD openssl-1.1.1i.ebuild 10262 BLAKE2B bf22af5fa5b25103bdefe046949fe26e6ca78dbf5f9965e2cafc4e08f927bbf8baa478296dfce2f182c13f1576e87ae3f257c18da16a1cc3cfb6c2f2862098ff SHA512 047c34d02e00529450d982dc891a9bc0319f8e7d1f3cdad70d8954f0c463b3c7621005382c091f282982337ea0f2d397038bfcdf2bfad99c16b51de466988ff5
 EBUILD openssl-1.1.1j.ebuild 10262 BLAKE2B e10b9f419bd7689bae4f6e19e4c14407eba31c27e9c67e8b68fa7b0bedab8d8a572dc3c7e6155e080001de43d37df90da8c4585d8340a891440d15b942a2a64c SHA512 f7d468aa14b0d5753db16ebe4daa23ace9b3974324971898e5c8ed48db2e33be1a01b8edc982c2bd19824f664dc15029b66ac295d7a57855e9782a27a0f15241
+EBUILD openssl-1.1.1k.ebuild 10263 BLAKE2B aaba8c0af1e37fe57bbc17c7a99f6c3bfab1a281a9ae43d36fb6f4376837dad017dc715cf012d11d2ceeee036cd722ff1ba2bf038426cf093cb022d76eeb6ade SHA512 7f119451851dc8bc2e966dbbe5fab4a3c66035c8743a12da3629939750aaec9fb54e6942095b8d117c0b4dce44985638f4faca52d89857e2d52f57c54f429e74
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
new file mode 100644
index 000000000000..59adb0cadad4
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f6f1eb200ab5..744e654c7f88 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -15,5 +15,5 @@ EBUILD protobuf-3.12.2.ebuild 3009 BLAKE2B 8fa16af3fa8a044e4855a3c97de40762ae4e6
 EBUILD protobuf-3.12.4.ebuild 3205 BLAKE2B 5d41dab953c7a0230df22500c99caa1ef843600fa17940d77567da33ee0c0fc68062e69fc816d480670e97fbfaa101c274c03c4d005aa87ae6f2f182cdd257bf SHA512 e33502f6f03bb899fada09a8bc3565b1e1d0994b85984ab69a0acf39c9139ebee6cb0c625ed97d6f781def4efec1497dd36e24d4a86bec6652dadb90fed27cfa
 EBUILD protobuf-3.13.0.ebuild 3199 BLAKE2B d79383364ae304ea0a4682e9d9d92b673ab524820262b8e8fbc303594ca9079961d6964222d1d2beba4733f97a9e74e4df48e8f907f1ffb1e46901f986b93625 SHA512 22f2acef4cadb511040ff2f6421c2e5efe4e0d5983ffaa111edde7d0737b82817dea34dc640c7c97a45c10678c2e0ffd7061c90031b2bcf8adaedebb0efd4027
 EBUILD protobuf-3.14.0.ebuild 3005 BLAKE2B 155eca420c45741efeb31947fa0357408abd0e7ca40fec5e8642af8522fa1a93bf626231307a28466edba9d0a1d22cded2d1abedb0650542e8c6ee8caba129e8 SHA512 aa95ff5ba7fe2d9571279f48d17af10d6a7dd33dde0bee4a160b90de1f71a4849fb181e7d3168e3ee524b70ed0a528dcbab7aa3e87b5cf6e2c7aafee89088156
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 07efb172c0fe3b77561e061fad4f59f1b7827620450d64568e980e77b2e0efc80ce5668dc2118184d2ccef91a96733d25d96aa3ecf732ae4b049ee1c2296566a SHA512 23acf5d789030bf0d69d365ae46bc4e1d13dcd62539ead55d0411fea810c59de3497c55bb6a8ce298b8781e05421d37ed6b203e1ffddf2aed4393c2e68ec35bc
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index ae36a439b162..842b1bf5554c 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/25"
+SLOT="0/26"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 4c412d62e57c..74a9c23e8724 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,4 +1,7 @@
+AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
+DIST raft-0.10.0.tar.gz 315569 BLAKE2B 2365ee2ef4aca44257cf7631875013a6778d8858427946443ec02411783517f3ef129529c3302eceedbd43d9a57de9a3fc20a762b51ce8c7ed96045d4c8d27b0 SHA512 5039e2305c92f5002de4ef33f3c0b76dac1e72b8d983440ae0f5cb65d99213278e23a80401476617f32857c1913ab30bf257265d92f6bb5992d2701d4c25f977
 DIST raft-0.9.25.tar.gz 313444 BLAKE2B a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55 SHA512 8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
+EBUILD raft-0.10.0.ebuild 948 BLAKE2B b594180bd763206d959ed723aa4058a7a3a1349a97a6a1f3b5cc2efb0ab5a9b2acaf82ae5c24ce559b2120b539da09b724f44568fba25939fbd0bd33944c8b4c SHA512 d5fb44d9341600d522abfdab8f72b3fedbc458a883c481ca6adbae20f1eb4c24f8fa6edaf2e674d10a06d9e4b0043540d03ddc0dea7d55c862aab76dde29621d
 EBUILD raft-0.9.25.ebuild 1030 BLAKE2B 39e3e289802fde309d41d0a5ecf5484d58610db877e276bf3bc601c33f3060f9d8d968345f56868d3c653ab6192789761a972f2df2a16f00f4d4fa1e69b49658 SHA512 ae0f3446717543f20a52a54e143d16351758fe2377d6b38319a1d288a45dab0b1c2e78d5813a6a97c060ef9d1b04fc864a6c8fdabf6f525677018b8c9795118f
-MISC metadata.xml 755 BLAKE2B df2f0d028fa7b8e27b29facf058e32cfcd3352415ed4a682499a8a9bfccab115b174d30750a66d9a811da90fe5deb68ab9c2344f7c691d158d48c36d76da9db4 SHA512 95093f3a838955c8a109dfea975d73698bc5aade34bd54fc5dbbe9ec6e5ec9f092cdb939c4f91290babacdd6ae5ef72027201bd731955f8337ec21e49713a3c7
+MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
new file mode 100644
index 000000000000..f31b599b6101
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
@@ -0,0 +1,21 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2021-03-16 14:45:58.000000000 +0200
++++ b/configure.ac	2021-03-23 07:45:06.875557286 +0200
+@@ -47,13 +47,10 @@
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h stdio.h assert.h unistd.h linux/io_uring.h linux/aio_abi.h])
+ 
+-# Check if zfs >= 0.8.0 is available (for direct I/O support).
+-AC_CHECK_PROG(have_zfs, zfs, yes)
+-AS_IF([test x"$have_zfs" = x"yes"],
+-   [AX_COMPARE_VERSION($(cat /sys/module/zfs/version | cut -f 1 -d -), [ge], [0.8.0],
+-       [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+-   ],
+-   [])
++# zfs support. We have 0.8.6 as stable in Gentoo, which is plenty above the required minimum.
++AC_ARG_WITH([zfs], AS_HELP_STRING([--with-zfs], [Build with zfs support (default: disabled)]))
++AS_IF([test "x$with_zfs" = "xyes"],
++   [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
diff --git a/dev-libs/raft/metadata.xml b/dev-libs/raft/metadata.xml
index c96395f90242..d1012a6417a7 100644
--- a/dev-libs/raft/metadata.xml
+++ b/dev-libs/raft/metadata.xml
@@ -9,6 +9,9 @@
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
+  <use>
+    <flag name="zfs">ZFS support</flag>
+  </use>
   <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, 
diff --git a/dev-libs/raft/raft-0.10.0.ebuild b/dev-libs/raft/raft-0.10.0.ebuild
new file mode 100644
index 000000000000..ffd134995c1b
--- /dev/null
+++ b/dev-libs/raft/raft-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020-2021 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 zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
+	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-uv
+
+		--disable-benchmark
+		--disable-debug
+		--disable-example
+		--disable-sanitize
+		--disable-static
+
+		$(use_enable test fixture)
+
+		$(use_with zfs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 00b4a9eaddf5..b566a4a41b2e 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,5 @@
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
+DIST re2-2021-02-02.tar.gz 402958 BLAKE2B 824afc7f6f92cfa7070f37e975469c995e9d4aa4bfb12a6e22a739199b74ea414536278ca18fc3a61250aa8744d56eeaaa203f4a8a37378fbf554750c9c8db9c SHA512 643ebbd998ae4089f1cda259df98f7c973df716f2959c3c01dc0c9ebdad685a5392d26e2149a1f865a93334dfec42d2e133776a39a4bf6a36053829958fa86db
 EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
+EBUILD re2-0.2021.02.02.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2021.02.02.ebuild b/dev-libs/re2/re2-0.2021.02.02.ebuild
new file mode 100644
index 000000000000..383b552b2a85
--- /dev/null
+++ b/dev-libs/re2/re2-0.2021.02.02.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2021 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/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 1b0a4f0f3bf5..75be5ec88af9 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,6 +2,5 @@ AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a226
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2953 BLAKE2B 1de6cc94b8b121e69d72480af8707fb5fd9933cb78afec9b94c56cb5582bc87cd8a350cf84ef9a12b97426198f5c692d86f617eac4108425a8307d73a39e5172 SHA512 da349228dd208d9a3945dd8ea09876da2b7f3c87275dfca7265de578cfcf607a1c72b0960284b3a4cae790d9b06331a4de546f5da675866ebc4f55c8a01dcba8
 EBUILD redland-bindings-1.0.17.1-r100.ebuild 3924 BLAKE2B d9fba280de9e10a62508ea91d5a64af105bda36aba653cd7eb3deb373d4d1f9b23e9fa0c730561052634d3616f145c30f0053a013433d277c89657717a9c8054 SHA512 0775b0fcbf23687f54d66af542efee334184f060692bf92cbd846df7f50c359838ba20c8939978d2eeca496efedf967eb30671c5f4a2f912ef32e38c60610aa4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
deleted file mode 100644
index ca8b6ee1e90e..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
-PHP_EXT_NAME="redland"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-inherit php-ext-source-r3 python-single-r1 autotools
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/bindings/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE="lua perl python php ruby test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/sed
-	virtual/pkgconfig"
-
-RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( >=dev-lang/lua-5.1:0= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
-	php? (
-		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
-		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
-		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2
-	test? (
-		>=dev-libs/redland-1.0.14[berkdb]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bool.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	use php && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	if use lua || use perl || use python || use ruby ; then
-		econf \
-			$(use_with lua) \
-			$(use_with perl) \
-			$(use_with python) \
-			--without-php \
-			$(use_with ruby)
-	fi
-
-	use php && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	if use lua || use perl || use python || use ruby ; then
-		default
-	fi
-
-	use php && php-ext-source-r3_src_compile
-}
-
-src_test() {
-	if use lua || use perl || use python || use ruby ; then
-		default
-	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-			cd php || die
-			${PHPCLI} -v
-			${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!"
-			cd "${S}" || die
-		done
-	fi
-}
-
-src_install() {
-	if use lua || use perl || use python || use ruby ; then
-		emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
-	fi
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
-	fi
-
-	use python && python_optimize
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			doexe "php/${PHP_EXT_NAME}.so"
-		done
-
-		php-ext-source-r3_createinifiles
-	fi
-
-	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
-	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
-	einstalldocs
-}
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index b080643bf0a8..6eb3ea62ce3d 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,5 +1,7 @@
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
+DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
 EBUILD rocksdb-6.14.6-r1.ebuild 1096 BLAKE2B 627a65313bfc642f1fa77f3cc0e20324d7b62b17e9464d9436285b4ebee5d3d932183ef521f43aa545f5ef5bc3b727bd520b373348672025005af75e29c294d3 SHA512 7a43c3752950b3d884c537f3378a823747f366e2ec896478f7a40ae002083cbd8a540e0189f28ba788f1a3cd471014ce579740b4744e2c4039911548fd0f3d3a
 EBUILD rocksdb-6.15.5.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
+EBUILD rocksdb-6.17.3.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
new file mode 100644
index 000000000000..eca7931e3752
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 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 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	dev-cpp/gflags
+	dev-python/zstandard:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+RDEPEND="${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/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 54195fcb02dc..7f65c6d1ba26 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,4 +1,7 @@
+AUX roct-thunk-interface-4.1.0-append-flags.patch 1229 BLAKE2B 9901f0ee86b164e18c7ddd00bab50e84e7be133f0b52149a57a0f75039f91938ef3c7414235f1a821ae0181239e82688768289e32ee17a434211c5e139d3740e SHA512 3d145bc46282b17489886ad6fa3c720fd71b56f46aaf5b9c04de382109c01da7e356c1bec75e86e5ad3c5c315af7b81ae030e68993edb9b7af62487d640ad869
 DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71d444a467bdd0b39ce0b487c70f1f68180fb4b564b10a65e26e41b71d5e66721c3086ec834aee2550246172965f2d611ce9a644a SHA512 cbb45c4372ce2620fce6ccbf94e8e7600256d12acf6721da9d22aeb619cec9d4e4e25354649b83fb322f8d369347c251ebb7242ff8fc3976cc3983de0d8e30a9
-EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
+DIST roct-thunk-interface-4.1.0.tar.gz 2697077 BLAKE2B 6d5d35c57d73c7d23fe28f438421372c1dcd51b1bcbf8720dfc993ce56a4afb3cd2c5d14185f4424436db4ce6d1d48dd5f802d0fc24ea1dd78ceb5cff7604103 SHA512 adef8c6c8f375d6d402c1066859fdb45f1e938578011fa0008ad242e1365d3672c5cb02a50f98b6f2d760269b4ef46b33a77f237521b76afe42ac883c71ecd86
+EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
+EBUILD roct-thunk-interface-4.1.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 673 BLAKE2B f78ae2fd3c7a17761aa74600340903bb39071bb8ced6ba5015626f28ea472b815e5d2880bd91b3c9509204eabfa169166297edcca464582d2b0f181f8241847e SHA512 143d0032c62e1acb1d0cd72cd5be335954495a1afc6b79a6490afd5f145a8c0d9458b6ca36111faff9b310e3e40bde182ec8222faca7d48b4945719686f4e50e
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch
new file mode 100644
index 000000000000..2f5f1c674944
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3a4d99..0015b0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,17 +99,17 @@ set (HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,--enable-new-dtags -Wl,--versio
+ ## Address Sanitize Flag
+ if ( ${ADDRESS_SANITIZER} )
+     set ( HSAKMT_C_FLAGS "${HSAKMT_C_FLAGS}" -fsanitize=address )
+-    set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -fsanitize=address )
++    set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -fsanitize=address ")
+     if ( BUILD_SHARED_LIBS )
+-        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -shared-libsan )
++        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -shared-libsan ")
+     else ()
+-        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -static-libsan )
++        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -static-libsan ")
+     endif ()
+ else ()
+     if ( CMAKE_COMPILER_IS_GNUCC )
+-        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -Wl,-no-undefined )
++        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,-no-undefined ")
+     else ()
+-        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -Wl,-undefined,error )
++        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,-undefined,error ")
+     endif ()
+ endif ()
+ 
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild
index ee5be506ed83..3cbf10ed4cd6 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild
new file mode 100644
index 000000000000..16e23a2d974c
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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}"
+
+PATCHES=(
+	"${FILESDIR}/roct-thunk-interface-4.1.0-append-flags.patch"
+)
+
+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/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 6a1bd803cba5..c8d5d47d0865 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -4,9 +4,9 @@ AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb4
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
 DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
 DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
-DIST simdjson-0.9.0.tar.gz 7952791 BLAKE2B 3229cc3cece573c9aa0fe21ba807e7698a038317dd17f7551d2afb79a1104efc0535e8af9b2f504cf00ce0f04a90bb7802507cf3d4188ff5d2dd057b7512d83f SHA512 800ae478e6f47d4e0cf1eb941b1a9f6a5098b2d6027f329ea50b449798798395d4ccab0c84271edcb7fbd2adca125ede3ad6fac3f2508e0af7aade85350af1aa
+DIST simdjson-0.9.1.tar.gz 7956997 BLAKE2B b8a2cf899ea8ee074a2d4d94d14fd28e091b5d13cd63dacf774bfc184f9d42703ec4719710a4784bc742dff6d6cbd32722f6acc20606d38f8ed687b6280ec377 SHA512 337b550ee15c19ea7c53a3485e6327b6ac7a4152b3ae4101d63dba2d2510cd5b6cfe4d85a7347318d4d4317e4354331d004dd0de9c98325fa0baf7071caedd3b
 EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
 EBUILD simdjson-0.8.1.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
 EBUILD simdjson-0.8.2.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
-EBUILD simdjson-0.9.0.ebuild 1194 BLAKE2B b59614cbbd18b3f9e63fc598bd1caf725fa0e596d90025855894c27e6805bef35fe34ed15a1e6a0f4f7a8c883ec23c69b2b307cbc0f285f4af1f97405c70e2d4 SHA512 90f1b5012ef9126f6a7ea974057616d8fb18ef15e9f4625b474d140d4634a82830148b813c26d1521e73e7e33476357233b8eefdd19f4cf135079156a28882c7
+EBUILD simdjson-0.9.1.ebuild 1194 BLAKE2B b59614cbbd18b3f9e63fc598bd1caf725fa0e596d90025855894c27e6805bef35fe34ed15a1e6a0f4f7a8c883ec23c69b2b307cbc0f285f4af1f97405c70e2d4 SHA512 90f1b5012ef9126f6a7ea974057616d8fb18ef15e9f4625b474d140d4634a82830148b813c26d1521e73e7e33476357233b8eefdd19f4cf135079156a28882c7
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.9.0.ebuild b/dev-libs/simdjson/simdjson-0.9.1.ebuild
index b13f61e541de..b13f61e541de 100644
--- a/dev-libs/simdjson/simdjson-0.9.0.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.1.ebuild
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 71ba130556ee..38f013c74825 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,5 +1,5 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B 4cc2ebfe928190fcd7191e233cdc2bd7e04b7f331bb39ec08cb6f84aa7733755727eb176337265d60a1b290da1ad3719b2f4ee2e221de83a6f6987564adb0275 SHA512 e8e2f38a7ad930a5566f9d89e9da998676dfba5f466f44b6cf9463cf43ee315c0dceb04629317c6eb93fc9346a10bae11aff70cc3ccbcf9b01372eeb515c1e28
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1718 BLAKE2B 66c98cdf7cc8e794e4118cc83d9ac787b09208951dbcc838c4587ba1f741e6a2f449362edef396d97c8acdc4d0bf9a3e2e34ac6c7c02490eeee0c3ffc038eaee SHA512 9f2750ec9e26af20dee2cde2088c5e67632364054f23445244ea8eb45a1ff960afc3f5602b2c5de3b69010f9cb818768d9c861cc35791f8cd533894f7009ecdc
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 9eabf46f3fef..7cde2a6d3e58 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Fast public domain large integer arithmetic library"
-HOMEPAGE="https://www.libtom.net/TomsFastMath/
-	https://github.com/libtom/tomsfastmath"
+HOMEPAGE="https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath"
 SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz"
 
 LICENSE="Unlicense"
@@ -21,8 +20,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 BDEPEND="sys-devel/libtool"
 
 PATCHES=(
-	"${FILESDIR}/${P}-makefile-fix.patch"
-	"${FILESDIR}/${PN}-0.13.1-export-fp_isprime_ex.patch"
+	"${FILESDIR}"/${P}-makefile-fix.patch
+	"${FILESDIR}"/${PN}-0.13.1-export-fp_isprime_ex.patch
 )
 
 _emake() {
@@ -50,7 +49,7 @@ src_test() {
 	# We choose to be verbose during the test process
 	# because the output is quite repetitive with no
 	# clear demarcation b/t tests
-	local tests=( "test" "stest" "rsatest" )
+	local tests=( test stest rsatest )
 
 	local test
 	for test in "${tests[@]}"; do
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index a05b2a035155..daff998c2112 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
 EBUILD wayland-1.18.0.ebuild 1746 BLAKE2B 4877a6996f909af202d7d8f80d638197a0bc305a6ec6de32a01d099fe9133f211f09123889dc779de1b63421921e45a5a7ba656e093b8d0ee8a9c14df0c10b41 SHA512 8843d5f526a0c142658fa22c0f4b771379f5ce3b48516510790914c11815219900b8697a07d18af44cb5103a86e3c756d9244e344abb5d9976ec11d93eb8fd7e
-EBUILD wayland-1.19.0.ebuild 1814 BLAKE2B b055c04a74423a5ae250fda6e73fcc0c7b5c75d944545ef7375a61b07a00fb514f0839c2ed5782daaffd646f15b7d3988a2e360409d7904553f016bdccfd46c7 SHA512 d8425d76c2649037467552685c1d93cbae94ec5485f2f42a2e3292b1ccb269d73455aa99d80f0b9f0c20ef4019bcdfe84d518af157bcfd0695c9918bce4be7c8
+EBUILD wayland-1.19.0.ebuild 1811 BLAKE2B 7e03623d22ae15400829b467b44a3c7265ca5544bdb19b5a117851746e7df9f318443361532470254a86a3e527b46110eef5c2b9e47ed0cf41fe1b5c4406e320 SHA512 10b0a43e925cbb042c17be7bcead1d49c7b997651159822f92c0432a0eee804af2f8aaf4e13ef14de7e5d1768dd9c35bbab4f9e3aa7d14d681b7f56cb703ba13
 EBUILD wayland-9999.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild
index f437006d7fb6..7f275f3bc2c0 100644
--- a/dev-libs/wayland/wayland-1.19.0.ebuild
+++ b/dev-libs/wayland/wayland-1.19.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 inherit meson multilib-minimal
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7db008262700..07a7a3fc0fa8 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,11 +1,3 @@
-DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead
-DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
-DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
-DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
-EBUILD xapian-bindings-1.4.14.ebuild 6444 BLAKE2B 063eb90d3b62a38fd17bdf99f9372b6a9d2310a56e442a3576ee907805671c71c668f193b8450547ef514bc649205880c15d9718c8492a3126cd3645f808e1c2 SHA512 e80fb4537490c94b347cb16a8b038305807c5f1d2d3ce8b06c48c2ce03ddd3779c4368b35452d5d3cb95920a1b9039812152e55cf32a40c2d1436f8af5b983bb
-EBUILD xapian-bindings-1.4.15.ebuild 6444 BLAKE2B 9bea376ed61ae5c7e5b967152252b1c6a1929cad3abf20cb92f6d6454b0a0bc33bc01e9fa06742d8ee4ba1639eb8fe84593442f12bdc140fd6384edecf184592 SHA512 c12fd2f7976315a4404593dfcf50edefb341987199f40b8b5dfcad9293f93d3ab0aa579e75f7c84efd955bff417aa5d2cbfe54d85e626851bfb8574cd6232f09
-EBUILD xapian-bindings-1.4.16.ebuild 6444 BLAKE2B 9bea376ed61ae5c7e5b967152252b1c6a1929cad3abf20cb92f6d6454b0a0bc33bc01e9fa06742d8ee4ba1639eb8fe84593442f12bdc140fd6384edecf184592 SHA512 c12fd2f7976315a4404593dfcf50edefb341987199f40b8b5dfcad9293f93d3ab0aa579e75f7c84efd955bff417aa5d2cbfe54d85e626851bfb8574cd6232f09
-EBUILD xapian-bindings-1.4.17.ebuild 6444 BLAKE2B 67f76ea3a783cdad5593ee806e08d7c2a30c4df0ef6edb595a5a186038f19bababb38bcb75c62b13f38337d4e0982dc96b6ef294f6fc32f4d9182e25d38ad2ee SHA512 9389b4bcb60ee4e285a9c3eb0ee52dfc987a76afd0f3893fa0bacba61b5e3865383bc255e7527eca8a228509f92235e6aa434bbf944d36ec7b84e5752bf6256c
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7027 BLAKE2B f5842bf314b6c310c88614143151e2bbdc63ccbbf9c2c04940be8bb6c901045eb5112a931cd64f0df88ab7daa8e050e84b3d91c637c97bf4f6696ba88b8df6c2 SHA512 5aa61066ec41fbb3680dfd953016c4ee6e1aa63c9c051ddc339931a2c952d3d95174e665b46014f6f1935b23b8537089b3e006cf5b5526bc086515d2c61f8739
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
deleted file mode 100644
index 904c82c04fd9..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~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} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.14
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
deleted file mode 100644
index 848e34b54e21..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
deleted file mode 100644
index 848e34b54e21..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
deleted file mode 100644
index f7fa2dfaea72..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~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} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like php, python and ruby are
-	return $(use mono || use java || use lua || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with lua)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		if use lua; then
-			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
-			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 45102a051298..a947eec16b0e 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,7 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5
-EBUILD xapian-1.4.17.ebuild 1816 BLAKE2B 809243dcc9cd4381c065cd8f3a17cd5359243bc98811c8400fa9920280609996e28f493311e8333c52cd8ef03c79df2f91eeef0bb517c51172504594c2c93efd SHA512 15115ebfd00d4a5a40c7faa8d0361e046d16618c591cba4192fc0c527aa4bd8081840813914eaa063865d15d76d8cd3ec57820191d1cb57ac969e60df1cd64ef
-EBUILD xapian-1.4.18.ebuild 1823 BLAKE2B 42caa4249b8dd87771e59ff55033f747134055d5a427eaf705c3f1534a2c26775cd83392faaed75c22bf0ac4fe64b663667a6c78a465a2d15f76a2d652ad5beb SHA512 723d12abbefa2272b8923c826437dd73939b32d753e90bee174810bf00e67c03d5a363948ce5535b1764354f77464f3bca47c34bc8ddc3315047c3d09be1f271
+EBUILD xapian-1.2.25.ebuild 1847 BLAKE2B a2a10f3a42dd65c4b7f0f69ae49ec26feaad6d2d85c4ce0b235fabc6b053f4dc264f6ff6c75635effc580f18200d4c02f41c7c629c1583dbd048590c6927acb8 SHA512 75464258d2e41411043d53d4d3e9aa6cfb39d44cc4325cdfdc37ef3865ba3ca60cf304c310e898c1bb1789f12f62a4e7ff5aefe4d7b6098c3b41ac83f0550406
+EBUILD xapian-1.4.17.ebuild 1814 BLAKE2B e2929c4a13927bf231d2f8fb353e7847f044ee9f6cbc869ef6621fcd6ed99041b517ce6ab697e03f56ffbccc6f6dfa9e6589733019f062923140662f08ebe90c SHA512 2246efa98ecf88d19280b56f5e872f90d585f5437a56f9a8655bb8dcbe213393d784d90aafe40c871d2b1b00624bf0d6a67334887b01b78d9d6dd71b28166259
+EBUILD xapian-1.4.18.ebuild 1821 BLAKE2B 970eccbdc9ae049fd23249cb46a6d1bd65b6bfa239ff6ce4bfec4d2498405dc489df2465ce9960cb3d4e308e20f36a42d2a7cd685275abe7608a1932330ff4cf SHA512 c4c9de7cbe5d89a84e80fe7dd6c2fe88f7054c36276f97f06ea2e33aebc7fef111bec2b820c3decc3d0c09574c6a9ca200a3361dc5eefce1f6822bd659d6a9f8
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index a2bfb9c5cd38..7289983d3f51 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
 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 +brass +chert +inmemory"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index 59b45ca14067..d2e1c0ec8fc4 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,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 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index b33e8c6402c3..af91a3119e61 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -14,7 +14,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 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
commit	8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree	4d26462d027b14926335894749d2e01d982234d0 /dev-libs
parent	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)