gentoo auto-resync : 25:11:2023 - 10:31:10

21 files changed, 59 insertions, 1005 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 309266787983..02c6d0738759 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 140f07e0a847..4895084e2812 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,11 +1,4 @@
-AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
-DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03
-DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21
-DIST cryptopp880.zip 9279806 BLAKE2B bdce352af83ff148cedbe0233efd3352d5052e6b4ea04484de11e35a8cb5d51cf6bd5aa641ada1bc4535454c1a1afdbfb96f4ae2ef5131d79a7985247810f423 SHA512 3fb1c591735f28dbd1329a6de6de9c495388c88bd5c4f077894c41668398ed313f14121a4553e0d4aa71e552ee8c3b744b770711748528ade71043ecc6159c80
-DIST cryptopp880.zip.sig 659 BLAKE2B a7d46e43cbe671714c5320b99824a91708058528be46e1a770bc214696b936aa5ba062279475966ce6108af6cacb3a22256df91ad5b9bbb54c81a69b9dcfca7b SHA512 8f3987841ff08f65a28fafed1ba3b0111e2c790d247ad739c28e6edb02a77e076b961007c4ba8684bc9e6c880730244b144ccc5f3416fb5fe57566b8021ee92e
 DIST cryptopp890.zip 9288053 BLAKE2B 95fe0585cff826587a301dd3df863c39cba889d407bb70ae7b35a4f9a0f7f5fef83b1c65cb95923a05f8ae91f18ed20e88738e8bb081a3f9c8c49c2d67d44ecc SHA512 903970c4c0312272e93bae0cc3477be66b273dd38c9329fda9f7157ec44e247a3bc16b9d2b4ad625f258af0eaf2dc2c4210d4d14829b455f180983859a5c4b41
 DIST cryptopp890.zip.sig 659 BLAKE2B 741ec10a01a444573fbcf749258e26461ff131935fede8f47b3f2dd8c51f3b43a9af894e0e31f9ad925baf451bdd747b7e22cc8b178992e4190bba503f9bf648 SHA512 4891cf446a47000453884f36f4f8db2da254e11b573c02690fd5e1de604f01498a479847a732abaf0f75b1cdf3cd5bc104f6be240d0de6c7184a3651c674ac95
