gentoo resync : 20.06.2021

48 files changed, 457 insertions, 289 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index aeda32ddaf58..1b7acd332fe2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 714a10396c10..3344b1c9c4c6 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,6 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
 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.1.ebuild 4096 BLAKE2B 13fb5acca64256ef6e17b1a723fb553a735cea1c8b8a15f49a4d13b1337c4557e2355c00c2cc984dc2820d36d18afcbb5bcfe45a827dd4a7b804d2f5373ad2a0 SHA512 796e7258ec3d58a1c8273bb73ef897f4c87ca56088560da3d796de201e6e4dad3a2161a5f43e457ddd43d5e3cadcb5bba5f7c4098d98e10964d0b7082ecb7e73
+EBUILD botan-2.17.3-r1.ebuild 3041 BLAKE2B af20f6fc0d5cfc587cc67c8fffffa5d456123e996910f178059db6902ae6c4f8b21017c6da509f7f53e2d958069274ed59080747077cbe9fc61384a8b2c6a41f SHA512 14a862be4d12e02677507c1c0ba8b7950731da329e5d13b1fa8a1f09dd6923dc5e72e41de104efdc456a2b4a6ca528ec9901a56e80bf6382ac9c96c84428104c
+EBUILD botan-2.18.1-r1.ebuild 4099 BLAKE2B 4e4136635017ce0f72533b39aec098e577ef5bc7c434689f1c0d14c683fce8f6ab53bfe605fd8649a3ec87d03df6f266658ed771c33551e7494885a4d9167ccd SHA512 fc77b584b7d9c90b53eed029138d909b45b6cd1383bce0501b480a9f536e171b8151542b3f4057642456f35306dace346fd13fd38c7337c3463a96ed43516683
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3-r1.ebuild
index 69e23dffa1c5..2bb63cd2ae79 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	lzma? ( app-arch/xz-utils:= )
 	python? ( ${PYTHON_DEPS} )
 	ssl? (
-		dev-libs/openssl:0=[bindist=]
+		dev-libs/openssl:0=[bindist(-)=]
 	)
 	sqlite? ( dev-db/sqlite:3= )
 	zlib? ( >=sys-libs/zlib-1.2.3:= )
diff --git a/dev-libs/botan/botan-2.18.1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 7b1dd5d7ceac..5f66e51f3aa3 100644
--- a/dev-libs/botan/botan-2.18.1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	bzip2? ( >=app-arch/bzip2-1.0.5:= )
 	lzma? ( app-arch/xz-utils:= )
 	python? ( ${PYTHON_DEPS} )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
+	ssl? ( dev-libs/openssl:0=[bindist(-)=] )
 	sqlite? ( dev-db/sqlite:3= )
 	zlib? ( >=sys-libs/zlib-1.2.3:= )
 "
diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest
index cab523ac17fe..e426fac4fdc4 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 592 BLAKE2B 5bf7a327f2cae4bea9733f12ea92abcacd3df0eeacd3455889d8c1070e15e464c024351ee51874f8e2c2633cc6b2013219b2184b2e3ddcde021fd1e577c5098d SHA512 8f5c3c6a2d133c86a1bba29a696147a3e91d1f9f21463e5dace1828d69f0a720853b8d52fa3141fb173a658595df9617fb37416b4097342f3b6e101ea6f9139a
+EBUILD cJSON-1.7.14.ebuild 589 BLAKE2B a08975e4959f167a9739b7b3a5f269ffc98e517af3f13cd21ee4527e85ae9cbf3262be0a8473428134c549fe3f6cfb581d8758898452de0091302932918bbefc SHA512 09eefdac63278701a652aabe6bfb5d8e08fcf8c4738ebc0dc65668e4835d5f268d786b58840b1a231028bae0f105bc49b0783da43acea396229f4783ea78af9f
 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 5e31a6ae07d5..c9555ca553bf 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 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index 27e9a56c22f0..6a378abbb27b 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -4,6 +4,6 @@ DIST console_bridge-1.0.1-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f
 DIST console_bridge-1.0.1.tar.gz 259480 BLAKE2B 78df3aeaba2e7589166709e7c43a77ac021d22d0db8d379f320455a9d532b247083ff86c3e03d7f9842943c3c98f78cfb33d7920a2987433f822a05ccaf23866 SHA512 913b7ee1d5401c6324eaaab1f8a54d5ff6df4eedb119a1cd00712f223750d69313047344aec5887920497c7b456cf6cb88e5f756bfbbb5ed8223ec758cdfd021
 DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
 DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
