13 files changed, 90 insertions, 179 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c07022508b1c..11be40c302f2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libchdr/Manifest b/dev-libs/libchdr/Manifest
index c24ba416d5cf..eb97894fcda2 100644
--- a/dev-libs/libchdr/Manifest
+++ b/dev-libs/libchdr/Manifest
@@ -1,5 +1,3 @@
-DIST libchdr-0_p20211127.tar.gz 414443 BLAKE2B a728a4ba0fa74883c7cfd43b5ee5147cc54a98370cc663237b5f12742a7859d36fc6c1572a8ec2af6e6bdf602eba4b0028d6fdf8f128320a2fbe60f0868d9f1b SHA512 534f949c8aaab9e307a9a2c1789ca2398dd59c3228a4b9bed62b413e8cc9e2ad11896580c55531dc13f9cd875f142499b52bf793b569a6df740e6d945fb3e17d
 DIST libchdr-0_p20220917.tar.gz 1748223 BLAKE2B edb42f85d402955a82b79d62e3d47e614b01719ae641c7ed993ba479fb9762a7c66267212bb52d41a5fb175d11482ea7814dc120b0100e5c9210012274184d7f SHA512 acde5dd87b9e61862fa6da81cee715a14c2f350ce5167f85ccdeecc259aaa93ae500e403962b60a332f6a4dee3dc71031d23e2778650ac2702e02c8cc24f1431
-EBUILD libchdr-0_p20211127.ebuild 609 BLAKE2B eebeda069e618631e33be060eb7e9416cdb781fcdd32c94be79131a571f35c4e299173863f91e5383cfbc3bb44c4d43690dc6ec401c78afa361d6052691a5dd9 SHA512 755f0632159c878897d1af0f9cf210da397769579787843a0d4120967e0ea68f31e38cddcbdf06d3a7f14063a7215688da882c97e175dceebb36488b5df71032
 EBUILD libchdr-0_p20220917.ebuild 601 BLAKE2B fd00f055d1a29a818e85dfdea86e180d26efdb8bf58da719ba1a18d9bdf51d93027041175673a3b7bb1691d1785a2df2056d54ac0d6935348bf3511ad43ce530 SHA512 6bd6b97b311a6e1231ca4e863128fabc0dd20f0ac54fcc500d3e05dd0433188780e161de2ad509e300b37e006ac2c41df1a9b4dccf8f80a6556b4ef3818470a4
 MISC metadata.xml 327 BLAKE2B 20c6d3bc61e288afbfd5b0d7d6bb641dc2214d9221b1c2b69a69de676042994bca2878c855b92fea7b5aca60e6dc687c55f0e79f4db13d579332a3d15991e211 SHA512 31e8175f36df91d1bc81a2351a99deba53cb57cb08e6e0e5ad65e17c53cd1cb1b1565b943f2c881bd3e11df45c6ea518f3eaf86335e10d816078161bb23d284b
diff --git a/dev-libs/libchdr/libchdr-0_p20211127.ebuild b/dev-libs/libchdr/libchdr-0_p20211127.ebuild
deleted file mode 100644
index fb1c7631271e..000000000000
--- a/dev-libs/libchdr/libchdr-0_p20211127.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-CHDR_COMMIT="929a8d6523a7d21ea9e035f43211cd759e072053"
-
-DESCRIPTION="Standalone library for reading MAME's CHDv1-v5 formats"
-HOMEPAGE="https://github.com/rtissera/libchdr/"
-SRC_URI="https://github.com/rtissera/libchdr/archive/${CHDR_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${CHDR_COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SYSTEM_ZLIB=yes
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 48e848ee5b4a..17df8b9659e6 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -5,5 +5,6 @@ DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda
 DIST libgpg-error-1.46.tar.bz2.sig 119 BLAKE2B 5c4ce6111d2872a19d7fa818c67cabc584eef93e47c0e0e42b7e5a54cced137910861bba730f2c8f41fcaf8d9311e21f725d284b4c1948e653741e84fc06ef3d SHA512 2c2957fbf6220d60846cade760985486c9a287b04f4361b22352352ef68963f0ae6add00a8925b76bdb924223383a1029565063e4a925865be1802fa821a7bca
 EBUILD libgpg-error-1.45-r1.ebuild 1984 BLAKE2B fb622e43f183e520c376009b177e1d55c7c6c50d6eb147ab8d58dfaa11f0b208c76216b61574e1413b648d05860d389af940349b98d76885f3f42344170ae0da SHA512 3911ee0d4b74853adc1dbf19c7e7d717639bbf6b5033cf9f54314923167ecd30f258f57082b430e05fab6cc4785b8b359fc46211fa7b3a71240b740379727cc3
 EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