-EBUILD crypto++-8.6.0-r1.ebuild 1895 BLAKE2B d973859bf23b9c0ae86d9941d9e28a3868f07c2a5c377b561d27a87a2b69756b22a4af372d79eb084b4de93551b2d2f95ad23af38040eea24a6f326b831a7eae SHA512 52f292bd19fc57ce2243dca5d0d11a626af0e31ac28ccf086226b9312c06d9c08b717c362b70424c7cf536b8b45a549ab66b66e47b1dd85f8c0846a2101cb7ee
-EBUILD crypto++-8.8.0.ebuild 1873 BLAKE2B 7d1487987eea4190ec7416e68fb9e0b65d31388455b77f5568d8e6f2643cc056297b8b2de19060c4e504f87c5c41c8b0406da3e2347d1b2c70f7126ad2624d57 SHA512 95343ac76a4e2dd0cee5db4436be42870fb78bb6342559895953aac0c0922e2b153a3779ae9c27adaa556b149ca964271dba61f4a619d1cddb60f5d276b289fb
 EBUILD crypto++-8.9.0.ebuild 1873 BLAKE2B 7d1487987eea4190ec7416e68fb9e0b65d31388455b77f5568d8e6f2643cc056297b8b2de19060c4e504f87c5c41c8b0406da3e2347d1b2c70f7126ad2624d57 SHA512 95343ac76a4e2dd0cee5db4436be42870fb78bb6342559895953aac0c0922e2b153a3779ae9c27adaa556b149ca964271dba61f4a619d1cddb60f5d276b289fb
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.6.0-r1.ebuild b/dev-libs/crypto++/crypto++-8.6.0-r1.ebuild
deleted file mode 100644
index 2074fd8b8c31..000000000000
--- a/dev-libs/crypto++/crypto++-8.6.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/crypto++.asc
-inherit flag-o-matic toolchain-funcs verify-sig
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-SRC_URI+=" verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )"
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-# ABI notes:
-# - Bumped to 8.5 in 8.5.0 out of caution
-# subslot is so version (was broken in 8.3.0, check on bumps!)
-# Seems to be broken in 8.6 again too
-#
-# - See https://cryptopp.com/#news, but releases usually say
-# "recompile of programs required". Even if it doesn't,
-# verify with abidiff!
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="
-	app-arch/unzip
-	verify-sig? ( sec-keys/openpgp-keys-crypto++ )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_uncomment() {
-	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
-	default
-
-	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	tc-export AR RANLIB
-
-	# Long history of correctness bugs:
-	# https://github.com/weidai11/cryptopp/issues/1134
-	# https://github.com/weidai11/cryptopp/issues/1141
-	# https://github.com/weidai11/cryptopp/pull/1147
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	default
-}
-
-src_compile() {
-	emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.8.0.ebuild b/dev-libs/crypto++/crypto++-8.8.0.ebuild
deleted file mode 100644
index 57c31351372e..000000000000
--- a/dev-libs/crypto++/crypto++-8.8.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/crypto++.asc
-inherit flag-o-matic toolchain-funcs verify-sig
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="
-	https://www.cryptopp.com/cryptopp${PV//.}.zip
-	verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )
-"
-
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-# ABI notes:
-# - Bumped to 8.5 in 8.5.0 out of caution
-# subslot is so version (was broken in 8.3.0, check on bumps!)
-# Seems to be broken in 8.6 again too
-#
-# - See https://cryptopp.com/#news, but releases usually say
-# "recompile of programs required". Even if it doesn't,
-# verify with abidiff!
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="
-	app-arch/unzip
-	verify-sig? ( sec-keys/openpgp-keys-crypto++ )
-"
-
-config_uncomment() {
-	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
-	default
-
-	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	tc-export AR RANLIB
-
-	# Long history of correctness bugs:
-	# https://github.com/weidai11/cryptopp/issues/1134
-	# https://github.com/weidai11/cryptopp/issues/1141
-	# https://github.com/weidai11/cryptopp/pull/1147
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	default
-}
-
-src_compile() {
-	emake -f GNUmakefile LDCONF=true all shared libcryptopp.pc
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONF=true install
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
deleted file mode 100644
index 2ae8d287e12e..000000000000
--- a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch
-https://bugs.gentoo.org/762997
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -1256,7 +1256,7 @@
- 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
--	$(LDCONF) $(DESTDIR)$(LIBDIR)
-+	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- endif
- endif
- ifneq ($(wildcard libcryptopp.pc),)
---- a/GNUmakefile-cross
-+++ b/GNUmakefile-cross
-@@ -732,7 +732,7 @@
- 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
--	$(LDCONF) $(DESTDIR)$(LIBDIR)
-+	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- endif
- endif
- ifneq ($(wildcard libcryptopp.pc),)
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index d4ab29baadee..bf870a87fca6 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,16 +6,10 @@ AUX elfutils-0.189-musl-aarch64-regs.patch 1865 BLAKE2B c177254f31b214d39dc18a95
 AUX elfutils-0.189-musl-macros.patch 2421 BLAKE2B 23c214481ee441b4f3b66bb5cfd8a5321328136e743ad6b48533b2943d6cc896726d49d0b7493b5b57f0dbdec5bda9dcacf8fef485b0fb58bc24f732920a6e4e SHA512 86b249a14ed5a352acb16115559163d0f762ff718a23ff2989974e28f16f64c7554f3dcf5f6d5557bce524c3142e0e61ba315f1c20ec4106074b4d5901379fb6
 AUX elfutils-0.189-skip-DT_RELR-failing-tests.patch 1184 BLAKE2B c2de6d91ac92e2a5ae956a654a36462f0c2e719f9463d569aceee8f119a7201023f29e5ec68b477fceac31b5b8ece6be24314f856fe49c2b0699df6d4bb1f5c0 SHA512 a6cea47c2010df688b5020ad7b0f9143de0ad4d3202a147271b97b0df816a0c60f494e4ef8907e2fca79f8d59a72d8e049e4a9fa41eb2d2b2d269652a00814bb
 AUX elfutils-0.189-tests-run-lfs-symbols.sh-needs-gawk.patch 1200 BLAKE2B e4db5599c301c2be1b3ace1b33fb708d8eed892cddf98210709c20b2b8d205bebee0ea95af984bdedd974b4cd4324864570331cd77fc692f4083a77d6146ce41 SHA512 2a7c574fc912655428af6763a45c7f9037fbb7cdaaa7bfd1a215072185a6c42fa044cd51bef474853e9e611ee33ec5a43faae9b123120e0379d240905323454b
-DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4
-DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4 SHA512 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
-DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566
 DIST elfutils-0.189.tar.bz2 9143169 BLAKE2B 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 SHA512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71
 DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb1117de36cf28f8ddb50ccb4874fb24cffdf44bcbbc028b2ef3f64562960bf11a431274d861f9db96e3d865b37ec2 SHA512 2016c5f0ccd16f7feb0c825164bb18b2f1afad17dcd39d9f159429360fe4afd645665f612397d48bde191a1e59bb8352e2d065d61d7f649b929c3a7e7bfe8dd0
 DIST elfutils-0.190.tar.bz2 9162766 BLAKE2B 9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513 SHA512 9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102
 DIST elfutils-0.190.tar.bz2.sig 310 BLAKE2B d6a2d490aa6815ed9a7c3624050716ebf7c50465af9907d471d47aa3b57590faf9b9ee03de127c6b3bdffa6948414aab6aa8c784ce29570f76bb03ee2021c062 SHA512 7cd88c19402a959679204a5b01ddd48720e224b84268d0d7452f0f1433150b97dd02288fac204fbd5e2fd6f227473bfe62205b350d5fe2e17addf45fb452eed6
-EBUILD elfutils-0.188.ebuild 3233 BLAKE2B 2ce003a022aa4bdb6fd7c7d0c3853b61273b7677e3e2c1bb135dff6caf708b03cba8d6d47205d5382a3e374fdd8109838afcd2b3e64b807b9e36c56fbeeef802 SHA512 035033e83b2deae6b6bc2666da46dd7b65ec91eeee0faccada2e9ea0f5671d1c3847ebd03c3cbf56e9fb9e191ed7e9a5194059e0e61c50bff66410f9d47e840d
-EBUILD elfutils-0.189-r1.ebuild 3412 BLAKE2B ac3c2c6a3307cc76d0f9bc32a0ad3404c3c3f919a75d3b25769510ccef1bf35de9411c21c0d92d8dd7b9305dba024d2fb2a1fa94429bca39fd162e9fe728014c SHA512 db46b6b28a6305e800e5526a182d7210170ec8719786d61d52ec4d121cb2d2bd1bb460a5b516dc52ae7c08f1b1cb5d7c8235ed3b8979c0c2c9b998efb3ef0323
-EBUILD elfutils-0.189-r3.ebuild 3539 BLAKE2B 5ccea1ebf5ef0f80f1741f339ec1605700fb3df98409e1eaea566e39d6a9dfa118dfba1abdcc0988af99928affe060c5b30919b1fc0dadcbf3106f33e5c73071 SHA512 b11f8a0c688d1fecf305f35b86257b5cd72fb16ff3e5701a2f47c71ca52cd288367c6193e5c298c3c602627d8b8bd1a343e9da9e4f3f3d703bf4047bff94024c
-EBUILD elfutils-0.189-r4.ebuild 3580 BLAKE2B b07ecf6ec6090b356e1aff2ac9e566acc21c0333d1df2ddc3d87c4d6bd67bb60e15ba67a43f13ede4f0e41ebe10641b103992bd7a48b8928a3fb954ad1e186de SHA512 6b9471a78703502f7d8f49e4c56ece7ed1f288aa22fd7a60d8b51e3be75da8db65f76a371dd857fd9d47206532638ee3459bef4dacfbd60736e4bc3cc0484550
+EBUILD elfutils-0.189-r4.ebuild 3576 BLAKE2B 403abe865eb97d562717dd550b1a177c1486f135a25892a984d583aaeb424333f608c2c8dfb5f17c04b6b9e295d7761fd3eca866c57dbf775b522e38388f96cb SHA512 a1f9f585b0d2b303c0a26667b72eda2c94716900c3413b50c0b3b7c240f183e2fef3db29dff69a2d41b412048e9d2b90c7a5b7661087731a13f32d485f45a308
 EBUILD elfutils-0.190.ebuild 3206 BLAKE2B a6fe0ec196c532d81e22402bf198720c680029ae822163eb970d6539ec4475bb45b97950e32423d9b701238b425c25a06d7524f4bee6aa059d776def7eac2287 SHA512 d6f11f16e1e16c1a10d8bfa2182c5b456675f664a88a5df8ca03f726de97ca423401e4e3a6d176c7278834b376a3aea26d01e269e69ed5c457f8fee9b9e8eb57
 MISC metadata.xml 680 BLAKE2B f5f2ad88e2f5f7823ea466403cb44888cea12ded4c1364e4c941be9f0e620ff9214973459bd4f70c43540e8f2a5d915c7d6e65ff3b2758c6660af928deb648b3 SHA512 403b91d41f6ff564c66445492c45d41ed4513709e557ac68d447e583b6bc4e22ccafe67f8e998660dfe47e75120c902107fccba90db06d99bd4c72f024bd881c
diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.188.ebuild
deleted file mode 100644
index 3fcaf83642aa..000000000000
--- a/dev-libs/elfutils/elfutils-0.188.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2003-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg
-inherit flag-o-matic multilib-minimal verify-sig
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="https://sourceware.org/elfutils/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz"
-SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +utils zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-libs/libelf
-	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	elibc_musl? (
-		dev-libs/libbsd
-		sys-libs/argp-standalone
-		sys-libs/fts-standalone
-		sys-libs/obstack-standalone
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-elfutils )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-0.187-patches/
-)
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use elibc_musl; then
-		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
-	fi
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	# bug #407135
-	use test && append-flags -g
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-debuginfod
-		--disable-libdebuginfod
-
-		# explicitly disable thread safety, it's not recommended by upstream
-		# doesn't build either on musl.
-		--disable-thread-safety
-
-		# Valgrind option is just for running tests under it; dodgy under sandbox
-		# and indeed even w/ glibc with newer instructions.
-		--disable-valgrind
-		--program-prefix="eu-"
-		--with-zlib
-		$(use_with bzip2 bzlib)
-		$(use_with lzma)
-		$(use_with zstd)
-	)
-
-	# Needed because sets alignment macro
-	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
-	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	dodoc NOTES
-
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.189-r1.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
deleted file mode 100644
index 7158de2c9a26..000000000000
--- a/dev-libs/elfutils/elfutils-0.189-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2003-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg
-inherit autotools flag-o-matic multilib-minimal verify-sig
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="https://sourceware.org/elfutils/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz"
-SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +utils zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-libs/libelf
-	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	elibc_musl? (
-		dev-libs/libbsd
-		sys-libs/argp-standalone
-		sys-libs/fts-standalone
-		sys-libs/obstack-standalone
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-elfutils )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-0.187-patches/
-	"${FILESDIR}"/${P}-configure-bashisms.patch
-	"${FILESDIR}"/${P}-clang16-tests.patch
-)
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use elibc_musl; then
-		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
-	fi
-
-	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
-	eautoreconf
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	# bug #407135
-	use test && append-flags -g
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-debuginfod
-		--disable-libdebuginfod
-
-		# explicitly disable thread safety, it's not recommended by upstream
-		# doesn't build either on musl.
-		--disable-thread-safety
-
-		# Valgrind option is just for running tests under it; dodgy under sandbox
-		# and indeed even w/ glibc with newer instructions.
-		--disable-valgrind
-		--program-prefix="eu-"
-		--with-zlib
-		$(use_with bzip2 bzlib)
-		$(use_with lzma)
-		$(use_with zstd)
-	)
-
-	# Needed because sets alignment macro
-	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
-	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	dodoc NOTES
-
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.189-r3.ebuild b/dev-libs/elfutils/elfutils-0.189-r3.ebuild
deleted file mode 100644
index 238b3fd8098f..000000000000
--- a/dev-libs/elfutils/elfutils-0.189-r3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2003-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg
-inherit autotools flag-o-matic multilib-minimal verify-sig
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="https://sourceware.org/elfutils/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-libs/libelf
-	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	debuginfod? (
-		app-arch/libarchive:=
-		dev-db/sqlite:3=
-		net-libs/libmicrohttpd:=
-
-		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
-	)
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	elibc_musl? (
-		dev-libs/libbsd
-		sys-libs/argp-standalone
-		sys-libs/fts-standalone
-		sys-libs/obstack-standalone
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-elfutils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.189-PaX-support.patch
-	"${FILESDIR}"/${PN}-0.189-skip-DT_RELR-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.189-tests-run-lfs-symbols.sh-needs-gawk.patch
-	"${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch
-	"${FILESDIR}"/${PN}-0.189-musl-macros.patch
-	"${FILESDIR}"/${P}-configure-bashisms.patch
-	"${FILESDIR}"/${P}-clang16-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
-	eautoreconf
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	# bug #407135
-	use test && append-flags -g
-
-	# bug 660738
-	filter-flags -fno-asynchronous-unwind-tables
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(multilib_native_use_enable debuginfod)
-		$(use_enable debuginfod libdebuginfod)
-
-		# explicitly disable thread safety, it's not recommended by upstream
-		# doesn't build either on musl.
-		--disable-thread-safety
-
-		# Valgrind option is just for running tests under it; dodgy under sandbox
-		# and indeed even w/ glibc with newer instructions.
-		--disable-valgrind
-		--program-prefix="eu-"
-		--with-zlib
-		$(use_with bzip2 bzlib)
-		$(use_with lzma)
-		$(use_with zstd)
-	)
-
-	# Needed because sets alignment macro
-	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
-	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	dodoc NOTES
-
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.189-r4.ebuild b/dev-libs/elfutils/elfutils-0.189-r4.ebuild
index abfa0027df3d..4fbcbbab5b6d 100644
--- a/dev-libs/elfutils/elfutils-0.189-r4.ebuild
+++ b/dev-libs/elfutils/elfutils-0.189-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1834cfa5494b..0a1ed19b047e 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,7 +4,6 @@ DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e54
 DIST libxml2-2.11.4.tar.xz 2626756 BLAKE2B 5d7e6388291a8473195131f5cb22aee9a4182f28fd8eed468c449b762d363cfb1713a7466c1f98e96cf819ed8f78e13a6ba930c2fadd8d63869b6efe8e8be8a8 SHA512 c1df7441c729430bdd2de52e9da69b171afc4b776e4a2eb43acbc71ada7a3814a465247fb5fca4c83ecf1c281f7745069ec3d051a7964cb7cc119a3d983f93ba
 DIST libxml2-2.11.5.tar.xz 2628132 BLAKE2B 4af53ef7c19cfcddcf3de5c694a1b03cf4212f8e4c4cb3d873a897fddd8a89d7a52d049a8b85e96c6cdb471689aa385512d87b9710074e90583bf7ad46319172 SHA512 8f087cdaf61957567f04280facc70211c09ca131a532fd13ed4bfc38ddec50e44b1f842b108e635bd4205232036a3e1097904ac016f1fd135bacd17aebb04272
 DIST libxml2-2.11.6.tar.xz 2628652 BLAKE2B 0a1776ca44b21143c538665b6cf7a50962bb1bda6c85f45e4fd4fb7c36ecb4d592d1f5a8d38015bac06a3acb6f7adb1d4afa10fe95987197509f4c1f45b15962 SHA512 43d244450b494c7dbd3521287b87cba0c11267be8d7940a1ecd49dbf0ebefdd052c4c3472c3f267b0d8c431d9b5b964b05067af9e38bc4b0e4f46bc0445b6201