-EBUILD console_bridge-1.0.1.ebuild 1690 BLAKE2B d8525f60b52477f8d8f1e207745493bbe4ca041ecb141c5838e90e2862430b71e61ceaa3156c140ee472225cc881e7ab08497f02d28fafc73baa3b8c65aa24e0 SHA512 174d7a98c79695cac6d7d9a0feed363673e0e3c0baf70a1b5c5b13a154a5d4f1f87c6f43844392ca8fe5ba4c33ccbeb5242beb26fe1be927c967cf415a0a5625
-EBUILD console_bridge-9999.ebuild 1690 BLAKE2B d8525f60b52477f8d8f1e207745493bbe4ca041ecb141c5838e90e2862430b71e61ceaa3156c140ee472225cc881e7ab08497f02d28fafc73baa3b8c65aa24e0 SHA512 174d7a98c79695cac6d7d9a0feed363673e0e3c0baf70a1b5c5b13a154a5d4f1f87c6f43844392ca8fe5ba4c33ccbeb5242beb26fe1be927c967cf415a0a5625
+EBUILD console_bridge-1.0.1-r1.ebuild 1693 BLAKE2B 4c9b82d631a8ddfd27fffe87a0820bc62400f267d0e19cb6cc4e3ad721a335c561c18d834028e505141b8329903c0ca9dffd631df76a49fc6c00fa37d1323499 SHA512 ccfba4e4d63b72869ab9a7bf6d8e57dc091954de96e1423aa3c29de8911800d00fd5043dc82c6e360f0ba265840e2414b1b9b23adf4c07788347462d9803e4a3
+EBUILD console_bridge-9999.ebuild 1693 BLAKE2B 4c9b82d631a8ddfd27fffe87a0820bc62400f267d0e19cb6cc4e3ad721a335c561c18d834028e505141b8329903c0ca9dffd631df76a49fc6c00fa37d1323499 SHA512 ccfba4e4d63b72869ab9a7bf6d8e57dc091954de96e1423aa3c29de8911800d00fd5043dc82c6e360f0ba265840e2414b1b9b23adf4c07788347462d9803e4a3
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.1-r1.ebuild
index 495e31259084..21209fda7c82 100644
--- a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
+++ b/dev-libs/console_bridge/console_bridge-1.0.1-r1.ebuild
@@ -31,7 +31,7 @@ SLOT="0/1"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/boost:=[threads]"
+RDEPEND="dev-libs/boost:=[threads(+)]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild
index 495e31259084..21209fda7c82 100644
--- a/dev-libs/console_bridge/console_bridge-9999.ebuild
+++ b/dev-libs/console_bridge/console_bridge-9999.ebuild
@@ -31,7 +31,7 @@ SLOT="0/1"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/boost:=[threads]"
+RDEPEND="dev-libs/boost:=[threads(+)]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index d533786b3dbd..5376d9d25086 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -3,10 +3,8 @@ 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
 AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
-DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
-EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
 EBUILD elfutils-0.184.ebuild 2367 BLAKE2B 0a3544424f08f2fc6cc603490b24a3be0f981f5ea459d97db81ee6b212fbd130d0acbe2556f6f33accd3b0a3812c10a1ba4aa5686cfb4e9174b43e9a0795d133 SHA512 92fc6617eb49b7f3e8952357497a3430a6750f28e4b4e8543e568cd1a17127aa296940b9ee7b366a0919bf3d065fbbd86273d09e04dc92919fe68a11252350b0
 EBUILD elfutils-0.185.ebuild 2422 BLAKE2B 8722db7c34a6e74ba835bc1a839bb32dfe88b9f9fdc55dcb487b136465951e7d1b9ee5f12724ebdab9a57e4d8c14a3b043c8d8cc7369c61ad3a5e929b9ee7de3 SHA512 84d9a249517f2e7a7504774546f6f2e80c83ef45a84de0d5a5e086c87d5c89136049d6f76387750fc5fe867c19fbcdf8d1c436387fae4511b30a5d7cb49ae95b
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
deleted file mode 100644
index f384d98065c5..000000000000
--- a/dev-libs/elfutils/elfutils-0.183.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
-	"${FILESDIR}"/${PN}-0.183-CC-quote.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/foma/Manifest b/dev-libs/foma/Manifest
index 3f37bf6adacb..460430133f27 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,4 +1,4 @@
 AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
 DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
-EBUILD foma-0.9.18.ebuild 1043 BLAKE2B 60a3176fab8bdeb2190fc1b8c99e64dd088e4826330f538f568dce0a0c69608cab23dafda960da6d75fc96acb76f39296ece78e68cf488f9ac35b24067b54ebc SHA512 15e20dd8a69b00638c30ae9d9ec82e272218f6405c3fa48f2dfc563fbbf14ccaf6a9eeeb4a45e1a81c1e15b6299c7933eca86513889048b07f88910a814f1584
+EBUILD foma-0.9.18-r1.ebuild 1043 BLAKE2B b7ae4ba2f23b105dc836063083df247d1c2501b78222782c60d1f3a48d9e2eb99ae70800c9b93898e97f22616c7d7c2bc946cf46db879c6501bbaaaca90de170 SHA512 47652a80ca89e70e776b539969b5b55b1f26cebd024c30d682a268fb14f563c51b0f41f168d9ec948de6fbf9eb12cdbc2a7e14ddfb8321a709fc01f353b2ed37
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/foma/foma-0.9.18.ebuild b/dev-libs/foma/foma-0.9.18-r1.ebuild
index e7a0c979d279..bc5c9d290e3c 100644
--- a/dev-libs/foma/foma-0.9.18.ebuild
+++ b/dev-libs/foma/foma-0.9.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="sys-libs/readline:*
+DEPEND="sys-libs/readline:=
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 0914520e701e..008a96705477 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -2,6 +2,8 @@ AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3f
 AUX igraph-0.9.2-disable-broken-tests.patch 378 BLAKE2B 7f3748ec5d9ed8f9f97f638ebfa353a8373e3d672fbd4f0e697aaef92c1ac926386ee4fc38d94e2f2bfc1bafe0b44922f7c1536016ca6d7334bd419006b66f2a SHA512 93f4509b498eacb384c8af9d52c6c74efbc50c15e178d365774140421eff7005f7428e7f7da2d58cfd74adfda44e833e1b2fb54d220b6a64bdb144bf8fda0e7f
 DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
 DIST igraph-0.9.2.tar.gz 3805091 BLAKE2B aa0e140a9dc8e1005f7f9265aef5880c071fab63c5914c8d93fc7adcbda84d7088678cdb6c277d40bc5998140c70d4a3b359517a4e3583153d1d7233ae8ba42d SHA512 8feb0c23c28e62f1e538fc41917e941f45421060b6240653ee03153b13551c454be019343a314b7913edb9c908518a131034c8e2098d9dd8e5c923fb84d195b3
