gentoo resync : 25.03.2022

21 files changed, 609 insertions, 57 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c6b31eb496cf..41d539d08247 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index ff1a75d16cfb..321ce4cd2ca8 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,8 @@
+AUX asio-1.22.1-cpp20ex.patch 664 BLAKE2B bef8ef8e761832f1268f3dfca4fb666fd2a3e70a6cd69c1aa9ed0c0a78d6ba0b9d10f08028285925a1aaa5a1fbb80cf4f402b0ad185a89b473328e3654346c0a SHA512 4f7edcc30206c1d9048352e11a28e31fa24c19419560fbeb4456f9481ac0b7c22dcf09a27e446b4eea656126a7322b9e00ba0175c581fe0b4dd9ed61955e7a36
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f688a1e6a0711d7bac322cc4a7f817db209278f216468c6a72b9d3dd564cf298e1f49f8098c3fd9aec7acd66eb7 SHA512 07f9c29d8f02090b4d4b6a1867bcc07a8e9f3388556dff787ca3ba143022eeb63bfac0b5bc264076fed4db3b2e5ec6b7ff0ebefde40ba4753c832032a72d54cc
-DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e182cdde10b24cee246814874dd7739c523b071dfede61a12059f52e04d7bbd309a03d93070bc1dd4640c253c19 SHA512 6421960abd2cf0c205cc50e86adfe492bca2870b486328b4825dc0cefc9c40cdc085516d474c23e15a73f4c108c0e69add5fab6dbe594a1e53636c5c3027e4c5
 DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
+DIST asio-1.22.1.tar.bz2 3085878 BLAKE2B 07326a2273d5b8c0aef8402c92a6a88abbcb961d2a029596d58735d6626279e6d4d591371cc368a41fac1d0161b8786174ba71153e73aac38fa81a83f5f5be86 SHA512 be4a066d9f73662f68a771f63a59fc2e16e8ee1ae1ca6c581e09922514029e58c479edfc0517ee6b29a1fd377d202a2a6eb80d9d17f6e957233c11331f04a479
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
-EBUILD asio-1.20.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.21.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
+EBUILD asio-1.22.1.ebuild 1187 BLAKE2B afd85ce684e834dd8a0e02c7e5551af496e3da72b9f3c658ed9a543b1fe518b91647b3e4467a5c117f6a9a8eea141009b296d4026feb458164425de13834837d SHA512 ee2dcdf16fac6d3a9615a0c8f4f6ece8c855d7277bc039710e11165478e06fefe0204b53efa652645c7edd996da9e948d68dcef459d1caa96c41c7ce8e0cac29
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.20.0.ebuild b/dev-cpp/asio/asio-1.20.0.ebuild
deleted file mode 100644
index 0e025f305eee..000000000000
--- a/dev-cpp/asio/asio-1.20.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.19.2.ebuild b/dev-cpp/asio/asio-1.22.1.ebuild
index 0e025f305eee..1917fccbef79 100644
--- a/dev-cpp/asio/asio-1.19.2.ebuild
+++ b/dev-cpp/asio/asio-1.22.1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Asynchronous Network Library"
 HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -20,9 +22,15 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-cpp20ex.patch"