-DIST libxml2-2.12.0.tar.xz 2639292 BLAKE2B 50265115b37219e96408228407e6d3e2b910b1026770de7c23a1dc9e66aa491c6194e2404ddfc33874ee43e6ad81ffc68572931e6ca2426d5c5094bd6224247d SHA512 ea0b66f20bf9c81afd757d5764e8ad1a7a3e4b7addba1b0e9492ee7a8024ce0523ab5031808780801120e18a29134b664b2b4ecc425ea28fb4d96029bedb903a
 DIST libxml2-2.12.1.tar.xz 2637392 BLAKE2B 86ca96c35388386d4e6433e4c452bdca46d9267a9370117c5f5d8826de79a01b09a6a9184e27e805f657ac06aba106ee118c5aff3bcdef9231d01d1569c5fd9e SHA512 84ade06df7d170b777cfe701389444176a02714b1d8f1916d022ef6cf7cf85822571989608dcecc470c2eec044a65dd971562a95921ddb1668736295a5be2806
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
@@ -14,7 +13,6 @@ EBUILD libxml2-2.11.4.ebuild 5438 BLAKE2B 5465d5035da3e2e10d395972b368d1755a7fe3
 EBUILD libxml2-2.11.5-r1.ebuild 5317 BLAKE2B 7aa83b9f6bdc7728344ff865cbec1aa07137a29287ab3641a11bd4a465a7a3678a5d2914f6db4d9bfdf7fe436cc8b141102b698357d1d291f6330129a8b19bde SHA512 645bc66b2c28b71dbc33f66fb650224d4947b5de8b20c6aa8e0f20c32fb3cfac0d97287c48673087a5388583216effd350b09449118b45ac7672b319042c7554
 EBUILD libxml2-2.11.5.ebuild 5250 BLAKE2B 40c27adaeeb5f643fd1f28216b0c487890b414e3864ed56a389a81ef7f0622965233d0d67347b7912711e7c4b69a1c284255c5eb96bf10d671f8be8d5f60b1ea SHA512 e97779c5ba726cfdddbaff520bb2f484f180b4e422217b4375ae249c9cb2e218897b1f51cb494c7db6a78000af2be1803ca35a41876bf7c2de8d4c4dbeec3046
 EBUILD libxml2-2.11.6.ebuild 5317 BLAKE2B 7aa83b9f6bdc7728344ff865cbec1aa07137a29287ab3641a11bd4a465a7a3678a5d2914f6db4d9bfdf7fe436cc8b141102b698357d1d291f6330129a8b19bde SHA512 645bc66b2c28b71dbc33f66fb650224d4947b5de8b20c6aa8e0f20c32fb3cfac0d97287c48673087a5388583216effd350b09449118b45ac7672b319042c7554
