gentoo auto-resync : 24:04:2024 - 23:59:27

26 files changed, 539 insertions, 370 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1f9ffddd190c..c9a3faafe6ba 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 741653e49c5a..c3efef6b5dc7 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,5 @@
 DIST libcbor-0.10.2.tar.gz 289450 BLAKE2B 3ef2d7fd7942ff32acbe59db6a4b68ad72dde3af4675ef2ee3c93666360554d6e9a29392dbc4fb3029f9ff821f536b90bfd1c522c9c9c2298ab511322fb53d37 SHA512 23c6177443778d4b4833ec7ed0d0e639a0d4863372e3a38d772fdce2673eae6d5cb2a31a2a021d1a699082ea53494977c907fd0e94149b97cb23a4b6d039228a
+DIST libcbor-0.11.0.tar.gz 293563 BLAKE2B 6ac400ee9cabb0ec68355c35f762ea61222152059e70bcf9dc3cf4e06a6599bb6a392197ee979821a0e50c22a5c9e94e5d11458178ed7e26b049c410fddfa24f SHA512 c14aaa55c0c82e09b9eb2cc6847951d1bac8a081a247776c507d5450367da5717b1056bad09fb0f0178311de8754e8f89c060e0fc0f400fafdc42de441421e66
 EBUILD libcbor-0.10.2.ebuild 1390 BLAKE2B 98dce60ca1dc69fd798252bf4c20912dfb10437a5588276e45a690eadde59acaa23fe5146a737bd1943e562b8ecfb089e77fd5908cd8617e42c96b82d03876da SHA512 db50d8a23d2fbb5776b5db98c3b24fe5f54ba5f982b45f93bdf358f0e02d3602ccec65149b3b09adac04119d8b94c022aa0ed174d173bd4887c80115f4b29b50
+EBUILD libcbor-0.11.0.ebuild 1425 BLAKE2B 7ec665889bf777ea740e0ba477d43885d482b2e972d40d8e043f1dcb819732cfd07c4d89fc5a475faf9598dafe977a09ac30ff62314a4da3058d5742bfb5dda6 SHA512 731f07269dd55e29e492b4081cea28de1b0cff8e735958b9962025b9269f60aa7faad61bd54b3ee11c378ebf4e7d8a7356dbcc187579d6c65bdc9d7f296be070
 MISC metadata.xml 334 BLAKE2B 5f985c348f94bd67786fd6c07fb324006dd82ca3eb69f2ecba0fddda67b447e8d9a82cd53c2a14fd27f11b6b1cef95490359903589ddfec9f0bf8b5bfecd11d8 SHA512 f445b63640728de4a470d9c151b5f720e12981131c643204310b0c33ba4f5ada478609948f4d621306f85758987ff242a0f845052934a642358ae0234a7ee095