+DIST igraph-0.9.4.tar.gz 3823988 BLAKE2B c62f15fd227a83da8a78c2bf569874e290c0f8ffd8c69353de1ff2fbd5dff290eceff2462495efc86f44303f3d9d0d397eba720a743da6c118dacb9eeff1b2b8 SHA512 1188d69b95f581d7dac5874dcdb2d1b1a322e39b275c6f092c199ed6214def814062bd46d573bdaa4bc8f4514d6840c6e93dedbe0f6c99a15de33cbc39356573
 EBUILD igraph-0.8.5.ebuild 1177 BLAKE2B 0aebcbb3875bb2ee611d6e35fae031a41cc0eec694649e573adaa3cf987099b2114417332b930102a3b817344ef30f5c383f4f72a70ac9dfe7d3a0caa8397207 SHA512 b8c588bd5a802b2c879d02e81d6c5cde176ff698739423eeb4de5df89cf03d14e70030218b957974f4b65278922116ae0035bf9ad3da9cf9ba275ada0311fdf3
 EBUILD igraph-0.9.2.ebuild 1090 BLAKE2B d883cb49549f5d829bfb66f771b2aa2e212fc86502f68b08031b4fa70abefdf771b3e82d427407fc892493df7d818213d81eb4adf393356a4ff245a182836294 SHA512 0fccd719667534d855dffe24648ef1e17793e5d5ba0c602b3d0b75232e832b5dd8651bde81a258358a9b748d38f0ecdb47c8cc180a990ec9d0e84220d8cd8043
+EBUILD igraph-0.9.4.ebuild 1090 BLAKE2B d883cb49549f5d829bfb66f771b2aa2e212fc86502f68b08031b4fa70abefdf771b3e82d427407fc892493df7d818213d81eb4adf393356a4ff245a182836294 SHA512 0fccd719667534d855dffe24648ef1e17793e5d5ba0c602b3d0b75232e832b5dd8651bde81a258358a9b748d38f0ecdb47c8cc180a990ec9d0e84220d8cd8043
 MISC metadata.xml 821 BLAKE2B a81ebb12eb30401f4a4d19a16f45d50455588465cd22cb3604ae9bdbbb949645efd0ea0a4d9e01bc330262b1a51f0cddb9a4a03ef32d7fab236b36ffe2159bf2 SHA512 8d5fbb68495909d06396bfc2456911b7fbfdd4d4c0bbe946435eae35fc23eba7d7a790fa696f721203a49681ea9af0ca0d6c86281be41ce5419d5df9ca8eefc2
diff --git a/dev-libs/igraph/igraph-0.9.4.ebuild b/dev-libs/igraph/igraph-0.9.4.ebuild
new file mode 100644
index 000000000000..7d9cab598422
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.9.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk:=
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-broken-tests.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DIGRAPH_GLPK_SUPPORT=ON
+		-DIGRAPH_GRAPHML_SUPPORT=ON
+		-DIGRAPH_USE_INTERNAL_ARPACK=OFF
+		-DIGRAPH_USE_INTERNAL_BLAS=OFF
+		-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF
+		-DIGRAPH_USE_INTERNAL_GLPK=OFF
+		-DIGRAPH_USE_INTERNAL_GMP=OFF
+		-DIGRAPH_USE_INTERNAL_LAPACK=OFF
+		-DIGRAPH_ENABLE_TLS=$(usex threads)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 4931d19ab65b..a0273ffbbd06 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,7 +1,5 @@
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
-DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
-EBUILD libical-3.0.10.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f
-EBUILD libical-3.0.9.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f
+EBUILD libical-3.0.10.ebuild 2454 BLAKE2B a0142bd74802511a78e1a173084f996f182e06d5a67d02c24abc0ed8472493a767f6dae58dacc42ae4a74d47522388369b12de89c3baacb8498d01db4f389f5e SHA512 8e4dd7b07cb04f98b5fae037e63b2f572674fe9355c943e598bc4850b4abb75e1b4b1cff4b167541592f68201d5a7d9e8d83782400dd5928346a844a91e4dcaf
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
index 5ce88999e056..718a8b5dcf58 100644
--- a/dev-libs/libical/libical-3.0.10.ebuild
+++ b/dev-libs/libical/libical-3.0.10.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_USE_DEPEND="vapigen"
 inherit cmake python-any-r1 vala
 
-DESCRIPTION="An implementation of basic iCAL protocols"
+DESCRIPTION="Implementation of basic iCAL protocols"
 HOMEPAGE="https://github.com/libical/libical"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
@@ -20,17 +20,6 @@ REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		${PYTHON_DEPS}
-		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
-	)
-	vala? ( $(vala_depend) )
-"
 COMMON_DEPEND="
 	dev-libs/icu:=
 	berkdb? ( sys-libs/db:= )