-EBUILD libxml2-2.12.0.ebuild 5255 BLAKE2B 3b4b7a86a4233e02ea014171583216f664c70e0cf152519f8c72c11909bdac13a55d4f2ffe11a901c602b84299a43032cba82f01c85dae67485cc06a76bb9fdb SHA512 80783246bfce6dfd9b616d83f7e250394fa1895a0b4bae3781a714d90d71e394cb7048736803624e10a3c498ac2691c84f1edcfaea476312569b10e7be923b1f
 EBUILD libxml2-2.12.1.ebuild 5255 BLAKE2B 3b4b7a86a4233e02ea014171583216f664c70e0cf152519f8c72c11909bdac13a55d4f2ffe11a901c602b84299a43032cba82f01c85dae67485cc06a76bb9fdb SHA512 80783246bfce6dfd9b616d83f7e250394fa1895a0b4bae3781a714d90d71e394cb7048736803624e10a3c498ac2691c84f1edcfaea476312569b10e7be923b1f
 EBUILD libxml2-9999.ebuild 5255 BLAKE2B 3b4b7a86a4233e02ea014171583216f664c70e0cf152519f8c72c11909bdac13a55d4f2ffe11a901c602b84299a43032cba82f01c85dae67485cc06a76bb9fdb SHA512 80783246bfce6dfd9b616d83f7e250394fa1895a0b4bae3781a714d90d71e394cb7048736803624e10a3c498ac2691c84f1edcfaea476312569b10e7be923b1f
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.12.0.ebuild b/dev-libs/libxml2/libxml2-2.12.0.ebuild
deleted file mode 100644
index 7a65290535a9..000000000000
--- a/dev-libs/libxml2/libxml2-2.12.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
-	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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-SRC_URI+="
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)
-"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	virtual/libiconv
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
-	BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		local tarname=${P/_rc/-rc}.tar.xz
-
-		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-		unpack ${tarname}
-
-		if [[ -n ${PATCHSET_VERSION} ]] ; then
-			unpack ${PN}-${PATCHSET_VERSION}.tar.xz
-		fi
-	fi
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		# Please do not remove, as else we get references to PORTAGE_TMPDIR
-		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with ftp) \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}"/python >/dev/null || die
-
-	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		NATIVE_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl run_in_build_dir libxml2_py_emake all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-
-	# Hack until automake release is made for the optimise fix
-	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
-	multilib_is_native_abi && use python && python_foreach_impl python_optimize
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index e42ef42e3d5c..08481874d262 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,7 +1,3 @@
-DIST mimalloc-2.0.9.tar.gz 1143452 BLAKE2B 55e91d8fc89ef5344078caa5e72efce8c0745e3aab7bfb682587abf806bda1903c1afeaa57660a4dbcf7c19c04c759caf69af9fb62d15ecbdf2ce5bcf6574625 SHA512 bf6945bfb600ade35dab34c7f570ee4f69a77612547ad874bbbd989a4e594a6a219c222a22c90c5e36f205aae4d5cd1a5e4651caed5433db275d414c6769bf49
-DIST mimalloc-2.1.1.tar.gz 1163057 BLAKE2B 2f4f06b755f4083b0dc75e08004c38a65f7a855e0455dd8f6e3833578d10d55150c8dc02a8d1448cec5dd02375729ee7fc4ef1ab215ac527f9c52a98f752d8de SHA512 01c7bdfd001ebc34bb0918fe4ecff42a4ec316fbbd73d4dda52c93c31e5712595758a595ae7ea436f445ecc0ebbf7f9c63d9c572f1c1c5a9e96f51fc524a4875
 DIST mimalloc-2.1.2.tar.gz 1163868 BLAKE2B bba29671fdca81b682edeefe16a1239640ea28fee4e44c97d0422ae81e0b3e7141c733459ccafc6672780157af67ff7d2a10cf4157180e003b458332a79d8481 SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1