diff --git a/dev-libs/libcbor/libcbor-0.11.0.ebuild b/dev-libs/libcbor/libcbor-0.11.0.ebuild
new file mode 100644
index 000000000000..55e875fbc884
--- /dev/null
+++ b/dev-libs/libcbor/libcbor-0.11.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-any-r1 cmake
+
+DESCRIPTION="CBOR protocol implementation for C and others"
+HOMEPAGE="https://github.com/pjk/libcbor"
+SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+			dev-python/breathe[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cmocka )
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	python_has_version \
+		"dev-python/sphinx[${PYTHON_USEDEP}]" \
+		"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \
+		"dev-python/breathe[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DWITH_TESTS=$(usex test 'ON' 'OFF')
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		mkdir -p doc/build || die
+		pushd doc >/dev/null || die
+		emake -j1 html man
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${S}"/doc/build/html
+		doman "${S}"/doc/build/man/*.?
+	fi
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index ce514a7aab19..9452b92266f3 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -2,7 +2,7 @@ AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3a
 DIST libksba-1.6.5.tar.bz2 708400 BLAKE2B 934bde6412de6c1f3062b101930d7b2beac3f6e3f2fbeb5c964a6252b68a3b70c7cb3a48c7eac04b7f1d2ea3c717e1c7e164c1bc6113b46244b9dd130c64b540 SHA512 959312ac0bb2dabcdd22217266daccdf3938d62ff2936c767cade76888757ece1bb6fe79f2c679db03d1baf3919757265d0ded216fee8b8d235e94a70fcf05de
 DIST libksba-1.6.5.tar.bz2.sig 119 BLAKE2B 70f290ed44160af2882b5f2543965e3003dd0fd106ab6eaa1f7dfbb878d1f0402c16f3e802af6be589e501e17d0ead82c03afe73c8353b314c8cafb24e7d4a11 SHA512 e70f136edcf29bf931eccaf930e0ae644fd372e0a6f472599898d2fd5e44e64ab2cea63b0be2b1d9a468f73f607881dfdf06adfe6d1fc9ebd66b21e4c245f837
 DIST libksba-1.6.6.tar.bz2 708510 BLAKE2B 9985b16e946d6b407b5acbf005610cfb2f01d2a733ddff110e329dec8d95bd248cce6e9936d441676a4b06f031cc9122e26146a0f6d36cb343fb9ec16aef3627 SHA512 3b30bef9452ae0c52b4a52e9145fbd6dc57cf7a2b59302e3af063db6b45384e8ed7af62604efd7939b9e0cb5931e946b15609888e9699fafe4acbb0cbf138087
-DIST libksba-1.6.6.tar.bz2.sig 119 BLAKE2B ec4b72d612bb20c280316de7a66ffe697c65caf52e451621b42965d7d5b3e53577fc5b9c41ad5f5c09e42d90654d82afad8462f0baaf757e122fffedcd35d4ce SHA512 5ab4f890819ee3638660fa2ce529223e1798da53508d0cc2db5a9f0b21a242863037f5e81cdf2805e6cafb56e22412005f01cbe7b6344f3eb1a38f7cff98520d
+DIST libksba-1.6.6.tar.bz2.sig 238 BLAKE2B 0d62b39821dee0a3f921e87190247cacec1fcde253d26773a378f3a55a61468feba7b79fc875b1b2b8735f9ff310467dc30d8e5b5b06f37bd1ef4744a3fbfeec SHA512 053b594044ea2d5ad90341e14cf9969e3d8695e4671586cbcdf12d33c7864bf258fcf4474ea09db9612677cb239cb629d6b61799f684a1d838a57c0b53e27bf8
 EBUILD libksba-1.6.5.ebuild 1791 BLAKE2B 659dfdcfcecec6995d35a6c58bc533a9bb09d861af4229ec79a55dac105bbac2d6b014c9606d504a0b19088b874a23e806a9e5947cb970b46eeb0cf357daa7e6 SHA512 7e73050f51512559b044a3953aa0f35064b107d8acc14a6f9ffc7e3addd3f71103b1ba1f6f1fd75edb46415a14b6640cbf4c9ba60db317be5a0ffbb820443a95
 EBUILD libksba-1.6.6.ebuild 1791 BLAKE2B 659dfdcfcecec6995d35a6c58bc533a9bb09d861af4229ec79a55dac105bbac2d6b014c9606d504a0b19088b874a23e806a9e5947cb970b46eeb0cf357daa7e6 SHA512 7e73050f51512559b044a3953aa0f35064b107d8acc14a6f9ffc7e3addd3f71103b1ba1f6f1fd75edb46415a14b6640cbf4c9ba60db317be5a0ffbb820443a95
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libpy/Manifest b/dev-libs/libpy/Manifest
index 27e144e6c916..8f76cbe46a8f 100644
--- a/dev-libs/libpy/Manifest
+++ b/dev-libs/libpy/Manifest
@@ -5,5 +5,5 @@ AUX libpy-0.2.5-setuptools.patch 288 BLAKE2B f971e67fbac3d82450004d8124b7e85f725
 AUX libpy-0.2.5-stdint.patch 257 BLAKE2B c90530144f700a85b659aeda245face0f4761a37c0912871ab6742972e86fc33218ba43336cff65a83149272b04c7aebdfb6bd1ed9b15fa5ed807ce2cd1be6f0 SHA512 72401c5402e7a2a744e27ceceebca12015ddff44c267c05138b22a7bd4798a098050d880662a5f7952fc9802d1299fcf77fa37af4fb0fc4a9631f6c4a27a7a82
 DIST gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz 862253 BLAKE2B a7d7acd2a41924d37c06e4908315d80df92815ed3e81973baf915951f2fcfeb4485ce690ba224cd7168537d81bf43b84efbecef8074dd3246a020e0877924803 SHA512 f01af7e17a3b7fb064bb5b7f1f75f0eca5e987a9976555734a88b7f7a18a763c620668da0628cb6bd1553a69b248bb0b91569b99cf873789c5b27700c25a479a
 DIST libpy-0.2.5.tar.gz 201467 BLAKE2B 629f650740a54736bc014abd63c729c11070d7d226469668386b6fe187a05b830b7ababa17e6c90777c97d2af5397cb1295712218626c837c1cc2c5526e957fc SHA512 8127bdeffdf218837928d6e5743156987cb5e3ca943ec3e84f1fb5d01c1c5fa387eca3b8c276d60d1eeb18fad7a9555bc54c113c976f1d5f23f779336dd6ed71
-EBUILD libpy-0.2.5-r2.ebuild 1409 BLAKE2B 7fdb6e737241b2f7fd9b6f73b7d537c3986db7317e4fa38cac2262523502ebfe5604a12f0073b512b0df80e27ec4e4924d6968b8389598aa3731cf40f050a3cd SHA512 9ab48f400ed102bd43f6d8651a06c354180d8173aab8960b544b72a259704213e50181a19c0584cede5bfad6f7c499282f11dd0557988c260f303ff2c8bbc287
+EBUILD libpy-0.2.5-r3.ebuild 1410 BLAKE2B 9a4f5366cb67a71245652cabd6d33a57961e9e43f4a2243bc6c9923bf7641209cc00bb1914670f35fd96c55026f10cefee5d517fd10dde5f644ca543a595ba9d SHA512 8ae98b50a46ee72c7745f6e348ddc450b3a4ac87bed72fa76c2784db5c498c721a10df6750f811e0ea6b200272acbb21d3fd28e53e431b91574f1cffcf7efdd2
 MISC metadata.xml 436 BLAKE2B ac6c46ec13e4a0f4a190cbc4c03b7a4a72bed6148730c65c56ee0ecb2298acffd536550237d12e2213e04e9a7a31cea4296b5f447857863a62a568d8449cfa0b SHA512 55718401fe31da4f3ec6cfb8b9b74e2429f0d54b87bdb6eb303b235930f034c533cd383004b501d211c2dd36a3d42baa1380c7d34a09facafebe3beb32d4dfaa
diff --git a/dev-libs/libpy/libpy-0.2.5-r2.ebuild b/dev-libs/libpy/libpy-0.2.5-r3.ebuild
index e11055754550..285956b05a94 100644
--- a/dev-libs/libpy/libpy-0.2.5-r2.ebuild
+++ b/dev-libs/libpy/libpy-0.2.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 inherit flag-o-matic distutils-r1
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 60f2ba17644c..000c7593360c 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,9 +1,4 @@
 AUX librdkafka-2.2.0-backport-pr4449.patch 12334 BLAKE2B 1787951e628e64890e1a84203f25609d0488ebf8508e16214a9c9c97f23b853cbd86d1b5ceeb3f00d9118245bf9771ad5db82f5db60c37f1c3d2ba493bf3fa4a SHA512 4e8e2de48025ec7b17c070d1e830a8bead9470d283e26ed0b4a9c7779cb2963cd129e59283da07d44f5a46917c783b026367ce575c6a3d103759e7b64855d937
-DIST librdkafka-1.8.2.tar.gz 4097028 BLAKE2B 37a3190417e973ea4629012e358ff61cda45eb0134448dd0054fd1f1cac57f3543b133331b0b0d518f219f30f79f7665a214c75084d6a8474687b7e686395724 SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22
-DIST librdkafka-2.1.1.tar.gz 4281061 BLAKE2B 8200c2aee0d04109cb78f13b186cf907f3260ee6a17a2fffc4f7706ed9cbea9436eb31d17167e9af783495ef2365f7401bbdc671d5a8d7e7f2ecb9b5c7d57fbb SHA512 6bf1761e7ed1820b587fda24277f6606ec046da281064df13c4380f49a92f3e2b165614b9c622d46b27078ec024a4dc211610e500e597265e8219f8869c4d203
 DIST librdkafka-2.2.0.tar.gz 4340164 BLAKE2B 394c9fd25db0a3a02b16fec3d5d5acc4808b4c8a6c8e025e71f15a91c6311206bf4d7c863860be36483c150bb10955cdc98ba0f088fa493b20ae52154e2a83d0 SHA512 1a85b5864efdeece1327e461b62a378f24b73eb7174168f630aeff01d4a5074d6b2f15744bc267665fcfc6384e804df00c20b7271ecd85a98dca84746b86b4d9
-EBUILD librdkafka-1.8.2.ebuild 2420 BLAKE2B 8434aee94d4cac9cc072a2fada436fbb11343351e27915f7fec0e0e8965a17fbfea254f74d4484caacb7d1ecc02ca1742e1ba96c6b2a4ae1f15e99143b2793ab SHA512 bf6e394da410f9dd33fca36f8a3dc05216d10a8cb523cdcc6c0f8316d433e6cea3c797def510e0ed81f5818d70fb530fd850433e953ff7c69600dfc485e98a3e
-EBUILD librdkafka-2.1.1.ebuild 2420 BLAKE2B 8434aee94d4cac9cc072a2fada436fbb11343351e27915f7fec0e0e8965a17fbfea254f74d4484caacb7d1ecc02ca1742e1ba96c6b2a4ae1f15e99143b2793ab SHA512 bf6e394da410f9dd33fca36f8a3dc05216d10a8cb523cdcc6c0f8316d433e6cea3c797def510e0ed81f5818d70fb530fd850433e953ff7c69600dfc485e98a3e
-EBUILD librdkafka-2.2.0-r1.ebuild 2496 BLAKE2B ed18208ba63ab262f6bd7a98c0fa2c108bc1159e3478041c98e3e802c29a12a7b999eb5f06f16fc6ef37a83d7df597461cd654893344f84547511e8c119d5653 SHA512 5c55e4a42beef23a4f69df3f7e8758ae56ef37cbc466b08e8e193169cd4084b96fc7db47f14b52765a60df2ced1b836e25a87d5a262dde9d1869a19411da6575
-EBUILD librdkafka-2.2.0.ebuild 2435 BLAKE2B 41abb4653abb71001142595a21cf7e6a167f4a458eccd9209bc65d24ad8f84fcc8112efee4555e0d5e13a255f55994905f2827b2f281190fd9cd438acd6773a9 SHA512 859251b3d24695c846f7f7b9ef799b27d5d4e70f479e387d6d0d2239bfff41b613ce6af9c4c32eee391f8462bc95ee4200a92c81fb7e355ffd9f149d09481313
+EBUILD librdkafka-2.2.0-r1.ebuild 2495 BLAKE2B 21cac5dfbfc61f27ceea8d88cb78956274835d2fd3cb2b4ae5f3a3cd8740e4ec5a8401b76150501050dd9da273e0ece8a1760dbd027834c95f5b202db378f7ce SHA512 ee2800213c052dcd1434af8ecc5665498a2bcbeb212347d08be431b383f52ae627406f55f363261fbce5986e5b495ba420ae922f7c16b70e4cd565e6b87013cd
 MISC metadata.xml 458 BLAKE2B 9fe3256ed33cb5691e327d86d5276cfa37e898e938c623f0643bf6cb583e4ee6bd34922880185bdbabc638e2e85ffe157554ff95063db7a348fc9e6f425411e6 SHA512 84279a77f53332007509a0912059a5fb71fed16f0976dbdad200f7a0ff54cff43e17d94afa05f8169181c3fd1aa18e93f6c2e4e279e01cbe9fefdaba46042e7a
diff --git a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild b/dev-libs/librdkafka/librdkafka-1.8.2.ebuild
deleted file mode 100644
index 6c9c3a3edca6..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/confluentinc/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-# which: https://github.com/confluentinc/librdkafka/pull/4353
-BDEPEND="
-	sys-apps/which
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != "9999" ]]; then
-		sed -i \
-			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
-			tests/run-test.sh || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--prefix="${EPREFIX}/usr"
-		--build="${CBUILD}"
-		--host="${CHOST}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--infodir="${EPREFIX}/usr/share/info"
-		--datadir="${EPREFIX}/usr/share"
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	./configure ${myeconf[@]} || die
-}
-
-src_test() {
-	# Simulate CI so we do not fail when tests are running longer than expected,
-	# https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
-	local -x CI=true
-
-	emake -C tests run_local
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild b/dev-libs/librdkafka/librdkafka-2.1.1.ebuild
deleted file mode 100644
index 6c9c3a3edca6..000000000000
--- a/dev-libs/librdkafka/librdkafka-2.1.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/confluentinc/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-# which: https://github.com/confluentinc/librdkafka/pull/4353
-BDEPEND="
-	sys-apps/which
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != "9999" ]]; then
-		sed -i \
-			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
-			tests/run-test.sh || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--prefix="${EPREFIX}/usr"
-		--build="${CBUILD}"
-		--host="${CHOST}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--infodir="${EPREFIX}/usr/share/info"
-		--datadir="${EPREFIX}/usr/share"
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	./configure ${myeconf[@]} || die
-}
-
-src_test() {
-	# Simulate CI so we do not fail when tests are running longer than expected,
-	# https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
-	local -x CI=true
-
-	emake -C tests run_local
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
index e15c202156b1..86c99f805fc2 100644
--- a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/librdkafka-2.2.0.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0.ebuild
deleted file mode 100644
index fe891e25400a..000000000000
--- a/dev-libs/librdkafka/librdkafka-2.2.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/confluentinc/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/confluentinc/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/confluentinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	zstd? ( app-arch/zstd:=[static-libs(+)] )
-	sys-libs/zlib:=[static-libs(+)]
-"
-# which: https://github.com/confluentinc/librdkafka/pull/4353
-BDEPEND="
-	sys-apps/which
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-RDEPEND="net-misc/curl
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	static-libs? ( ${LIB_DEPEND} )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != "9999" ]]; then
-		sed -i \
-			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
-			tests/run-test.sh || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--prefix="${EPREFIX}/usr"
-		--build="${CBUILD}"
-		--host="${CHOST}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--infodir="${EPREFIX}/usr/share/info"
-		--datadir="${EPREFIX}/usr/share"
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-		$(use_enable zstd)
-	)
-
-	./configure ${myeconf[@]} || die
-}
-
-src_test() {
-	# Simulate CI so we do not fail when tests are running longer than expected,
-	# https://github.com/confluentinc/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
-	local -x CI=true
-
-	emake -C tests run_local
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 352100af6c79..939e164d1a2a 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,8 +1,10 @@
 DIST libwacom-2.10.0.tar.xz 114952 BLAKE2B ec9226feeac9998bc8b1886967db1ef5ea34312717eec5cce31796ffb2209cd479f6b2c1f7e2fe63c7c26ff7bdc93cf33a04314caefe84bb1113693086a78de5 SHA512 dc62db42596e14ace8463bc6bb115503d55f14c23a2a259b2169746e21b25eeeaacc09d7d1dd85c3e05f6dc5f3d96a3c757b2c93b171673e8f869337408495f9
+DIST libwacom-2.11.0.tar.xz 116056 BLAKE2B 2091859e036d928bc62543a56ea6ca0e2a879f83000437bc73560c334533a1b7b17e36a4f730c51f5b944cea6dbed0bc90b924c1f2112cd8f4bf0cb82505a0b7 SHA512 66823d97d165b428ddbfc3539572c94e2138b0732bc1c9e97c5ee071982fe8b82ead1302a5c308cbd1038e283fdfd7db853ef4a822c946f85a63b8247877a8a9
 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
 DIST libwacom-2.7.0.tar.xz 111424 BLAKE2B 2cb046a7390c017680a2a67197896b0613fa3b0ca65d388b5d760fba1438c3079786efa77a5b69d26dce7b8813436ca4240500ef00d77e11427fee81df912d64 SHA512 47dd8fc7b82fce88ae9d857bcbecec2e45f2a83e832a5e1f97d5b09f77a2dacd53a470e08e756217fe7c5ef4420fdd8d3e3c37071336f7a3dce522b9fa781583
 DIST libwacom-2.8.0.tar.xz 112244 BLAKE2B cc9bd7118f8e8d8d4ee3a22a6af20f00b95a3660cbc7c0822b7c067c1e78d89a9615db710cd8f3fbcf3a14ccdd434a2694dbb3ce0ef9bdd540b456c774927536 SHA512 b374ee8ded4f5cb7961699d2b9826ad69a3089f9a3073b4275596e1036f0e08813fba09c98653e852da73781c34c779e3faf20dab66eff667812a655e153f133
-EBUILD libwacom-2.10.0.ebuild 1441 BLAKE2B ccca26019588f69fbb0344cf970c09e9c7278fcace7e8cccc87bcb8296add61edbef279204ec8dcb0142e7599aca5a0d6551992dba87cd9dbc790cb526e46ba1 SHA512 5eadc31d3415cb12b66ad90d8c0e7b75edbb2a258df4d6145f58e1d8bdd688e2988ba6ea631b60bd88e366524ade706377845c66065306a1ccabe32a24708454
+EBUILD libwacom-2.10.0.ebuild 1435 BLAKE2B 13773e63c537c2ad33503314b75cbba8510cb67bd82382ecf8f5117c570badb00d20d2fe59e5f1f19ce09e4cd24d2fcc150e1609f571229d96cd25b6c6a94fcd SHA512 51396664c5527d44e936cba7290d3fe6799fc2713a65d060974d2240241ce3229fb711b2cbccd71065df3ab705af733227bc41ada9c7e849cfa9e3d6569c6e52
+EBUILD libwacom-2.11.0.ebuild 1441 BLAKE2B ccca26019588f69fbb0344cf970c09e9c7278fcace7e8cccc87bcb8296add61edbef279204ec8dcb0142e7599aca5a0d6551992dba87cd9dbc790cb526e46ba1 SHA512 5eadc31d3415cb12b66ad90d8c0e7b75edbb2a258df4d6145f58e1d8bdd688e2988ba6ea631b60bd88e366524ade706377845c66065306a1ccabe32a24708454
 EBUILD libwacom-2.6.0.ebuild 1494 BLAKE2B 97233bfad12bf355b3eca8235be62801f0179ba9fc8a4ee5cff0a477d9cb057865a01ab11cb3e8ea1dec40564ff65f29b61c996ca9c8c051b76c49902f3caa20 SHA512 d48c95618c25cb1dfd2011af84ff3ff17f596d12b68d0c50a3e63b251f59d3a1dd094e181c58ae3c4a28e801279ac6e0b7bde63abb84ff55e9e900fb5cced44c
 EBUILD libwacom-2.7.0.ebuild 1494 BLAKE2B 97233bfad12bf355b3eca8235be62801f0179ba9fc8a4ee5cff0a477d9cb057865a01ab11cb3e8ea1dec40564ff65f29b61c996ca9c8c051b76c49902f3caa20 SHA512 d48c95618c25cb1dfd2011af84ff3ff17f596d12b68d0c50a3e63b251f59d3a1dd094e181c58ae3c4a28e801279ac6e0b7bde63abb84ff55e9e900fb5cced44c
 EBUILD libwacom-2.8.0.ebuild 1416 BLAKE2B 7bcc5b30760555a2d4db75515aa33f9c677ba8f953da407b7628fcde15b0e40734fde98a71e6132ad1035fe468926bcef5811b3a6551d4821e05b183d38078cf SHA512 8be77ece66720deade0fd4f589329a9f5d45fe1dd36b203dd229415acca495f65a98557628921691ffecff929177e790605e92317029fbbab3d0c5649a9f166b
diff --git a/dev-libs/libwacom/libwacom-2.10.0.ebuild b/dev-libs/libwacom/libwacom-2.10.0.ebuild
index ec6ea6420bb5..4b992460e769 100644
--- a/dev-libs/libwacom/libwacom-2.10.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libwacom/libwacom-2.11.0.ebuild b/dev-libs/libwacom/libwacom-2.11.0.ebuild
new file mode 100644
index 000000000000..ec6ea6420bb5
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-2.11.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libevdev
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version \
+		"dev-python/libevdev[${PYTHON_USEDEP}]" \
+		"dev-python/pyudev[${PYTHON_USEDEP}]" \
+		"dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 8759d3d88d66..0b1657198edf 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,6 +1,8 @@
 AUX libxmlb-0.3.12-no_installed_tests.patch 744 BLAKE2B d3e2a7a3be09049ebe407966a471d3798ee88902bf7c132708c8abb7353761e1c961e9a9d47c87458c87aed1a0f9ed6c294ffebfa0cc7fcb87311e175192bfa8 SHA512 3a8394b18d41a1219c26fa841829037a10293a2682da57c43d0f2932817dd16701cffc2906c84cba2e412712f852f7df8d0230cec6d3a0fb7dfd2e43ef24e217
 DIST libxmlb-0.3.14.tar.gz 127096 BLAKE2B d99ec674385cd8dc31d92b14ac1539138b00c980ba3561fd406099a64afdf2f8b6fa2d808b5a33daafbcbc5ef87e20a02a534f860699f78bc71aa55d4b507d51 SHA512 6c77b9475ca3430270ca29e3d1c5720740c54ff55da76501495da315ea039500e64791689600aa59f3003ff54d030203616ad468169c296bf34434a68e24df50
 DIST libxmlb-0.3.18.tar.gz 131331 BLAKE2B 8ee200c28b5159a895d601700b6553945b23e321d2266a0438a176747be4922b81bdbc9b9a27c3ff8490f8d40fd5e2d6e7eb5c2ca21484438a55adc54c6d3be3 SHA512 2576aca6b7651cf484694ad157914982ef1e3949ea641b4181966e5d5292b3d8c16318fe61b14d8c7e6d0e0d184ed30d498f874f5ada196f0ca69c6180d9061f
+DIST libxmlb-0.3.19.tar.gz 131490 BLAKE2B 1455e14a90f29865f304b16cbf0355966e7fd0766f8033cb2b2bc9fe28ad0a1266c1e06faaeb3677a683be56bc2fd9a64094d958f00358292fae55949229ab9a SHA512 07db2e99b2f78f6e99cccbf5ca250978955d5a9bf18aaa675b2292d1df438fc3f98a5d0e8ddcfa41e686782f35947fe92b54b520b4e6e278d6e5c871e7491271
 EBUILD libxmlb-0.3.14.ebuild 1339 BLAKE2B 9126fd9d0734feaa3aceb999696b05d02163e5f36d5e3f2c0e53d737b7d7fb936fcc7daee906a6e0f94391a3d0d202a05c71a88f4f5e3cc07ad6132616a2fe58 SHA512 59c9effd08b6cc2e87cb3810a154a6f20fda5a892101f4871d58bc412bd42591715124a0039c9ee4aeed4d4bc3cabc1ac7ab8981cbf7169cb0c78234acdb772f
 EBUILD libxmlb-0.3.18.ebuild 1600 BLAKE2B cf4c7a5e372e21bf33f12071de12ec487ae0d58a6eb75b268148dc5cd302193447d5058617a82ed58a27aa39d687ef8a23a4c1cba6d0efc353534b07421502d3 SHA512 6d37590e72a150ce0b17e5f897b774b1ead4a037be46f24d3b23214f7c4e64a6044b61a8e351358b4cda651389fc3590268c7a80e4147e02dce9d307f66a3577
+EBUILD libxmlb-0.3.19.ebuild 1600 BLAKE2B cf4c7a5e372e21bf33f12071de12ec487ae0d58a6eb75b268148dc5cd302193447d5058617a82ed58a27aa39d687ef8a23a4c1cba6d0efc353534b07421502d3 SHA512 6d37590e72a150ce0b17e5f897b774b1ead4a037be46f24d3b23214f7c4e64a6044b61a8e351358b4cda651389fc3590268c7a80e4147e02dce9d307f66a3577
 MISC metadata.xml 404 BLAKE2B 5a8abc0540042c1f19d535395eeaac03acc402617660e0419c89700d9142bb0fa96a9c50bb67ead640788d61a165214fa0e3ca3f6c930625f5b119190041da80 SHA512 301a232fd84aeed1efb47d886cd464f31be1148332d59654667a92df7626b2ce4405d5cbc07868c9ae68ec0ee8983a10c8783114ef9ee650d127667d3d7760a7
diff --git a/dev-libs/libxmlb/libxmlb-0.3.19.ebuild b/dev-libs/libxmlb/libxmlb-0.3.19.ebuild
new file mode 100644
index 000000000000..1d407706e7cc
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.3.19.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # libxmlb.so version
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc introspection +lzma stemmer test +zstd"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	lzma? ( app-arch/xz-utils )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	zstd? ( app-arch/zstd:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature lzma)
+		$(meson_feature zstd)
+		$(meson_use doc gtkdoc)
+		$(meson_use introspection)
+		$(meson_use stemmer)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/installed-tests \
+			|| die
+	fi
+}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 0070c3a26e85..e5c31a0c11f7 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,6 +1,5 @@
-AUX mxml-4.0.2-rename-man-page.patch 812 BLAKE2B 1b87863000d0ff6323eab7d935c9a492d819a8201127bd8acc0f9c0734203721ad6ef045875874684b19de4c3c56a6677f7c5d005a10d58bfe121969d4e9e1eb SHA512 f842f2e531c10aa172c9bac60f34ff30003b5c954892f33528c85276cf8452c1ccd872c05e06c553e76c2af7d3cc01061f915ceb577ee6cc84b51a4c4ca57811
 DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466 SHA512 43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
-DIST mxml-4.0.2.tar.gz 1576722 BLAKE2B b5016adaf88801ec31852231ef31389d7d1d43b214d6b99e4e2b6bbfa47ba3c68fa9ac6b2ea332a61bf71688684c81e6863f1da38e30d4509cfa20f4ae943d19 SHA512 41fbd71bd390e63f0d44d006a3bcbdf95b7d3a09ea69a90d3dc86717d6f7edcd93875e6343b6d9f56ce8b2c3d34fdd4bcbb9992fb81c3392fb3deb5e3beb9482
+DIST mxml-4.0.3.tar.gz 1576958 BLAKE2B fe65513190bc8c03b8a66fb6711f9dcc846c19cdf67c17908fd5795408fead3e6ae2c11c8d4ca1c10be7b68d54ab87c602ab6ca3e5386d26ff75753d4dbe6476 SHA512 5855ea90c32a250ca0943389c768f1b9d9a231762d9b678d56bcb55c12d90a51b28c66940355e945b3d315bd764001e05ede576de976132768eb1eecb2667bba
 EBUILD mxml-3.3.1-r1.ebuild 1494 BLAKE2B ab7d3ad378c98fffb924dedf724181ff267b43f73dd18747b15c55dfc8838c2f57d728c5862d4c92acf88b6b122d13194f60b453df54bc022f950b886a88f40f SHA512 785dcffc1909acbced83f29755983cfc07a9392f47f2908bd115230fa608c158651645659686efc0c36e937444c943b4985a5fb32cbae00d347ad65c15dca457
-EBUILD mxml-4.0.2.ebuild 1369 BLAKE2B 3a465556e30491848accaa0c068c1d18c51ccc8e366d46200e214e7d917448185da11e4e487cf9191a9eff9df72e6b8dcfdd2031bf69074148e5c9d555c26ebd SHA512 83706c46c85048c77d3ada08999d84ad205f0267219470da0e663730a8894973c2416b2e92b9e296a67d2135cfa71108004abb6e2eefd6a1a25f5cabf3d1236e
+EBUILD mxml-4.0.3.ebuild 1308 BLAKE2B 877f27944372fda43878fc54431ad25f1b6ea74d2e777a0f4a72afa8aa0ca79b14a285272cf5069dc86119afb35bb6070c38e315d19b68508fb84623790ec3eb SHA512 d8b2dd012525ef782d17c48b01b88114e264137178bba0d603efa3ac1c3244c5adb959722b90e562b8181d111f032f16eceeebcff49f2f2072dc7af8f105c6ce
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch b/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
deleted file mode 100644
index a37a8fd56a90..000000000000
--- a/dev-libs/mxml/files/mxml-4.0.2-rename-man-page.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -219,7 +219,7 @@
- 	$(INSTALL_DATA) mxml4.pc $(BUILDROOT)$(libdir)/pkgconfig/$(MXML_PC)
- 	echo Installing man pages in $(BUILDROOT)$(mandir)...
- 	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
--	$(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml.3
-+	$(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml4.3
- 
- install-libmxml.a:	libmxml.a
- 	echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
-@@ -276,7 +276,7 @@
- 	echo Uninstalling pkgconfig files from $(BUILDROOT)$(libdir)/pkgconfig...
- 	$(RM) $(BUILDROOT)$(libdir)/pkgconfig/mxml.pc
- 	echo Uninstalling man pages from $(BUILDROOT)$(mandir)...
--	$(RM) $(BUILDROOT)$(mandir)/man3/mxml.3
-+	$(RM) $(BUILDROOT)$(mandir)/man3/mxml4.3
- 
- uninstall-libmxml.a:
- 	echo Uninstalling libmxml.a from $(BUILDROOT)$(libdir)...
diff --git a/dev-libs/mxml/mxml-4.0.2.ebuild b/dev-libs/mxml/mxml-4.0.3.ebuild
index 4725865ea65f..5056680d49d8 100644
--- a/dev-libs/mxml/mxml-4.0.2.ebuild
+++ b/dev-libs/mxml/mxml-4.0.3.ebuild
@@ -20,8 +20,6 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.2-rename-man-page.patch" )
-
 src_prepare() {
 	default
 
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index f0f6deb59ba2..019da8fffe80 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2023.04.17.tar.gz 93179 BLAKE2B 056213043095029cdc721d87fc9fb5023f6c593e975b4b069037c8db278317e68517227d2ccea444469baf15412e435de3dd8418f1d010c72a6c1dc252742b87 SHA512 55d1f5ac62da1294bfe4814f2370db0a11636f18afa7da06f04b84b9c1e6ef546846420d27094aaa838eb6cc87197cf6e120a38af0b7ce71297be646a58ecb7b
 DIST opencl-icd-loader-2023.12.14.tar.gz 93193 BLAKE2B 13b0e085dddfd1d3d493dac40984b18b839a58c2a72a8a0684a353391d9fa80888567d97e7de06caa4f0f8255bb9747b88c218ead112dca3c1df971339aded5b SHA512 b30aa0b856e6c73450fc23f768201ac01d3c5519a14305c79127debc6407be656b68ae2bd527bb7225d4268865f7bdf0b384279eb78b2806725d37ab940bf56e
 EBUILD opencl-icd-loader-2023.04.17.ebuild 953 BLAKE2B 8827e26e1f5c3f07934fa282bdffdd1a6ccbe10c8edea9ac226fcebe06fd91d15bd3bebba7b92939f48d619522e85ff37e122b4f2deb0fdf6e9689e340815b17 SHA512 e2e4dd064bd37539b170dfe3f8504de0fd5f689506001cd82407928b755c4d0ccf8d16918ca24ad62e857aaa4a7939299f4bf79887175b028252b2131867a78b
-EBUILD opencl-icd-loader-2023.12.14.ebuild 956 BLAKE2B d0dc0ea55c407fc0337f291dad413406925705db70ee5031770d6945305ea74946f175cff10d43cd069ded3d4ec86c3804f590f4b9526abb1dc3cbbd720730b7 SHA512 c00bbd25781e7287400070912e34ac03cd7da506a3af24e1dc91cd8b9adb448de77d30252f42a7d863342aad6782f13076b985f7ceff96d1f35432705a952abb
+EBUILD opencl-icd-loader-2023.12.14.ebuild 953 BLAKE2B 7238be7d98c2a0a52e6aeee2f4bf40f49c025fe8900f8e6c3f76ab792fd6c4f399bbf55c890cb78b8d3461c3d92644cf7f286ef621e6fc509f1b6ccda6fa7ec3 SHA512 ef7003d34569b5cb4bf01679bd891cb91cf2fe23ecb3e97d599b5bbedafe7eab79b9bb1620aebed9137dbafcd4d428b2efe134d16ff696d306127ee4a07a1cac
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
index 3531e3631cf7..64e4a5ed7503 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a74eb927901b..6b607e6952e1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -24,15 +24,18 @@ DIST openssl-3.1.5.tar.gz 15663524 BLAKE2B a12eb88b0a4f2d927123e0d3ca7d2f80f2bdc
 DIST openssl-3.1.5.tar.gz.asc 833 BLAKE2B 633502ec0a87074136d7ea42d9ac5f3df53523560d2a97410b5b57d28d916336da95ab5521c10f94202e3a0995331f0e17bdcf8843135634a5d5a95cfafc7b21 SHA512 48187bb8a7bdbd8b76fdcca736d2b03e2a89330b304eefb4e9620f570c741c60f2023307d8619ba1fa101a99223f94895e7be57ced6547a4fb06bd4c3677533a
 DIST openssl-3.2.1.tar.gz 17733249 BLAKE2B 960222e0305166160e5ab000e29650b92063bf726551ee9ad46060166d99738d1e3a5b86fd28b14c8f4fb3a72f5aa70850defb87c02990acff3dbcbdac40b347 SHA512 bab2b2419319f1feffaba4692f03edbf13b44d1090c6e075a2d69dad67a2d51e64e6edbf83456a26c83900a726d20d2c4ee4ead9c94b322fd0b536f3b5a863c4
 DIST openssl-3.2.1.tar.gz.asc 833 BLAKE2B a1d25fe30bf1804d13a8b6b98edf56be5bf744d9e2706f4169455c24efe2e3a361487d00d0d4bac240c3f0170693d77a39dd0d4ee5c792d2247aa00c47e74ebf SHA512 de39516c7b77612f33cdc830a8d13ef6bcd91c03d24a6ed105480f140f9e1ad7049844e234c96a516d62e0e33ce90442ffd0f309ea674884c735f04d8562f372
+DIST openssl-3.3.0.tar.gz 18038030 BLAKE2B c68efaf8aca87961f396e305acc767b56d651b9adf4fd2c9d9b5a3266e35da4b856c6ed34be47d656c782aade975f20317a6759913b33d29d7eb088e638fa501 SHA512 1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da
+DIST openssl-3.3.0.tar.gz.asc 833 BLAKE2B 207b9fd53de6f57fe24d6a6e5e9f735b7649258bb2873b6c1e29b7d2689c9a75774dbf09392be40f8a8ab240e4e6c745e2864155e8b0f2f3f5ca3b45051e869a SHA512 8750daa607e6bfd2326a4d4f04c9c04608d9fa852fc1515acf1fcf3d1ad33b8ba8435d9ef1ac3a032fecd09aa90446c53996045506bcfbddb7544bb61b26af24
 EBUILD openssl-1.0.2u-r1.ebuild 10129 BLAKE2B fe03657452c1218e9ed6fff4b939ae5a1b648b20495690c8cc5f8668b6985c860176733080b4f0265d4bae6bc060bf432995a404be24733735ede3f5440f793a SHA512 e843699fac5b1bdf348fb13cd7de96af09af709e6b9dd5d0ca20d867a38ad870504ac58e7bf21efc01f8303520938031f36f0f5e5d1e76458c6e954ee464f364
 EBUILD openssl-1.1.1w.ebuild 8233 BLAKE2B 4657e3e413f25f4503dbc5484e3d06e63c25c64f9132e3ce64629601f729380b6e1918d34f19e9269ac8ed066b2014d2163d54808e67476d033b2af1603cf609 SHA512 122f5d3e3577d9da17d0a49b38925d3fbbaab4117c116f37d0430463d5dcaa3803089cacbc5fddbc5466506eb6a59f1b5fef130dec200c5951f67d9d6c5b160b
 EBUILD openssl-3.0.11.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
 EBUILD openssl-3.0.12.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
 EBUILD openssl-3.0.13-r1.ebuild 8556 BLAKE2B 5e6b7dd5cd4a4ddba9e894281d5aab747360774fc2f588d9c026bc01fa850b8ae682f867d32484c206d35e67b19744accc2f090845e586088e106139df3cff02 SHA512 865c22ec6db34e4f7249828bcdfe1cb677ae435fcd50a4007905f4f72b84a4dc0dfd4a039d2d0d1945cd1e8220613b8e4946135f8e918a2619eb9209b5b911ec
-EBUILD openssl-3.0.13-r2.ebuild 8583 BLAKE2B 23d5be66e48a3b164db0bb6ea6040557b9227f27dba2dfeeccd8990bdf9561e2c09282f9dc2cfe96d76fee745c76f8ba43af5257822ccd3fc2919d9bc7ee05e0 SHA512 67aa166e2a828c7e86006b9f89b7610d373d54ad84434e09b556466302583cdb0a0b0cc56cd39ebdc802a0e8143862c69d19537b4b847f451f5b894580511202
+EBUILD openssl-3.0.13-r2.ebuild 8581 BLAKE2B 8829ef2346c04480dc1d7466dccfbec8c1dcd5f8baf37602a2733acaffd2e15850f48663a7184c5187028cd23e0c85d86e00ac714ff5763941597bc2a6582596 SHA512 6897ed70609c468f0867e26d1f729e4512eb48a6838d1ba19ad67360b6e45c47e91132fd749691da120c39620a551513016c0d9454d2b6bf4be8555c0bb99ac7
 EBUILD openssl-3.0.13.ebuild 8487 BLAKE2B f59e012d00584a3d17b51dd8ce6a1e0e77071fbc9a4144f604314e19e8cc57addcc32d12f2d4c03eda2b1e9c8023ad629ca27369f0d7b6d9983d092d53dbf6d7 SHA512 7ccae792fdaae34aec986e59630d64e5dc4ba2916b37093c95dc4649a2d314e701f38018f79c4e10af7eab5a809fa7dbfd1b35ae49bef74327804c6d00170267
 EBUILD openssl-3.1.5-r1.ebuild 8586 BLAKE2B c22d038b5af42c19389048b43618e3aad090062a8b5ca78eccf3572714d5d2469c1535ea3c4801241d313bf508191448dfa7e8bb52efc24f82523d1fc5273f85 SHA512 fa711d41776c086f9b31001143730e7f8524a41f6272d9df11fe7315c666113b8ba817fbaed7cd85482275014112e8f6a95213f0078531b2bd6a9f503c3f96a1
 EBUILD openssl-3.1.5-r2.ebuild 8626 BLAKE2B ae09c41b277f416c8ad0180384fc3fbe7cee002e180ebb4817b6b4b2562a3b4782fe2e9240a275aff8c1a34d22160485dc1e6bac4a03546a3859d454a20b7cae SHA512 d7d687dd36f5839ac75c616f454fb8192d9826057638db17b6ea63dee11da6b5449d89d1a0cf47e0e67a98f51a5a46ca368770e0f03e3d77ce0642b1627d8d5b
 EBUILD openssl-3.2.1-r1.ebuild 9305 BLAKE2B 9be044f9fd88230cf5bcfaca16458bcdbb9abc2ad6d66f56ebbc1dd74a2bfcf17dd43d1ca713be1e07bc99f775f620b214fcee5f46ab7a1d2bc1b80778bddb50 SHA512 829c77aecfa5acc0949fd481be6297ec0ecf1d12d2e65846ca75436bef359cb96b1617ed8acb60b2a665da80de31b971614221a9000a3e8e5c8954c50c89d22c
 EBUILD openssl-3.2.1-r2.ebuild 9345 BLAKE2B d40d084b65cb98d5924961c8c9b9aa7f33243af5a6aa20cd57dc6bd6599653b910a6dae9f88b55e7ba1086b0f45d81b3ba80d1613f4966d7912a2807ac8a14a6 SHA512 3a46af388ec9b7226d85f5eeaa9e3af8c46c1f3e0fb1daa16166aff56febf81cdb68102f1b08ee70dbfb59db753b195eeef11c739adf1008e91d26938adc64a2
+EBUILD openssl-3.3.0.ebuild 9191 BLAKE2B c32b7a3f223a748f05baae1c885a3f96c7d2626499efd5d349f54dbf3c4a65fd32d794b2f1dc162917517103590f584e8cf6bee7cce4d864fbfc439dfa7e42ce SHA512 c2b3b14b43a738a49c29bfb3ee34c0307ce607a0b0b8c1b7bbdf4224f7c6deda2fdf09ca2f941cc860beff7ab97d022d00cbc8e4fc791700d8b71767c453c72c
 MISC metadata.xml 1566 BLAKE2B ae4515c90356b8a2d3e2df8e0cea43c587f73bd2e08f696c065c2254639009b6806806df8a84c63d00781b0cbf906a0d11e94b715749ab1292e77afa9cd5bcc2 SHA512 4a5e6b894476e74f1f93f00c326139eadf1afd498f4508fb723322539f29e53aec6dd198da878db714d2da61ab266089c2dd2f91b9fc66a34375ceb6f68ca394
diff --git a/dev-libs/openssl/openssl-3.0.13-r2.ebuild b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
index f24d736cb85c..19b6318ef26d 100644
--- a/dev-libs/openssl/openssl-3.0.13-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/openssl/openssl-3.3.0.ebuild b/dev-libs/openssl/openssl-3.3.0.ebuild
new file mode 100644
index 000000000000..97ec87920e44
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.3.0.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+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
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+	"
+
+	#if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+	#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	#fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240424 )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+)
+
+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!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && 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_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# 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 || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && 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
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# 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 (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(multilib_is_native_abi || echo "no-docs")
+		$(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 fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+}
+
+multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# 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
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 97d423f6868a..cc59693a6151 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -3,7 +3,7 @@ DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d44
 DIST weston-12.0.91.tar.xz 1986200 BLAKE2B 368fe795bd6121390f14995d8c5ddfcd585e620bcb54f0818b9e9131bb442e79048f82bcd90cfff563c7ad9968cdc9e4f1d859fdd318f4e9b08fec371c4a62e4 SHA512 8e1ceae599344c305e1b65294403d434c4a6ca740f76bdcc67a9f83afe9d352d75ab9cf8bb5091b889ddece43941adf9c4666767098c4c27cb732f8c7f8f738a
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 EBUILD weston-11.0.1-r1.ebuild 3670 BLAKE2B 68f602a9146246169076ade491844eb26ec365ba8adeb9d474ce67599b0e7d859b71eb6c1fb9690d1ae78f05b2d860ad2ff3727ef42ff07017dbbe36c8ef9f3a SHA512 b04bded6989a3f08961d801501cfe0682c06144f4826173c295ec0cd208a8926b13bdb22b3d6e0c81cc5a704196e86ec68ad49899dcf6c693fec4bfe9c4f2567
-EBUILD weston-11.0.1-r10.ebuild 3649 BLAKE2B c117a6aff993c601f910af251c145ac35bc02773d0e5e6f2a04b3b8ae72ac016e059fce0eb4a2b3b7c5aa1d48cc46f8c526fb637bd1324234e69f93936f78c66 SHA512 abed4d58b69f90cfbfed65e89f3fcb5b5cb6610bea4d9ac490fede7730084c72c38fad08d49dbfbc6273573335980b47b1cc266bbdbe24e06eea7e582828df55
+EBUILD weston-11.0.1-r10.ebuild 3648 BLAKE2B b9b687c98f0147edb97b18f44c628aeb2a1e283311b728e0427242d21f1897a840c20cd9580044e43617a2dd797368d4ad7922600660fdb828ed1f4e6264b70f SHA512 a60c48a58e0cbc4df204087dd7d73829ca9cc1a2331d22f0fef537c19a489bb3217f66fce19811bbab4aa5049d9021836cb96584d95f62f2b9cd9acf48a3b035
 EBUILD weston-12.0.91-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
 EBUILD weston-13.0.0-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
 EBUILD weston-9999.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
diff --git a/dev-libs/weston/weston-11.0.1-r10.ebuild b/dev-libs/weston/weston-11.0.1-r10.ebuild
index 73b554aa4256..74ee66abd7d2 100644
--- a/dev-libs/weston/weston-11.0.1-r10.ebuild
+++ b/dev-libs/weston/weston-11.0.1-r10.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"