@@ -42,6 +31,20 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sys-libs/timezone-data
 "
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		glib? ( dev-util/gtk-doc )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
 
 DOCS=(
 	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
@@ -100,7 +103,7 @@ src_test() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
 
 	cmake_src_install
 
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
deleted file mode 100644
index 5ce88999e056..000000000000
--- a/dev-libs/libical/libical-3.0.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		${PYTHON_DEPS}
-		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
-	)
-	vala? ( $(vala_depend) )
-"
-COMMON_DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-	glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/timezone-data
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DICAL_GLIB=$(usex glib)
-		-DGOBJECT_INTROSPECTION=$(usex introspection)
-		-DSHARED_ONLY=$(usex !static-libs)
-		-DLIBICAL_BUILD_TESTING=$(usex test)
-		-DICAL_GLIB_VAPI=$(usex vala)
-	)
-	if use vala; then
-		mycmakeargs+=(
-			-DVALAC="${VALAC}"
-			-DVAPIGEN="${VAPIGEN}"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 633755b6f5a4..8c715558defd 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,5 +1,5 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
-EBUILD libp11-0.4.10.ebuild 719 BLAKE2B 59a0b7fa6e881d4d5bfec50c20e90c780555f9469200a92951e7f1570739f2e5bee26f995feb2f3816d478c3fa266700761b58d732828636e2c69f04e80c661e SHA512 42ec94429d923dd38858b4e73bf6dadef025935bf2ab3aec90e8ac9bc93b9e814c1335ffdb0431f1b977eba1501940d49af32108f9ed3f0c67677bca26073cc2
-EBUILD libp11-0.4.11.ebuild 726 BLAKE2B 5aa548b60083c2f819e55deaacf96c1528639b475dfff52c82cd613b29349f8e4bf44c3a86d17471b752559af50dd91b8fac33ad23e5d6408443a1eaa5c3acd0 SHA512 60c17399f13bcf6b45df691af99ee288238143c2b75fd8ec244d56ecf1dffab753ae905fd7eb55d24aa09a2c74f19407c1b0a925a6880b64f537e17bbf2e134e
+EBUILD libp11-0.4.10-r1.ebuild 722 BLAKE2B e14c3b3aeba1c543d44eaf0f20a86aafe71f98708611f19ff0976dcc7f6268f5483de65061cbb9ca95990c3cdd9897505d2a1b444dee0e9dd2894a2824cbab83 SHA512 4e0453e386b440591cf95e47b335a9817c014dfdd4a084eedcd86e2b57443fbd334cf521c8325a473bdb645c03693ac487944f6219bad6915f0f0c13d7d8b35f
+EBUILD libp11-0.4.11-r1.ebuild 729 BLAKE2B 64e4db925136c268df67aea58c593d42f6b1737f42068c6a0c004f6032388db6fb1378b4356bbd44784e0ddffda0157e43c09d1a02999c8fcff083ddb169a695 SHA512 e38c13b78d61009df4d0e2d706f06e3d7b2ca5820ead60f73a62ce53f176b9cc84d68c2fbc7ffb57ce0115d848da888b6a77928b85cfc3dfda1e29b25113eee9
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10-r1.ebuild
index f2409455c067..b9fcd14e12ac 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="bindist doc static-libs"
 
 RDEPEND="
-	dev-libs/openssl:0=[bindist=]"
+	dev-libs/openssl:0=[bindist(-)=]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libp11/libp11-0.4.11.ebuild b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
index b5fde86162cb..17e3b7767447 100644
--- a/dev-libs/libp11/libp11-0.4.11.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="bindist doc static-libs"
 
 RDEPEND="
-	dev-libs/openssl:0=[bindist=]"
+	dev-libs/openssl:0=[bindist(-)=]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 4aa40e531c1e..400eea29ce87 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -2,8 +2,8 @@ DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd716176245
 DIST libzia-4.27.tar.gz 632660 BLAKE2B 2769e24b628731c4363437513358d7de9a8eca2a49580de2b8b0a791692ef17adc696c984db202e1f7015edd5d5259dd6dc4e9a057e8267b510051aa70a4bf20 SHA512 5022569931a820cfd2c0e76b26021bf07a7c55f77872786b5907c7201be9da1a2d6d653eec3cdb9f504ce43d54207478eab38eaf697ae9dd42f17c3dce6666f5
 DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
 DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
-EBUILD libzia-4.25.ebuild 963 BLAKE2B 654a9ef983820db7b0bca89042218f313d790e2c8425d40a4e45717f1506eadc8ea6906038046d0afc7e92a81e88b29a65e7cdd42a40e971c5c00dab368b4b90 SHA512 1fccdc580e2bceb1b2ffad9478239d103ba682887545e812b605cff09a35ab1f2ba362a2fe48a03233ca60208e9b20402e2a6884d47da8ca99791924004af9e7
-EBUILD libzia-4.27.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
-EBUILD libzia-4.28.ebuild 963 BLAKE2B 654a9ef983820db7b0bca89042218f313d790e2c8425d40a4e45717f1506eadc8ea6906038046d0afc7e92a81e88b29a65e7cdd42a40e971c5c00dab368b4b90 SHA512 1fccdc580e2bceb1b2ffad9478239d103ba682887545e812b605cff09a35ab1f2ba362a2fe48a03233ca60208e9b20402e2a6884d47da8ca99791924004af9e7
-EBUILD libzia-4.29.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
+EBUILD libzia-4.25.ebuild 972 BLAKE2B ea9965bdd007de4a2ec0f7a465b47364fa3ad4c9284373ab326ac8a8e1ef865e150a2ee3e0b0a77aae49b5369d8de69afecda965585d35cc7aca13130896e72c SHA512 82e01a11610e1db6cde670f892dfc45a13bd88318b969c2800b8f769df017c85d696fd62eab8d2cf8c692ea59e9799799fbc4152a4cc6d8994113c93ee90c318
+EBUILD libzia-4.27.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
+EBUILD libzia-4.28.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
+EBUILD libzia-4.29.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.25.ebuild b/dev-libs/libzia/libzia-4.25.ebuild
index 527e88508dfa..d203a987c0e0 100644
--- a/dev-libs/libzia/libzia-4.25.ebuild
+++ b/dev-libs/libzia/libzia-4.25.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="platform abstraction code for tucnak package"
@@ -18,9 +19,8 @@ RDEPEND="dev-libs/glib:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 MAKEOPTS+=" -j1"
 
diff --git a/dev-libs/libzia/libzia-4.27.ebuild b/dev-libs/libzia/libzia-4.27.ebuild
index a3fecb46f788..b085977f4099 100644
--- a/dev-libs/libzia/libzia-4.27.ebuild
+++ b/dev-libs/libzia/libzia-4.27.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
-DESCRIPTION="platform abstraction code for tucnak package"
+DESCRIPTION="Platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
 SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
@@ -18,9 +19,8 @@ RDEPEND="dev-libs/glib:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 MAKEOPTS+=" -j1"
 
diff --git a/dev-libs/libzia/libzia-4.28.ebuild b/dev-libs/libzia/libzia-4.28.ebuild
index 527e88508dfa..9e77c8f593da 100644
--- a/dev-libs/libzia/libzia-4.28.ebuild
+++ b/dev-libs/libzia/libzia-4.28.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
-DESCRIPTION="platform abstraction code for tucnak package"
+DESCRIPTION="Platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
 SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
@@ -18,9 +19,8 @@ RDEPEND="dev-libs/glib:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 MAKEOPTS+=" -j1"
 
diff --git a/dev-libs/libzia/libzia-4.29.ebuild b/dev-libs/libzia/libzia-4.29.ebuild
index a3fecb46f788..b085977f4099 100644
--- a/dev-libs/libzia/libzia-4.29.ebuild
+++ b/dev-libs/libzia/libzia-4.29.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
-DESCRIPTION="platform abstraction code for tucnak package"
+DESCRIPTION="Platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
 SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
@@ -18,9 +19,8 @@ RDEPEND="dev-libs/glib:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 MAKEOPTS+=" -j1"
 
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index b47a3bb3f5f0..97e72f7248d5 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -3,5 +3,5 @@ DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
 EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
 EBUILD mathjax-2.7.4.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
-EBUILD mathjax-2.7.7.ebuild 1355 BLAKE2B 6e6b8d13af34268afad11e2c942d56d4bab7e02db8260645eb40a2c81632ea4f8c3016246fa7171548319109dcde907f663e42b8074b41af64cb4061e78386b2 SHA512 3d1c0f9b491e189c3eb2745674283ef4619a58fc29793eb6b33404157ddc8f81c672ead14fa6ce00e90e109b57b9ef7a4a346beae3779f185bfc882facdab815
+EBUILD mathjax-2.7.7.ebuild 1362 BLAKE2B 85f2ad7f7e8deae216c4bb7e4ad0d41a57696051bef17704e13d0e4dc7a1ccb387a71953e2990d7124aef85b786c5f285f973055383bbddf8c00dc6a68329d46 SHA512 415e8ce3a08802689eb440f60d490e81d8c7cc62e64236528293148b219c26798d5cea7cda6b60f0e93d79fa740d883e65a4c230428054e2768f2244005b923f
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index c30baaa60e5e..02f0e0b71632 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 9aedbc169ca2..476f713b6da2 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-EBUILD nanomsg-1.1.5.ebuild 995 BLAKE2B 3eb80eb46b9e392c6a41958525b7b23a0f3b2ffe160b00d0344a8095bd490535dd7504a51d7d72ee992db1bb448180f37983b058397ce784d25e7cdea094e781 SHA512 f64d63065ba7c038a4601e68affdf45fc866dc892daa3803693649dc66431356eee749861434043bfbbdc7e9c536fd8909038c4386b7304f33cde824139c3431
+EBUILD nanomsg-1.1.5.ebuild 994 BLAKE2B 34dfe354694cc88bc1a360bf9ba1acb46b6f983e3ae8cebfef2648d9f0b82262ef2d0c76a7328a40e39c9c24450af6eb7fb95881f71f82069c4383bd8a1e5a8d SHA512 eca033accf7fec49b296587f3d1ac90cbccc83857339f46b0ce3776951fdefa60528966080bfbcda26f0ea1a697eba9f7fb0bb8dca27f08477955304643d3c99
 MISC metadata.xml 247 BLAKE2B 6474b3360f35b862e1df90ca2717bde61ee0d1878dc7e7a92d3e2e44d86f7bc33022e8338a0d3fc6c3debb1d676ea9107c4705595e5607d611d4c49a8de4f4ad SHA512 a1400bbdfd7e7a9cb5d2f588383417cdbee4a149c069a5fd818f3a1bd587e2f99d514fbcb23e0f7c7d86be15ac8367a22e295802646b0024a3d9bc6fd512dcd1
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
index dd2c4d96aae9..6822c15c56ac 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5.0.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-ruby/asciidoctor )"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5796f172baa3..547dc2aab168 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,6 +6,8 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
+DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d
 EBUILD openssl-1.0.2u.ebuild 9895 BLAKE2B e3120c9bacee4a6cf6e00f1fdc0e480df1e28ca38c9c901d14f679a4a6a5cab074f1bdefbd9e94a28399e2ce7f14fafcc7261146a3fd95bca92427fff46ab361 SHA512 ccb2f8c173cfac5adf5aef9d61a5894168f3092f626d6e6b09cc91e29592765975eef243cd1d42b4693abbd568bc836cc875242476ab6ec00df143cfd394a080
 EBUILD openssl-1.1.1k.ebuild 10292 BLAKE2B 65992f0284bae36b470dae1c979ed0cd6794d147e9c5981f43822e32be87ac4cb51db517141d20b77c5fba104a068893b838f91cefbb24e57af22d1377534c3c SHA512 cb43106f639e268230e406bba3eb0e742c8daf6bc6584faf72a7138ef82213ac92d4400360957a444d981b09edae091081a84425feb76156095d11449f4a4962
-MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
+EBUILD openssl-3.0.0_beta1.ebuild 8184 BLAKE2B 3713e504271fcf5116eb6e789deca73b54d66751d692fdbe4b441cee1f79927844701a768d978c151e133fabb211c7a1a85a8709b46945c1e5f3042153b1c5b7 SHA512 497a284458f9bd5d71048208a4a66f01b07ff83b75fddb75ddb299d0693cd32a17d6a9211238cc855a25e1dfa98db946e399376595a5ec4be29e26770fc4e910
+MISC metadata.xml 1354 BLAKE2B d18c8fdbc725d1c3dc63d7431f739267e4932a42e5a6df706abc0e77e96fee79d4b18679e52ce6f8db3afe6c33bcbc88c43b866a3136856800510abe4b359050 SHA512 15846b4760a40d2e36759c09cc00329d1cebbbdf7f7ed779fe9e9d3e81e5a1641458566baac753ad99380024056c54611502f07c6b8335f51025131060857e70
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 5ca8d93d2f67..44e5433a4857 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -8,6 +8,7 @@
 <use>
  <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
  <flag name="bindist">Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name="ktls">Enable support for Kernel implementation of TLS (kTLS)</flag>
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
diff --git a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1.ebuild
new file mode 100644
index 000000000000..f5fac82dbecb
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.0_beta1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test vanilla zlib"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5
+	dev-perl/Text-Template
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	local myeconfargs=(
+		${sslout}
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use_ssl zlib)
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= echoit \
+		./${config} \
+		"${myeconfargs[@]}" \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile \
+		|| die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]] ; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m} || die
+
+		# locate any symlinks that point to this man page ...
+		# we assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index b26972589137..b810dd6e64f8 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.25.1.ebuild 996 BLAKE2B 788017d30810613d9abec86258f3a2ba840ea750ed02427eeb9670addd9509af167e69f995d7e13cfacf1618f696a9fefb73cb701a98e4bb069fc39cb4c7e0bd SHA512 568aebd959a913ce6b3c04c0111071eb2e0dc5c6257025caf7f632d237c519259c069e6c79019600df7037e3fbc63fae7f9fdbe24d0a0ea26fb075829f0bdeed
+EBUILD pkcs11-helper-1.25.1-r1.ebuild 999 BLAKE2B 9f07d76e3b10d70b7989cba7c3d485c7f534157f71a810a7dae9d4f5f287d3f1baa1c9b6953e096b525f3bcfe171b9923d6c4d411e6e7465678918a77351ae2f SHA512 920a60949d693eb431af45c70ca911922c2b21d4c7f6347d66320349e195a9a936beffbb0b147e1b1a25aaed754811ab0a24ccd322e854db14da40fde236d78c
 MISC metadata.xml 434 BLAKE2B 0f814ae964f39284cc9ca255744de6eb6cb9b268d9710e6f820562691f482dfde9ec1c3caa547ec65350a883a528a0c8858d3bb4225fa7a0f43225647652db96 SHA512 f38336f8c6e9716b560fe2ee16bf2fe0a670f757981651ece38f82a8028ad457dab6d99fac2bdb76a7f69cb807e3885b6933a82e5c82b387b9d822ce7ff518da
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild
index a0a0e6969eee..79f591fd0863 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc
 IUSE="bindist doc gnutls nss static-libs"
 
 RDEPEND="