+)
+
 src_prepare() {
 	default
 
+	eautoreconf
+
 	if ! use test; then
 		# Don't build nor install any examples or unittests
 		# since we don't have a script to run them
@@ -45,5 +53,11 @@ src_install() {
 		emake clean
 		dodoc -r src/examples
 		docompress -x /usr/share/doc/${PF}/examples
+
+		# Make links to the example .cpp files work
+		# https://bugs.gentoo.org/828648
+		if use doc; then
+			dosym ../examples /usr/share/doc/${PF}/src/examples
+		fi
 	fi
 }
diff --git a/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
new file mode 100644
index 000000000000..55de22b8a136
--- /dev/null
+++ b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
@@ -0,0 +1,29 @@
+The cpp20 dir doesn't exist
+https://github.com/chriskohlhoff/asio/issues/1026
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,7 +15,6 @@ EXAMPLES_CPP17 = examples/cpp17
+ endif
+ 
+ if HAVE_CXX20
+-EXAMPLES_CPP20 = examples/cpp20
+ endif
+ 
+ SUBDIRS = \
+@@ -23,7 +22,6 @@ SUBDIRS = \
+ 	$(EXAMPLES_CPP11) \
+ 	$(EXAMPLES_CPP14) \
+ 	$(EXAMPLES_CPP17) \
+-	$(EXAMPLES_CPP20) \
+ 	tests
+ 
+ DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,4 +241,4 @@ AC_OUTPUT([
+   src/examples/cpp11/Makefile
+   src/examples/cpp14/Makefile
+   src/examples/cpp17/Makefile
+-  src/examples/cpp20/Makefile])
++  ])
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index bfcd473b553a..c6b7af72f338 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,7 +1,9 @@
 DIST folly-2022.02.28.00.tar.gz 3600258 BLAKE2B 5943b0e4b6178c8293714f673ed289daed26b1dad22dcb52dc80475f385961cf0a690accc44139f245f2df5cf10c0bdb5638c8bed52cb97fefd3ad6d8dc147b8 SHA512 91ee21e463ffc6eee3b0e5e0244721a9612337b9afe92645556a154f521aec1070f4f381962247bb9bf11592efb5b8bb01f70d1a66acd3444967538062dfe826
 DIST folly-2022.03.07.00.tar.gz 3604306 BLAKE2B fe255678d6f827c82ada3e136742d07bd62dfb81c1250ca6bae9a4f3e1f015904032da8de1488342da1326fa520b448c63a59ef7e0139ecb0844a1ae19c1dfed SHA512 e63eff137711ca71b5a78469e4feff1b4e7b65465413eefb91b7c0cb26b94e1d581a305a9df9937ce05bcd8af3dc465adb816ad95538689811d8ab5b5b9f269f
 DIST folly-2022.03.14.00.tar.gz 3605018 BLAKE2B 11a58e3c23c1e1299c16821e552d500f8215d2fb2fbdee3699b8487e1073196dfc322461e7670d3968c703d84b0b526d2479bcb74005b763f195ce48f04a419d SHA512 0b3710862360788eb55dc40703e3862f57819acf217287f13ce125b56692c4e5b1de12289f02520ecca9007fa872a69e8936df0ec9260adf974a88286489a9b1
+DIST folly-2022.03.21.00.tar.gz 3611725 BLAKE2B 6b0d3431810a26484b2c15a8ba4b245e720d717364a4305269b3adabaa2d005466dfd7ad086b38cb06ee2a2d5908e903e68486aadc62834a32b4fe59cd313095 SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7
 EBUILD folly-2022.02.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 EBUILD folly-2022.03.07.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 EBUILD folly-2022.03.14.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.03.21.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.03.21.00.ebuild b/dev-cpp/folly/folly-2022.03.21.00.ebuild
