gentoo resync : 11.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
commit: 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree: a8a537b82fda83a0799c2ca9887f212558363aa7 /dev-libs
parent: c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)
92 files changed, 1344 insertions, 866 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 32c5c523f276..7cb2e37a6352 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 550e32f50792..0174f5011267 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,7 +9,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r4.ebuild 4340 BLAKE2B 4f9fe548cf5ba4e2495868937e40df1e9d52f26d595dc6d0af992417c7cf369a2200eb0257f8dab1a9c237bca8b698b2007336478921d6562cf44df15468bdbb SHA512 be925beae89d64d2e976bb191b1de4579f9dd97885798c2c2cd5380ca7b410428d3f7193b6664c26b0019d508b87cfa758f8cb7a58fac7cc0f4eb71a71a3f46b
-EBUILD apr-1.6.5-r1.ebuild 4286 BLAKE2B 6e71a5f9038e99e6a3536a24792fcc77b7eab6a0f39e1716ed6dc2b9612d997a45e131baf73f892bc4a41fab7c0d14c15db15ceef150afb54f571391e1b0b3cb SHA512 409894d01ba5ae6c23a535c57c9bafbbc0246f9d07e3d7ba468565dbf8fc64f5abed8fbc823f035ab41484357219972dc0af9d7234f131838dedc9ca5d3ba132
-EBUILD apr-1.7.0-r1.ebuild 4249 BLAKE2B 106694456b86fdad4ceb25337639934a9ae5e54659442b0a8dd5e975d66d5396894524adaa463682965dad56e63fcb1e29e614889c6fc13e218145cd89ea01f8 SHA512 2144fad618c9f2209c7780188dec1ba1cf9fa5ff07a96c67368b30d8ed12d4326ac903e498e3a0e6f1c6f4b89ea7dd0e1119f1da36f7b277507e160f3677198f
+EBUILD apr-1.6.3-r5.ebuild 4632 BLAKE2B 2fe447be53ffd513c3da12b2408db0ee4c2fbe1075b7d46fccf4eb82bcacdfd94df32ab0f721840cba3a9da6b8349e90c883f06a902532bbeb732268fcd48ac7 SHA512 e248703e1ff52e08288f0f3f04208e99d5b7e4a2cd586a55de18816a39054ad0a9614dd902221ea917f4109bd85bd563f7c3ad1d60ee4ab0502e5c6e88eff718
+EBUILD apr-1.6.5-r2.ebuild 4578 BLAKE2B 9b9a472c369276aabe416d3a36d92b7e1d2e890bbfe70afd1d010f49fa91668ea90ad319ecfcd210927bbe53218f57064ea259bb5c13531f14b1a3e45ba0ff9c SHA512 2a0a1867d03f658c7a1c39c93c26f4cf05b488e14d8c1e9c7ddd981a3493a68311dc69db04fe0ca3194bf1d3a98f990df67e1b1b4fd3c6be0b71965737e3fb56
+EBUILD apr-1.7.0-r2.ebuild 4541 BLAKE2B 07e1451afca4040255be80212f864c6195614df179a2b23ea1c88805eab8d36743e270ae4d67ccb0244f6a850228d4f685daf53b1ad51ffc71a3cbb3b3af6284 SHA512 fd22698c299e7c6ff3153dd62fd7437d8a1d070cb636914d9aca02e5a442e6435b92068801fdf283c89b7b56cafd848081cbe7b2b6cdaaa1c277a4bd612e797f
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r5.ebuild
index ce047e457b5f..977176aee5c6 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r5.ebuild
@@ -109,6 +109,14 @@ src_configure() {
 			myconf+=( --disable-nonportable-atomics )
 			;;
 		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r2.ebuild
index 2e6c0d4627e7..c7f60001d874 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r2.ebuild
@@ -108,6 +108,14 @@ src_configure() {
 			myconf+=( --disable-nonportable-atomics )
 			;;
 		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild
index ec551265391b..8a231aa627f6 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r2.ebuild
@@ -109,6 +109,14 @@ src_configure() {
 			myconf+=( --disable-nonportable-atomics )
 			;;
 		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 7f6799872500..369e179c9301 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,6 +6,6 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
-EBUILD boost-1.75.0.ebuild 11092 BLAKE2B 6ec533577d40edcdc62f2cd18a714366a2892a14c7bbcd183f99df1b346d222cd2034817da45d6c385fe60c92364c7765ae283f23401cf13ac037659070b96c0 SHA512 d4f0bfd53afd7077cc21248ce742005db00e2be99317dd4048496dd6d8e47575aeafad7fdc1db39c6f3d9baf859a6811a1d2ff1a76011f7855a100f39dbb2581
-EBUILD boost-1.76.0.ebuild 11072 BLAKE2B 863d64d1be7a6f81e8287f1f7b8545004f6d091ff8875dc72f0f891a17e9cb88da39c0684528a9ab7e8484cb5f8bf4ebf12757a23422a41a45c564b51cd950bd SHA512 f7784206f1620d169723f293ddc264010cdab1719f6d3f0c0904d7ec922e50248a587699f8d700d773733307ea6cec4ab52082e43f4f8c56c9f7e77c1fc890c0
+EBUILD boost-1.75.0.ebuild 11103 BLAKE2B c8b74a302e399613bc23bc8d3e78977113721dd64554db1371f58a3f36d47933c09903ca94fddaa7fe81af0f45105059b51da9c2b6fd3edc6e4a4e9684d8f3b1 SHA512 b1eb508b1f1060bf5f5e91b1c43492fb1374880290d0874afd9e3a4c7cbd9dd4f909ba1b7b7cb40fe447b15eba19cebbd5da9d8263c26209c89661d513a629b5
+EBUILD boost-1.76.0.ebuild 11090 BLAKE2B 157af6674fad5c4c687f531eb1c1eab06b6b4fa2a9bf2dbb8f5aeb909d90b58c985f341ff82665e8ba02b859c94219ae85b8a9f8446ced615c30c31e7fa6242d SHA512 6cac57f9c9cf1aa0f7003a347bce8b754c1d6970b0f215141e490f19b8fa4543b56eb7ca7040093e218dcd2ca6f05da0efe952876bfe17efeb3aaeba58ad98a6
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
index 8111a49dd6da..eafcc5779bbd 100644
--- a/dev-libs/boost/boost-1.75.0.ebuild
+++ b/dev-libs/boost/boost-1.75.0.ebuild
@@ -12,7 +12,7 @@ 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"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
diff --git a/dev-libs/boost/boost-1.76.0.ebuild b/dev-libs/boost/boost-1.76.0.ebuild
index 8216723986fe..e75b93f8476f 100644
--- a/dev-libs/boost/boost-1.76.0.ebuild
+++ b/dev-libs/boost/boost-1.76.0.ebuild
@@ -12,7 +12,7 @@ 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"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
@@ -45,7 +45,7 @@ RDEPEND="
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r1"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
@@ -169,7 +169,7 @@ src_configure() {
 		$(usex context '' '--without-context --without-coroutine --without-fiber')
 		$(usex threads '' '--without-thread')
 		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
+		--boost-build="${BROOT}"/usr/share/boost-build/src
 		--layout=system
 		# CMake has issues working with multiple python impls,
 		# disable cmake config generation for the time being
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index dcf07bb01805..8cb9d79cd21a 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,9 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
 DIST Botan-2.18.0.tar.xz 5941536 BLAKE2B 2a4182bab5e681fdfeafa113462bf5a31057d7be97d71d0a6e60975b84432dd3932498f42f0b879e216727df4bbfcbf0d844e971df95eaf9cf922280f32858b4 SHA512 8613412e3e2fe8b787db7a4d4dbadf60b8fe6b68a84408c600c37cd0b5dbdf3f347a49f5bd88eb8d4f658e927a8b976884146551bf7d256fa80e9675297c0f09
 DIST Botan-2.18.0.tar.xz.asc 488 BLAKE2B b9a9c98e11eae227fb900cae2dca3aecc2114ecacd87336cf5cdbe6fbcb9676514f11e365e94dbfecf3b9edc1a9a3398ff2c66f34a77d7b4d6b0f87518af6d9a SHA512 f2e1689e10b0706eed5a3cf08dfcb163874d3ada12968ac739eeff259ae81b1329fafdae4d29290195276fe3bb1cdeaf3f302b8df53a377c5bbdb7964deaa044
+DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
+DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3.ebuild 3038 BLAKE2B b239da11047cdc690d35356cdc0abcc899275cb19fb0265e03b00377ee41b085e030844c9223af0900c3ef15c4e265005d4d24adb6aa6694829acc3f5325abbb SHA512 ffccf93568dbebe4963029a2e46fa6dfb6acf4ed70d81aef3695b97ce34cfb884d6e3020712c3dd623b0a72abb197aafefd947c90249c41866f7a66eaa322508
 EBUILD botan-2.18.0.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
+EBUILD botan-2.18.1.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1.ebuild b/dev-libs/botan/botan-2.18.1.ebuild
new file mode 100644
index 000000000000..4d9fc251745d
--- /dev/null
+++ b/dev-libs/botan/botan-2.18.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
+inherit python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+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 doc boost bzip2 lzma python ssl static-libs sqlite zlib"
+
+CPU_USE=(
+	cpu_flags_arm_{aes,neon}
+	cpu_flags_ppc_altivec
+	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( dev-libs/openssl:0=[bindist=] )
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+	verify-sig? ( app-crypt/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=(
+		$(usex boost '' 'boost')
+		$(usex bindist 'ecdsa' '')
+	)
+
+	if [[ -z "${DISABLE_MODULES}" ]] ; then
+		elog "Disabling module(s): ${disable_modules[@]}"
+	fi
+
+	local chostarch="${CHOST%%-*}"
+
+	# Arch specific wrangling
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)
+			myos=darwin
+		;;
+
+		*)
+			myos=linux
+
+			if [[ ${CHOST} == *hppa* ]] ; then
+				chostarch=parisc
+			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+				chostarch="sparc32-v9"
+			fi
+		;;
+
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	local myargs=(
+		# Intrinsics
+		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+		$(usex cpu_flags_arm_aes '' '--disable-armv8crypto')
+		$(usex cpu_flags_arm_neon '' '--disable-neon')
+		$(usex cpu_flags_ppc_altivec '' '--disable-altivec')
+		$(usex cpu_flags_x86_aes '' '--disable-aes-ni')
+		$(usex cpu_flags_x86_avx2 '' '--disable-avx2')
+		$(usex cpu_flags_x86_popcnt '' '--disable-bmi2')
+		$(usex cpu_flags_x86_rdrand '' '--disable-rdrand')
+		$(usex cpu_flags_x86_sse2 '' '--disable-sse2')
+		$(usex cpu_flags_x86_ssse3 '' '--disable-ssse3')
+		$(usex cpu_flags_x86_sse4_1 '' '--disable-sse4.1')
+		$(usex cpu_flags_x86_sse4_2 '' '--disable-sse4.2')
+
+		$(usex hppa --without-stack-protector '')
+
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_enable static-libs static-library)
+		$(use_with ssl openssl)
+		$(use_with sqlite sqlite3)
+		$(use_with zlib)
+
+		--cpu=${chostarch}
+		--docdir=share/doc
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--distribution-info="Gentoo ${PVR}"
+		--libdir=$(get_libdir)
+
+		# Don't install Python bindings automatically
+		# (do it manually later in the right place)
+		# https://bugs.gentoo.org/723096
+		--no-install-python-module
+
+		--os=${myos}
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest
index 669a114b6cda..cab523ac17fe 100644
--- a/dev-libs/cJSON/Manifest
+++ b/dev-libs/cJSON/Manifest
@@ -1,3 +1,3 @@
 DIST cJSON-1.7.14.tar.gz 352028 BLAKE2B 203795f004496793fb04577df1e4a917df2424bf7866e32459584d3dc776ee13263c5e62ded01e3776973d2210e642d1066d3126e2c737bd0fa048464f3aed84 SHA512 8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01
-EBUILD cJSON-1.7.14.ebuild 587 BLAKE2B 23c0ce3bd52fcbb2bb5af1e2d27ab9320fc4be25ca357022c7d061af848508dd935f642890d0c8f6ce7a2e6facdc1fe76d62d298e385faa476bcf24dc4574907 SHA512 9ccbfc68479b8011e03528d759f8364a0c1f11e283a3507cc72b102c5fe89ead0f815eff49ac15703c66bd36af959e25efdf48ea95dc0891402dafdd4187ff91
+EBUILD cJSON-1.7.14.ebuild 592 BLAKE2B 5bf7a327f2cae4bea9733f12ea92abcacd3df0eeacd3455889d8c1070e15e464c024351ee51874f8e2c2633cc6b2013219b2184b2e3ddcde021fd1e577c5098d SHA512 8f5c3c6a2d133c86a1bba29a696147a3e91d1f9f21463e5dace1828d69f0a720853b8d52fa3141fb173a658595df9617fb37416b4097342f3b6e101ea6f9139a
 MISC metadata.xml 337 BLAKE2B 978c9df8613b18cfc28abbc3c97f01db84578bf7f8679dff0e6267989de828840cd60c7c5fcb93031b7b166108399ac12782364b3fd9e9189c5af615188481a0 SHA512 7a3117192e55ea42f26b1a48969fe68cd4086fd3269714231481abbee471ec271de15113426a38ba23e3eb119518ba49c7424a7803e46f8e17040a5044dc2724
diff --git a/dev-libs/cJSON/cJSON-1.7.14.ebuild b/dev-libs/cJSON/cJSON-1.7.14.ebuild
index 23f5aee8a50f..5e31a6ae07d5 100644
--- a/dev-libs/cJSON/cJSON-1.7.14.ebuild
+++ b/dev-libs/cJSON/cJSON-1.7.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 7f9909439975..15131e20141a 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
 EBUILD cdk-5.0.20160131.ebuild 1184 BLAKE2B 488c718eedb70b6597e407d66e340c3bad3a65e681d3f369023d7ebae446ae6c99b01be83398a95190dc30233609e4866985634acc45f0b1ac3236e67d1c52b8 SHA512 ac97c4bbf62f60f1c79910f19d3b5deb48adcf8fd421b46df35b9525de5534ba3a5028d7f714d0e54701e3bde54a7040ed394b2486ecbbf47b2fd00d6f628fb5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 257 BLAKE2B 79047e3de318b37a708a9b29a4f029450dec552f2fa99fc580cea6050eb164eabb0abba972a6fc77bfe21c1c2f4ae437b4753239953c9af1875159c6a39d1519 SHA512 2406cd8512460b934f3b6caa65f52b454fb3946491481e04ba3e11c45206dd9dc38df1d8881c459e9e518e19dfac798388dbb11339e274e75f88b3e3d5f9d057
diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index 6f49eba8f496..4ffd18ae6be9 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/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-needed -->
+	<upstream>
+		<changelog>https://dickey.his.com/cdk/CHANGES.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index e79e3dd343ca..dcd088e70793 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,5 +1,5 @@
-DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
+AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
-EBUILD cxxtools-2.2.1.ebuild 473 BLAKE2B 32106e510b978e7ab418230272024b0a8703364d3297c91c8a8e2f2237c3aa124a8ad16134d1bfe32544f30ac3c21fcc757d365d3fa932719d7fd4e634c5b081 SHA512 80dcc712ddb860c1e15598351a42cb9bdec2ce91318a26a20b0f8ad8a658948ff0cca86dab766456d6fad2ea0c50ebebc2af7f95e2d190765b0e829a8bebb36a
-EBUILD cxxtools-3.0.ebuild 677 BLAKE2B 1a1d3b0419d833e51dacd2620cf5c57cd35859edde2309128afc54f12756dd40cd65be8a4284d157ce69b56b934af08b22e7dadef2e5b2a8e3d5bf4cd698fa20 SHA512 f38c2fe5c964b0661b88da20bb854c334625bea1fcb3cbd04eab5abe5ff7e9d143cb94e1af4a2f65f4ea069e77faa3775d23e5a5318a2e5d35e0b22480c08445
+EBUILD cxxtools-3.0-r1.ebuild 718 BLAKE2B 4d27b6535b5081de15511541e3e1642f210517e544ba87c5f998d0e1ac0364d1d909b8866b211854310e9046a1e4692b046d5d58966fc4df7a0eb0bed5e10c41 SHA512 e505492432b83d85566a9b51cc37645b970b6cdb2f36793abb141eb203e72e528cbc814828b5cb55aae6a685d9d69a5b2ce5197e9b2571fdad0a934698732694
+EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
index eb54949ddad6..63310078b432 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,15 +9,28 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog )
+DOCS=( AUTHORS )
 
 src_configure() {
 	econf \
+		--disable-dependency-tracking \
 		--disable-demos \
 		--disable-unittest
+
+	eapply "${FILESDIR}/${P}_gcc11.patch"
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
 }
diff --git a/dev-libs/cxxtools/cxxtools-3.0.ebuild b/dev-libs/cxxtools/cxxtools-3.0.ebuild
index 124abb7c1635..23367377184d 100644
--- a/dev-libs/cxxtools/cxxtools-3.0.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
new file mode 100644
index 000000000000..d8fb34886420
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
@@ -0,0 +1,23 @@
+compilefix gcc 11
+
+based on compile fix from upstream
+https://www.gitmemory.com/issue/maekitalo/cxxtools/30/770247974
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (09 May 2021)
+diff -Naur cxxtools-3.0.orig/include/cxxtools/char.h cxxtools-3.0/include/cxxtools/char.h
+--- cxxtools-3.0.orig/include/cxxtools/char.h	2021-05-09 18:32:41.415653108 +0200
++++ cxxtools-3.0/include/cxxtools/char.h	2021-05-09 18:33:56.117653108 +0200
+@@ -68,9 +68,10 @@
+             typedef int32_t value_type;
+ 
+             //! Constructs a character with a value of 0.
+-            Char()
+-            : _value(0)
+-            {}
++//            Char()
++//            : _value(0)
++//            {}
++            Char() = default;
+ 
+             //! Constructs a character using the given value as base for the character value.
+             Char(value_type ch)
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index a8bfe4fa0a4e..c767271077ab 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8167 BLAKE2B b6b79c6487a1fecc4f85705b7b6c84450f50fb59ed3dfda98ac4c860eb736fecbf3bb166babc4a378f3876b43870e3d26f36f07f5843ee67ac7df13154fc5daf SHA512 c6313275fb70347ba826414a13564b7e64eb8fc908c3ca32317b6a0f5e8f3125169fb1c7019dc4cdf2220e04f9097b36660c035a3585fac5c19efee9b18c7fe0
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8241 BLAKE2B 208f26a90e6bbb2492346ded6188249f51ab13648be74c90861edd96624b02fc50e28447630d307fde95bed627909444afb34389eb3b99f89487e9c785036709 SHA512 ac67964d83e52718ee48a4e03a0c5f2fd60ff3527b87ea708cbaaae333b0f4c8885b7d9956c1d0ee036c20275a97034db7e849d1b31002beca6705d2faa2c0e6
 MISC metadata.xml 720 BLAKE2B 47731fefd662b4ede2aa37d2eb8ad4dc8cc58c31d2cafd4127f06276023e9f3c9379a780a9b6f064c05f3b8974cf8e389ee9c5ccf85c3d856dcf60b6eb8d5f59 SHA512 4a08ed3009ae32519bc78f4f84f8f50cd04b2ba48afde0528374b38e64f2e4d7d93f6bce97476e9871ba68d18f26f18a00002ccf22d06e8eb1bb9ea4d4dabe1b
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 7949763dee6e..6da4c0add450 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -87,19 +87,22 @@ src_prepare() {
 
 src_configure() {
 	append-flags -fno-strict-aliasing
+
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# getpassphrase is defined in /usr/include/stdlib.h
 		append-cppflags -DHAVE_GETPASSPHRASE
 	else
 		# this horrendously breaks things on Solaris
 		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+		# replaces BSD_SOURCE (bug #579218)
+		append-cppflags -D_DEFAULT_SOURCE
 	fi
 
 	multilib-minimal_src_configure
 }
 
 multilib_src_configure() {
-	# Java support.
+	# Java support
 	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
 
 	local myeconfargs=(
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 2945a9da162b..d44263ac02f1 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r11.ebuild 8230 BLAKE2B 6e501742e15483337c93b8771075dcab080661b960aa46a8ffac4c3e03419af5e0c4a2e16e9f41ffd8e29d07354f69c1bd197bff2fcbfedc388bf7c445f08ce7 SHA512 c6445103ec5e443092b4f97b519d7728bda8015ef0f18b1c435609b890638ba967289f0e62fb61604774a7cdb5161ffffce7c81bcec1823e50df2063e7f29036
+EBUILD efl-1.25.1-r11.ebuild 8230 BLAKE2B a3cd86b3802d1d6ae29246702551ab953a364aa921596449b36c414b2187b515dc3e1ddf8c79ace78158ee21bbfb63008d79eafb899b0f56810b538cdb203c26 SHA512 a0da02c6c5c7d4a9ae33757f877c8c264fbb266c45b0daebaf7fd05fe8f68584b27ec8287af265d2218acaa336cef53849e1f233b63db5a8c8a6ffbe9c40d300
 MISC metadata.xml 1888 BLAKE2B 4c689687387fb09a2387587bc32e5cb4f09b94264fb1b594d8dc0c1c214eaeb6cf5f39110ea3dde72acdcf328da25bfcd2756dc85c8b060ad64aa321b8dc8a23 SHA512 40289f8c6e10786c8c9d5069b775c7db5695910a33593e706d3ed0f623bdb8b6149161a25ad55deedd479fbc214dac174d6b99151e5167272fa464f5115eece1
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
index a0b95b1aba75..59f6f41ed9a8 100644
--- a/dev-libs/efl/efl-1.25.1-r11.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -10,7 +10,7 @@ DOCS_DIR="${S}/doc"
 LUA_REQ_USE="deprecated(+)"
 LUA_COMPAT=( lua5-{1..3} luajit )
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit docs lua-single meson python-any-r1 xdg-utils
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 470209587dce..42e252db5ea8 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -3,5 +3,7 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
+DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
+EBUILD elfutils-0.184.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.184.ebuild b/dev-libs/elfutils/elfutils-0.184.ebuild
new file mode 100644
index 000000000000..5860b8abf503
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.184.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	!dev-libs/libelf
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+
+	# Symbol aliases are implemented as asm statements.
+	# Will require porting: https://gcc.gnu.org/PR48200
+	filter-flags '-flto*'
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--disable-libdebuginfod \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma) \
+		$(use_with zstd)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index f4a1664ea895..71e4a870ebec 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,5 @@
 DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
+DIST fstrm-0.6.1.tar.gz 135425 BLAKE2B 607852bd6bd18d2dc4e862c7425882274710674da1edb3a525b409f5eff9cb46748f8e5b7b1e88ab180ddfed7a19ee41aaa9551d70331ac80ff178ffa0b4ca98 SHA512 7bf2728e2d0d1fdbd4e93069ddb03a01dc56909dbac57650ed530c80f761170b257c7191a3d789d4661df1f09c15594f20ec93a4eb5e5deb7ea3a7eabe56806c
 EBUILD fstrm-0.6.0.ebuild 822 BLAKE2B 396271d57a86f3b2fd7352f33b3d481015406002790b3d62e7c069658cb382dd4f6a4c7ea47ee96941d894f8079dcf2c6a25895b15b4ed6c3279475e6e3f5a18 SHA512 5b50e0acf16f422e8b135cff76fce107397e48fce40ebb78a06b7a1fdbd3d641359ad6b1bd41b0c28ec3fb04ad8c926d790eae39d90e18ec119fa1a1d4b15107
+EBUILD fstrm-0.6.1.ebuild 800 BLAKE2B bab0f122ce2ae84d16f5712fc9042c9b7f2a5305391089b7115a511677706f0b857a0e5ae8cfcddf34089ed59fb134566d18e1591ca56507e6082109fc3d812e SHA512 bfdc42d0f0ee7380b33b9eb7b30b5d3e5a1b6398ef9c4e0078fd98c3e4017e5de47d0022eee2eb562cf3885b497d48d65a772397da3a183fb379396c93a4855b
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.1.ebuild b/dev-libs/fstrm/fstrm-0.6.1.ebuild
new file mode 100644
index 000000000000..cc4ed85f22b2
--- /dev/null
+++ b/dev-libs/fstrm/fstrm-0.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Frame Streams implementation in C"
+HOMEPAGE="https://github.com/farsightsec/fstrm"
+SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="utils"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="utils? ( dev-libs/libevent:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable utils programs)
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 99e49d654f48..42846906415c 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.34.0.tar.xz 531368 BLAKE2B 5e32c330ab2fda0b9f06de0fd9d7e3f3118b0af36a73f4f0280f069b49002a4d00e5cbfd373d65b0ea7a15bb5b577f8babbdf7ee71ed7db773d2ad65008a452e SHA512 8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0
-EBUILD gdl-3.34.0.ebuild 729 BLAKE2B 1b46485f8ac883f64d5c35b46992a7eb3e8a82ecae841eee29f29a9752f794f8d2975b3cdfe4d551a0ec8a1687961db0116ade3936d30804ceaf3e458aa167e5 SHA512 09a66a3105ecd29787f0378e6bea909aa9312e6c211eabbf11d21775d5ef7e504a60d87912f95d5e6f326c1df8c9d4a9ea4ee17c5b8a3cb25ac69f71f52c0260
+EBUILD gdl-3.34.0.ebuild 731 BLAKE2B 38d28b9934dd2175089d23353fb7453bce97af0e5cd073def8a2746bfc545e3f081022192ed6dd4bcf875bfd24094ae699bdcde1035cccbb5f1f7b6676af2553 SHA512 684f6d653e25d090ed2af906f0e7d3be915174b5d623f9e5e5623dd625dfc2af170c235ed4b8b02a4762a78abe8224679803d60730f80760e8c02a61e3219923
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.34.0.ebuild b/dev-libs/gdl/gdl-3.34.0.ebuild
index df1f4b4c6f8a..191464b8a329 100644
--- a/dev-libs/gdl/gdl-3.34.0.ebuild
+++ b/dev-libs/gdl/gdl-3.34.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2
 
 DESCRIPTION="GNOME docking library"
-HOMEPAGE="https://git.gnome.org/browse/gdl"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdl"
 
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 4a104ab86996..1efb765b15ce 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,6 +1,3 @@
-DIST inih-52.tar.gz 16808 BLAKE2B 12d4078ad7b6a4013ea77239c486fb7b5e9165252d4a67ee57d60fc72a98f15ca537b610c7b22841cc660e46bb424aa5c9b7ed1cf2462600a2aa58d40447ba90 SHA512 14c0d0dbd78efc99bec8df12067107d130eef8b124e0616f7d83dc4e14530b57f0c8fcf0b8862d425b5a0b84d6c6a6bff7b3c852c9b2e2364ef56c8f64a1f339
 DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
-EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
-EBUILD inih-52.ebuild 792 BLAKE2B 3951febb447caa2fb0941f4d5eea045f38dcc4025307844769289443a74a96db6591f0c40c097e5910100b835678030b2e74f16cd2b32c63d2fcb5974968b972 SHA512 f86ffab553d7205dd69fbbce5c68f878a4217dcb1e4c02b1ab189a15257a6190e011f01b002c54cff744e89c25a82249e32f554d48789f6704be5dd2041e78e9
-EBUILD inih-53.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
+EBUILD inih-53.ebuild 843 BLAKE2B deec706b54388544da5467665be9cb1dbdd22c7b973df3ac1f41953679b0f5ec0fd402bec661b7f60f4cb2b7e611766043371cc7ae4883853bdb85cc2b4bb5cb SHA512 27521846742cf375bf4c28950293653b1c0f230ee938e185814a35f499830d6c1c4e5f8165d2178cc17a8b52dba787ebcab052a0e3f2bd438c33e4170f059c5a
 MISC metadata.xml 519 BLAKE2B 837ec41139390ae96130a1be2c25e178f4ca39a655a263e1be689c3da09236c43cc9750d07af108577d54663710ccc0cffb5fc432b0320c9c3f55177424ed35e SHA512 b9c05b7b9e8314a943215b721862d16b361306cc715d77250eb5e4fa1ac24f22165b8a79465188f4b5e3dc2381de72821c76b6bd6b6c7b966a3c6697209a8234
diff --git a/dev-libs/inih/inih-52-r1.ebuild b/dev-libs/inih/inih-52-r1.ebuild
deleted file mode 100644
index 288ada671b4b..000000000000
--- a/dev-libs/inih/inih-52-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="inih (INI not invented here) simple .INI file parser"
-HOMEPAGE="https://github.com/benhoyt/inih"
-
-SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="static-libs"
-
-S="${WORKDIR}/inih-r${PV}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		-Ddistro_install=true
-		-Dwith_INIReader=true
-	)
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS=(
-		LICENSE.txt
-		README.md
-	)
-	einstalldocs
-}
diff --git a/dev-libs/inih/inih-52.ebuild b/dev-libs/inih/inih-52.ebuild
deleted file mode 100644
index a9416cdfe171..000000000000
--- a/dev-libs/inih/inih-52.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="inih (INI not invented here) simple .INI file parser"
-HOMEPAGE="https://github.com/benhoyt/inih"
-
-SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-LICENSE="BSD"
-SLOT="0"
-
-S="${WORKDIR}/inih-r${PV}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		-Ddistro_install=true
-		-Dwith_INIReader=true
-	)
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS=(
-		LICENSE.txt
-		README.md
-	)
-	einstalldocs
-}
diff --git a/dev-libs/inih/inih-53.ebuild b/dev-libs/inih/inih-53.ebuild
index 288ada671b4b..eca5aae8a4c7 100644
--- a/dev-libs/inih/inih-53.ebuild
+++ b/dev-libs/inih/inih-53.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
 
 SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 5ae8ddd8b88b..f8f287688bcb 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,3 @@
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13.ebuild 1302 BLAKE2B 15f0c96be42c7d22ca83459c00dc590ad48550faa90b5f8d96af710a6885fd8fc0cf737b0b53e7a8287a3d496fa6c3648311731e6befebebe11dcf0371ded8fc SHA512 329a9c29ad729cc29fcf3e6073f1e6096a03d8d125debb886e9534a1138a883793506e6156593a4066f208e2d25da7395ebf7da3a7f6122f47982c783ed39671
+EBUILD libcroco-0.6.13.ebuild 1305 BLAKE2B 82078462794835865bc3e92633e2efea2e8abcb45837d968a7a4cfa984d7c3dc9f37a7784481f5227879058cd969413ae6e166f70c1b0b45e4ebbf30b7cedfe6 SHA512 c2cab85a8228b0afef2c7cab7c6c012200eef3c80658db477a60f74d6e5ade364e2c85645215507536489c5c7aad115a7709b0bc06e2965f9b12047e2ac05352
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index b3717ad99083..4b2cca0bd0cb 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit gnome2 multilib-minimal
 
 DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
-HOMEPAGE="https://git.gnome.org/browse/libcroco/"
+HOMEPAGE="https://gitlab.gnome.org/Archive/libcroco"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 61650b9151dc..db60f0ece15e 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,9 +1,4 @@
-AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
-DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
-DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a
 DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
-EBUILD libfido2-1.5.0-r1.ebuild 870 BLAKE2B 85e52b54149c65334e969b683f4dff940801b6cb62b75466c97998e2ddb074501c9fca7d2cb998b4fcabb325ffe43ee94ae6b551eb49188361021595c20c678d SHA512 dac62ce4718cfd5de470f03df1fed9ddb0a27b4bfbdc3db57eb9f32b26c36801218e917ea1ec7f17b89a6a0e10b56cb49bc88de2ce85b7846596e0665aefc4b5
-EBUILD libfido2-1.6.0.ebuild 877 BLAKE2B 2401ed8967cfc45b6027a2c7ce5d133533b348c4a33950de8b9c393aa2f552880ee2b7f4abb0bba4b3a95af6268bff89e2d382be657944824e585430bbcddcfc SHA512 f1b95940afb27d35d1cece6fc7000fbb990070258460fd17af281e70538bbcf857ced210420994446462bd448fe6860ba594f8c078f3d432a380c97ee83372a5
-EBUILD libfido2-1.7.0.ebuild 988 BLAKE2B 7fa3f17d035bb8a6c68c561b8c53b7d414a39e5649250fc7aa1afc3d724930537bfe8516625283b571b79fd08004f1a0c8f16b17f55ae03b060f1ff65c23442b SHA512 9b34b0926ca1210ac1d62e59894b3dfbd25fdf8bdd882a986bb2adf7cdb72ae04d5fc8a07f0d2081d908b095b1f0a9633c1b01a0091a369fd6b7314a21417fcc
+EBUILD libfido2-1.7.0.ebuild 981 BLAKE2B 492d7d3e41da8cf0102d55c9684f476e734101085ae8b3db2ebd440a0d0f7a4e892e45f2ee632f3dd9192a9df8edbd464f2f601a7f7b65129b7bfd0b8e78755a SHA512 b8156159a0a503a94eb5b80f24baeb7ec94f08d5beb8f60ec09e761f280371743447cb9883de4b36bf14900264d620acf843b2640330ed8d15e832dee3d48860
 MISC metadata.xml 330 BLAKE2B fe16e7735c17510c8a41691a7dd619d9d62c96f58508979936877acf1c261f402e5219decc02dafb97e7b171047b62981c616abdaafe24a3acad1a6893da3725 SHA512 4eb35ebcdd1831a7fbd6e00336dfbcf6e8697ff95e68b68686032b1251fec090c22d3096666ed48833c5b9a8e9afe10bfbddf592834095a3ee9e95f1ec594c52
diff --git a/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch
deleted file mode 100644
index df7f489b45c1..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,13 +128,11 @@ else()
- 
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
- 	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
- 	if(HAVE_STACK_PROTECTOR_ALL)
- 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -3,10 +3,8 @@
- # license that can be found in the LICENSE file.
- 
- find_program(MANDOC_PATH mandoc)
--find_program(GZIP_PATH gzip)
- 
- message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
--message(STATUS "GZIP_PATH: ${GZIP_PATH}")
- 
- list(APPEND MAN_SOURCES
- 	eddsa_pk_new.3
- 
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
deleted file mode 100644
index 51d2ad330326..000000000000
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev linux-info
-
-DESCRIPTION="Provides library functionality for FIDO 2.0"
-HOMEPAGE="https://github.com/Yubico/libfido2"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="+static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	virtual/libudev:=
-	dev-libs/openssl:0=
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/plugdev
-"
-
-PATCHES=(
-	"${FILESDIR}/libfido2-1.5.0-cmakelists.patch"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~USB_HID
-		~HIDRAW
-	"
-
-	check_extra_config
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm -f "${ED}/$(get_libdir)"/*.a || die
-	fi
-
-	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
-}
diff --git a/dev-libs/libfido2/libfido2-1.6.0.ebuild b/dev-libs/libfido2/libfido2-1.6.0.ebuild
deleted file mode 100644
index 7834bfb309af..000000000000
--- a/dev-libs/libfido2/libfido2-1.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev linux-info
-
-DESCRIPTION="Provides library functionality for FIDO 2.0"
-HOMEPAGE="https://github.com/Yubico/libfido2"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	virtual/libudev:=
-	dev-libs/openssl:0=
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/plugdev
-"
-
-PATCHES=(
-	"${FILESDIR}/libfido2-1.5.0-cmakelists.patch"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~USB_HID
-		~HIDRAW
-	"
-
-	check_extra_config
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm -f "${ED}/$(get_libdir)"/*.a || die
-	fi
-
-	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
-}
diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild
index 21c57df89552..ad132c0d8eb9 100644
--- a/dev-libs/libfido2/libfido2-1.7.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="nfc +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 7a6ce6616baa..0321715d20be 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,3 @@
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
-EBUILD libgit2-1.1.0-r2.ebuild 1660 BLAKE2B 65463467c0b1e475c10bfa29dcbf0614128eea760c6e792fd098726fa97eaa8a45aa9a747630f9951355a1788f937db1b891f93b413096f1698c7d36efdf0d0d SHA512 7c9edc1bfe9e9d0d7da99bc1cc3dd2f9eb8c6cc4869e1da375cd7c06db23129134397c83ebcbd981296b0c84d01d1edabab282c2847b88d5d9715ad7d3fe2a13
+EBUILD libgit2-1.1.0-r2.ebuild 1661 BLAKE2B 1acd45d3b5aa96e3f7cfb75baed1137a7fbc6ddfaa42d5703e9890a191c4505f4dce87a3fb1f331454d136fcb46db7178436c8820cd7b7ea5e7b2812960d1ce8 SHA512 45ed2fab7ab54597e186def3362ec90c3318859fdc86f203a822e74214bf84275358b359bdf997eaa3e23c02cd014e15b093035ad8470202d93c86fa8c202402
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index c15f66c355d0..7887ad1aa834 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.1"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-IUSE="examples gssapi ssh test +threads trace"
+IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index ffb55f4fb216..42a1cac1205d 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
 DIST libgnome-games-support-1.8.1.tar.xz 45264 BLAKE2B a2bb36bcff92d3e24e3f6092437cf1e2fc93de6a891ce85448d0b68d42e0b717a084fd0af927a0ec0203af79b6f7ccc67c64c4f6b7a23473bc624cba8e0489c2 SHA512 ed5ba94db9ab3d6193e7bb2d0956e20c42577b9fdba4d1d31acb252c43d248cc9b478c807b5f9489dfc88d6757bf95206405d0adf4fb68aa50b8f9d1b6ec59bf
-EBUILD libgnome-games-support-1.6.1.ebuild 666 BLAKE2B 0bbf6c886e20d56785ced43dfb3ca8fd4fa5fe205c3a22c56aad82a179bb57e966e1dd6bc6c057e640ca29b7256ef91fbdb3c0da9cd53e7f2c2ed2615379cb27 SHA512 abb35787d23eb98d9cb36e4673af42b3f5208cda2476462a4775afbe510bc56bffe8ea26553ee7ab36779c06b8f007435a44e487bb5c09f469f5f9ac913b9a28
+EBUILD libgnome-games-support-1.6.1.ebuild 667 BLAKE2B 82e1bf2bee0c0ba1c6478e8f5782557c20970ee83e73b6ecc874832bf3ce5e425c49e4eb95b0e140578755da21159c6463376755ad7c19038089ca9ddf432190 SHA512 2091bf500744a06de13c44e2cf1958d9e0bc7cdab2c008bb7a1243e242b69fb9591859b9a9b910205849fe7f829ea3efd0922d227901327dca639519a01b798a
 EBUILD libgnome-games-support-1.8.1.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.6.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
index f901fd53715d..26587bd4a03a 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
@@ -7,7 +7,7 @@ VALA_MIN_API_VERSION="0.40"
 inherit gnome.org meson vala xdg
 
 DESCRIPTION="Library for code common to Gnome games"
-HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index fb4393cb88bd..f4c0e5d8fde0 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,6 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
+DIST libjcat-0.1.7.tar.gz 64818 BLAKE2B a39bba9f82316e26f2d758d0ded6260968964404cc4401afb34cac2e74aff9649fa16ea28a9aceb72ef7d2d6ae45d25f8db333b212460f8e2e1c2e5649b76b68 SHA512 b22e4aee1e5bb396375ec50fb0a28544a52423116fdb81ce886638d56ee3003d3756339a4965aa0f27cb51759180f51075bd6eee6ced54b295a931c8cab0c519
 EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
+EBUILD libjcat-0.1.7.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.7.ebuild b/dev-libs/libjcat/libjcat-0.1.7.ebuild
new file mode 100644
index 000000000000..ef894f74d4c7
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 426c54d48728..a5fdacd4970d 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -3,6 +3,6 @@ DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
 EBUILD libpcre2-10.35.ebuild 2482 BLAKE2B 626d4e8b07d220fc5da8640fe180b60636e037057f083e4ab47b69d036f93b09de7fb4f5c83578fc7f76b74c7f2b2e42c03c4d7db6e237b623d18f7d9f988019 SHA512 9fd07ac07bb685bb1355b02bccd9755fa2bd1dac3f3879e1ecfd2772088c0b7827e7f6a76e5ae9d78c7bb6cdb81354e01cbab2eb219465dedb4d5b1c9e10562b
-EBUILD libpcre2-10.36-r1.ebuild 2490 BLAKE2B 725adac77bf1a20bc93253ca3d819320ea16b6520d33c78c3cd9a39d379b509ddf8a3c1640bde3489a809f9cb534ff98be57c5b00bd3468107aae2349003020b SHA512 ff835f049c326f1902cc5ce0b650e39078f061e7c2a848a8ae1335f9823bbf5b373358de04c49db38edce954a3a82f1e0eab090bfbce2a1bfcbd1c4b54a0437f
+EBUILD libpcre2-10.36-r1.ebuild 2482 BLAKE2B a569108de5f728ff394048a43b3b2fbe4dd0007da77d0edfa04a5fd973822658e138cbe48ef700a07b8a19b2993e44fce9fb0aefb50cabe285338a63f7b23bc2 SHA512 33af5c3113fadfd29ed6d9d56110be92b85d5cc905e4cbcf69606ef1b797285558106b72135b8abd07e720c0348b1ef7e17dc82ae0243590a5b5ffd314f370a6
 EBUILD libpcre2-10.36.ebuild 2489 BLAKE2B f85a42c119e96bdec00f6e3a74141e670e9da7a0db2fd9328068c647a16a934b589907b05f267ad5a574f1b0f32048e3ed461849326a789c13b93ca56bacaf4f SHA512 37436173e30d3ec421c37fc1793bdc1f68f5c126f511255b7710ba654b2972b42b1de0f5c53f1d7575a629c50ac66b1ee36f024dc60b760d9e55d0ad253e7c82
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
index 32b1a3ae4c9f..785bb4d0b8e9 100644
--- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index c4617068537d..a4b3dbf4b0a3 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -4,10 +4,12 @@ DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b
 DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
 DIST librdkafka-1.6.0.tar.gz 2909665 BLAKE2B 64b9098531febc0c4b06ce8d6d6cc65b9895cda9b40c9d9fd8b70d5febbb2c851856fb71a355d606074dae9e026277da5e65d0e9ed44a3dfd76b2b55cc142651 SHA512 b58d701f71342eb2c29ecd5aa0514af351b5a5d2282768e034b5995300fcbe2c416d6b4e15dfaddaacf2ec3b7571a320bf5356ade3fe33598d3f05f99f6553ba
 DIST librdkafka-1.6.1.tar.gz 2920909 BLAKE2B 03d949319b022bc933a9b816660f87498cf9df460f41c65f08e5f6aa22cf5766974f4abe5fe0078054a21df45cc0b46f30383ce83743348fd3124e3b9ffed7f5 SHA512 19f64f275c7cd1c60f026a466c79021549e4acced60e6c01b364944ddb2f4a2c0784ab35031275c406b638a14b958c6f904177e51e2fcb4d058c541d046677dc
+DIST librdkafka-1.7.0.tar.gz 2946082 BLAKE2B ea74e2dbd0e25ed998a80a0c964e78993f233c3fec1555dbefe11e0e9a407badcc903fbdef47289c82627a67cfce0d995a2786b90e810d874ccba04ba81fbc67 SHA512 2fb1eb1821d6eb2e3c4346aebd26a96c612f18a055e6861c49231957e8694758bd31aafa45c066280d6b1359e95e5a61927a276dab161356448da0685f5658fa
 EBUILD librdkafka-1.4.4.ebuild 1653 BLAKE2B 2f0a5d2b1df78f090be40b06b8213483729e7d74c44a942b43e0134c27b3d467bc89530ffb87ee47c88094ff14f7a117475e8e6998ac0a3d04f63519624fed56 SHA512 750ca1610433a16dc37b65a07461250b93a3865ba6138f37c9b4c552d9796398d7285be8671dd121f7f41921c6f5789fda61e232a6fe246f2799005bc80a45c3
 EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.6.0.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
 EBUILD librdkafka-1.6.1.ebuild 1960 BLAKE2B fbecafccc3028981e5820e6e2a59d8c812135f1391b6e64d6bd4f201bdfda58dba274aa3b8aabcb33a05a4630ce947d5bfaf2ba4c39fd004116c7f1b9c6c4ba0 SHA512 7031c0242ce441df6ed5d26c6b5cd5d3d13732e6b1ef64d19e1d8a79e2c8300638d710e42b392815b3544715d5496f2286bb87be45613fccadd37239e5afe34f
+EBUILD librdkafka-1.7.0.ebuild 1963 BLAKE2B f87cc24c5f701f0347fbf6dd9092652a51159d514cd905adf3220370fd2673310dede62096fc2f7017f5a4fe9cb58c15061c95bf4ac014ca91f051919217314c SHA512 79693522afae010ac530d14a8155007933b5e30b0dc0545970973bd1c846d0d9ef3accce80d993e164bc49b3d2e905193d82cf3ebe0e55820aa705b6e6687765
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.7.0.ebuild b/dev-libs/librdkafka/librdkafka-1.7.0.ebuild
new file mode 100644
index 000000000000..0057ccda8dd3
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.7.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	# Simulate CI so we do not fail when tests are running longer than expected,
+	# https://github.com/edenhill/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
+	local -x CI=true
+
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index f3b6da383ea0..e512552cd976 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,7 @@
 DIST libreport-2.13.1.tar.gz 1841698 BLAKE2B e0fbebbb557fb9fb320dea0a8face6a2eabdb0ad80b5de092e5e4dfe2a0439a4804d4ec99c1286aaafa31064496a94fabce5e26f851001eb9c3bb9989a46e4bb SHA512 6c2ea47e6efa36f23030fbe08946d1e524690e5f6279cbfdaf7c463ef71b23ae82a5e4471ddce89b35d4024f58197cef9f58a07dfcf5bbc1a9b310e39966f81a
 DIST libreport-2.15.0.tar.gz 1859305 BLAKE2B ceedd392bd0c7fc5c3f0db5d4a63ced6a1e430b09d1d085996ce735daef5f48cd18267fb1401d9343857619daef6f7f3dcea8508c62313a9f908e5573508649c SHA512 7baaa1fb65face910e55ad06e53af08c5e31f058bf5936c3c1d45581e050380b5db75659b5a493cc626a81795d82616a2dfad696d60c107929cfb8e2905e7f4c
+DIST libreport-2.15.1.tar.gz 1860410 BLAKE2B 43743fc7a7698851e247956621286cc94dbfcc451b8d95aaff9263e65f787b23f7bbf5d7ec087196d5f9f30a697c66e547bbccdc913b3ea2a17ea4c7bf77ee02 SHA512 70f947690173a0afa57981c9755a18bdd0ad44c888c00713de74624296b81ff25203d5dda5d5c57eac85da4a1631585184b77715c7adf6688b469e32d4113cf4
 EBUILD libreport-2.13.1.ebuild 1932 BLAKE2B b1b0ac62d7a18a8574de59aefabc42b709e0383f709ffc3a0d237c55c7b85fbede70845062a4e5e3597de5a6628a5167765eed6df8086d87c49067b8fdfdba28 SHA512 df3cc87bb015cad4a3e806d6aa91b2c6894fa40006c6122c973e97467e00c689e8d7dfdd5d9aff152fdb46af6beafd83ef555d656c2eb0c7a6793b0ce87054da
 EBUILD libreport-2.15.0.ebuild 1939 BLAKE2B a8396e59929c8fe1c3202a9cbde980dbcead4c5e44c717371fc6ef9f023bc0eb4bfa3ccdebb6a1a71c213f12ad03c8a66e05da00998a10b7aab731c5b5dd8aee SHA512 c069c3d1184617bbb14cc579f5ab78ff13d4d5e6527bab2b81a4b1922ff917de64ca5f167221cdcb7b0365a71ce50c1844f93642ddf55ce36b2d50b3e28e8988
+EBUILD libreport-2.15.1.ebuild 1941 BLAKE2B 999dd154bf0da4387db110706c4a9139fc905a1ec59b7c6b3a0567099626b8f7a175e033d9398fe0e45b4e824e3675bb9526c44ca3d818af08b89f79935ad356 SHA512 ad0a31390264afb01e74acd8d31cf9002785f5210674aac5cae05012b12458dbc1bb7a8036d7f064dbd77d3523b7880f59b7858cdf7911f496b6cfca8dcfbd45
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.15.1.ebuild b/dev-libs/libreport/libreport-2.15.1.ebuild
new file mode 100644
index 000000000000..2cdc5d5a57d5
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.15.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://github.com/abrt/libreport"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk +python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-admin/augeas
+	app-arch/libarchive:0=
+	>=dev-libs/glib-2.43.4:2
+	dev-libs/satyr:0=
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/nettle:=
+	dev-libs/newt:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	sys-apps/systemd
+	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+	python? ( ${PYTHON_DEPS} )
+	x11-misc/xdg-utils
+"
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	use python && python_setup
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-bugzilla
+		$(use_with gtk)
+		$(use_with python python3)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_install() {
+			default
+			python_optimize
+		}
+		python_foreach_impl run_in_build_dir python_install
+	else
+		default
+	fi
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 1d13ef40d1af..a8211f1c23cf 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -4,5 +4,5 @@ DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea45
 DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589de42b38a7586b4a35571eec9a0b0afd1df101467cb8f82e9a32dbdb9a25058d827a5565ad8d49ad2216d2b6af5b101612a94080 SHA512 ddb77c0608a7e6cacf1923a3d0f5950975511c46d53f6f9c23f80dd99eab84dde2a1292c1e35555f7f1659f25a1b80668516558b83c42effb921fff06c0fb559
 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf
 EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a
-EBUILD libsodium-1.0.18_p20210421.ebuild 2601 BLAKE2B 30bd99e992c1b54bbccf7aca1a1aa8de0b0b40cb6aeb7f4459400a71e2b44c261583a78da90a30d2181a29e18a19d1c85d5d6007092d8c1fddf3a6077ff45f5a SHA512 943eea50ed848239893ad87190067ab75f2a63928feef0872da28b0583cfd50094e6bbab8982dd466860c574498c775c6fc73f274f17c7d3980334261624f120
+EBUILD libsodium-1.0.18_p20210421.ebuild 2606 BLAKE2B 453f5c7ad1b968a5748ff6ec2ab2ef497eaa7ea7d2a97a64dc14e9867167e353b859128aff3723f84cc45549718e702a7db2e13dd8fcd349011eca5b261badd2 SHA512 76eba8aecdf9f0aeeecd76035cbe77ffb12daaa992e9c17f6c9b1d36cf44640850a75db292da04ce64eea10e2a7b861e486e08e6b88e8c9d7689661abe95789c
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
index 3afca22ee5ed..441dcc589707 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index 272c42ed082c..0095bc1c4888 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,3 +1,3 @@
 DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8
-EBUILD libuev-2.3.2.ebuild 533 BLAKE2B e297873aed1f8b6a5ea88ce5ec898c84d5cafe842d339059b0fc2b6e3848dea72cf1742a9929ef5011e56d392bebf306985fc6d389028a30bdea70bfb0502b78 SHA512 c98bea1fe2f67802ed97bc01d622eb9aa56ca480d9ef896fc6c0d5e7f30c368bea2afa23f0d3dd4b45186b62ec028cc888f12ea0e39fdf00b6ada2d7cba08eef
+EBUILD libuev-2.3.2.ebuild 562 BLAKE2B 438adf14a6c25b8a7e2994c761650a02f2a55f976971cf5ad7715881b65a7848ee8e468934d45add587e69d23dbfad3092d4872fb1674f247b5739a80ea11944 SHA512 862d201fc3db9d81182a155f3d30c86ce7b8399ac5315810bcd440d1fad73d65bd88fabcf1ec85992bba3f0b0db355a0eb492b21908f552506263644926e17f4
 MISC metadata.xml 727 BLAKE2B 82955efcfda4e0f1e3e82f3206432f9832e4844b0c68968cbc143bd9a68d83f90ccc574a647871313cf489787d24f266c94d269725305062c4e92cdd584533b9 SHA512 b6ecc3f2878e73950cb6e8d479905746705fc63b366c995a76a1af2df285bc471cf7d891ea54b857c35738485c4394c306bdfe1ad46c57378b261b7a78f3971d
diff --git a/dev-libs/libuev/libuev-2.3.2.ebuild b/dev-libs/libuev/libuev-2.3.2.ebuild
index 4aa8d00bd3fa..d82689f38da8 100644
--- a/dev-libs/libuev/libuev-2.3.2.ebuild
+++ b/dev-libs/libuev/libuev-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="A collection of useful BSD APIs"
+DESCRIPTION="Lightweight event loop library for Linux epoll() family APIs"
 HOMEPAGE="https://github.com/troglobit/libuev"
 SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 558dd38b4f22..b03b1af906fd 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -1,5 +1,3 @@
-DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
 DIST libunibreak-4.3.tar.gz 639886 BLAKE2B ec044b659f1a837b4e6627067b96a6f19ee8302602d635e1e32aab9533486b5cd063aa99114c6443ede9d76d3f382d7492eac8b52b84a4baa2ccd9c2129e79d8 SHA512 4b53fd169912033403b6ca09047b7b928211fab3607ef26070ab731054138b9a291f7d138d3a479f9cde8edb0fabf8da114da68aee32e60cddf45cc3baae1170
-EBUILD libunibreak-4.0.ebuild 1271 BLAKE2B c5f7d7a51ea9c2b7ff881ba8fcd0381f6f35671d6758ab17486d0311cd29d686fbb78ccc23190aa3952fb84fc45c6a4646cc8dce57670df40eeb7967a1c23000 SHA512 d47e18f51abc0f7497dfc97ed4cc81a3ef9b33c106687cc94d4954fb3987089cb37a0958d79ccc239b8fcaead0cfb32ccdf42b299ec292b532f09c1dd6438c66
 EBUILD libunibreak-4.3.ebuild 1195 BLAKE2B 5bf75bc9bcff1632f31c92b6b1f4d7ed8723c75a8406f37517b33e83e245668b96cc0cbe301107d5c5894dc28d1e73e7e5af4c66eaf99fb4e5742c739fc160a2 SHA512 7f859b573847358cfa86d142d209fe8311e978698c88232698b0612d431d9dbb25d48cbfd8f88fc4b3076c30ae3ef4dec589adb379c59cad12008ba6e10ddfe2
 MISC metadata.xml 555 BLAKE2B eb162dde2c8d6c9d3e5098ab2c7c983c5907345de68e067a09b820f1b430980502bad3c0271b59b0a971556bb7212868471b6d31c7aefc8d75d0b569b6de64e1 SHA512 44d76eef672e931f6d5b76d667af5f667cda9f8d15cad07ab7ac97fb785a34b7af21ba735ef692571e8a1364aab3b98dde787566f7db3eb2b4442924ebebe8d8
diff --git a/dev-libs/libunibreak/libunibreak-4.0.ebuild b/dev-libs/libunibreak/libunibreak-4.0.ebuild
deleted file mode 100644
index ede6eebde7e0..000000000000
--- a/dev-libs/libunibreak/libunibreak-4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-DESCRIPTION="Line and word breaking library"
-HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
-SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(replace_all_version_separators '_')/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="doc +man static-libs"
-
-# Tests require internet access to www.unicode.org
-RESTRICT="test"
-
-DEPEND="man? ( app-doc/doxygen )"
-RDEPEND="!dev-libs/liblinebreak"
-
-src_prepare() {
-	if use man; then
-		echo 'GENERATE_MAN=YES' >> Doxyfile || die
-		echo 'GENERATE_HTML=NO' >> Doxyfile || die
-	fi
-	default
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use man; then
-		doxygen || die 'doxygen failed'
-		pushd "${S}"/doc/man > /dev/null
-		mv man3 x || die
-		mkdir man3 || die
-		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
-			mv x/${h}.h.3 man3/ || die "man ${h} not found"
-		done
-		rm -rf x || die
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use man; then
-		doman doc/man/man3/*.3
-	fi
-}
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 192df4d666f5..9c6845599a6b 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
 EBUILD libusb-compat-0.1.5-r2.ebuild 1119 BLAKE2B cac1767551107388bcaec8f195c2f27004b4f3595b6f3a5c26cca94408d0277e49135376b6fd47d299b0a527cccd635aa365c6fb9752895f0188e1cae5d33e2d SHA512 1a289d196dcbaa89e071c853d46d2835211bc9d998112b6a1c4a6cc7a84451b84f5d61109c0ff0826e6621e84bc2e3913306799396dbe0f1522793a23b9abd76
-EBUILD libusb-compat-0.1.5-r3.ebuild 1177 BLAKE2B 9a9d3b358b9000a7df31e80c0aab1fb6027deff8591ed56cd05c7cefec7872cd02c1a84397757a36cd6ed73af5bc72839ff55e57f3300b602c2999c9c60e8e67 SHA512 396e8acf2f2e509ea48fc6781d18561e2bdf1b09618a65f28c8431d2ddd2ca6e7c070cf0c2d923c35accc4e8348cc98cd894d1955a78160ac100921c1ec6d78a
+EBUILD libusb-compat-0.1.5-r3.ebuild 1169 BLAKE2B 9091b1e63697a377fc9034d42c206f8a5d9f3959cbd5b5cdec3ada74c5be3c4141f1b68aa7f35d2bfaea84dbeb688b4ac2b7461618a77f1bc30e28267277a3a3 SHA512 73ec3df96ecb5192c276dab63b1a76cf13d8dfd0355b1a2c3eca3e45a49de4900ccaf5202cb7c4c4f23487f2d3bb579f8624f0dc746bae69b1b820b71c641653
 MISC metadata.xml 333 BLAKE2B ee2452df6eb77285ba7e918f882c543d413656aaf0a199ac369ef60d25b8790fa37e320101f9645d5042ed04826e00922d5d38752b31492deda2cc78e7c41b49 SHA512 10f5333485c01d415c73f195e22785a9584d9dcf9662317605d9c6f14507863be5769457d2080137d31ad79fd0e825b9f02ec4160c40a5347591726843148705
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 8dcfb5c2424b..d2650c1bb749 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 4c146a706b80..24242f06c942 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,5 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
 DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
-EBUILD libvoikko-4.3.1.ebuild 1244 BLAKE2B 9af46e333ec8ebe53e3df8ea21b34d9c6c181ba5f9ed56efad93407d3af7fe98d79caf4063af5817cb7af69a2e24e14c606b5d9c9854ded11452de4b7fedf724 SHA512 21640f9b98d1362a4f6a6d69af4306f28d23ddca1a4736d415013769554b671af36d2f9dcaa5b24ab04f446604a420acd888f3cfc193d6064a4b24a2bbb65a10
+EBUILD libvoikko-4.3.1.ebuild 1245 BLAKE2B 689688d92a86832c2bddeaff2ebddfcd6c07d261e65ce08db4e00ff348b647805d384f4ced4a13c6423887c820228e62f81d30877b000bd00e63f6c44ed57ae5 SHA512 efaf7c440248913d2d18308b7348528fc9ff114f2282fb52252ee2a36bf78c8ab339f91dfcb8462f9248b6e2aaae4f34471f3073751b592711c8e216e984c1f3
 MISC metadata.xml 419 BLAKE2B af90ea5ea311d4352bbdfd4852f71dc51564f7f34cd088b8b77016b5500a468d37c4ca6c1cf38ba4e091e8adfaeb5a8051955f189c4855963a4fd6c5b4523ef2 SHA512 8b84aa16876a8aad7bd8bcfd588ff4de660dcc4ec9fd5d07f22d513bfde4cac278992cfd619a5d556256adbc4b00bb946448feefa561fa99e07da2181b121a88
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
index 772aa6d83de7..856038cdcd8a 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-r1 verify-sig
 
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 8ab6844fadc1..fc2a76103327 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,9 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
 DIST libxmlb-0.3.0.tar.gz 112097 BLAKE2B a1046ee5c940dfd23a7e3cc07c0deb2be0f18fd416c13df7f467ce98308239191788a1cf18026593862c04645486f4ab332fe71eb96dc5e5abc7909e61451cf0 SHA512 28731c84cab0b1164fc08ea751ee7da22b8f4f278c4950a2d5957cc0dcd4457b6ce47dace25dd7c163a790b7ed2619dd6b4863f8147dc201c18f3433990af2cb
+DIST libxmlb-0.3.1.tar.gz 113197 BLAKE2B 1e437cb1d9e58350b591bdb6234be453dfdf80fac72c96764c4ce3b7e1f5ffccc310590c1945bc44fd747f0f0c6caeb6ba95cdbeb29e21a1c5a990f041a10ed9 SHA512 7fc892762c7272cbb11e5cb2b6d936ba802b10aaeab68b33e5c1fbccfdd0019378080d355f1719d946e9b838ac76b77c7229723f692c0dde3de3f94ad62a1842
 EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B b7c684f7643c068f1394e5faa8c13e58fbe7920dcea85ce0dd523bea99fa97370079b9162eb7818aaefb820fe0b7d6a650c8cc50d2469b84ff0415a6dff73c61 SHA512 2fa73b4aeeb0aa9e1845741bb0ed6d523adaaba4f8269a398cf59ecb756c65e77acb9b7418a876b453c42e68fcad9b814d2d007ed66f1d7067ec8044161a5cb6
 EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 EBUILD libxmlb-0.3.0.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
+EBUILD libxmlb-0.3.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.3.1.ebuild b/dev-libs/libxmlb/libxmlb-0.3.1.ebuild
new file mode 100644
index 000000000000..a4cc4b2a152c
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # libxmlb.so version
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index b51206ee1597..47b518d9b4d9 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,8 +1,4 @@
-DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
 DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
-DIST onig-6.9.7.tar.gz 935733 BLAKE2B dcabf46429ba1a99fb3c645144ee68cba2594ae30972dbfedc229eaca0686c32b776688218c68564a8c24f9f782f84901cd81bca01e2126ec39c742c002a517c SHA512 eba6057f87ef5897fe72d4535942e005329ec532db2f4cf8d5e901c478c151eedf3886ce04d595c406e2d5ad98273c0c2696eb46da5ee359b24f8221531e1f5a
-EBUILD oniguruma-6.9.6-r1.ebuild 1487 BLAKE2B 7d1f980c6b2ff38dfd80e68632b9d769c4be4ff04dec7c4fdaf4011e066e7860a59bf3326af4017d68ecfc065d3d4a7fbb1cd4b3fc5a91887dd6ad70bc4e8df7 SHA512 1fcec2d9665c2bb992fba0f2cf0b5883397eafad5c4cea454fe3e2619a588d88924bd07a380bdf7163a9a515f9eed3f28674eef4d71ba7fa6f6a636dd173bb6c
 EBUILD oniguruma-6.9.7.1.ebuild 1285 BLAKE2B 2c6ad8ab5a14ea6c8c06cf2dc5f6b10c3a03764b4513989550d7b16f4c8a3ef1b477da70a70df38105132b3d3daaf4949eb84b2af1937b6ffb7fe7152c815810 SHA512 dd66cf7455630ae9d043cb531e4555a30c9c76e24afe45d0a922a3a212bd8b408ae18a1ade04d389a23987a0b25ad03e5e2f24fb6b5bf9fd25424843cadc0998
-EBUILD oniguruma-6.9.7.ebuild 1284 BLAKE2B 0918276e5fcc2dbb2c67e3a650d05e6e00cf9ebe1f7d79dba01eaadbc545ae5a312af2d689b2df4c699922d68cb4d4366395e20157c07047702ff4edeef10325 SHA512 7e9e0ec5344f12d49016983a54ec0d34579be7f8b5b9f685878eba5c444933eca1b097bd132a09ce6df79c7829e2fca24b86669d8b739670491ee79e8d030384
 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.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
deleted file mode 100644
index 57411083c8d4..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ /dev/null
@@ -1,55 +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/223
-	# https://github.com/kkos/oniguruma/commit/d177786282a618c76cdf2e993e3d0d9a684e9666
-	sed -e "/^AM_LDFLAGS[[:space:]]*=/s:-L\$(prefix)/lib:-L\$(libdir):" -i {sample,test}/Makefile.{am,in} || die
-
-	default
-
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-posix-api \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild b/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
deleted file mode 100644
index a600340da373..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
+++ /dev/null
@@ -1,55 +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"
-
-BDEPEND=""
-DEPEND=""
-RDEPEND=""
-
-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() {
-	default
-
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-posix-api \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 718641549435..7abdeb5ca809 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -29,5 +29,5 @@ EBUILD protobuf-3.15.5.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e59
 EBUILD protobuf-3.15.6.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.7.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.8.ebuild 3181 BLAKE2B 6f0823f268356f55eeaffca71594104aa53d3f7f612744a4359cf227274005466bbf268166184ae0e58faa3bc5b90a3d2a3813c5887a66d9c595a7e412a09a2b SHA512 27b97bd974e55091ac08e06d8c7148f748e31295323e587c28aa52095f64f795bd53b0805f7c614c72717bd096d2f509a4dbdb410acdbafe14f539035ef0b0fa
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B 6aade3fdee471f2548e673b72a1b2113bb3ecc484f03fc39fd73263f3dc117510bbf96733a4d0d8626a9622c4878c50bd3dbc8cf48d61e7f3c51b84f3f40eba4 SHA512 36c081fd688a7386f70d1e99b448fccee19d7fb99e7443f67e58511bad9221d85fea9c449ca17c7ed38ee047f9b3b24046dbf251e414ccf38497f9f46ce49402
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5cbad9cde8198ca2113451c4c5683ad1af8e645b939d8794edf8e85a10e223e3a736de4073fa8452b2453ff458d2c148d8ceb2618aee354b2de0d6803b221fe4 SHA512 30f97c4b2688602289bf1c73fc6e742394bdf51fcfdbf76b8e34f5bd9d7c92ada0e6de220919903ebce05b84cd5eaf30dd1d49965b0e654cff8b921f4db41034
 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 adc2b704358f..ca997c7db9b8 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index d6f9d99730fa..4be251aadd0e 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -3,5 +3,5 @@ DIST re2-2021-02-02.tar.gz 402958 BLAKE2B 824afc7f6f92cfa7070f37e975469c995e9d4a
 DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
 EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
 EBUILD re2-0.2021.02.02.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
-EBUILD re2-0.2021.04.01.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
+EBUILD re2-0.2021.04.01.ebuild 1345 BLAKE2B 895b1d92d1ed990d5cdc63041fe39e2fe3bd10cb7247e28a6461af5c170ea2215f5ffbd8dda0812443379de0f2131d5da2032a33240a3f210a72184b0f9c53bf SHA512 3f65ba7cb020840448c228a03973a387cbc282fb8e605f274321d7e60774dcf33d8e76e854eee9e1e716a428e89c49a748ec8a5b9673f1e605f9d08e1a5e86bd
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2021.04.01.ebuild b/dev-libs/re2/re2-0.2021.04.01.ebuild
index 383b552b2a85..79d181996604 100644
--- a/dev-libs/re2/re2-0.2021.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.04.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 5b65104d2824..4bdf966ea130 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,10 +1,5 @@
-AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
 AUX tntnet-3.0-autoconf-2.70.patch 2238 BLAKE2B 65b5cd276f35ce4b046dc1b6ce4be086935eba283266520b7ba07db6e83b066dc6233d40f80e13131c64e28412ef7974326339f5b2d694a8c2e87b5610dea3bc SHA512 7cebddc0e366499935874706a58620e5f277d5f39a1644733895d2899a97818313e70168c9d9ec91313c9afe9e2a513367b99c109e3b6065c5ab2a688ec05a80
 AUX tntnet-3.initd 550 BLAKE2B b31fd930b69c62c3439096c8de229a256d3f77cb18be752902b577950bb757cb06bd0f19005b25405c263f64d0d8db5d18b0b914d552a25875620c8c44ce090d SHA512 1be6437278de9319806a7fd4ef8cfb7674e4c04b156c2342f850d8ee9aa33c4c490cb64243592f1d6605e96cb51192216f859eac2a59e7aaea8d2730a9dedc0a
-AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
-DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
-EBUILD tntnet-2.2.1-r3.ebuild 1838 BLAKE2B 83dc28513d4f4dab4de68ba0bfac92260ccc9734f1006fceaf7a8c86d11dec0456e3bb17e209321e5674fd8c720e47dafc7a229f40b8d3664ffe79374af3df46 SHA512 17863a37e636cb220d150a4edd3c04eb6019fc36f61fd7ed3b286c2c65a579e37e39b284247e9096e8b771f5080c38f1b1e6402c688da37b8d831115e2078a0f
-EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 5c76c3354d42c2a76df1fc7143fe499dd7570af798a744b705d3c10a081cfacac1902b723df6de7b221fc90fc621ae8986af25b1c74a5240a567ab4a088d0d57 SHA512 865c94fddabb875f9aea48d2caf9ab44bf8056d0714166ebff613191fd2a263033d583f34b237bfe2a3101da8c996db1b8e511d4f3ebb5cbe1853cee187966a9
-EBUILD tntnet-3.0.ebuild 1451 BLAKE2B d1a58ddfabb0682199cef445ec53967c0bb19ab4eba8c9651fb9579d163b0bc65e7af0456589277059e4e26b97092f387c1af554e05e9416cc34574af96755a1 SHA512 bff9d33294b934bc3d5ce1ba1fbe497b34f5538c9d709cffadf649f0453ce5631528b855d36fd813db3ab935a97cfba2fb21ff8e60348639fe524a64201946b5
+EBUILD tntnet-3.0.ebuild 1450 BLAKE2B 699723d62961e3947f071f77dd1187e208b0bf16843c423150dd434de3601fb5e03d990dbac66ef11e5cfd80dd4b4f7af30255e0aec395ccda2316c766bb3d1b SHA512 dff4d70ca22949d77d0a3badabb1a932c29e357b3dfec27f8918d6fe13ef5f0a2a3157278aa125923799e1283f88935583cfe37ccb5ca7fdce3bc9c2ccf616a3
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
deleted file mode 100644
index 5e0465060898..000000000000
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -18,6 +18,7 @@
- 
- AC_PROG_CXX
- AC_PROG_LIBTOOL
-+PKG_PROG_PKG_CONFIG
- 
- AC_LANG(C++)
- ACX_PTHREAD
-@@ -40,6 +41,12 @@
- AC_CHECK_FUNCS([fopen64], ,[AM_CFLAGS=-DUSE_FILE32API])
- AC_SUBST(AM_CFLAGS)
- 
-+PKG_CHECK_MODULES([MINIZIP], [minizip],
-+  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
-+AC_SUBST([MINIZIP_CFLAGS])
-+AC_SUBST([MINIZIP_LIBS])
-+AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true])
-+
- AC_ARG_WITH([epoll],
-   AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]),
-   [epoll_option=$withval],
---- a/framework/common/Makefile.am
-+++ b/framework/common/Makefile.am
-@@ -23,7 +23,6 @@
- 	httpparser.cpp \
- 	httprequest.cpp \
- 	httpreply.cpp \
--	ioapi.c \
- 	job.cpp \
- 	langlib.cpp \
- 	listener.cpp \
-@@ -40,16 +39,13 @@
- 	stringlessignorecase.cpp \
- 	tntconfig.cpp \
- 	tntnet.cpp \
--	unzip.c \
- 	unzipfile.cpp \
- 	urlescostream.cpp \
- 	urlmapper.cpp \
- 	util.cpp \
- 	worker.cpp \
- 	zdata.cpp \
--	crypt.h \
--	ioapi.h \
--	unzip.h
-+	crypt.h
- 
- nobase_include_HEADERS = \
- 	tnt/applicationunlocker.h \
-@@ -144,3 +140,13 @@
- 	tnt/stressjob.h
- endif
- 
-+if HAVE_MINIZIP
-+libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS)
-+libtntnet_la_LDFLAGS += $(MINIZIP_LIBS)
-+else
-+libtntnet_la_SOURCES += \
-+	ioapi.c \
-+	ioapi.h \
-+	unzip.c \
-+	unzip.h
-+endif
diff --git a/dev-libs/tntnet/files/tntnet.initd b/dev-libs/tntnet/files/tntnet.initd
deleted file mode 100644
index 54982bddd6e6..000000000000
--- a/dev-libs/tntnet/files/tntnet.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE="/var/run/tntnet.pid"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting tntnet"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/bin/tntnet
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping tntnet"
-	start-stop-daemon --stop --pidfile $PIDFILE --exec /usr/bin/tntnet
-	eend $?
-}
-
-reload() {
-	# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed...
-	# finally...
-	ebegin "Reloading tntnet configuration"
-	start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/bin/tntnet
-	eend $?
-}
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
deleted file mode 100644
index bb9f702a21ea..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Modular, multithreaded web application server extensible with C++"
-HOMEPAGE="http://www.tntnet.org/"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="gnutls server ssl examples"
-
-RDEPEND="
-	>=dev-libs/cxxtools-2.2.1
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
-
-src_prepare() {
-	# Both fixed in the next release
-	default
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	# bug 426262
-	mv configure.{in,ac} || die
-
-	# bug 423697
-	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	# default enabled, will not compile without sdk
-	local myconf=( --with-sdk )
-
-	# Prefer gnutls over SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf+=( --with-ssl=gnutls )
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf+=( --with-ssl=openssl )
-	else
-		myconf+=( --with-ssl=no )
-	fi
-
-	econf \
-		--disable-static \
-		$(use_with server) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc doc/tntnet.pdf
-
-	if use examples; then
-		emake -C sdk/demos maintainer-clean
-		rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
-
-		docinto examples
-		dodoc -r sdk/demos/.
-	fi
-
-	if use server; then
-		rm -f "${ED}"/etc/init.d/tntnet || die
-		newinitd "${FILESDIR}"/tntnet.initd tntnet
-	fi
-
-	# bug 737184
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
deleted file mode 100644
index ec2ac1e5af66..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Modular, multithreaded web application server extensible with C++"
-HOMEPAGE="http://www.tntnet.org/"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="doc gnutls server ssl examples"
-
-RDEPEND=">=dev-libs/cxxtools-2.2.1
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			>=net-libs/gnutls-1.2.0
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? ( dev-libs/openssl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/zip"
-
-src_prepare() {
-	# Both fixed in the next release
-	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	# bug 423697
-	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Prefer gnutls above SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
-	econf \
-		$(use_with server) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
-
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/*
-	fi
-
-	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
-	fi
-}
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index 2dd289308caa..24ed5d0c4ea1 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc gnutls server ssl"
 
 RDEPEND=">=dev-libs/cxxtools-3.0
diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest
new file mode 100644
index 000000000000..243c6f909b97
--- /dev/null
+++ b/dev-libs/trio/Manifest
@@ -0,0 +1,3 @@
+DIST trio-1.16.tar.gz 167337 BLAKE2B 0f284e0a130723f7511c0e874276c79c1addc1329833d14f0b76bae9808d90b76a2b26817ee85da71c3997360918cb534917a11bbe35ba627d1012cd8a2f6299 SHA512 3a8bac3ed001f70f498bd2ab0881ed6d3760bc978bf9ff587c3fc1d5d7a38205f779c5fe445f41edaa9e23c15bc1b4a521916e19161277741bc8e2f744b46c69
+EBUILD trio-1.16.ebuild 812 BLAKE2B b0058b7e1079f6619f3aaec03fd13bc80f9dd99139d4959359caecc12b9ab312260b906863a63805ede02873e94e38714d898ba4664afebe96f479fcb6c1eae3 SHA512 92799664ce644cb5a0b63c7bc493d3dcc82eacce4328492e0012a82aba88a106e8ca4ba59f562cd106dd9f75fee95fb74b4eb18cee7f6214f3ab41d0bdc32f87
+MISC metadata.xml 328 BLAKE2B c7b164aa25ad9fab55823ed0ff243062f73a4a7ae3d6d9630f72f9d912406a82f30fd9629cfe3441552478cd32b0ff4247b9fc7fe7eefe0fb65ae52cda4de5f2 SHA512 e507df5cc9d38e4f11eee8a2dc26390fb0380c596c91c1bb4b3f3a4d60303e0707af3679fecf0d1a0c560998e66284cb8cd24a539f7d47b37f046d01d5be4209
diff --git a/dev-libs/trio/metadata.xml b/dev-libs/trio/metadata.xml
new file mode 100644
index 000000000000..c71b42fc85c6
--- /dev/null
+++ b/dev-libs/trio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ctrio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/trio/trio-1.16.ebuild b/dev-libs/trio/trio-1.16.ebuild
new file mode 100644
index 000000000000..1980624be416
--- /dev/null
+++ b/dev-libs/trio/trio-1.16.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Portable string functions, focus on the *printf() and *scanf() clones"
+HOMEPAGE="https://daniel.haxx.se/projects/trio/"
+SRC_URI="mirror://sourceforge/ctrio/${P}.tar.gz"
+
+LICENSE="trio"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+HTML_DOCS=( html/. )
+
+src_prepare() {
+	default
+	sed -i '/$(CC)/s/-o/$(LOCAL_LDFLAGS) -o/' Makefile.in || die
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" LOCAL_LDFLAGS="${LDFLAGS}"
+	ln -s libtrio.so.2{.0.0,} || die
+	ln -s libtrio.so{.2.0.0,} || die
+}
+
+src_test() {
+	emake LOCAL_LDFLAGS="${LDFLAGS}" regression
+	LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./regression || die
+}
+
+src_install() {
+	doheader trio*.h
+	dolib.so libtrio.so*
+	einstalldocs
+}
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index ec30fa6f4062..16cf1115c341 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,4 +1,5 @@
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
+AUX ucommon-7.0.0-c++17-dynamic-exception-specifications.patch 20164 BLAKE2B 7ff4cee29d8c458536395e9ddc5cf00f3a54f3e9adf109b4bef5be163eda283031471de89159f95b4d97a0da537c7662f4e25dd87c595cda193bffec535a844d SHA512 7d6feb6fbe79678757ae280648133a57baa5b9337960249313cd11ccf5fa879ef9fd2c040a8d5b4416ccd62bd852bb4d159f0a0a7b92007c6f11e34420683432
 DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
-EBUILD ucommon-7.0.0.ebuild 1422 BLAKE2B 736212e2aa3963ede287b186de584560c476026f2bc62237871b8b0136c0dae018b2ff41db8c4380c5e9b92e2c9ea7242e7b01fab496c350bd6f98bad8707266 SHA512 2b0a7ee8180df784616d614ce9bf521df7dae113ca279c78123dfc80fba6ed00e009649eecb3c6a0cde5e79abdc761514380a1af02bbf7cb7bff0b535672b69e
+EBUILD ucommon-7.0.0.ebuild 1555 BLAKE2B 092429d49b5b224ab472f3bcae31d2234760332acfefda8292d0ce51ca205f70b171eb3f2b139a3c7598f10f64db420703872da823f98c1beaaf292b1b1b3b5f SHA512 348629a361315ef7114816367b554c230d4053fd7818857a20cc57ded66cbb3d0a0e3cd7a5b6e5f72da4f16be87a5a471b1caca4d9dee879834b3df1539d53ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch b/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch
new file mode 100644
index 000000000000..49e4b7828975
--- /dev/null
+++ b/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch
@@ -0,0 +1,502 @@
+--- a/commoncpp/exception.cpp
++++ b/commoncpp/exception.cpp
+@@ -53,14 +53,14 @@
+ 
+ namespace ost {
+ 
+-Exception::Exception(const String& what_arg) throw():
++Exception::Exception(const String& what_arg) :
+ _what(what_arg)
+ {}
+ 
+-Exception::~Exception() throw()
++Exception::~Exception()
+ {}
+ 
+-const char *Exception::what() const throw()
++const char *Exception::what() const noexcept
+ {
+     return _what.c_str();
+ }
+@@ -70,22 +70,22 @@
+     return _what.c_str();
+ }
+ 
+-IOException::IOException(const String &what_arg, long systemError) throw() :
++IOException::IOException(const String &what_arg, long systemError) :
+     Exception(what_arg), _systemError(systemError),
+     _systemErrorString(NULL) {
+ }
+ 
+-IOException::~IOException() throw()
++IOException::~IOException()
+ {
+     delete [] _systemErrorString;
+ }
+ 
+-long IOException::getSystemError() const throw()
++long IOException::getSystemError() const
+ {
+     return _systemError;
+ }
+ 
+-const char* IOException::getSystemErrorString() const throw()
++const char* IOException::getSystemErrorString() const
+ {
+     const uint32_t errStrSize = 2048;
+     if ( !_systemErrorString )
+--- a/commoncpp/persist.cpp
++++ b/commoncpp/persist.cpp
+@@ -39,7 +39,7 @@
+     return _what;
+ }
+ 
+-PersistException::~PersistException() throw()
++PersistException::~PersistException()
+ {
+ }
+ 
+@@ -114,7 +114,7 @@
+     TypeManager::remove(myName.c_str());
+ }
+ 
+-PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException) :
++PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) :
+ myUnderlyingStream(stream), myOperationalMode(mode)
+ {
+ }
+@@ -125,7 +125,7 @@
+         myUnderlyingStream.sync();
+ }
+ 
+-void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException)
++void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size)
+ {
+   if(myOperationalMode != modeWrite)
+     throw("Cannot write to an input Engine");
+@@ -133,14 +133,14 @@
+ }
+ 
+ 
+-void PersistEngine::readBinary(uint8_t* data, uint32_t size) throw(PersistException)
++void PersistEngine::readBinary(uint8_t* data, uint32_t size)
+ {
+   if(myOperationalMode != modeRead)
+     throw("Cannot read from an output Engine");
+   myUnderlyingStream.read((char *)data,size);
+ }
+ 
+-void PersistEngine::write(const PersistObject *object) throw(PersistException)
++void PersistEngine::write(const PersistObject *object)
+ {
+   // Pre-step, if object is NULL, then don't serialize it - serialize a
+   // marker to say that it is null.
+@@ -181,7 +181,7 @@
+   }
+ }
+ 
+-void PersistEngine::read(PersistObject &object) throw(PersistException)
++void PersistEngine::read(PersistObject &object)
+ {
+   uint32_t id = 0;
+   read(id);
+@@ -202,7 +202,7 @@
+   readObject(&object);
+ }
+ 
+-void PersistEngine::read(PersistObject *&object) throw(PersistException)
++void PersistEngine::read(PersistObject *&object)
+ {
+   uint32_t id = 0;
+   read(id);
+@@ -237,7 +237,7 @@
+     throw(PersistException(std::string("Unable to instantiate object of class ")+className));
+ }
+ 
+-void PersistEngine::readObject(PersistObject* object) throw(PersistException)
++void PersistEngine::readObject(PersistObject* object)
+ {
+   // Okay then - we can make this object
+   myArchiveVector.push_back(object);
+@@ -251,7 +251,7 @@
+     throw( PersistException("Missing End-of-Object marker"));
+ }
+ 
+-const std::string PersistEngine::readClass() throw(PersistException)
++const std::string PersistEngine::readClass()
+ {
+   // Okay - read the identifier for the class in...
+   uint32_t classId = 0;
+@@ -269,14 +269,14 @@
+   return className;
+ }
+ 
+-void PersistEngine::write(const std::string& str) throw(PersistException)
++void PersistEngine::write(const std::string& str)
+ {
+   uint32_t len = (uint32_t)str.length();
+   write(len);
+   writeBinary((uint8_t*)str.c_str(),len);
+ }
+ 
+-void PersistEngine::read(std::string& str) throw(PersistException)
++void PersistEngine::read(std::string& str)
+ {
+   uint32_t len = 0;
+   read(len);
+--- a/commoncpp/tokenizer.cpp
++++ b/commoncpp/tokenizer.cpp
+@@ -70,7 +70,7 @@
+ }
+ 
+ 
+-StringTokenizer::iterator& StringTokenizer::iterator::operator ++ () THROWS (StringTokenizer::NoSuchElementException)
++StringTokenizer::iterator& StringTokenizer::iterator::operator ++ ()
+ {
+ 
+     // someone requested to read beyond the end .. tsts
+@@ -106,7 +106,7 @@
+  * if no one requests the token, no time is spent skipping the whitespaces
+  * or allocating memory.
+  */
+-const char * StringTokenizer::iterator::operator * () THROWS (StringTokenizer::NoSuchElementException)
++const char * StringTokenizer::iterator::operator * ()
+ {
+     // someone requested to read beyond the end .. tsts
+     if (endp == myTok->itEnd.endp)
+--- a/inc/commoncpp/exception.h
++++ b/inc/commoncpp/exception.h
+@@ -77,10 +77,10 @@
+     String _what;
+ 
+ public:
+-    Exception(const String& what_arg) throw();
+-    virtual ~Exception() throw();
++    Exception(const String& what_arg);
++    virtual ~Exception();
+     virtual const char *getString() const;
+-    virtual const char *what() const throw();
++    virtual const char *what() const noexcept;
+ };
+ 
+ /**
+@@ -96,11 +96,11 @@
+     mutable char* _systemErrorString;
+ 
+ public:
+-    IOException(const String &what_arg, long systemError = 0) throw();
+-    virtual ~IOException() throw();
++    IOException(const String &what_arg, long systemError = 0);
++    virtual ~IOException();
+ 
+-    virtual long getSystemError() const throw();
+-    virtual const char* getSystemErrorString() const throw();
++    virtual long getSystemError() const;
++    virtual const char* getSystemErrorString() const;
+ };
+ 
+ /**
+--- a/inc/commoncpp/persist.h
++++ b/inc/commoncpp/persist.h
+@@ -46,7 +46,7 @@
+     PersistException(const std::string& reason);
+     const std::string& getString() const;
+ 
+-    virtual ~PersistException() throw();
++    virtual ~PersistException();
+ 
+ protected:
+     std::string _what;
+@@ -210,7 +210,7 @@
+      * the given mode. The stream must be initialized properly prior
+      * to this call or problems will ensue.
+      */
+-    PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException);
++    PersistEngine(std::iostream& stream, EngineMode mode);
+ 
+     virtual ~PersistEngine();
+ 
+@@ -219,75 +219,75 @@
+     /**
+      * writes a PersistObject from a reference.
+      */
+-    inline void write(const PersistObject &object) throw(PersistException)
++    inline void write(const PersistObject &object)
+         {write(&object);}
+ 
+     /**
+      * writes a PersistObject from a pointer.
+      */
+-    void write(const PersistObject *object) throw(PersistException);
++    void write(const PersistObject *object);
+ 
+     // writes supported primitive types
+   // shortcut, to make the following more readable
+ #define CCXX_ENGINEWRITE_REF(valref) writeBinary((const uint8_t*)&valref,sizeof(valref))
+-    inline void write(int8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(uint8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(int16_t i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(uint16_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(int32_t i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(uint32_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(float i)  throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(double i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+-    inline void write(bool i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(int8_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(uint8_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(int16_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(uint16_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(int32_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(uint32_t i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(float i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(double i) { CCXX_ENGINEWRITE_REF(i); }
++    inline void write(bool i) { CCXX_ENGINEWRITE_REF(i); }
+ #undef CCXX_ENGINEWRITE_REF
+ 
+-    void write(const std::string& str) throw(PersistException);
++    void write(const std::string& str);
+ 
+     // Every write operation boils down to one or more of these
+-    void writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException);
++    void writeBinary(const uint8_t* data, const uint32_t size);
+ 
+     // Read Operations
+ 
+     /**
+      * reads a PersistObject into a reference overwriting the object.
+      */
+-    void read(PersistObject &object) throw(PersistException);
++    void read(PersistObject &object);
+ 
+     /**
+      * reads a PersistObject into a pointer allocating memory for the object if necessary.
+      */
+-    void read(PersistObject *&object) throw(PersistException);
++    void read(PersistObject *&object);
+ 
+     // reads supported primitive types
+   // shortcut, to make the following more readable
+ #define CCXX_ENGINEREAD_REF(valref) readBinary((uint8_t*)&valref,sizeof(valref))
+-    inline void read(int8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(uint8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(int16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(uint16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(int32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(uint32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(float& i)  throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(double& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+-    inline void read(bool &i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(int8_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(uint8_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(int16_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(uint16_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(int32_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(uint32_t& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(float& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(double& i) { CCXX_ENGINEREAD_REF(i); }
++    inline void read(bool &i) { CCXX_ENGINEREAD_REF(i); }
+ #undef CCXX_ENGINEREAD_REF
+ 
+-    void read(std::string& str) throw(PersistException);
++    void read(std::string& str);
+ 
+     // Every read operation boiled down to one or more of these
+-    void readBinary(uint8_t* data, uint32_t size) throw(PersistException);
++    void readBinary(uint8_t* data, uint32_t size);
+ 
+ private:
+     /**
+      * reads the actual object data into a pre-instantiated object pointer
+      * by calling the read function of the derived class.
+      */
+-    void readObject(PersistObject* object) throw(PersistException);
++    void readObject(PersistObject* object);
+ 
+     /**
+      * reads in a class name, and caches it into the ClassMap.
+      */
+-    const std::string readClass() throw(PersistException);
++    const std::string readClass();
+ 
+ 
+     /**
+@@ -319,63 +319,63 @@
+ 
+ // Standard >> and << stream operators for PersistObject
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) {CCXX_WE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, float& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, float& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, float ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, float ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, double& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, double& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, double ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, double ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) {CCXX_WE(ar,ob);}
+ 
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, bool ob)  throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, bool ob) {CCXX_WE(ar,ob);}
+ 
+ #undef CCXX_RE
+ #undef CCXX_WE
+@@ -390,7 +390,7 @@
+  * the engine
+  */
+ template<class T>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob)
+ {
+     ar << (uint32_t)ob.size();
+     for(unsigned int i=0; i < ob.size(); ++i)
+@@ -404,7 +404,7 @@
+  * an engine.
+  */
+ template<class T>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob)
+ {
+     ob.clear();
+     uint32_t siz;
+@@ -421,7 +421,7 @@
+  * the engine
+  */
+ template<class T>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob)
+ {
+     ar << (uint32_t)ob.size();
+   for(typename std::deque<T>::const_iterator it=ob.begin(); it != ob.end(); ++it)
+@@ -435,7 +435,7 @@
+  * an engine.
+  */
+ template<class T>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob)
+ {
+     ob.clear();
+     uint32_t siz;
+@@ -456,7 +456,7 @@
+  * to an engine.
+  */
+ template<class Key, class Value>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob)
+ {
+     ar << (uint32_t)ob.size();
+     for(typename std::map<Key,Value>::const_iterator it = ob.begin();it != ob.end();++it)
+@@ -470,7 +470,7 @@
+  * from an engine.
+  */
+ template<class Key, class Value>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob)
+ {
+     ob.clear();
+     uint32_t siz;
+@@ -488,7 +488,7 @@
+  * serialize a pair of some serializable content to the engine.
+  */
+ template<class x, class y>
+-PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob)
+ {
+     ar << ob.first << ob.second;
+     return ar;
+@@ -499,7 +499,7 @@
+  * deserialize a pair of some serializable content to the engine.
+  */
+ template<class x, class y>
+-PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob) throw(PersistException)
++PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob)
+ {
+     ar >> ob.first >> ob.second;
+     return ar;
+--- a/inc/commoncpp/tokenizer.h
++++ b/inc/commoncpp/tokenizer.h
+@@ -175,7 +175,7 @@
+         /**
+          * shifts this iterator to the next token in the string.
+          */
+-        iterator &operator++() THROWS (NoSuchElementException);
++        iterator &operator++();
+ 
+         /**
+          * returns the immutable string this iterator
+@@ -185,7 +185,7 @@
+          * invalidated for each iteration. If you need the token,
+          * copy it (e.g. with strdup());
+          */
+-        const char*  operator*() THROWS (NoSuchElementException);
++        const char*  operator*();
+ 
+         /**
+          * returns the next delimiter after the current token or
diff --git a/dev-libs/ucommon/ucommon-7.0.0.ebuild b/dev-libs/ucommon/ucommon-7.0.0.ebuild
index db1a90863ba5..52f09366593d 100644
--- a/dev-libs/ucommon/ucommon-7.0.0.ebuild
+++ b/dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="Portable C++ runtime for threads and sockets"
 HOMEPAGE="https://www.gnu.org/software/commoncpp"
@@ -11,28 +12,21 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/8" # soname version
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc static-libs +cxx debug ssl gnutls"
+IUSE="doc +cxx debug ssl gnutls"
 
 RDEPEND="
 	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
+		net-libs/gnutls:=
+		dev-libs/libgcrypt:=
 	)"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
+	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
+	"${FILESDIR}"/${PN}-7.0.0-c++17-dynamic-exception-specifications.patch
 )
 
 src_prepare() {
@@ -49,28 +43,33 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
+	# https://bugs.gentoo.org/730018
+	# need to link GCC's libatomic when compiling with clang
+	append-libs -latomic
 
 	local myeconfargs=(
-		$(use_enable cxx stdcpp)
-		${myconf}
-		--enable-atomics
+		--disable-static
 		--with-pkg-config
+		# don't bother with openssl, incompatible with the 1.1 API
+		--with-sslstack=$(usex ssl gnu nossl)
+		$(use_enable cxx stdcpp)
 	)
-	econf "${myeconfargs}"
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
 	default
-	use doc && emake doxy
+
+	if use doc; then
+		emake doxy
+		HTML_DOCS=( doc/html/. )
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS="doc/html/*"
 	default
+	dodoc SUPPORT
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 9d79f5d88726..45af475bb735 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,6 +1,3 @@
-DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
 DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
-EBUILD userspace-rcu-0.11.1.ebuild 700 BLAKE2B 34b0c77a1c001de1b7f17576d566f844342bb83f5a03474ec40b1daa7bba38736ca42bf4a4a29d43f7ee5fc94e634387b8ebe35ac44c48d08401776d27643096 SHA512 f1fec987b003fdf73bcc179e96b4a82e4a0159348a52b07cc9d439eda42f608d4dfde931f022889f6f04c9d28c9e7dc828ca7554b5f9129ddf0cf0baceb18b07
-EBUILD userspace-rcu-0.12.2-r1.ebuild 786 BLAKE2B 10feac0f9129d69be5e4198bc4cca47114557e8ef01bc0eedeeec4444d2deea5a6bb070ce887f42c3b6864dad0d8e535499b5e19de1800e3c3acfb8a3aa3f1ed SHA512 ae2ffce01715203a0b51a5602723e2a049b918bc545bf26ec5b8304f24f7b960ed2c4b7cd6a12c35fedf67738e45da23a283b94152113e4b7c905d610f2fc0fa
-EBUILD userspace-rcu-0.12.2.ebuild 707 BLAKE2B 100a45de2603b238099794018c42c6ebe41e4d35bc40b70a9780efcd1a29c88f2c11a630be02e492827f0f8272e0aeb53a24252d16a2be6b86bc9a227a29af2d SHA512 b79b76dc220840ac7d54385a7f99cb7f8cce799a96c0e534bf3e78572388914f88e59f2de93c26887f4d97d77b007bab8aa465941e20204404b10666462f784a
+EBUILD userspace-rcu-0.12.2-r1.ebuild 779 BLAKE2B bfc53650395398c8ebb43ad109e5df7c88a734f5cc7fed739773ab809633b7e17539917c0c5ed5343011a4f55445793282a10c9746af50a1663bc86d32e3819a SHA512 1fb8b6b228730da7ae4424c5032b340670ad50a55bcfbb46314d0baea017300bbf3c568095912b23c40974ad9bfb78faaef192a67eab466e8e1605a736327aaf
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
deleted file mode 100644
index fa94af45224e..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	if use regression-test; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
index 3f480a08e886..f173f6fa26e2 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild
deleted file mode 100644
index 74ef772211de..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	if use regression-test; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 655643092fce..c32d33f8e0ba 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,6 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
-DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
-EBUILD uthash-2.2.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
-EBUILD uthash-2.3.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
-MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
+EBUILD uthash-2.3.0.ebuild 668 BLAKE2B cf07d7e7f25b55d2d325e0dd6f81ab8f135f5752d1e84f325536f517e5f19fef457ce1e4e6bc6746c7a894a4613eba12b7b7ce997ef361e68131ee60b303e2c9 SHA512 ee109e34c19e834f56ee97c158610ab5d47247c984e62fd1d1b2e7ec5ec548bc8a49068531084fce0268974357a2c80ea40b6080e145f07a73d9003775ea0fd1
+MISC metadata.xml 485 BLAKE2B b34f32435665d24b66dde021480965ef423ef4d6e4dac195d11dd6381bce5f496a82b494bc040a79c34bc64b5f226b52d798e899ce0d5686b96c733643f292b7 SHA512 088755401b81a4f9fdaee97b25418d2023805c64c07733e6b5d52c69f48060b0741f519c43a4c0c8678dc0640d6827cb3ad116fc49266046ff41051f265337f4
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index ce8a4ddcbac6..6e3e64f2f795 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">troydhanson/uthash</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+			<email>jakov.smolic@sartura.hr</email>
+			<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+			<email>proxy-maint@gentoo.org</email>
+			<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">troydhanson/uthash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/uthash/uthash-2.2.0.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild
deleted file mode 100644
index 7e3b5953a15a..000000000000
--- a/dev-libs/uthash/uthash-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
-SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
-)
-
-src_test() {
-	cd tests || die
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	doheader src/*.h
-	dodoc doc/*.txt
-}
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index 7e3b5953a15a..6a3882e3aa85 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -21,9 +21,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
 )
 
+src_configure() {
+	tc-export CC
+}
+
 src_test() {
-	cd tests || die
-	emake CC="$(tc-getCC)"
+	emake -C tests
 }
 
 src_install() {
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index c4670747c563..cf5c706e449f 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
-EBUILD voikko-fi-2.4.ebuild 847 BLAKE2B 35a73d14066f49e2c55c71a07a4e237ea5aee52ecb3ff1b459c568d6087e2f1b8f5ec791b165a6f321ca63ad8e726c6a4b5968d525d6a17fde1211245ac4d93a SHA512 7ee18393f7d03ec1dd25297fdbb06e79462651fb058e3989e5b505e4e28d82809cccc1ab731b1118e2bb36984241cf82cc76faa1f73d0382f17ca1bb037a1080
+EBUILD voikko-fi-2.4.ebuild 848 BLAKE2B 31d6bf4f4af6ca80b70da74cce78614b469bc8c176803b0b976c90fe05645c43518e535b613dca80cb68f858ec921ee52511aa39569ea3179d7e916328752704 SHA512 cbd67839b92ea4657a7e5b856db6e1fc7fcf51ec4a9e9d3cc9a2c5606e08e59dd18823a24d8b3c78398f95adc13ca0dbcc337a19548aff28931d8b563267238f
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index d469446b332e..b2351309f371 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1 verify-sig
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
commit	185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree	a8a537b82fda83a0799c2ca9887f212558363aa7 /dev-libs
parent	c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)