-EBUILD mimalloc-2.0.9.ebuild 691 BLAKE2B 1a62d4c9f1967bbfcfa97dbdd3f3002e2707e2b20ae4384ed830224e72f7d76616703b09e186eb8abdd112f7c74b8e26b514e0e285354dba5bf3f0835c8421d7 SHA512 4a60f837ae0ac1d77b9e9576f624d8ff3399900776132bf03d84ae3bfe8a8a612e64ebc3cd41f4dc9a9be248ea512b0ad479374718016dec6c4d041218ad54a1
-EBUILD mimalloc-2.1.1.ebuild 690 BLAKE2B e11048d9108d8ac7caee79c98cec839b4b4e876b07db25ef90cc02febc39e9cb18119815856d1057bbae5488ae7d959042911229092d651ac827e03e5ffed88b SHA512 96d8778567d719946eae49f5ea59d72864407411cde6e522e080295f34dc47e4abf9be789e180d3e5a968fe2d6d1a37ba94736a95a5012ad5a0c240eecedd49b
 EBUILD mimalloc-2.1.2.ebuild 799 BLAKE2B 024aa62d7b8b4677612cecbfd86ea2e5ee94513aea8b6e523077be88a8ca1ea4bb0a0776500d56f75b3a9302e688f4a8bc88b916420556df747d2bce493672c2 SHA512 2d39c66344673ba3411aacc3098de5b4fe6648fe782f0c9910abe5d3017d7f8d8fd57794a92518c190fda5130ad3dba318e47601d6c4c22e9632a9ae4a21454b
 MISC metadata.xml 504 BLAKE2B cf6477282968a5469d072cfd81ce800e3ef0a48deb5353c85a1cabc837560cafdb9f9739cb4e98784238d2cc512a29cae5efee401f92a19bf75fb5d810154f76 SHA512 4e8fcc49881f3c479424cf363665d9b12c58eb52f7d962b98b81f5b3e186ba3bd14c2b5dac488d819147121a16c2d9613e75cb77f71fa04e820ca2c1e538baa6