new file mode 100644
index 000000000000..b644181fecc6
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.03.21.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog[gflags]
+	dev-libs/boost:=[context,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 8b11d8d68eaa..54d0e22bdfa4 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,9 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
 DIST gtkmm-4.6.0.tar.xz 13910344 BLAKE2B fd46c2e0fbda32daf472cae00591ab2cff6027dc0dfeee627ab1e3ac8d44066e702781ba452926dd808b30de260f9f6700242b0d80abd91b2b3ee5faef6eee17 SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
+DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
 EBUILD gtkmm-3.24.5.ebuild 1372 BLAKE2B fad17eb7a7aa67b1fdba65d42558bc5facef1a28b036635bcb2ec2813114ce259f3200d9b6aa06f0fc78353b1abbd8ed0fe9bee2668786b90b06e3e818d9db49 SHA512 8b8d26eb6b3d15c159ba466ee12cf28dff55d5c95622c31647b8a85cf65c4caf820a8e135019fc97cce7ef2ba10710b8ebdc0450568e8bc3f54299549a3df89c
 EBUILD gtkmm-4.6.0.ebuild 991 BLAKE2B 7299f8bfdc1dcc8e9ddc75d251540368555f09c9c32112dee19d4f0c4151b9f655cde42b8bee58748225743369d58754252cb96b1041c3801d9a6fab684f0027 SHA512 516c52e0839d3ca3349358f32b167ee5e6bc9dd8cf59da58e42f6eaa1a542b6a5e75c2f3d649dd99e29717d0a1b2327995d7a682905e1d1c6339fc91242ae3bf
+EBUILD gtkmm-4.6.1.ebuild 992 BLAKE2B f0ab512aed881459c4c4c2804aaa90b58d161be5fc8c8f8e468991a6042aa63a0f356b4218dcbf2889c0c8f6a35dc61710be4bb9a9dee18d98e0fb42449dbee8 SHA512 a4648c8a24f80ea069b9ac063c73bc1a6bc664ce10a6e313e3e080ab11f913a135291d0ece42431b642c0f258d054b25c8be413b2a51444cf83219b6b273a9f7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
new file mode 100644
index 000000000000..e5644c7e4ae2
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.68.0:2.68[doc?]
+	>=gui-libs/gtk-4.6.0:4
+	>=dev-cpp/cairomm-1.15.4:1.16[doc?]
+	>=dev-cpp/pangomm-2.50.0:2.48[doc?]
+	>=x11-libs/gdk-pixbuf-2.35.5:2
+	>=media-libs/libepoxy-1.2
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-libs/libsigc++:3 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild-demos=false
+		$(meson_use doc build-documentation)
+		$(meson_use test build-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
new file mode 100644
index 000000000000..40ca0ece8be8
--- /dev/null
+++ b/dev-cpp/highway/Manifest
@@ -0,0 +1,4 @@
+DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
+EBUILD highway-0.16.0.ebuild 827 BLAKE2B 5086672711f1f60342b6f77ddcd850d845c499d34c13f1f181721bf677c3cc21cdbc6967e6203e084c1cf697b4dd053580efbfb6ca5362369ba0b81577a2dbc6 SHA512 c4f183d1abe116d4994e90044ae957d631e57d2efe95644c650a899de70be366ce683e1332d87c2123e46a6c13a18c44de95fc6ce638ac0272309355aeed5f1e
+EBUILD highway-9999.ebuild 827 BLAKE2B 5086672711f1f60342b6f77ddcd850d845c499d34c13f1f181721bf677c3cc21cdbc6967e6203e084c1cf697b4dd053580efbfb6ca5362369ba0b81577a2dbc6 SHA512 c4f183d1abe116d4994e90044ae957d631e57d2efe95644c650a899de70be366ce683e1332d87c2123e46a6c13a18c44de95fc6ce638ac0272309355aeed5f1e
+MISC metadata.xml 616 BLAKE2B d7aed88bf99a4e1370c0007e2eeb0d9e8a64c888cf1ef428f5096e40d75497a7255ceeeb73b68d7bb3afe44f65073811759dbb61f2270d4a8fdbc0721c7b27dd SHA512 855f548c51686530649f9eb1d5a8f4441f8dca8377622acc3cd32562b58556000dec77ba7c162e8f00443e85b75fde81d2cc900c1741ed76f815e3521d2602e4
diff --git a/dev-cpp/highway/highway-0.16.0.ebuild b/dev-cpp/highway/highway-0.16.0.ebuild
new file mode 100644
index 000000000000..4371d5e0bc03
--- /dev/null
+++ b/dev-cpp/highway/highway-0.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
new file mode 100644
index 000000000000..4371d5e0bc03
--- /dev/null
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml
new file mode 100644
index 000000000000..717dcaf45afe
--- /dev/null
+++ b/dev-cpp/highway/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>dnovomesky@gmail.com</email>
+    <name>Daniel Novomesky</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Highway is a C++ library for SIMD (Single Instruction, Multiple Data),
+    i.e. applying the same operation to multiple 'lanes' using a single CPU instruction.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
new file mode 100644
index 000000000000..65f396ea7532
--- /dev/null
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -0,0 +1,8 @@
+AUX sdbus-c++-gtest-1.11.patch 2164 BLAKE2B 26bcf5be0de9bc9240123a1c7b6f676e069e3eac96a1d96c2dde9db31350b55540ea2a84e612d8c3989f1ecf10772fdbe9470950d595b0f1f2321f4bc0edef1e SHA512 e5db4f76d650882e3bb034c05ff20bf47c96aad8cd39b57e47d63ee753e8c08837764e9be87702720f8beadcf6a9b067f78ed94380babb8811ebb6af6f5daa4b
+AUX sdbus-c++-static-libsystemd.patch 417 BLAKE2B ec6120631ad48d70820c1070a47a224c837c838e0ff24c031b02fb4b9ef900da7b3a2c0b0e696066665a9004b9fcb68851c6971a220b2446da03dbbf42138ac5 SHA512 e42a080f580597aa7c3cddb71f6e6368addfe4a36b08b2944baf111dd70029c3d0d79868dabeaf78b91836c2a84939163ce10c3ffe4b36e53424be06c1fe1a0e
+DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
+DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
+DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+EBUILD sdbus-c++-0.9.0.ebuild 3127 BLAKE2B 073d0b6c378c1e5e63882d32e798e67ebac1bc15f3c6524c46ff5534999ec9c58b42de0c400b46fafb3492a9de80bf1a65e6a75aa0220c2c5c606bd8a5d36e95 SHA512 ccd1ef989aac5eae53ac0c142809646569a914c48df17220c61ebc92096a19c8e16e04a0345a6f03c33c361c53570e3d603d4376e9eb15fb645beca4ef64d223
+EBUILD sdbus-c++-1.1.0.ebuild 3178 BLAKE2B e90613baf5061d935d4dfabc555599c02b27f62044cbd61ebe1f79461726dbe0d415ecc78beb0d9f18cb3d52669035e616a5161f8ad9a25b94d2496692a220c2 SHA512 2174b4740d81306500f37cc90f5b974ff16a41bc6c65117e23610ec2a8ebc601573e632c410a28a177890df47d22379bcad794123e81b4496ef8bf48eef81a20
+MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch
new file mode 100644
index 000000000000..e6d3622ee11f
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch
@@ -0,0 +1,58 @@
+From 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44 Mon Sep 17 00:00:00 2001
+From: Stanislav Angelovic <stanislav.angelovic@siemens.com>
+Date: Thu, 27 Jan 2022 13:38:19 +0100
+Subject: [PATCH] fix(tests): printer for std::chrono in googletest v1.11.0
+
+---
+ tests/CMakeLists.txt          |  2 +-
+ tests/integrationtests/Defs.h | 22 ++++++++++------------
+ 2 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index fbf198c..ec42e55 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -19,7 +19,7 @@ if (NOT TARGET GTest::gmock)
+     if (NOT TARGET GTest::gmock)
+         include(FetchContent)
+ 
+-        message("Fetching googletest...")
++        message("Fetching googletest v${GOOGLETEST_VERSION}...")
+         FetchContent_Declare(googletest
+                             GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
+                             GIT_TAG        release-${GOOGLETEST_VERSION}
+diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h
+index 2f129a4..2bfc7c9 100644
+--- a/tests/integrationtests/Defs.h
++++ b/tests/integrationtests/Defs.h
+@@ -56,20 +56,18 @@ const bool DEFAULT_BLOCKING_VALUE{true};
+ 
+ constexpr const double DOUBLE_VALUE{3.24L};
+ 
+-/** Duration stream operator for human readable gtest value output.
+- *
+- * Note that the conversion to double is lossy if the input type has 64 or more bits.
+- * This is ok for our integration tests because they don't have very
+- * accurate timing requirements.
+- *
+- * @return human readable duration in seconds
+- */
++}}
++
++namespace testing::internal {
++
++// Printer for std::chrono::duration types.
++// This is a workaround, since it's not a good thing to add this to std namespace.
+ template< class Rep, class Period >
+-static std::ostream& operator<<(std::ostream& os, const std::chrono::duration<Rep, Period>& d)
+-{
++void PrintTo(const ::std::chrono::duration<Rep, Period>& d, ::std::ostream* os) {
+     auto seconds = std::chrono::duration_cast<std::chrono::duration<double>>(d);
+-    return os << seconds.count() << " s";
++    *os << seconds.count() << "s";
++}
++
+ }
+-}}
+ 
+ #endif /* SDBUS_CPP_INTEGRATIONTESTS_DEFS_H_ */
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch
new file mode 100644
index 000000000000..d6f018fda175
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch
@@ -0,0 +1,10 @@
+systemd does not include pkg-config dependencies for static linking.
+
+diff -Naur a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
+--- a/src/libsystemd/libsystemd.pc.in	2022-01-18 11:35:43.000000000 +0000
++++ b/src/libsystemd/libsystemd.pc.in	2022-03-05 21:24:47.139338880 +0000
+@@ -18,3 +18,4 @@
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -lsystemd
+ Cflags: -I${includedir}
++Requires: libcap
diff --git a/dev-cpp/sdbus-c++/metadata.xml b/dev-cpp/sdbus-c++/metadata.xml
new file mode 100644
index 000000000000..3bd4943a1267
--- /dev/null
+++ b/dev-cpp/sdbus-c++/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<use>
+		<flag name="systemd">Use external libsystemd instead of statically-linked build</flag>
+		<flag name="tools">Install interface stub code generator</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
new file mode 100644
index 000000000000..04f6c85c5a16
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
+
+SDP="systemd-stable-250.4"
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	!systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE="doc systemd test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!systemd? ( sys-libs/libcap )
+	systemd? ( >=sys-apps/systemd-236:= )
+	tools? ( dev-libs/expat )
+"
+
+# util-linux is needed for libmount when building libsystemd, but sdbus-c++
+# doesn't need it when subsequently linking libsystemd statically.
+
+DEPEND="
+	${RDEPEND}
+	!systemd? ( sys-apps/util-linux )
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	!systemd? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+SDS="${WORKDIR}/${SDP}"
+SDB="${WORKDIR}/systemd-build"
+
+pkg_setup() {
+	use systemd || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use systemd; then
+		pushd "${SDS}" || die
+		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
+		popd || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if ! use systemd; then
+		EMESON_SOURCE=${SDS} \
+		BUILD_DIR=${SDB} \
+		meson_src_configure \
+			--prefix "${WORKDIR}" \
+			--includedir "${SDP}/src" \
+			-Drootlibdir="${SDB}" \
+			-Dselinux=false \
+			-Dstatic-libsystemd=pic
+
+		# systemd doesn't generate the needed pkg-config file during configure.
+		BUILD_DIR=${SDB} \
+		meson_src_compile libsystemd.pc
+
+		# Need this present otherwise CMake generates the wrong linker args.
+		touch "${SDB}"/libsystemd.a || die
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_CODE_GEN=$(usex tools)
+		-DBUILD_DOC=yes
+		-DBUILD_DOXYGEN_DOC=$(usex doc)
+		-DBUILD_LIBSYSTEMD=no
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \
+	cmake_src_configure
+}
+
+src_compile() {
+	if ! use systemd; then
+		BUILD_DIR=${SDB} \
+		meson_src_compile version.h systemd:static_library
+	fi
+
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+		ewarn "Not running the tests as a D-Bus configuration file has not been"
+		ewarn "installed yet or has changed since. The tests can be run after"
+		ewarn "the package has been merged."
+		return
+	elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+		ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+		return
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	if use test; then
+		# Delete installed test binaries.
+		rm -rv "${ED}"/opt || die
+	fi
+}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
new file mode 100644
index 000000000000..7eee346da844
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
+
+SDP="systemd-stable-250.4"
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	!systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="doc systemd test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!systemd? ( sys-libs/libcap )
+	systemd? ( >=sys-apps/systemd-236:= )
+	tools? ( dev-libs/expat )
+"
+
+# util-linux is needed for libmount when building libsystemd, but sdbus-c++
+# doesn't need it when subsequently linking libsystemd statically.
+
+DEPEND="
+	${RDEPEND}
+	!systemd? ( sys-apps/util-linux )
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	!systemd? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+SDS="${WORKDIR}/${SDP}"
+SDB="${WORKDIR}/systemd-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gtest-1.11.patch
+)
+
+pkg_setup() {
+	use systemd || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use systemd; then
+		pushd "${SDS}" || die
+		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
+		popd || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if ! use systemd; then
+		EMESON_SOURCE=${SDS} \
+		BUILD_DIR=${SDB} \
+		meson_src_configure \
+			--prefix "${WORKDIR}" \
+			--includedir "${SDP}/src" \
+			-Drootlibdir="${SDB}" \
+			-Dselinux=false \
+			-Dstatic-libsystemd=pic
+
+		# systemd doesn't generate the needed pkg-config file during configure.
+		BUILD_DIR=${SDB} \
+		meson_src_compile libsystemd.pc
+
+		# Need this present otherwise CMake generates the wrong linker args.
+		touch "${SDB}"/libsystemd.a || die
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_CODE_GEN=$(usex tools)
+		-DBUILD_DOC=yes
+		-DBUILD_DOXYGEN_DOC=$(usex doc)
+		-DBUILD_LIBSYSTEMD=no
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \
+	cmake_src_configure
+}
+
+src_compile() {
+	if ! use systemd; then
+		BUILD_DIR=${SDB} \
+		meson_src_compile version.h systemd:static_library
+	fi
+
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+		ewarn "Not running the tests as a D-Bus configuration file has not been"
+		ewarn "installed yet or has changed since. The tests can be run after"
+		ewarn "the package has been merged."
+		return
+	elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+		ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+		return
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	if use test; then
+		# Delete installed test binaries.
+		rm -rv "${ED}"/opt || die
+	fi
+}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 759b70cf69fc..b7af9e23cf86 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -9,5 +9,5 @@ DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebe
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3328 BLAKE2B 49da765405909bdf94c7e315ae00b4503113db99ea1c13e411a5349bd52b816b36654e06a2cb7c8d10b66caced270f8a7bc2d9c569296ecf4f99a91accf2301e SHA512 19edba39e17bf21471309fb769a3ffb0af06b6cbf61f3523767b8980ea2655cca96edd6191ace397610d9e2460a2e684361077e57b82393500950255dd0a7c8a
 EBUILD tbb-2021.4.0.ebuild 1003 BLAKE2B 60f60e47a512ee0a715cabc1f7bf876aa8f4be338cf3563ccc5aeb6b4f8c83dc6671e1fe168a96c2e856c95912fd5766021040ce593b5d656e95136f7afff5e2 SHA512 27a5925c68d5f369753c72e4cd8bb472cdc9e21758e7b3e1d144afb374f12d92964b1721d39c885c6da9500aed0aecee17914ffc87a675721e7b6a5d41c43a60
-EBUILD tbb-2021.5.0-r1.ebuild 1277 BLAKE2B 76bbb45fbec3510069a131972bb7d8bfb729c21c099de260d06d1cb323b120305b316e7ff616c4ad4c1346199ff170c314001d4088e17970a216ac34aaca620c SHA512 d58b8047284b92b1fb879c96759b31ce6926e3a812c0e4c55ad48999f91b1aa183234d4bf145f7a37fb82748f24e0b76fc60de471cfe73345d0deb2bd8fc4536
+EBUILD tbb-2021.5.0-r1.ebuild 1276 BLAKE2B 228a61df9e5fe9d3c7936664c2593509ec520ae3ba30353c92c9761a06594cd86b9bda96cad86c0f60a9f35b9f7435ece7472f5a1d4003b592086614ec1819cc SHA512 e2d60935288b5ed6c19ee94d4365efd478d5007c8b5ac315f87ecb68f3caffa60cc988a280841b48c00ad616e1a2866b98857d7f8f1ae6d0b377f4fdbee37f1c
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index 22d714102105..49103c2b0f5e 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"