gentoo resync : 06.04.2022

28 files changed, 386 insertions, 94 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 41d539d08247..4a5b3615c5b7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 94524da6e4ff..7aadacdbfef2 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -4,6 +4,6 @@ DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee
 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
 EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
-EBUILD catch-2.13.8.ebuild 966 BLAKE2B cd760e459aacbb982d7e540a74140006d4a64c0a8679c7010e02bf7e53784ce2d5826685a202d2e6be4b23fe4267e563df3908aec4cf2931f41c2c318f6e7c05 SHA512 49bf3e035b7cb254795701b58c5b3fac004f7065b563c273d5c26ce8213b5767b742ec3cb89a2e77b22eb7c0ac4cd871285a2c74d1dd9d4327b1f88a724f3450
+EBUILD catch-2.13.8.ebuild 973 BLAKE2B 0fe774a892c1b283cfc7dc5720839fd082a4e2cfb2738d40750456dc7804949a85c2f78c72da9c0b4011780f99eef12d5e7b3c1e4a7f1f2710300904040908af SHA512 7d3cec794d5c1f267bc3c8436bf28783b00d0be01ffbd0ceedff66e5aa6b4a684a067803e348bbf9f4a29db63618adb79ce64bb1cff74fde9f4329504a773228
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-2.13.8.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
index 9711bc919ca8..792e1b076670 100644
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index c6b7af72f338..2da6936124b9 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,9 +1,7 @@
-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
+DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
+DIST folly-2022.04.04.00.tar.gz 3629241 BLAKE2B 6e606c7412a8c2dcf731bf1373d3ed33680b07641109fd5da066bd648961d9608d82496322496bf6334a8576ae2394a36603ba8098e972c9b949a989f04baa4f SHA512 923cab43820b75ef7f614a3e62d278ecb3a64beeabefee64d6fb113fbbfd368b69a2a90015706ba58e68967eb9bbf97052678edd1f2d6d4d466792f08e547488
 EBUILD folly-2022.03.21.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.03.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
+EBUILD folly-2022.04.04.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.03.14.00.ebuild b/dev-cpp/folly/folly-2022.03.14.00.ebuild
deleted file mode 100644
index b644181fecc6..000000000000
--- a/dev-cpp/folly/folly-2022.03.14.00.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/folly/folly-2022.02.28.00.ebuild b/dev-cpp/folly/folly-2022.03.28.00.ebuild
index b644181fecc6..b644181fecc6 100644
--- a/dev-cpp/folly/folly-2022.02.28.00.ebuild
+++ b/dev-cpp/folly/folly-2022.03.28.00.ebuild
diff --git a/dev-cpp/folly/folly-2022.03.07.00.ebuild b/dev-cpp/folly/folly-2022.04.04.00.ebuild
index b644181fecc6..b644181fecc6 100644
--- a/dev-cpp/folly/folly-2022.03.07.00.ebuild
+++ b/dev-cpp/folly/folly-2022.04.04.00.ebuild
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 18a092792784..dcf48e4f18a5 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -6,5 +6,5 @@ AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec0
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-EBUILD glog-0.5.0.ebuild 1434 BLAKE2B 41a5f681a1b2d94c4122bcce5306fc999f40161a159e68ad78fab56b9bcb5d88caa6f309224f095cd540f00aa191b6fa1379b5e888ab62cb113160c578c5a23c SHA512 630a5b158fe228f22f4025594ca9b9741ca1abe11ddfcd65280111e60e46b19e8558d59e17bf63c7979af1b50c48259f679bf2d60782717ae5b42522c181e6ce
+EBUILD glog-0.5.0.ebuild 1441 BLAKE2B 36b65a05f64470f316bef75c6cb33717856f047eab30b9b2f47194660e1184c675edd25ed2bbaf383842b5e804cc5e589a84f54d4aaec411703c31806781434b SHA512 80ad142349249550929e1eaadd4215e535333dfcffe2488d801373296985c788562cc443340497256a930fae8a8c83913caffbd8ff56ef88a0a2a5fd52903b2a
 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index fe2ba7a63245..88123b2be536 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 40ca0ece8be8..e88160836824 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,4 +1,5 @@
+AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 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
+EBUILD highway-0.16.0-r1.ebuild 942 BLAKE2B 9fb7283832fd7064ecfd2737d2211788004763fb9ce97a70af64ca9867d50c42d2cd0f34e32608179cc3950aa59cd1a2e5f5d22a0eb5404a1b03355ceb5f41d0 SHA512 320e54fbba2da543642ea3d01c355bb2ece387aa5f96cfaffed33ef480285ab57fe89f1a96308d14dd4b73d1d35391f77e8700002b6733c6ac72f5589a5eb892
+EBUILD highway-9999.ebuild 834 BLAKE2B bb10c9e76cac9a5149824c3f7def1928cbb19db5f7612aa22b8d5aace561483cb7d391e95a21be12edb73c87b3ce5e2a0ae4bb652ea8cfc2f9976b9afecdad8c SHA512 68cf57994bbed31f0ecc10e876ab78edef1af6c1af5be91e2d6ee7758b962799104873795d7c6ce443a2b4cc68c2324823b4e0d8233ca95eeeeb61b042bb5487
 MISC metadata.xml 616 BLAKE2B d7aed88bf99a4e1370c0007e2eeb0d9e8a64c888cf1ef428f5096e40d75497a7255ceeeb73b68d7bb3afe44f65073811759dbb61f2270d4a8fdbc0721c7b27dd SHA512 855f548c51686530649f9eb1d5a8f4441f8dca8377622acc3cd32562b58556000dec77ba7c162e8f00443e85b75fde81d2cc900c1741ed76f815e3521d2602e4