+EBUILD libgpg-error-1.46-r1.ebuild 2465 BLAKE2B 5f69a1101d7dfd50121fbdd4ab4d77dca2108ab6ea0f485d5d7be7de8b9511ce1d233ebe99020a4c6bc09f46fe2888ef0b0d6366f586d13dc3c3c4fdd7edd9a3 SHA512 d71c3e63ecd8123d2eef077805b713d1e754258253e8e4998fbc2aff9afa4ccd8849cc44bcead73a3ed23e268176a1d6ec8e9e4597d1cf67ee9b50e838dbf9ad
 EBUILD libgpg-error-1.46.ebuild 2353 BLAKE2B c2dc6ff38ef7409ecb175bd5d34aeed4360b1edb2fc2f18c28a67f800cc268d961060cf1ae4292c65f48484be9c503e64e45abb70903d99d8f0580fb0c778fd1 SHA512 4abc616854ca2e408eeeea9261a36f983d1d9d71bd964075ade931c9ad5e7fb41772a67218dc3eb72fdbc1c40d3725bac0d555fcf13f7ba07c73a11cb0e47698
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
new file mode 100644
index 000000000000..0e230fcc57db
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools multilib-minimal toolchain-funcs prefix verify-sig
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" mirror://gnupg/${PN}/${P}.tar.bz2.sig"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+	/usr/bin/gpgrt-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
+)
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
+	# only necessary for as long as we run eautoreconf, configure.ac
+	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+	# not a pure /bin/sh script, so it fails on some hosts
+	hprefixify -w 1 autogen.sh
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_is_native_abi || echo --disable-languages)
+		$(use_enable common-lisp languages)
+		$(use_enable nls)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--enable-install-gpg-error-config
+		--enable-threads
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index e3f29e52b328..e301ebaeef81 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,7 +1,3 @@
-DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
-DIST libwacom-2.3.0.tar.xz 107872 BLAKE2B 5589067eabb0b0d5384015a0200950146d1c028ce8cd870b845de8ec22ca1710645755253952e49f9c1db585a945c6ea8da37318b900f16602a1a7081512ecd9 SHA512 ccbeddc55cc67d8102aa4536616f3c379877ba9154a72d7ad92941854c79b727a21efacf4282b9a8730ff181d094749bf84a9fe5850de6246d91a17e5029d888
 DIST libwacom-2.4.0.tar.xz 108812 BLAKE2B 18f41cd052b18c652c61062948355b4738afe57db344749055492cc6853bcbe3048c582a72318891727ec0fb01a7799f4c80c544b37b51c9246f98e5ae3fef1b SHA512 c67b8a81e9f4285a4e6f422b29e9b8b3677e3fc45e5190fd2b95ad361e5ef35e124b7d78bcf2bb9d7b7183525a6be9916b3038714c42c9ef405a1075750465f3