-	>=dev-libs/openssl-0.9.7:0=[bindist=]
+	>=dev-libs/openssl-0.9.7:0=[bindist(-)=]
 	gnutls? ( >=net-libs/gnutls-1.4.4 )
 	nss? ( dev-libs/nss )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index b3ac8c9f8846..dc80585857a6 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -3,5 +3,5 @@ AUX disable-mipproblem2.patch 1098 BLAKE2B b15da536e0e46a2edbec44e4c68a97e57b96d
 AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8d6262609eccf70e29f6442a7b261b22ffc112ff30cfddc0b8f2a80ffd787d2e9f14f8bb1ba35c095110d695 SHA512 d802c597e408ca50fe01e240c868b2fb5cc2ca3ff00cf15ff1de1c1dc5d0cf0b88da25de0d1151f8011e331f85e343348150285bb515c9ffc17806ff4edd082d
 DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.2-r3.ebuild 1796 BLAKE2B 3539c5632cffcbd77a4d116637ea4d3aa737a33e4a47fa159a4af84b9c0d89abf67d6db70703c43e28b032dbcdcf3d83f28b1a3d029884889e666d220dd1f1cf SHA512 b3851d84685a7147c4eaf0282eb7fba643b0c1009684fd0b2ce145d8aade498de6846d74fd6077f7d47d056a7fce2ddbec00b4ec698d3a6c53ba86e38bbbe706