diff --git a/dev-libs/mimalloc/mimalloc-2.0.9.ebuild b/dev-libs/mimalloc/mimalloc-2.0.9.ebuild
deleted file mode 100644
index 10b7bdb1fa6c..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/mimalloc/mimalloc-2.1.1.ebuild b/dev-libs/mimalloc/mimalloc-2.1.1.ebuild
deleted file mode 100644
index 74a816407cfe..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMI_SECURE=$(usex hardened)
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 36284d93fb42..9bbe6173f30e 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,6 @@
 DIST onig-6.9.8.tar.gz 944148 BLAKE2B ee7d91f2d3a7a41d675bcbb9d18490aa3e5a9edb8f3c6e880d27f2218c476499bba21088def41fbb5d500bfb2916af85c2489fca5bd846594fab53ac492531af SHA512 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7
+DIST onig-6.9.9.tar.gz 957444 BLAKE2B d31f4caf5e14477ec1fd40ab764137b49046ac759f487432a129ebdf6da89b128218bb14b08f9359ac0b87286bcd309faa3878b26528926aab6f7d2e25e722b0 SHA512 14d2afd0d2cf86012c9959f221e9a77e7787e709c9dd7295d159e0a9ba89df52fa3edc59f95a6d859c34181e2e2e53e21b932b3eceb4d6ddeb2a3445ef951e95
 EBUILD oniguruma-6.9.8.ebuild 1303 BLAKE2B fd064ef36cfb24c22fc1725619fd3768519255d70bba3a27410766c0708422b72d0646cf1f9d330c9da442203c355f3e06c50bb3aec65a1761e7c41da34a4cb1 SHA512 e175366f4f4157db4b5635cb98b594bb26fba0c014104ee4ec23d0ced1782d4f1b65cf6bbaa537d265e1d160b9693be5d4caf532fe272f4bc699ccc89143e6c7