diff --git a/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
new file mode 100644
index 000000000000..de157925c6ef
--- /dev/null
+++ b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
@@ -0,0 +1,17 @@
+https://github.com/google/highway/commit/daf441c78191b3433410498d27a5bfdfdf93a142
+
+diff --git a/hwy/targets.cc b/hwy/targets.cc
+index 2a0ab4ef..7e7e2d79 100644
+--- a/hwy/targets.cc
++++ b/hwy/targets.cc
+@@ -328,8 +328,8 @@ uint32_t SupportedTargets() {
+     if (!IsBitSet(xcr0, 2)) {
+       bits &= ~uint32_t(HWY_AVX2 | HWY_AVX3 | HWY_AVX3_DL);
+     }
+-    // ZMM + opmask
+-    if ((xcr0 & 0x70) != 0x70) {
++    // opmask, ZMM lo/hi
++    if (!IsBitSet(xcr0, 5) || !IsBitSet(xcr0, 6) || !IsBitSet(xcr0, 7)) {
+       bits &= ~uint32_t(HWY_AVX3 | HWY_AVX3_DL);
+     }
+   }
diff --git a/dev-cpp/highway/highway-0.16.0.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
index 4371d5e0bc03..52fb0b16d961 100644
--- a/dev-cpp/highway/highway-0.16.0.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -25,6 +25,10 @@ DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-AVX512-detection-on-IceLakeClient.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index 4371d5e0bc03..2c36b3475aba 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
index 01a53e34684a..64d30a2115ac 100644
--- a/dev-cpp/libodb-sqlite/Manifest
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -1,5 +1,9 @@
+AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
 AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
 DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
-EBUILD libodb-sqlite-2.5.0_beta19.ebuild 2944 BLAKE2B 5e06df184bd2b51956fb050e88fa602f6dcccb393fd833f24776d03c5e544214bdea9b633e7731786e7b4e1cdf6d4ffbd74af02b415fb6dfc47ca62203b0f443 SHA512 7a7ef9fe5545fdf0d575226cd7185ccf8539d6773944400655cf410e7d00bc6f2150e748fb869d47f4cb22c94b17efabfaea086cb9f55365d710a1ab9caa78d6
+DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
+EBUILD libodb-sqlite-2.5.0_beta19.ebuild 3047 BLAKE2B d8f3ad6f4a660578ef18be3f424070fc0b76506deacf615fd0fb3a6bf06bf53a506b0a61193dbe1b21d8fd72add63ea131b1bd78e04bb9eeb500817622aed443 SHA512 c9dadbb3dbc3fa009ac4fc6b9779955011acdfca6792bf8d853cd789ca6d1aa25f813e52a4a11138d734f24e694b51055996c77397efd7b7a24ae878306a9909
+EBUILD libodb-sqlite-2.5.0_beta21.ebuild 2944 BLAKE2B 3f1b342dcbd02217e0433c2a957d4219636a9e2e47f805aaf902db6c6bf43941641a6ce1a034356ae22681755881af1501df7448950a442d33725fa83a4806d5 SHA512 3e5a3b7dc5b12e254f0faf216c00a049bf192e996943f4cdabfa2adcbc24a3230a37214f89608328e83a4b5194272efb68ef9dc3c13833874f4736b8678a429d
 MISC metadata.xml 910 BLAKE2B 7063501aac969fa79938ca8d91e000811d48b00d14424a48cf57a4ba46e74c1100cae9c0c4fc7e2707ea4bf1e2e21e9f1eca254dbb665d7931b606ead8281cda SHA512 20edccf9e1907a0b154ab8c517b9b440a65206664432a725a764288822fb56dcdbd1fb04ad20b138d488e53164adde2296af799859871663c03acefe6d9f4d80
diff --git a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 000000000000..00b685600c8e
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx	2020-06-10 19:25:37.000000000 +1000
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx	2020-08-10 14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+ 
+ #include <libbuild2/script/regex.hxx>
+ 
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
++{
++  if (__s.__current_ != __s.__last_)
++  {
++    switch (*__s.__current_)
++    {
++      case '\r':
++      case '\n':
++        __s.__do_ = __state::__reject;
++        __s.__node_ = nullptr;
++        break;
++      default:
++        __s.__do_ = __state::__accept_and_consume;
++        ++__s.__current_;
++        __s.__node_ = this->first();
++        break;
++    }
++  }
++  else
++  {
++    __s.__do_ = __state::__reject;
++    __s.__node_ = nullptr;
++  }
++}
++#endif
++
+ using namespace std;
+ 
+ namespace build2
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
index a8f86d0c81e3..667455d569ee 100644
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ src_prepare() {
 
 	cd "${BS}" || die
 	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 	sed \
 		-e 's:libsqlite3[/]\?::' \
 		-i buildfile build/bootstrap.build \
@@ -97,7 +98,6 @@ src_configure() {
 		config.bin.ar="$(tc-getAR)" \
 		config.bin.ranlib="$(tc-getRANLIB)" \
 		config.bin.lib=shared \
-		config.install.chroot="${D}" \
 		config.install.root="${EPREFIX}"/usr \
 		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
 		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -113,5 +113,6 @@ src_test() {
 }
 
 src_install() {
-	b install
+	b install \
+		config.install.chroot="${D}"
 }
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
new file mode 100644
index 000000000000..996133e1f47f
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-cpp/libodb
+	dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	!<dev-util/build2-0.14.0
+"
+
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+b() {
+	local myargs=(
+		--jobs $(makeopts_jobs)
+		--verbose 3
+	)
+	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+	echo "${@}"
+	"${@}" || die "${@} failed"
+}
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
+		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+			"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+			"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+			${i} \
+			|| die
+	done
+
+	cd "${BS}" || die
+	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	sed \
+		-e 's:libsqlite3[/]\?::' \
+		-i buildfile build/bootstrap.build \
+		|| die
+
+	if has_version dev-util/pkgconf; then
+		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+				"${i}" \
+				|| die
+		done
+		sed \
+			-e 's:libpkgconf[/]\?::' \
+			-i buildfile build/bootstrap.build \
+			|| die
+	fi
+
+	cd "${S}" || die
+	default
+}
+
+src_configure() {
+	pushd ${BS} || die
+	emake -C build2 -f bootstrap.gmake \
+		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	popd || die
+
+	b configure \
+		config.cxx="$(tc-getCXX)" \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS}" \
+		config.c="$(tc-getCC)" \
+		config.cc.coptions="${CFLAGS}" \
+		config.cc.loptions="${LDFLAGS}" \
+		config.bin.ar="$(tc-getAR)" \
+		config.bin.ranlib="$(tc-getRANLIB)" \
+		config.bin.lib=shared \
+		config.install.root="${EPREFIX}"/usr \
+		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+	b update-for-install
+	use test && b update-for-test
+}
+
+src_test() {
+	b test
+}
+
+src_install() {
+	b install \
+		config.install.chroot="${D}"
+}
diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
index 644a76611483..7ddfdf241944 100644
--- a/dev-cpp/libodb/Manifest
+++ b/dev-cpp/libodb/Manifest
@@ -1,5 +1,9 @@
+AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
 AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
 DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
-EBUILD libodb-2.5.0_beta19.ebuild 2826 BLAKE2B 4f21893d66bda9d7d9ac96c2e76c58a8efb7efeb9642202365b0560e346661a454fd665a04211b8a35e688cdc2b5ca8ae894aa5c1628ffa4187c6b1911431bde SHA512 74cfb4919661dadce3f740279f871f14f50928ead36772a2f59b61344e4022fb77520135409762d910b32cac29213f8314a833672284ce6bed374ef65e817615
+DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
+EBUILD libodb-2.5.0_beta19.ebuild 2929 BLAKE2B 3876b91e9ec8420acf48d7cf9e30099b6ae3966a9613d563d8c720b383b73f829fe626bee93e74201954461f891223510e49efaeb7c604c7caae4960760eadad SHA512 53c399515584df75ba9b1e5b73220dd22f46a3d1a133e225f2f8f3869ed035655bf7a55bc901948ac34475577463d30dc31890ab5862fee627601b19145f9dd4
+EBUILD libodb-2.5.0_beta21.ebuild 2826 BLAKE2B 8581864e1a30971f89439fc823d85e7d7c3c7b31788edb3af7827c4333f417285ef211256f4279ac0e34bdfe680dec9914461f4c7223741ddbf039298651cbc6 SHA512 54bda0a50b2d9f8c25890ac33c1b8543325a4577fa16e13f0b7c5ff10d216f50a74cfab305b87b946c0a8db68d1c435fe9d629b69e738466b3bfa2bfda7298c8
 MISC metadata.xml 910 BLAKE2B 7063501aac969fa79938ca8d91e000811d48b00d14424a48cf57a4ba46e74c1100cae9c0c4fc7e2707ea4bf1e2e21e9f1eca254dbb665d7931b606ead8281cda SHA512 20edccf9e1907a0b154ab8c517b9b440a65206664432a725a764288822fb56dcdbd1fb04ad20b138d488e53164adde2296af799859871663c03acefe6d9f4d80
diff --git a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 000000000000..00b685600c8e
--- /dev/null
+++ b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx	2020-06-10 19:25:37.000000000 +1000
++++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx	2020-08-10 14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+ 
+ #include <libbuild2/script/regex.hxx>
+ 
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
++{
++  if (__s.__current_ != __s.__last_)
++  {
++    switch (*__s.__current_)
++    {
++      case '\r':
++      case '\n':
++        __s.__do_ = __state::__reject;
++        __s.__node_ = nullptr;
++        break;
++      default:
++        __s.__do_ = __state::__accept_and_consume;
++        ++__s.__current_;
++        __s.__node_ = this->first();
++        break;
++    }
++  }
++  else
++  {
++    __s.__do_ = __state::__reject;
++    __s.__node_ = nullptr;
++  }
++}
++#endif
++
+ using namespace std;
+ 
+ namespace build2
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
index df3cbb7b3e1e..32154f060860 100644
--- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,7 @@ b() {
 src_prepare() {
 	pushd "${BS}" || die
 	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
 		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
 		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
@@ -91,7 +92,6 @@ src_configure() {
 		config.bin.ar="$(tc-getAR)" \
 		config.bin.ranlib="$(tc-getRANLIB)" \
 		config.bin.lib=shared \
-		config.install.chroot="${D}" \
 		config.install.root="${EPREFIX}"/usr \
 		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
 		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -107,5 +107,6 @@ src_test() {
 }
 
 src_install() {
-	b install
+	b install \
+		config.install.chroot="${D}"
 }
diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
new file mode 100644
index 000000000000..3556b3eb4d7c
--- /dev/null
+++ b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	!<dev-util/build2-0.14.0
+"
+
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+b() {
+	local myargs=(
+		--jobs $(makeopts_jobs)
+		--verbose 3
+	)
+	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+	echo "${@}"
+	"${@}" || die "${@} failed"
+}
+
+src_prepare() {
+	pushd "${BS}" || die
+	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+		libodb-sqlite/buildfile \
+		|| die
+	sed \
+		-e 's:libsqlite3[/]\?::' \
+		-i buildfile build/bootstrap.build \
+		|| die
+
+	if has_version dev-util/pkgconf; then
+		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+				"${i}" \
+				|| die
+		done
+		sed \
+			-e 's:libpkgconf[/]\?::' \
+			-i buildfile build/bootstrap.build \
+			|| die
+	fi
+	popd || die
+
+	default
+}
+
+src_configure() {
+	pushd "${BS}" || die
+	emake -C build2 -f bootstrap.gmake \
+		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	popd || die
+
+	b configure \
+		config.cxx="$(tc-getCXX)" \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS}" \
+		config.c="$(tc-getCC)" \
+		config.cc.coptions="${CFLAGS}" \
+		config.cc.loptions="${LDFLAGS}" \
+		config.bin.ar="$(tc-getAR)" \
+		config.bin.ranlib="$(tc-getRANLIB)" \
+		config.bin.lib=shared \
+		config.install.root="${EPREFIX}"/usr \
+		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+	b update-for-install
+	use test && b update-for-test
+}
+
+src_test() {
+	b test
+}
+
+src_install() {
+	b install \
+		config.install.chroot="${D}"
+}
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index dd47b9f453c5..d3961fefdb47 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 588 BLAKE2B b5060497d1296712f887a97c140398704ed7212b485048f90fefd37ee0e94da8069a07097aea014e451849bed8c7fafe0b8dd9632c128ff0791db5fab45c214b SHA512 84b549380a7f9926b706557f28d9d1dca5006a6fd932c15e850d6332e0152de9be19972a413071289deedb44a0b2868679e65b50022ccc11bbe73d14bfc3b0ea
+EBUILD popl-1.2.0.ebuild 589 BLAKE2B ad77b6139e8b0576eb14901e284ac24a3b77d4fed9a5d23ec6018ec8271fbc8358db206f27882eda72fff57b2d706854b40680942cebd7b9e03a0c7f63d50b2a SHA512 290766a94a8723385349252bf8150da44c7c8c17e648ef137addea251191486ac996657ea60e1413815eadb893efaffdfe41a514c2de0d96607f52830134cf6b
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
 MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 5206f267709d..5728b4d18b10 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~riscv x86"
+	KEYWORDS="amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 65f396ea7532..218decd5d4af 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -2,7 +2,8 @@ AUX sdbus-c++-gtest-1.11.patch 2164 BLAKE2B 26bcf5be0de9bc9240123a1c7b6f676e069e
 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
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
+DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
+EBUILD sdbus-c++-0.9.0-r2.ebuild 3411 BLAKE2B 8e7b14f2ec70e2ee909da1226f76da1bd7971929445179d297b526bc2f832e57494b2cbc956035f42297f3c6170846734f70667f8ef30c93d9816d360ee71037 SHA512 a0065880261759f12d64da291312cffe88d10f90152142f9e96d36b8e29d4c2ee0960a097ee57966f6e8917cbb6833e595a73ce193835f90b7ba477d5b5439b7
+EBUILD sdbus-c++-1.1.0-r2.ebuild 3462 BLAKE2B d2a76de3dffeeeabf285ae3ec97cc09381816d0ab43c3f19be3066125054cbf832fbbcbe3760132ff72666cb4808bc6a6c85f09d2b48a32bd114ce5e3bae007a SHA512 ebb1b7b65fc17f3d09923814392367a5d9348365ced15a51e1511ba8e8227b46b78df511dfdd339e09bc0c5b471722f82db99d570b442cc3bd0276c9855c1efe
 MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
index 04f6c85c5a16..0dcc953b32f4 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -6,11 +6,19 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
 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 )"
+	!systemd? (
+		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+		elibc_musl? (
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		)
+	)"
 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"
@@ -56,6 +64,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
+		use elibc_musl && eapply "${WORKDIR}"/musl-patches
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || 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-r2.ebuild
index 7eee346da844..acaaad6ab19a 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -6,11 +6,19 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
 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 )"
+	!systemd? (
+		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+		elibc_musl? (
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		)
+	)"
 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"
@@ -60,6 +68,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
+		use elibc_musl && eapply "${WORKDIR}"/musl-patches
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || die
 	fi
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index b7af9e23cf86..1e72e17fbd67 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 1276 BLAKE2B 228a61df9e5fe9d3c7936664c2593509ec520ae3ba30353c92c9761a06594cd86b9bda96cad86c0f60a9f35b9f7435ece7472f5a1d4003b592086614ec1819cc SHA512 e2d60935288b5ed6c19ee94d4365efd478d5007c8b5ac315f87ecb68f3caffa60cc988a280841b48c00ad616e1a2866b98857d7f8f1ae6d0b377f4fdbee37f1c
+EBUILD tbb-2021.5.0-r1.ebuild 1275 BLAKE2B 72e0c6204e656d5ac9028e2ce9cd85977186ca4cf091e625219b7112088acaafad716489caf289cbcd6c41a4de52a8866e8a8e060dcefa33194e3d0c4c4d8087 SHA512 38cec889d464d496890acb94dfe8fea0052a865fd42dca5e40fcd3b4699236b58f6427de267c38b6cc89fda558d4b47fbf103193c5bfd19453935df7e205fe12
 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 49103c2b0f5e..aa3f0e7c26e2 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 )"