-EBUILD libwacom-1.12.ebuild 1425 BLAKE2B 06b18ad7c2f14ebb25e8115e4f7064f32b313176a05bbeb8aae16dca236d9fb8e16d229be20331bfee6aaed8804ac34fad608de033778a48313a22233daeb608 SHA512 47f61ed5b05b710385ba9c187fcfc600d1ad06d017cebbe8c6630f2f4771b9904173a6bfc1933a4026b8a3e838a971d08863591162ad28b8aedf79595d0ad1f9
-EBUILD libwacom-2.3.0.ebuild 1501 BLAKE2B 5c575736f3559516261d5dde4d4134a1ce07c383dc1c271733a806507e5b7222d0b19f99bf72c5c87f8a15649149e3a8e1a8f905acb4640f398dfe83b9c7fb9d SHA512 ac6ff77254301395a4c3c75b8a74c99cb9a0bdb39c63a61c02a113e957a6e7e67f003ba185421412fa7d5d0a5b7285f312fb9a515764be754ad97ecb8ff3f07f
-EBUILD libwacom-2.4.0.ebuild 1495 BLAKE2B 524c21f6a85ad1206397e6e10f15bc5c716e5024754565ff9240d590e2204c878ed341ad2509526dbcdb4ecee9906705d183bc0bcaa783327c8ce973b7c87aed SHA512 6693027ace5f31f274e0e000ce75d504fefe69d1a4ec32e268de75b5b44d9d35155f67744d2c5e52a0056a43771d336a1295b1a4c3b7692b91de539e2870c957
+EBUILD libwacom-2.4.0.ebuild 1507 BLAKE2B a8dc6326da4816e4839d61ce5ec89fb96722da29e2a919e6746fed0be433dfb5eea4aed6c5b878c6c7ee2b1620a33abcea829d4e9dc1b38ad59131a59d0a96f1 SHA512 a30ff6646d101d182e0d493db36880af9db89eed5b6482f424c48873e57e1db6a9bc45ee881ded69444863f996d6b2a9970eabb54f9b54d556d9b4cfa67be8a5
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
deleted file mode 100644
index 9fddffb29e27..000000000000
--- a/dev-libs/libwacom/libwacom-1.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1 toolchain-funcs 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.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-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/libwacom/libwacom-2.3.0.ebuild b/dev-libs/libwacom/libwacom-2.3.0.ebuild
deleted file mode 100644
index 450f5ceeff32..000000000000
--- a/dev-libs/libwacom/libwacom-2.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-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/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-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/libwacom/libwacom-2.4.0.ebuild b/dev-libs/libwacom/libwacom-2.4.0.ebuild
index 919b3dae4e25..a957edf76d71 100644
--- a/dev-libs/libwacom/libwacom-2.4.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.4.0.ebuild
@@ -35,9 +35,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 621839604533..beb16cb935d8 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,7 +4,7 @@ DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.10.2.ebuild 5341 BLAKE2B 59a155d4a270f399e15cbf1739191ca5334c94af9237c97f64cbff830cc5289c263d3c5c89fbd2ba7e1705e868134a9e3fa195e9fce1f3cc485bee150fd123d7 SHA512 d59b6d605e89ec643ba9b834fe60cd713f5298ae8a84192fdd8d91452f76ca1f5e05415baa9adaa2099501f5d01e6c3393c8d22252791a510be02edd6659768c
+EBUILD libxml2-2.10.2.ebuild 5339 BLAKE2B 59a2964dc8c0e783a0c0dc9894a3a665cb28b0cae64f7a3c48633e9de5206c0597b60dec933b9998524e2c40b1f1efe4049ad0ca1ebdabf653ee8d7a3d90fcad SHA512 69ab0b6a774c1030ee094e1fc82fe21599ff90dda7ca85e3e6534f6ad6d2b2d7274e7354daa999b8e0a88d030374327ce38290a9e467b375c93a869cd1bf6732
 EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
 EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.2.ebuild b/dev-libs/libxml2/libxml2-2.10.2.ebuild
index 6573ea6558eb..2e26506c071e 100644
--- a/dev-libs/libxml2/libxml2-2.10.2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.2.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 7593959cf56e..c235f00d2c16 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,6 +1,6 @@
 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
 DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
 EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01
-EBUILD libxslt-1.1.37.ebuild 2975 BLAKE2B 8b01b671c51f3a1b1da57fdd7757c80f1b0a9f4e32e4d2c9bba16b4d9f8b882e83ad8756ee13aa56cb12e2c00f9b0ab1da20b97e71b286c18ccdf1ead59cb9aa SHA512 a2c2a3c31fa28963173b3f9960e1e5e65a9fd199338b8b98b526d390bd075c37aec7f666cd22e9f7a943809b4ee7192763d6d38e3d3a427cfddc8f8bf53f50ff
+EBUILD libxslt-1.1.37.ebuild 2973 BLAKE2B f7e8992a216e952f92e42e138d7d21fbf49d8a5b7e4cb6c426c2d752b43850422846440dec92ef3fd5b47b58b291234308e2f8e1f488c4a949676996b2356257 SHA512 9bec1232df55a98751245878ead87c062cdc25f399a6a363348b61195b3848eb2de0bdc90a8bd64e591e65cba9bd0828d731b4cf04272770a547f78f6873d287
 EBUILD libxslt-9999.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.37.ebuild b/dev-libs/libxslt/libxslt-1.1.37.ebuild
index 3a49a240a8ad..dda83ffd7ac2 100644
--- a/dev-libs/libxslt/libxslt-1.1.37.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.37.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit libtool gnome.org
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"