+EBUILD oniguruma-6.9.9.ebuild 1311 BLAKE2B b42f7faa70e4eb06e03a774a44f7cca4a8ce3b8507e9b0fd8eb100181aaee92c7e33dff59eb56cd221adad23d27eccfd21001cb165bdc5ea5843972f0920301d SHA512 bea60ef9915ad979982cd1646cbf932082b65a4c7de85bfa2e31faee7c9b7501cc7cea1d426f02cbb033ab48c14e99251ebb7bdd3a82a0e57ce8e392421e5772
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B c2910ecee5175e00896f5e91c712c9d1c284a37e44673f3609e45cf1fb935c46189daaba27792f468f1aa60c80c7a9cadef881abbad026cebc56cb8733317046 SHA512 0c49cf1fc620e9e8b1ef78193abc4cf6f9d92c5aea38f2a6914241c6f7bc074c7acec0e79183c996973eec80f2bccb70be7492af05bd999558813e60621e2166
 MISC metadata.xml 914 BLAKE2B c3ffcecee4f392fdaa44339db589f018967dc8dd2322e08ace06d4ffed958563ef51366a0cf09126e04f78673f7a621efb3eec85bd4e2322ed3c3b74cc0f7b4c SHA512 13a7f0fdc4ddeabe2bb163fc1421766f9dbb7730284aa9b732720d49d39ae91c4dce9283a17d36fb10bbfe832187655f1cbedfe2ab2e9a89bb664f8bf978dc7c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.9.ebuild b/dev-libs/oniguruma/oniguruma-6.9.9.ebuild
new file mode 100644
index 000000000000..8ec4abdc73c6
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2003-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index f5e2e4404ce0..0a06ae4445fe 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,7 +1,3 @@
-AUX pocl-3.1-c++11.patch 861 BLAKE2B eca3f649a1ec22735712354cebfe580b740b7c93e851a806b638e6ea23fe5873824d9032771a59d00546b3e99c765ab9490643c446b6af2c7e068d921f82b741 SHA512 e2caac47e8a8fd5d744be1760dc5256d47b1ebcd7119b287a161ce67be262720ef05ed3a49fa39bd1822f79d2f2f82d57c3bf2261cba6459a11695bcc62b73fd
-AUX pocl-3.1-nodebug.patch 1257 BLAKE2B f7f678d2bfc2190b03a40c1ee4c4f2441455081c9097e85249424e27873452a5bcb5b07ce4bc9b0143841c67c7fac2339ea7b3ba76b237f30290a1b82d30b8e4 SHA512 853e583fe0e8bbda6a69e1ce7d49be064a874efc5d9b2ef554df0e11adc485bca2cb6b3376c08989a111935c428a468594a5fe6a1723aa3ffbf92bcb90c5e2f1
-DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c
 DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
-EBUILD pocl-3.1.ebuild 3202 BLAKE2B 9b010b6c6b90fcf99091643d725da9836b673e46cf5c90795d8e3569154ea5c3cb7187f45605eefc995902dff010cd188dc71a71d16a3334acd61c0e9322c797 SHA512 bf167ef520049b54b645c1bc934a7b0b43725c99211829827896be984c19d96cd1aab5cca469dc77079b5ab01305d6ace052cd70330821466e4e05142ffc1719
 EBUILD pocl-4.0.ebuild 3048 BLAKE2B a4abab634c1efd2cd5f3f2fee8ac7d4aa792465b9fac37f40570948fa8f81ea343c42ab44a17b30259d97561f78e307708f743af9d82397fe241cb8734c564f0 SHA512 47d7397bfe431ca7dca6ee666af2c723db68b84d2a12410a06e761a14cf838baa953f3dbdb36cc8c0062ef06f06319ce5c632b1671cedc4fc45fdd25929b282a
 MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec
diff --git a/dev-libs/pocl/files/pocl-3.1-c++11.patch b/dev-libs/pocl/files/pocl-3.1-c++11.patch
deleted file mode 100644
index e676979f2e95..000000000000
--- a/dev-libs/pocl/files/pocl-3.1-c++11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/903968
-https://github.com/pocl/pocl/issues/1200
-https://github.com/pocl/pocl/commit/b5a097e5e55922561f738eedbde050b0fec2e480
-
-From b5a097e5e55922561f738eedbde050b0fec2e480 Mon Sep 17 00:00:00 2001
-From: Topi Leppanen <topi.leppanen@tuni.fi>
-Date: Thu, 13 Apr 2023 11:14:23 +0300
-Subject: [PATCH] Don't use make_unique in countred example
-
-This is because of C++11 compatibility reasons.
-Fixes #1200.
---- a/examples/accel/OpenCLcontext.cpp
-+++ b/examples/accel/OpenCLcontext.cpp
-@@ -189,7 +189,8 @@ bool OpenCL_Manager::processCameraFrame(unsigned char* input, unsigned long *out
-     return isValid;
- }
- 
--OpenCL_Manager::OpenCL_Manager() : Context{std::make_unique<OpenCL_Context>()} {}
-+OpenCL_Manager::OpenCL_Manager()
-+    : Context{std::unique_ptr<OpenCL_Context>(new OpenCL_Context())} {}
- OpenCL_Manager::~OpenCL_Manager() {}
- 
- 
diff --git a/dev-libs/pocl/files/pocl-3.1-nodebug.patch b/dev-libs/pocl/files/pocl-3.1-nodebug.patch
deleted file mode 100644
index ea1085dc4a49..000000000000
--- a/dev-libs/pocl/files/pocl-3.1-nodebug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/pocl/pocl/commit/a13cb332d6678d4556d7319b284b77c371c4b91e
-
-commit a13cb332d6678d4556d7319b284b77c371c4b91e
-Author: Martin Kletzander <nert.pinx@gmail.com>
-Date:   Tue Jan 17 09:04:41 2023 +0100
-
-    Add stub macro POCL_MSG_PRINT_ALMAIF_MMAP without POCL_DEBUG_MESSAGES
-    
-    Without this the build fails with the following error when built without
-    POCL_DEBUG_MESSAGES:
-    
-    ../lib/CL/devices/almaif/MMAPRegion.cc: In constructor ‘MMAPRegion::MMAPRegion(size_t, size_t, int)’:
-    ../lib/CL/devices/almaif/MMAPRegion.cc:43:3: error: ‘POCL_MSG_PRINT_ALMAIF_MMAP’ was not declared in this scope; did you mean ‘POCL_MSG_PRINT_ALMAIF2’?
-       43 |   POCL_MSG_PRINT_ALMAIF_MMAP(
-          |   ^~~~~~~~~~~~~~~~~~~~~~~~~~
-          |   POCL_MSG_PRINT_ALMAIF2
-    
-    and about 10 more.
-
---- a/lib/CL/pocl_debug.h
-+++ b/lib/CL/pocl_debug.h
-@@ -284,6 +284,7 @@ POCL_EXPORT
- 
-     #define POCL_MSG_PRINT_ALMAIF2(...)  do {} while (0)
-     #define POCL_MSG_PRINT_ALMAIF(...)  do {} while (0)
-+    #define POCL_MSG_PRINT_ALMAIF_MMAP(...)  do {} while (0)
-     #define POCL_MSG_PRINT_PROXY2(...)  do {} while (0)
-     #define POCL_MSG_PRINT_PROXY(...)  do {} while (0)
-     #define POCL_MSG_PRINT_VULKAN2(...)  do {} while (0)
diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
deleted file mode 100644
index ff61446e2a20..000000000000
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-
-inherit cmake llvm
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-# TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="
-	!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
-	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )
-"
-RDEPEND="
-	dev-libs/libltdl
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
-	virtual/opencl
-
-	${CLANG_DEPS}
-	debug? ( dev-util/lttng-ust:= )
-	hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${CLANG_DEPS}
-	virtual/pkgconfig
-"
-
-llvm_check_deps() {
-	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
-
-	# Clang is used at both build time (executed) and runtime
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
-		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
-		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nodebug.patch
-	"${FILESDIR}"/${P}-c++11.patch
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local host_cpu_variants="generic"
-
-	if use amd64 ; then
-		# Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
-		host_cpu_variants="distro"
-	elif use ppc64 ; then
-		# A selection of architectures in which new Altivec / VSX features were added
-		# This attempts to recreate the amd64 "distro" option for ppc64
-		# See discussion in bug #831859
-		host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_HSA=OFF
-
-		-DENABLE_ICD=ON
-		-DPOCL_ICD_ABSOLUTE_PATH=ON
-		-DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
-
-		-DENABLE_IPO=$(usex lto)
-
-		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
-
-		-DSTATIC_LLVM=OFF
-		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
-		-DENABLE_ALMAIF_DEVICE=$(usex accel)
-		-DENABLE_CONFORMANCE=$(usex conformance)
-		-DENABLE_CUDA=$(usex cuda)
-		-DENABLE_HWLOC=$(usex hwloc)
-		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
-		-DHARDENING_ENABLE=$(usex hardening)
-		-DPOCL_DEBUG_MESSAGES=$(usex debug)
-		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	export POCL_BUILDING=1
-	export POCL_DEVICES=basic
-	export CTEST_OUTPUT_ON_FAILURE=1
-	export TEST_VERBOSE=1
-
-	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
-	# But couldn't seem to get tests working yet
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-}