+EBUILD ppl-1.2-r4.ebuild 1799 BLAKE2B cd793fa53344eddfe3f03cbf40ae9caf2cc3993d3613f0b8ee995c204040b74eb72ba40721f6d5e50e5adf39f918df879e601aa0d2cb513f45d149bee7b85c09 SHA512 255d59d036763b219173a4cc2733c7aed6af5104b6756670b74b52818608ada70658452780fb6acf3f6298d3cf2a11ca15d4055242ce413f0b68be84aaa186de
 MISC metadata.xml 889 BLAKE2B 569fe94d744c94a0991a4a41ab14df4450b7a9b4b2b2adad1d39cf6638b57ebf89246bcd99bfb2c8823f9c6d757c0070a78b8a0bf4afcc9afe8a08e4dd4c870e SHA512 f2b98bcc8cffaec5802fbc2788aab5e5571302c9f6296a34085febea857ef9f10f56ca722bd4ae3a8a80725a3a53e69c88ea7f33adab01221be04fe40e39f3e2
diff --git a/dev-libs/ppl/ppl-1.2-r3.ebuild b/dev-libs/ppl/ppl-1.2-r4.ebuild
index c3e4bc769be5..0ff38f8e2e76 100644
--- a/dev-libs/ppl/ppl-1.2-r3.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/4.14" # SONAMEs
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="cdd +cxx doc lpsol pch static-libs test"
 
-RDEPEND=">=dev-libs/gmp-6[cxx]
+RDEPEND=">=dev-libs/gmp-6[cxx(+)]
 	lpsol? ( sci-mathematics/glpk )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index ae82d901e3b1..e54ea47f82de 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,3 @@
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.6.1.ebuild 1007 BLAKE2B ead8b2504dc90179de6a0479400e57562736a7ee1c472d882c730d91e5839ae5eb992bc00d166a906f9bcf83c00dd56167b55988c9398dbc25539b516d4814c7 SHA512 f4f658c790d709a36c3a0ba3dc4d5b951ff67119907d60516087d568544168f3bf2306df738760eb4988b6322e7e037ff68d1db3cbec444ee5d659e38cecba1a
+EBUILD softhsm-2.6.1-r1.ebuild 1010 BLAKE2B d3f45642209e3917b749e10fdf690c499826c32a6bf0e77bf4e4d76b8fe1b393db59727b3dd1c9ac330436f1a1c3261e0fde0e05aba2d95f35565cc108a8e549 SHA512 1a12ea6533153ab8d15e3da7ea935d18007cb3a6a842b352a2259fc0282d0f736feba17bc4cd7e0e64d22ec9013cf340f62349b2cea15a733c78e4d1d1c524f0
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
index a91a6928ade4..808ff4cbdbfa 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
@@ -16,7 +16,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	migration-tool? ( dev-db/sqlite:3= )
-	dev-libs/openssl:0=[bindist=]
+	dev-libs/openssl:0=[bindist(-)=]
 	!~dev-libs/softhsm-2.0.0:0
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 730788ec135b..62e85a455319 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,4 +1,3 @@
-AUX tinyxml2-8.1.0-meson-typo.patch 659 BLAKE2B 86b0bc38802f42f90453c729d15be74bfca836f173a1c10f27849a06c5fcd964e7daa6c095f91ad6ad9ef58b079bf8e060ad0f889497369e76a80297f685a392 SHA512 d0a16ce826d1f6744ccc48240dbe7e0a627fc61e9f91599c9d0807431177a38e2f91f85183bc44a07ad9ad4e55b7f92ccf0c5b42fcccd60ec2e25ff5c1842451
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
 DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367
diff --git a/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch b/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch
deleted file mode 100644
index b13b27af7928..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/leethomason/tinyxml2/commit/0838dd11a3d7a122799298d6556cff501b88421a.patch
-
-From 0838dd11a3d7a122799298d6556cff501b88421a Mon Sep 17 00:00:00 2001
-From: heitbaum <rudi@heitbaum.com>
-Date: Mon, 17 May 2021 15:14:01 +1000
-Subject: [PATCH] meson.build: fix typo
---- a/meson.build
-+++ b/meson.build
-@@ -58,7 +58,7 @@ dep_tinyxml2 = declare_dependency(
- # This is the new way to set dependencies, but let's not break users of older
- # versions of meson
- if meson.version().version_compare('>= 0.54.0')
--  meson.override_dependency('tinyxml2', dep_tinxyml2)
-+  meson.override_dependency('tinyxml2', dep_tinyxml2)
- endif
- 
- if get_option('tests')
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index b0d37cf7278a..8ad921497c7c 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
-EBUILD tree-sitter-0.19.5.ebuild 763 BLAKE2B 500cce0afffaef886e181be47fd55efe177d665440e897cd4b26be097e25f4b5a7f62f6d4c98c4c1c842aaa3ae0b36b73802fe542a8fd3e18e4109c8da98950e SHA512 35f228535e4d29cdefc9d8933b2009107d6e0472872b517ab354c3c87ca7fc060fa7cfbf7943cd843e279f3840973388ebf12ee6aada52b167aa89417605a3c6
+EBUILD tree-sitter-0.19.5.ebuild 770 BLAKE2B e01250e7154c53c3491b777b2ab5010efad99d9732fd744626c3a409ab9f6eba831d50cb1060cb44f01a0ff1e1c2a0696bbd2115fd864b718739057e50831b8c SHA512 c31c6470c56da0263c1531677486883fe9b798e446096921e310ad456ecdad9516ac1238456a72487e3a730ed59a9c0b15ba3abc7834a0ced0855efb252cda6a
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index 60833984005b..72db00461619 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index f8c01d65e0bd..5b6f539372a2 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,5 +1,5 @@
 AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
 DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
-EBUILD urdfdom-1.0.4.ebuild 817 BLAKE2B d0f8f64a40174886df3ea75adf3bba0612ee7fbdba74dd36837ab7e77704a41c9e00ae66443ef9e1ec0534e9e0582a42c26d7a95f8ded4f919c808ca2bd045f5 SHA512 7957fbe7d2472168cb0beff2bc004e89e7102159bff1d0257e2b5c492b074a343facd3f2dbf280f0b5b06b3168db0a07799410e5b43b1e55ba0a3c307c11bed5
-EBUILD urdfdom-9999.ebuild 782 BLAKE2B db8f93a1297207c7333f837f524c0f7cacc2c8da6a63eb1070a14d2b1303d74326328d848f68d850cae63f38ef63f8c9eed7e7f0037748abb606abd542cfb2b5 SHA512 10acdd2b7a3785e8c2c61cfe2ae0650a29528a0a394de935bb8271915c92bf5acf477ba2aa3be58a5df74cec0fb9598351f9fe8de80e262d8234b22a45fb54ec
+EBUILD urdfdom-1.0.4-r1.ebuild 820 BLAKE2B fde755690e23f29d8513686cc252d9f711a7fcdceaa4c03865a44755897760170507dbced212ef38b163236a98850de0d69a73202d81fb3aceb3775022bfb65f SHA512 40b2bef45084b976a4913ffa9062ba8d46d9a4682fd39bdef786a20e599ec0719620a072f346d42e2b50605f3e94a6a8edf3b853b6ec8868c7ed2f42a15cc1d7
+EBUILD urdfdom-9999.ebuild 785 BLAKE2B 005167cf6dca7e85e01b03cd761e3920319d1e1c6efd13c66f45794cf4b1264701837073a800ce2d06c99ee87b835e8d2ffca6957a4ecbd27132f2d7a16723a1 SHA512 2c37fc029ff9e4a138c98ca0f5cdc4bb90a5507e1efced479f693dc6da9922bf759b75cf22cd8328711d17a79c7bf5b418b6d1dfd7dc673284aea9c3525daff6
 MISC metadata.xml 335 BLAKE2B e19eb242410b151b76ffa335373a754a074cc060f57c4441a4da4364d8b7f1cd0c71246e48140c6ba6a80a17bf8d721d09c3b61547f83714d0d9d49ab55182da SHA512 ec4d58e41be7a83c80a5e0a77edcf8c231d783e0b4b5f8bb7c42d54da4dba495575b9ee1c32e334a11a424449cc3eba44f89d147d465ec490e4507443211450f
diff --git a/dev-libs/urdfdom/urdfdom-1.0.4.ebuild b/dev-libs/urdfdom/urdfdom-1.0.4-r1.ebuild
index 7b8f7b078a5a..f25395d86697 100644
--- a/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
+++ b/dev-libs/urdfdom/urdfdom-1.0.4-r1.ebuild
@@ -27,7 +27,7 @@ IUSE=""
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
 	dev-libs/tinyxml[stl]
-	dev-libs/boost:=[threads]"
+	dev-libs/boost:=[threads(+)]"
 DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/cb.patch" )
 
diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild
index 1a6ff6fe08c4..1f7a6d0de978 100644
--- a/dev-libs/urdfdom/urdfdom-9999.ebuild
+++ b/dev-libs/urdfdom/urdfdom-9999.ebuild
@@ -27,7 +27,7 @@ IUSE=""
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
 	dev-libs/tinyxml[stl]
-	dev-libs/boost:=[threads]"
+	dev-libs/boost:=[threads(+)]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 45af475bb735..1516387a04bb 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,3 +1,5 @@
 DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
+DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
 EBUILD userspace-rcu-0.12.2-r1.ebuild 779 BLAKE2B bfc53650395398c8ebb43ad109e5df7c88a734f5cc7fed739773ab809633b7e17539917c0c5ed5343011a4f55445793282a10c9746af50a1663bc86d32e3819a SHA512 1fb8b6b228730da7ae4424c5032b340670ad50a55bcfbb46314d0baea017300bbf3c568095912b23c40974ad9bfb78faaef192a67eab466e8e1605a736327aaf
+EBUILD userspace-rcu-0.13.0.ebuild 786 BLAKE2B e596980c7b6e89853289cf2585eda6e4e1b534ff7742e48fdadba1a386bc5048d70293cfe63e5fa00ff04e5b9d4a8d2541b540a72947775f35c7e288bf2c15bc SHA512 6062091a19b76fdd14ae51eb4580bb183b0b945fd399aecf7c55c7d5cbd1cc6ff01128ee098cd9996a8bd49bbc89d02e640530dc8af791bc03e9a22b529c28e7
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
new file mode 100644
index 000000000000..d5a84522a542
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# 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/8" # 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_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	default
+	if use regression-test ; then
+		emake -C tests/regression regtest
+	fi
+}