gentoo auto-resync : 26:01:2025 - 06:49:21

31 files changed, 216 insertions, 874 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ab14c2d333db..078de5e3231d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index 8f6631f281be..91627b803044 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -6,5 +6,5 @@ DIST capnproto-1.0.2.tar.gz 2412146 BLAKE2B c4f519ced618cd7473194fce9fae96cce22a
 EBUILD capnproto-0.10.2.ebuild 1040 BLAKE2B 947227d338687a593c3e5f039ad0f353508aa56e6343ece186fcb574d90c6ffe06391eabc0f07c746c86c6f14c9f6165c8417707d520c6d5fa3effd29d7c6a4e SHA512 28d1362f934eeedeb8a3110ec68426122a085aced8f6fa30e280978e875953452686257d1e5117157ff060ca9b8430398bf6f9912f0148ef894e3855f41cd5a4
 EBUILD capnproto-0.10.4-r1.ebuild 989 BLAKE2B 9cb9afaa313d4ae36d385b8aa2a2cd9e3e5d6e373cdbd51a1e5aa2484528e582831ca4d3f4a7b20fc6bfb20236720033a508279b06b054b6c7d59d632d11e21c SHA512 f7d705c96fd048002da554fe842e28ee7dda42bca3b1844b2c2a7ca48608573e7f16b5eacf74a03b2d85aad97914dde8e93d74f879263843bd8d1f33c04e41d7
 EBUILD capnproto-0.9.1.ebuild 982 BLAKE2B 14fecab4dff6be5e7b42222cecd47664a85c45058d810c578c3d093b7c7b6cc61d9ce72ca1aae7995ea7b729f202daa17a46303c4062e06eee81b41029e8c631 SHA512 1db279715ff228a167b8e8f5d87a5f77e0d5d2c1855a72f0c522792ed2e34dec52c11a97e9cdbe58741e87c30faa5954cc0f80b5d2887113aac6260edee22a18
-EBUILD capnproto-1.0.2.ebuild 979 BLAKE2B e96cf9f9cfaad72c61945bd8c963378c35dc624edac10e9e704dee9822d5cd48934e902fcdcc2c7b44c5a5ec6ee4ce73c45686128b23259f140564ce89852f47 SHA512 c06d87b219d7198adb6ce22d58e8c9b2d13a7ef6a2fd6d7c8510e66038875b0760e1f28604a695bc8efe95caa9c44d85da510781951cc05f27c3805705ef4564
+EBUILD capnproto-1.0.2.ebuild 975 BLAKE2B f35a6e051681cd3bc9f1c58aeead501a5f457e66a299f74258856cac4cdae9c147f5899192d1fc7d51af2082a2afa884cf422f9dc526376cb04eb909af685f25 SHA512 35634f8d6e8c320d42f3a7fc59d10f70ddfd1fad662b4dee094f95b67da05752da3c83153f2d5a66d39264c8a41dfddf4e415202e4fa463794dacd0cc67da283
 MISC metadata.xml 347 BLAKE2B 36c92aa137b803a5b0804f7684ecd55e13733f506000bed2fa306267b87922255486124dffe336822554c8644e2b2b34cfa13a5456a0f69f0e5b0e4136a1ce95 SHA512 af4c39c709263a8d5a3849a057475cebd9c7bac0228d599c28d0d9298c1c0d06a744f5999198217ee9248ed0318f95d376fb1802afe766082d18606f4776be57
diff --git a/dev-libs/capnproto/capnproto-1.0.2.ebuild b/dev-libs/capnproto/capnproto-1.0.2.ebuild
index 80f2cf10b93a..5682e6778538 100644
--- a/dev-libs/capnproto/capnproto-1.0.2.ebuild
+++ b/dev-libs/capnproto/capnproto-1.0.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/c++
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="+ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index e432d9b2afcd..8fad5616efce 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,7 @@
 DIST flatbuffers-24.12.23.gh.tar.gz 2326944 BLAKE2B d32d8f861cfb2eff23cdedda01d4e0bd2f203c4d4bf1d0ade1a06ce9caf9fcf3b43c58f2e5bf9014892c184f819ab8005b322d6e96b9f3c9b9c5624eef12642f SHA512 f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185c9ef602294b67d73aea7ae371035579a1419cbfbeba7c3e88b31b5a5848db98f5e8a03b982b1
 DIST flatbuffers-25.1.21.gh.tar.gz 2432983 BLAKE2B 5c869588cd0de48c31d37564050f6b254a5cb310ff5a46c5afd5fc05829b3ca686ff404749de8f3d33921bc1551a34d5da01bb2fdff0c4aa5c5ec97e43924487 SHA512 809366e176f4459ee3010b7c3e2c7e6f800fdf0c5cc2d39846885e793fd933602176aeecbfbdc92aec7dadbcd54fc8ba0d57741c034251078136262bdac10ce8
+DIST flatbuffers-25.1.24.gh.tar.gz 2430616 BLAKE2B 36e74e8ed537e363edc74cdf7b58a9ae39f0f2d587ee2ac14f4bf14b22bb77b8f63b1c682d44c20be895cbf399f41fb194796c3598d0550c7bfe0f4b9ff90c43 SHA512 48694fa20e41ffefd2ee264f570e96516853da0bce66c3e29b40e66baa62fdc4e38642de395307e4503743e7e2034654211d3866406be2d44dc582b61dfc25f7
 EBUILD flatbuffers-24.12.23.ebuild 717 BLAKE2B a44084b2b1ea5af707fec9bf95beffb239026dba813b04933903c6f974f3f03a35ee0a42bcd613a0b42375747222c05baf1d6f380d1331b5169ed45fec60a97d SHA512 9e4926198bb76c4eb4df094853684aa1c19d8f427daa877006f4311f064d6c017f4668473dd600462f2b46460ed4ca24c4524d912c6119d49157c2519b2ab321
 EBUILD flatbuffers-25.1.21.ebuild 720 BLAKE2B bb886f740540a13c7b9f05f767e04f1986f66a08c2716be2aa023829d1633f9a364ac01b964acea51e5925861956c39e83132a03a664f75cdb599f7f20b1161a SHA512 d61ad6493dbee1c55c5d01515adc2d778d6ffaa40768deb6ee7cfedbd6be9e4da7859419a0773837f4fb207f66200872896f99a13d956e6d78d6c157dd940623
+EBUILD flatbuffers-25.1.24.ebuild 720 BLAKE2B bb886f740540a13c7b9f05f767e04f1986f66a08c2716be2aa023829d1633f9a364ac01b964acea51e5925861956c39e83132a03a664f75cdb599f7f20b1161a SHA512 d61ad6493dbee1c55c5d01515adc2d778d6ffaa40768deb6ee7cfedbd6be9e4da7859419a0773837f4fb207f66200872896f99a13d956e6d78d6c157dd940623
 MISC metadata.xml 393 BLAKE2B 09ed92e4ac7f31d7961f36dc115c0f3f30b695ea6ade0ab131b40b04f9d9fd94bbd87e7711e3ac5e22355d438ddfe5ff211306d1378c7b0da453037c1be77aaa SHA512 02e1316eb953e5103d52292bdd4e5add290dd9ebafc5399efc4d13574393ca823f7fc915bf452d3a4c96e1766cd5eebca951b27ca4e08f8433f6b532fc766b02
diff --git a/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild b/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild
new file mode 100644
index 000000000000..cdd8e1c2f807
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-25.1.24.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="
+	https://flatbuffers.dev/
+	https://github.com/google/flatbuffers/
+"
+SRC_URI="
+	https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 767b2f84ecef..b60bb1aca83a 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,12 +1,9 @@
-DIST libassuan-2.5.6.tar.bz2 577012 BLAKE2B 462af1eab69e157f65f8134a492cde01dd1e0ee00609f2c2585e742fb9c5532b3fd96054b4fb7449e305690f70aa7a120085db42e2de2e3b0ef8b1603e7e5846 SHA512 dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee
-DIST libassuan-2.5.6.tar.bz2.sig 119 BLAKE2B 379c6566b2369550bfc4b4616fb71ebdbd9947c183488e2af2261db79be3fc34c5691918f3c560b46c20e02e1aa46c44ee31c1fa3727d191f5801831d34e6721 SHA512 c7765530618128a12f1118278d35d8c33d32b560073dbd691cb92c0d94b75fd5fde65cd3f5db717ddfb907b266fdddc1e7a1e2b15b1b89b7470941dbde8162e3
 DIST libassuan-2.5.7.tar.bz2 605076 BLAKE2B 67cb01b7ed9be13a52a37db439666bb8eb709cc63204fe250ff57854459aa8b36655479e887b285fe9ad799c49e66f176f971ab3a871e114cfb217a1f2968d16 SHA512 ca33bd0325bbebccb63b6a84cc0aa5c85b25c6275a68df83aeb3f3729b2cd38220198a941c3479bd461f16b7ddb6b558c0664697ca3153c7fb430544303d773f
 DIST libassuan-2.5.7.tar.bz2.sig 238 BLAKE2B c30005d67cac32857a0dd59dc8a2b9d0d166c6cd6a413742a1d3117c050e9b1b2b96cc4c470fc3e5693ce4c5a422e2cb008b40ef7883a7d039dc9a2234229265 SHA512 b7a798da0e1252acecf8b58b9cc30a5f10fa432d2581c190e4fb064fcf10e9a1b9e07e86c73ee16f0f25ad0e782fac21142875a06487f612268be7f1a09cc1a9
 DIST libassuan-3.0.0.tar.bz2 592353 BLAKE2B c86f7d62413c6f7a228deb47abe0388790a7c0e3c89b5ee7a7a72f72bea6502d5cbe199b10f06efc885af6fefab358dbe0e61a6f798493dcfcc63df0cfacdb55 SHA512 7c5c95c1b85bef2d4890c068a5a8ea8a1fe0d8def6ab09e5f34fc2746d8808bbb0fc168e3bd66d52ee5ed799dcf9f258f4125cda98c8384f6411bcad8d8b3139
 DIST libassuan-3.0.0.tar.bz2.sig 119 BLAKE2B 0717d97dcc5746fced7e7be4e17beb51ac5856722577d58151d802d34dd2d05436da9fcc1d54c132486755f6a241ebb85e95534533e874303b0103786e4e579a SHA512 32ea59e2ccd4b0d35d098bd93a2193f6857a47ebeffd8cd884ea5e0a1abf057e23f0f4ca120e0c74b7369301566a9adc217ec444a2d90a5c5106ec4a4c8df099
 DIST libassuan-3.0.1.tar.bz2 592430 BLAKE2B 5d6a7e4e9ce1b196bc7d126786716d95896de6145b8d753e2289bd36cbc96efa216360ac127fadb7be2d577e7fa203c8c8695d4aa11afcca6ed5397dd40209cb SHA512 6914a02c20053bae0fc4c29c5c40655f1cec711983d57fa85e46df34e90b10e33d31256dd50ae7c7faa8d8d750a529bf9072da0cda3bdd77ebfedbc0e26e5e16
 DIST libassuan-3.0.1.tar.bz2.sig 119 BLAKE2B ce246ca64be1cb185d7e69e3de959bf3268ccf764117cec19a460ddeb2cd56259bd8312e6644a385626449bfcd63c194d83bcfe0c48e830e208c242e174f3273 SHA512 c87cd1690d138f21974c4f7331ccfaf9a1ae57e726699c14f8a81e2e15c5d1ff9a880c428d78d378007cb91bae613432ce25fcfc6e496686d18ff0e6438e4e84
-EBUILD libassuan-2.5.6.ebuild 1713 BLAKE2B aaeb4013bfab432c25f30064f7d22dd08b0f8ad4cd1a46a46c54469c30508fd08db20fce97818ce6ecbf9b70b759c62d4d823d5121c38c4a18a25ad1c6a45a0e SHA512 3bd555bd6d1210c53fb49040a8b4a72e3f9506a029cf638f32c1c1d143f17a79c25a47e36fa2fb2910ebc5c651da192ebee165e8c589874f5a6693486229b168
 EBUILD libassuan-2.5.7.ebuild 1713 BLAKE2B 382d2225add630b7d9136197e89bc5842433f75a3e73c89dc2275cb805b0defb92401e46c4fdcffbe9a00373de5318ccc489d0b8505b641a46028b4e97ffa2f0 SHA512 3a07f911b7cf4351cc4af95251acfaf6fc8518aa1f9b7e993dd05c35fa2afeba58442c2a104432d5a7750d9361de78eb7df39281e2458708665959f6bf60f45d
 EBUILD libassuan-3.0.0.ebuild 1545 BLAKE2B 7dc63973cda91f374ef26698de202bb8365aef5cef3b508b6b7c5bfd2c55449ba30d02421e201525c4a4368e6d556d4691af7cfbff1a4aeb74ca0687bb1e0cae SHA512 402027cf1f7b87a133fa5127965fe5558ad21bd789ceafe183d0f946de4f2c8074e8994ce5f190c9d01d9d0af8b7ccde2063de61077ba258df9ebc17ef85f3d3
 EBUILD libassuan-3.0.1.ebuild 1553 BLAKE2B 30a6e5ea53b9b819ad89b04a04e1e6cc45129234cbd2328420e75c5fc7efe570a82c1a67d0e8f27529d0fac708b9ad8f5184100164d1bd70740f6f71fa169021 SHA512 51f3a6b093efa6e155d940564bc643c1285d4d534cb838dbad0b98decce8edd3e5e729b4f4bb389fe39cc0bc0743e4111901b8acb0e28ac1e5b419eff09b122c
diff --git a/dev-libs/libassuan/libassuan-2.5.6.ebuild b/dev-libs/libassuan/libassuan-2.5.6.ebuild
deleted file mode 100644
index e659cd5964e8..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 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=/usr/share/openpgp-keys/gnupg.asc
-inherit libtool verify-sig
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=dev-libs/libgpg-error-1.33"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 7047840d529e..5952c3e51b85 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -19,5 +19,4 @@ EBUILD libgcrypt-1.10.3-r1.ebuild 6220 BLAKE2B 723a343c0fed0f8674f840772600949a7
 EBUILD libgcrypt-1.10.3-r2.ebuild 6455 BLAKE2B 3bac74b1de4e2c768d101a238ba07f7e48f2f5ec0fb1fd3842b13c647102f523487e22564412d4706de73f2ce5216e673149444e3983dcc858fd358fb9f3f6d6 SHA512 b8df25a71cc5717c4bf2a1892ab92ceb06ec877cf446dd53ef5046f334edbf821412f93c3153e290b1de47de65d29ae91511a0431bd122f80adfc140a53bf0a0
 EBUILD libgcrypt-1.11.0-r1.ebuild 6163 BLAKE2B 4f49e38ccc559a9a5a0eb0b0f8c12897462a4362b95d45e20cf32af03de209ebd49820307e7a84cdb5c978c1d4a29bf15a6521123689e12a24e7cd1f1237ecb8 SHA512 e8d94a54794640062309146cc32a454085cb017c6df6c02846cae559f27af7c587d5b6b0830d4270f1e3065b8387988b9b95ced74e2f3bee5a28cacc39961731
 EBUILD libgcrypt-1.11.0-r2.ebuild 6400 BLAKE2B ee610cebe98ded2d7f5432530a3dd8b388536d1549fe1fe5d53012d6c12ac047fa1af2304f35ce38f2f891c3c0d907bb229d9d6e5a7fbd39d334ab85d044fe5d SHA512 29b332016d4225e99170e90ffd1f187a086e648d10fdbafa1a412929d22ab013614b98dcb5495dc310a674daf4c54f90281b6620e8494f8aad6ffcd5ada246fd
-EBUILD libgcrypt-1.11.0.ebuild 6133 BLAKE2B a2dbd3488d5bfda63e6b9920865940eec16b3faa7903d1d36449954de8215bec2fa6bbf6ca0cccb9025e3c491e67f409efdc9b4bf8a60a13dd53e8ae1a09c2cd SHA512 9f5b03744206e7bf211d12f07096a5c614625447d41293bcd25def04e55d0cecbb898a89006af7b6e4b35b422cb187be0e0bf64e26b1cdba045b264413e13976
 MISC metadata.xml 451 BLAKE2B 3be914b8449db0938d868c7cf2df7fbcf29d7f2e9b91320dfb97f0c1bf6c22326f3a1c3f3b695eaacbe4d74bb3a0b733a7afc1f88e04a37d06a9d9ed25358efb SHA512 add260d64091e3aa1de6fb802f4cfd076c1520622ebe93ddf7a0312f8d46232bd330d9bd380e2bdef6aec15563b6d27f2733b5ebe624ad9d0965ed9c6456939d
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
deleted file mode 100644
index f996a1611e03..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="https://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-2.1+ GPL-2+ MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asm doc +getentropy static-libs"
-IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
-IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
-IUSE+=" cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1"
-
-# Build system only has --disable-arm-crypto-support right now
-# If changing this, update src_configure logic too.
-# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
-# but this looks like it might change in future. This is just a safety check
-# in case people somehow do have a CPU which only supports some. They must
-# for now disable them all if that's the case.
-REQUIRED_USE="
-	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
-	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
-	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
-	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
-	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
-"
-
-RDEPEND="
-	>=dev-libs/libgpg-error-1.49[${MULTILIB_USEDEP}]
-	getentropy? (
-		kernel_linux? (
-			elibc_glibc? ( >=sys-libs/glibc-2.25 )
-			elibc_musl? ( >=sys-libs/musl-1.1.20 )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${PN}-powerpc-darwin.patch
-	"${FILESDIR}"/${P}-s390x.patch
-	"${FILESDIR}"/${P}-o-flag-munging.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} == buildonly ]]; then
-		return
-	fi
-	if use kernel_linux && use getentropy; then
-		unset KV_FULL
-		get_running_version
-		if [[ -n ${KV_FULL} ]] && kernel_is -lt 3 17; then
-			eerror "The getentropy function requires the getrandom syscall."
-			eerror "This was introduced in Linux 3.17."
-			eerror "Your system is currently running Linux ${KV_FULL}."
-			eerror "Disable the 'getentropy' USE flag or upgrade your kernel."
-			die "Kernel is too old for getentropy"
-		fi
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Sensitive to optimisation; parts of the codebase are built with
-	# -O0 already. Don't risk it with UB.
-	strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == powerpc* ]] ; then
-		# ./configure does a lot of automagic, prevent that
-		# generic ppc32+ppc64 altivec
-		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
-		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
-		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
-		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
-		# power9 vector extension, aka arch 3.00 ISA
-		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
-	fi
-
-	# Workaround for GCC < 11.3 bug
-	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
-	# https://dev.gnupg.org/T5581
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
-	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) &&
-		(($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
-		append-flags -fno-tree-loop-vectorize
-	fi
-
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-		--enable-noexecstack
-		$(use_enable cpu_flags_arm_neon neon-support)
-		# See REQUIRED_USE comment above
-		$(use_enable cpu_flags_arm_aes arm-crypto-support)
-		$(use_enable cpu_flags_arm_sve sve-support)
-		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
-		$(use_enable cpu_flags_x86_aes aesni-support)
-		$(use_enable cpu_flags_x86_avx avx-support)
-		$(use_enable cpu_flags_x86_avx2 avx2-support)
-		$(use_enable cpu_flags_x86_avx512f avx512-support)
-		$(use_enable cpu_flags_x86_padlock padlock-support)
-		$(use_enable cpu_flags_x86_sha shaext-support)
-		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		$(use asm || echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-
-	if use kernel_linux; then
-		# --enable-random=getentropy requires getentropy/getrandom.
-		# --enable-random=linux enables legacy code that tries getrandom
-		# and falls back to reading /dev/random.
-		myeconfargs+=( --enable-random=$(usex getentropy getentropy linux) )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_test() {
-	# t-secmem and t-sexp need mlock which requires extra privileges; nspawn
-	# at least disallows that by default.
-	local -x GCRYPT_IN_ASAN_TEST=1
-	# Avoid running (very) expensive bench-slope test. On hppa, it
-	# takes at least 7 hours.
-	local -x GCRYPT_NO_BENCHMARKS=1
-
-	default
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 009ec288f6a5..b5d4e5de445f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -5,5 +5,5 @@ DIST libgit2-1.9.0.tar.gz 7660744 BLAKE2B c81beab379bd78a66d28a48600527979a6c51d
 EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a
 EBUILD libgit2-1.8.1.ebuild 1575 BLAKE2B ee289fb92268a9fa7267626df4651552cbb8d0487610aa292cbba5de8afcb54a16f6b68ff4ea2a8c4dc070fea29691359d54fc45e5243bc5c24f1584ddaff420 SHA512 dc7fe7e6dd8844acc2846f4adf55642949fe62c2c7897239a4764ad2284c60bdb14a10c1d87ab1aff615e064755297aa61b1e18ba9c6014a7a784353fd2c8f71
 EBUILD libgit2-1.8.4.ebuild 1565 BLAKE2B e6fdc32a9e7db73980bea242bd7ed73cd581a96fd60794fc387423302200d2b3481e9c7ab4a64a6ca4c6559eb8353fb91fa4d06734c03da9dd50cbe7444b127b SHA512 6f44eb7651b86561d2a669506ef4e5a281cbe3c5a0f2f5a56ea39971e3ffc95b248b52cd6714a8dbbd5a4e3bc10058233b8dd6f5a78c7d1dd6af4bbb460479a8
-EBUILD libgit2-1.9.0.ebuild 1577 BLAKE2B 78d1de85eda7cae4091a6330450fe120325bd82d03b810934dee663be86f21d37acee5d728d62990630fb5e1e27d61aa39a3ccc896fd248ebe09aea1616c727f SHA512 8864e3957a5f84f6c08df41113ad4ccde3966b4fd9dc8ece7d5a7542bb2ed55401213a53767bb6cb2442e97f22dc6bf028c0a355580247d5c6ec2598b2fda778
+EBUILD libgit2-1.9.0.ebuild 1571 BLAKE2B 4d23069ab3d4265a9cc0bf22decfdf0aa9063ac50ba8488372a46efcce54ab7923b1e58b6e7dee76d2ba3892ccbfc1f166cf973a9abf8168f628d29ea880a6db SHA512 0bd7afc17a9e06ed5d0796a7aef1d400aa42ab4e2942180ebf4634ab46b2abbe69b2530ae52d18f390aede0a28dc337e3ac8ba9439cd4a19961797d9d58c5cf8
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.9.0.ebuild b/dev-libs/libgit2/libgit2-1.9.0.ebuild
index e67a9617a728..1f458761528f 100644
--- a/dev-libs/libgit2/libgit2-1.9.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.9.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 7e85994e3dd7..c24dc8175c4a 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,19 +1,4 @@
-AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
-AUX libgpg-error-1.48-remove_broken_check.patch 777 BLAKE2B 44b858d4d643c9bea081ed86ad473248ab2e8010f732ad0634568547f5c55f3f09e8a90dcb39cf541a4f68356351d45a760c201c833c183e48b6f8af11bdb5c5 SHA512 eab6b038d52221e834d7efe5ade87a4f33a62df583129a5e8a5004d8d680782dd1c992c0fc0b41b2a8121688abc6a43943d30257c3ce62b22970e2017e2a5dde
-AUX libgpg-error-1.50-environ.patch 833 BLAKE2B a4d76cb7833aba6e2c5f67ba9e59c6d04b3848242641f678116ce3a8262453af1a426e5cca424e5dd3a4e05e445dc97815be14cc8d06029737ea5e781d836c7e SHA512 82fed1487db4353fbdec877684fe5842dadcf8d6ac177ab67d1fa2ea34891ea9d149a37af0aabc5d2b6c2c426600b6837a32bf98fbeacc1cd5d9b91ab852b209
-DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
-DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb
-DIST libgpg-error-1.48.tar.bz2 1080417 BLAKE2B 4ced63058586558f4d001bcc468f4bd419b8ec29fbd7dbcaa1a21f959d847c9e12c10c548a0038fd4eac0bdfc9907b61e9f6be71c95fc61c964c649e2415dfd7 SHA512 3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2
-DIST libgpg-error-1.48.tar.bz2.sig 119 BLAKE2B 36e74c520df1740d48630584cb7093413c7974157038dd0e732cb821d6e3b3386a331be9e94a7f19ea10256bd2902d778d52fe1eeab68065ef9dc2625ac2902c SHA512 302091beddab877acf4355f913fae4bd0a795f0a032f47e0e17c58fe1049833116a743d3470669cff59eab2f6d184b143689763cbb4d0f2f9bcab598e09dc12c
-DIST libgpg-error-1.49.tar.bz2 1081175 BLAKE2B f1d7ce3c8b32a1a98495576b4ed7bf938b847a84d0fa3ed585d461ad6b136cf87112055a39b4859301f87f555666d9dbf0dda5ec03ea6270802d98352224071e SHA512 bb4dd3faa8e2ec945e61fb2006697b48a51da7ee510b6650a6ab09c8734a987bc33c9835bc710ca9a9395c088271939091be418efc6ca5130b426c2fbc4959a3
-DIST libgpg-error-1.49.tar.bz2.sig 238 BLAKE2B ff9b3adbbd587afc09e4b7bc58bfa63446f92b7a42baa541e564ee52d88434bca621686f6db6312e8cd8b81f458ce9ee6307c0e6700ab3dc7d7a46d003c934cc SHA512 39d45939c17755e3dd126506d758a1a86f66827616f270c5b663df50e55692e2ef4f27e6e12a7eb1dbe44afc03b415f1fcb3160990b75980cafe6d9cd5a55ed2
-DIST libgpg-error-1.50.tar.bz2 1082003 BLAKE2B 621d9a604585daa1fbd08aaa94f3b177f6265046ccf452317e126e73079c567c555cbb8ab8b63e09b76bdf4f11a1aad7effd118651fe9e9cbcf01229f20ab297 SHA512 96e466d892a50843af6d7c08c0da602518bc6a28836bfc35f0a28cde74d368f57c5c70c65f0f41edb4fc1ca5ebd00f2ece531d8b3eb1bd6db566adbb29bc61ff
-DIST libgpg-error-1.50.tar.bz2.sig 119 BLAKE2B ee3a8e9221d4df8b37ceef70240ecf79efef045cfbde67f6a8bbc0f58dfa4955ed5a75e3cd31de7644707049919b154c1d9607e370dec7e8f2b0b6cb1b997beb SHA512 02e29838be3225f4894bcebd2c53355a98f5857baa4e9f8a78227a03f849677c35b1d2d009610badd6540dcfe5378b5365abcae77d29ba2d95dd252e9c93c893
 DIST libgpg-error-1.51.tar.bz2 1085510 BLAKE2B 8727a993fb5e589beceafce9d06d843b28ceff80398c33a5655608bdcd3d92ee363389bc209a1dff675b9f78d56f13b78d77e55696c0736612b09275ae0da7f3 SHA512 4489f615c6a0389577a7d1fd7d3917517bb2fe032abd9a6d87dfdbd165dabcf53f8780645934020bf27517b67a064297475888d5b368176cf06bc22f1e735e2b
 DIST libgpg-error-1.51.tar.bz2.sig 119 BLAKE2B 34bacbe1923aebc015ea1b975616836dd80278c8edc293474f83633fef59326edfe4043419729de4c8f26c49a6292f7d13a23c3ccda8aea3d1923913df616a5e SHA512 fc793d674c0f5b26efdc71a4420e9743e9dcf8ab646577be3561dc46f15343be42991cf3fe5c49d049f49e929618e7c05dbd32f9e4ceb1d58b90263058621a9e
-EBUILD libgpg-error-1.47-r1.ebuild 2584 BLAKE2B b01e073ecfca25a22afb7a21589021e8ba348619fec16cbe2e90026c485a51d571dcc079f5a3a2c8bf68851d28cac71d2e9b3db68de41f6664c3c7efec03d171 SHA512 54e96bb770c4cedbf1c7fd590f75f78876dad7fdc0abbcce79dc347b8a25b83f11d67eab9d06ca2a7083ce496cb79be85850ae6946e7ef54f6eec3431b0d82d7
-EBUILD libgpg-error-1.48.ebuild 2584 BLAKE2B 2760aaca32c26bd60a516b4fcee3502e9e38728bf6d0f09e5e9291b8d5264a67a789e822d686869dcd7acd38364ef7c0d1dff91cf744e86f0a79cb39f874cb31 SHA512 b68f0497246c706e237cac56a09ab79d66845c222f164d66c47fa9750cfb285b7bb3a2cb54d0a92a49ff8e738b548c31f94719fcf368b155b49bcada4b98c1d3
-EBUILD libgpg-error-1.49.ebuild 2703 BLAKE2B 84189f9f6664db8731889d086e1ab82b3764f136608893f153f7a964f085c20465211844d2392aa75bcb0cca96eee53c84466968c36421f9bad38ffda3bdb2b8 SHA512 b89f3d0538e24d0f1660ea98587ae4aac4156d6de335e1597a7837f620bde2bf01e1ae778d409a4d3b48e18cead15cc6d61867109cbc28306b3d7e56c4cda576
-EBUILD libgpg-error-1.50.ebuild 2750 BLAKE2B 9e296dd013c8b0f11653b227dcc081a3ef9ca5ec53733f6284e09961bad14a9c5dbf8f5a16618516b5c4bc7b7a47f226e118f2b71b94cce1319e15265921ee2d SHA512 34957757b0c8ad48e93b645feef47da1807daa053922ee5ac5b8a38c362ced1623b409c4b0bc76d0dd271a5bc816c28ac3557f9946462a1bf39274de11bc8e7f
 EBUILD libgpg-error-1.51.ebuild 2703 BLAKE2B 0ede7079abe419df3a2974ec663e069e5f0d1332fc25961faf1e79c00ba6a0dbd86b211619740ccc40aee643d832390b1c8c0a1d47287a03b2d7efbc1f95427a SHA512 e71596870c65b60d7bed231349577cfae3fedd4cb082513de40a8ff2f362d4785a9a6e95010ab4f627bc2ffbc2360462effed9d6ed92d2aa585a83595987d545
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch
deleted file mode 100644
index 043099c097bd..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This breaks our multilib builds:
-
-  Confirm gpg-error-config works... no
-  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
-
---- libgpg-error-1.44/src/Makefile.am
-+++ libgpg-error-1.44/src/Makefile.am
-@@ -347,14 +347,6 @@
- 	cp gpg-error.h gpgrt.h
- 
- gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh
--	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
--	@if ./gpg-error-config-test.sh --old-new; then \
--	  echo "good";                                         \
--	else                                                   \
--	  echo "no";                                           \
--	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
--	  exit 1; \
--	fi
- 	cp gpg-error-config-old $@
- 
- install-data-local:
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch
deleted file mode 100644
index 7ccdb2223a57..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This breaks our multilib builds:
-
-  Confirm gpg-error-config works... no
-  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -318,12 +318,4 @@ gpgrt.h: gpg-error.h
- 	cp gpg-error.h gpgrt.h
- 
- gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh
--	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
--	@if ./gpg-error-config-test.sh --old-new; then \
--	  echo "good";                                         \
--	else                                                   \
--	  echo "no";                                           \
--	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
--	  exit 1; \
--	fi
- 	cp gpg-error-config-old $@
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.50-environ.patch b/dev-libs/libgpg-error/files/libgpg-error-1.50-environ.patch
deleted file mode 100644
index 761e884aa806..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.50-environ.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=a59e902b887fd92337c9728f668cf9c89da3957a
-
-From a59e902b887fd92337c9728f668cf9c89da3957a Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Thu, 20 Jun 2024 12:05:15 +0200
-Subject: [PATCH] core: Declare environ for macOS and others.
-
-* src/spawn-posix.c (environ): Declare.
---
-
-GnuPG-bug-id: 7169
----
- src/spawn-posix.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/spawn-posix.c b/src/spawn-posix.c
-index 7de02a9..96f1536 100644
---- a/src/spawn-posix.c
-+++ b/src/spawn-posix.c
-@@ -57,6 +57,9 @@
- 
- #include "gpgrt-int.h"
- 
-+/* (Only glibc's unistd.h declares this iff _GNU_SOURCE is used.)  */
-+extern char **environ;
-+
- 
- /* Definition for the gpgrt_spawn_actions_t.  Note that there is a
-  * different one for Windows.  */
--- 
-2.30.2
diff --git a/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
deleted file mode 100644
index 63ad459a6b52..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools multilib-minimal toolchain-funcs 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+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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
-	sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
-	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)
-
-		# See bug #699206 and its duplicates wrt gpgme-config
-		# Upstream no longer install this by default and we should
-		# seek to disable it at some point.
-		--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/libgpg-error/libgpg-error-1.48.ebuild b/dev-libs/libgpg-error/libgpg-error-1.48.ebuild
deleted file mode 100644
index 8ce92b96f6b4..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.48.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools multilib-minimal toolchain-funcs 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+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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.48-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
-	sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
-	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)
-
-		# See bug #699206 and its duplicates wrt gpgme-config
-		# Upstream no longer install this by default and we should
-		# seek to disable it at some point.
-		--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/libgpg-error/libgpg-error-1.49.ebuild b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
deleted file mode 100644
index 45db15412897..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-inherit libtool multilib-minimal toolchain-funcs 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+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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
-)
-
-src_prepare() {
-	default
-	elibtoolize
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's:INSTALLSHELLPATH=/usr/xpg4/bin/sh:INSTALLSHELLPATH=/bin/sh:g' configure.ac configure || die
-	fi
-
-	# This check breaks multilib
-	cat <<-EOF > src/gpg-error-config-test.sh.in || die
-	#!@INSTALLSHELLPATH@
-	exit 0
-	EOF
-
-	# 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
-	#sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
-	#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)
-
-		# See bug #699206 and its duplicates wrt gpgme-config
-		# Upstream no longer install this by default and we should
-		# seek to disable it at some point.
-		--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/libgpg-error/libgpg-error-1.50.ebuild b/dev-libs/libgpg-error/libgpg-error-1.50.ebuild
deleted file mode 100644
index e7a6826c3e78..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.50.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-inherit libtool multilib-minimal toolchain-funcs 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+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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}"/${P}-environ.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's:INSTALLSHELLPATH=/usr/xpg4/bin/sh:INSTALLSHELLPATH=/bin/sh:g' configure.ac configure || die
-	fi
-
-	# This check breaks multilib
-	cat <<-EOF > src/gpg-error-config-test.sh.in || die
-	#!@INSTALLSHELLPATH@
-	exit 0
-	EOF
-
-	# 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
-	#sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
-	#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)
-
-		# See bug #699206 and its duplicates wrt gpgme-config
-		# Upstream no longer install this by default and we should
-		# seek to disable it at some point.
-		--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/libksba/Manifest b/dev-libs/libksba/Manifest
index 861cbdb04916..67ac01bd1b14 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,11 +1,5 @@
 AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
-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 238 BLAKE2B 0d62b39821dee0a3f921e87190247cacec1fcde253d26773a378f3a55a61468feba7b79fc875b1b2b8735f9ff310467dc30d8e5b5b06f37bd1ef4744a3fbfeec SHA512 053b594044ea2d5ad90341e14cf9969e3d8695e4671586cbcdf12d33c7864bf258fcf4474ea09db9612677cb239cb629d6b61799f684a1d838a57c0b53e27bf8
 DIST libksba-1.6.7.tar.bz2 706437 BLAKE2B 95f51bc9a0a7ee14b91089aded3a420cf2f986a1599e39e36dc46fd0b71bef465af9c6576c19516d0aadae67399eca69ae0448239216ba486812884ebefa1ae7 SHA512 60cb9df9f502ca479818f45b78c4bc2b78f6f359be2b8da489ea98f8896a43ab2c20cf97526b79a3220fb32f1701e62a6481fe61e91e567186ecf4f33d8e64d3
 DIST libksba-1.6.7.tar.bz2.sig 119 BLAKE2B 74b3fd7682ae526c7430fe3792f873838c366ec0de1d80b699370a8cefdfdfc386f883b1d45df8df62e64d9de992f4bbfa7f74cfbb38419694f1a11ff1d3110a SHA512 97df523f0640f8fed0c3c7603218058021475d5b0e47a36610aa88312a6bb5f302e1e2016f5721a9077d0d27b35b28c7c96d9843866c957c965b2c580d3ee60b
-EBUILD libksba-1.6.5.ebuild 1785 BLAKE2B e70f6f3faf8c4b7c9f52f20c19665c42d565c1e06c0416e414c6a60ac6864b0ff5c2b4c5feefefed1ad957325e0b4e6ac7e9f0cbaff9ef36b143803590789a4d SHA512 eb151d0efd00e442bbbcde314e8fdc2d4ff3ee99e3b2e6329fce95a1d176ccc07684859fc402c3bd58271c25c9600d7c65d071051fde477ba4c7f8e0fc5311fb
-EBUILD libksba-1.6.6.ebuild 1785 BLAKE2B e70f6f3faf8c4b7c9f52f20c19665c42d565c1e06c0416e414c6a60ac6864b0ff5c2b4c5feefefed1ad957325e0b4e6ac7e9f0cbaff9ef36b143803590789a4d SHA512 eb151d0efd00e442bbbcde314e8fdc2d4ff3ee99e3b2e6329fce95a1d176ccc07684859fc402c3bd58271c25c9600d7c65d071051fde477ba4c7f8e0fc5311fb
 EBUILD libksba-1.6.7.ebuild 1785 BLAKE2B e70f6f3faf8c4b7c9f52f20c19665c42d565c1e06c0416e414c6a60ac6864b0ff5c2b4c5feefefed1ad957325e0b4e6ac7e9f0cbaff9ef36b143803590789a4d SHA512 eb151d0efd00e442bbbcde314e8fdc2d4ff3ee99e3b2e6329fce95a1d176ccc07684859fc402c3bd58271c25c9600d7c65d071051fde477ba4c7f8e0fc5311fb
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.5.ebuild b/dev-libs/libksba/libksba-1.6.5.ebuild
deleted file mode 100644
index 45f7d7ba863e..000000000000
--- a/dev-libs/libksba/libksba-1.6.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
-inherit toolchain-funcs out-of-source verify-sig libtool
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.33"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize  # necessary on Solaris for shared lib support
-}
-
-my_src_configure() {
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(use_enable static-libs static)
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-my_src_install() {
-	default
-
-	# People need to use ksba-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.6.6.ebuild b/dev-libs/libksba/libksba-1.6.6.ebuild
deleted file mode 100644
index 45f7d7ba863e..000000000000
--- a/dev-libs/libksba/libksba-1.6.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 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=/usr/share/openpgp-keys/gnupg.asc
-# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
-inherit toolchain-funcs out-of-source verify-sig libtool
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.33"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize  # necessary on Solaris for shared lib support
-}
-
-my_src_configure() {
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(use_enable static-libs static)
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-my_src_install() {
-	default
-
-	# People need to use ksba-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 897b88c16c9f..88723ae66341 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,7 +1,5 @@
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
-DIST libtool-2.5.3.tar.xz 1050076 BLAKE2B e7bc3421d2273851f894583b879c897239bddaef00dc335176f00ce971d3c77e4d4304ae3b1d1b97d4b6b1b4fd9859ddc0eb5dcadac2e0de959b68cae973f726 SHA512 7a2b86716b2cbefcd45bda7f65af81fcb0aaa3dce96b09f417d6b94721a4dd9e72a9552862783d998ddf785e509315bb49f65c464dbc949d58e36f0960cf9b1b
 DIST libtool-2.5.4.tar.xz 1056924 BLAKE2B 47de3c49a690d44d7ddd5e3b5e4090c91dc5fbb9c40fc4a3963e150fb7329326ee3e21b8c149974726171c4b0380028e0efc7a369c4f04357eea46f69852e1cc SHA512 eed207094bcc444f4bfbb13710e395e062e3f1d312ca8b186ab0cbd22dc92ddef176a0b3ecd43e02676e37bd9e328791c59a38ef15846d4eae15da4f20315724
 EBUILD libltdl-2.4.7-r1.ebuild 1106 BLAKE2B e7829bd6d0b642806aa8823b9cb09551b690dc956d309cd29f1f67e312b682695c35e03314c842ee078e6ff20d3f8540e25b877f13bb1cc9be192d97e114e644 SHA512 4759faa380d42aeda3b4b22b0c8857da01b862b6b5da8c379bc6bfb4c8e591c65357aeb4b1e7c0c608d70abf5567ffdb33b47ac5527771199dc20e5e8f07cee7
-EBUILD libltdl-2.5.3.ebuild 1268 BLAKE2B bcb7f24a0ede0d9421428e34d4346ba42be0101dac5df968f900367d33a1056625901c7273a3c8881ac93646f561721c0c496dbe1333170b413063be5befaf15 SHA512 b64c1ef9373d980c538d5fd8c8216d72600f3169c246e7c4a7eba75a1aa2226aead4e9f67b0c2b9ce1833b94ec600cb480d63d53298decfea5898cd76b62f298
-EBUILD libltdl-2.5.4.ebuild 1261 BLAKE2B 46c6874bf14a6c196055299a9f4a1b3b7042cbef13317da723b7fbb81bde05fe85a44ac7c3ff740627644bda264ec73027111d85cb60eada7913cb56811946df SHA512 e9cd90f88036029e0a1ff0fc46fcfa48bbdd21de4ee4d45b6c7756020a912e889f4a2f683a45d685921a95689741634d440ea4c84a328f42b2d3160dc559f40c
+EBUILD libltdl-2.5.4.ebuild 1260 BLAKE2B ce5a26f9f07977eb0189dab72e435af3946326f23fd874cc5c99537b65111eb1585f13e1d399afa4c6c8599cf14335e8458ae20a6d521286a97bbb026c2506fc SHA512 55580154458a2456ecc4a4706a2f20e81fa63860676ea5728cdc2287b094576dc862880854e5aaadd21c56464018a7b130b7b0dbd69eedf11c352089485e4253
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/dev-libs/libltdl/libltdl-2.5.3.ebuild b/dev-libs/libltdl/libltdl-2.5.3.ebuild
deleted file mode 100644
index b367c10d5e46..000000000000
--- a/dev-libs/libltdl/libltdl-2.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-build/libtool.
-
-inherit multilib-minimal flag-o-matic
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-if false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-S="${WORKDIR}"/${MY_P}/libltdl
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-# libltdl doesn't have a testsuite.  Don't bother trying.
-RESTRICT="test"
-
-BDEPEND="app-arch/xz-utils"
-
-multilib_src_configure() {
-	# bug #907427
-	filter-lto
-
-	append-lfs-flags
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-ltdl-install \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# While the libltdl.la file is not used directly, the m4 ltdl logic
-	# keys off of its existence when searching for ltdl support. # bug #293921
-	#use static-libs || find "${D}" -name libltdl.la -delete
-}
diff --git a/dev-libs/libltdl/libltdl-2.5.4.ebuild b/dev-libs/libltdl/libltdl-2.5.4.ebuild
index 93790c2c82bb..54e89859efce 100644
--- a/dev-libs/libltdl/libltdl-2.5.4.ebuild
+++ b/dev-libs/libltdl/libltdl-2.5.4.ebuild
@@ -15,7 +15,7 @@ if false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}/libltdl
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index f8038611125d..be5f321187c8 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -4,6 +4,6 @@ DIST libzip-1.11.2.tar.xz 787300 BLAKE2B 84b41a4dfb5f61404972314021ee5de15319974
 DIST libzip-1.11.3.tar.xz 788520 BLAKE2B 3296ff48ce853687ea4fbe310130c2468c87990da9a6c285acb09406afb23fe2240fb27a94c23db8b2ad58bd7b80f5b6e84d0702957792d0baddd13487c483dd SHA512 7ad7e5f04f28e777604833e702aaa68d603b9895e70d6ee9e587549eb628a89e5569aca0ea255f82de1adb8f4599b828c63dd282eb15a5ea55a147aa7df7b2a4
 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5
 EBUILD libzip-1.11.2-r1.ebuild 2509 BLAKE2B 22e2fbba9452e52373fd902153d0efc76dd1e397bb652606b2ee81b655068cd915253ae8fb48c4d101e72f84ce79b01f4d7f12ba87d0ec7b1e8e9fc0b0409cee SHA512 3b32cf02a9c1d6674e0f6d52cfc1785b357e7ede2659564057f169d06a3c5c698f85dbcbc97d95f692d635291bd7a1a9318d902fb5c123c6caed23611dde9a93
-EBUILD libzip-1.11.3.ebuild 2509 BLAKE2B 63377232781e37b69526965c4eb48744b924d7c591bf8fd097576ce55df53a621611050df003dd06d4f9e2e6ab54cbbcfe850852dde708b2534cdd51fdff10db SHA512 80e13a4c89ac87e8ccf7a49a8843cb517f3021b57511ef37c16aedab204acd9c805bbc5184063b75181461cc643b8711a6c30b683fa13f84d45a6fb5959ad009
+EBUILD libzip-1.11.3.ebuild 2515 BLAKE2B f48851c40e8a39edf958b78e2495b9e611e916013b87abf05848f74895f8970a1fa12d1cc019116541ceb499f54fe7f2b138f64a676ea7385cbe7c5f40fe3c96 SHA512 9bc93128961ea583ec80c6ec1886a376d6a1d1b63fab9da3fd47da6cd335efaf014eca97fdc6380bc0bc6b26e99997e977f9bfea0c0c7bd4b6ef5666f0f44a90
 EBUILD libzip-1.9.2-r1.ebuild 2439 BLAKE2B b0ee07ac7f2f28ea49acfc8aeeb41a15331e9a502efc547435d89183f60cd0b76331451c24284d8cdf50a3b37ace6c2b18c7b0ff7f7c3cc74881f660ce354c12 SHA512 7b5164f5fae9374ac854129790cf1967c8a8e88ff8155b382e659b8fd6ede85c71c761d4927c33ed577a5b1b7c7020bec2612561a2333c9d3c9c74340aaa3d0f
 MISC metadata.xml 563 BLAKE2B 2cb57938618664b1424b3c4d475d79ae6a66964788665c559520ff8d7466d9a1c41c1a1821dd1213dde1062898e3bdb79478ff44fa3290c4ef6802a64539e77c SHA512 d14c625c1a43bbe8d69508cba6c78adad10287b6018693938a46af322614b3ba999fabf6f2d97c48836a80ded2dd7e0e32c1d6491654a8bdb5b77bd23acd1b24
diff --git a/dev-libs/libzip/libzip-1.11.3.ebuild b/dev-libs/libzip/libzip-1.11.3.ebuild
index a6858a285a39..3f609d8bdb85 100644
--- a/dev-libs/libzip/libzip-1.11.3.ebuild
+++ b/dev-libs/libzip/libzip-1.11.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index edea3d6a81fb..f2c3ac4d96aa 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -22,6 +22,7 @@ DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
 DIST protobuf-25.4.tar.gz 5878444 BLAKE2B 9b40985bda31a84dd3ab7a1d18f746d5f88660d9e036a20234cbc85e79322005d2ffd4e60d72c55a8b5f624d7cc50522771f0804f203f2eabca7b0b8ace0545e SHA512 1b3ba1a1575bcc9d52ddce93d466912863d600dfbb40f64845b8e66c8000047d05508b8f1baba8d5eef42a7ff90eb778f7c8a553c9ec2778fd3a9a18122c67ab
 DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793
+DIST protobuf-25.6.tar.gz 5878040 BLAKE2B b82848406890460d9321e6736e413290e1b4a73dc5f2d3db17dd4419e7ddbb788b6cdb52c884c3e7f0c49c5a69ce31468dcc311d73efca06f94ec51577472fcc SHA512 f1920414bbaed0a882b73349e1cd9cdf87c0d9c99790d70ab8ef589161a8dcad92361daec67bf9bf8350f4181fa8514b50362f1495f082ba5805c4a2e70b6308
 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863
@@ -39,6 +40,7 @@ EBUILD protobuf-24.4.ebuild 2915 BLAKE2B 2fd3f84bf7e86b64393fd39962080809ef4d65b
 EBUILD protobuf-25.3.ebuild 2914 BLAKE2B 4ddc5b0263ce920a014c805cd0bbb5c7f2e436c7e0185e1aa80e58f47610ae83ed55f64183d7ced81badc1e002ab3d60bd236df8da8d8111f19a03d3b236f451 SHA512 9e401d708de3865310db104d8a61ea763a24997b36e31e3770a1cf038772f12d3b8d956f11e62330ba2bb6ace0abc38576312015d16dadcad1966d3528c9b0db
 EBUILD protobuf-25.4.ebuild 3888 BLAKE2B 92e102f7dc8925101f54bc8bc9b51d57f0f4881f5acfa32940370889949526001ffc613d292e5960ac3f0fc3cd20bb6fef03cd64f29eae01108a59860dfb9c5d SHA512 683bd2e998acb32705d7c120503ed9d7b09559eb2267e238dac9284ad920de2bf4c17fc487906e5a1eca88a4ed44e0ade46e5aff44fab3b55ec8727aec8dc266
 EBUILD protobuf-25.5.ebuild 4045 BLAKE2B c98840d788637334043b704f2dc75c460df66df7666ab2e9d07a51fe9dd2e33241110a108c268d40cf5541d8f391917114e7c7594dd2b639fef84c7bc7b0d434 SHA512 0920ba6ddb6846a1045f2db1b9381ef52c58fbc4f5cf140b6531824913b5e6f806dfea9b62dfae74bcfebf75dbffe1e49b9e4a17709e767404bb15e58f7e079c
+EBUILD protobuf-25.6.ebuild 4045 BLAKE2B c98840d788637334043b704f2dc75c460df66df7666ab2e9d07a51fe9dd2e33241110a108c268d40cf5541d8f391917114e7c7594dd2b639fef84c7bc7b0d434 SHA512 0920ba6ddb6846a1045f2db1b9381ef52c58fbc4f5cf140b6531824913b5e6f806dfea9b62dfae74bcfebf75dbffe1e49b9e4a17709e767404bb15e58f7e079c
 EBUILD protobuf-26.1-r2.ebuild 2915 BLAKE2B 75df59e6ca105a529cf582cda4371c26f0b9bf1df94fb11c3b409e1b01fcde43e0705e05212ea630839446aba819c4b8132514383f94fa2aa455b232a3f64eae SHA512 8daaf04ef736d389f634f2366e833e7c6ce40a9e60b022a31df31868b01a282f948d583270827b1714cc7cfacac4cdd0e9971944dc5b3dd823afa4696c4cf1c7
 EBUILD protobuf-27.2.ebuild 3739 BLAKE2B f93b87963a5c0e5d78c21817ac657e02b1869a36679eb0501d06ce3523518260e6a55e65de5f2b251ebff3a36e4006cf9eaa8fd18f186dbf7a46c4fb416e4bd9 SHA512 f801b662ce4a47c137f061ca17010481cfe40f87bca22f7c895fe42e85c7e33a7a865092aa2db21aaf5e78177a7127902cfdabfd969bca6c567045790a8fcb0f
 EBUILD protobuf-27.4.ebuild 3942 BLAKE2B 6f5050e4120d890fdf88c743c8fb214862f8ea23c6105094242a41f9146acb325bb815d6edc0ce877b0bb4d866ebfdb14b24d9321e213fb90480a1af805cea37 SHA512 23cc67686171e88490bc604236fe8d5b204a0ad6583b01cf9fd4c86a35e6503f1e53db90d02d86759f7ef67bd221aa255b086badc02d89979d8f3100d58b0490
diff --git a/dev-libs/protobuf/protobuf-25.6.ebuild b/dev-libs/protobuf/protobuf-25.6.ebuild
new file mode 100644
index 000000000000..6a9820f1a034
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-25.6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+ABSEIL_BRANCH="lts_2023_08_02"
+
+ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
+ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	MY_SLOT="28.0"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	MY_SLOT=$(ver_cut 1-2)
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+SLOT="0/${MY_SLOT}.0"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_ABSL_PROVIDER="package"
+		-Dprotobuf_JSONCPP_PROVIDER="package"
+
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+	mkdir -m 777 "${TEST_TMPDIR}" || die
+
+	setup_test_env() {
+		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
+	}
+
+	multilib_foreach_abi setup_test_env
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
index bd2824970cfa..cbeece2f412c 100644
--- a/dev-libs/stb/Manifest
+++ b/dev-libs/stb/Manifest
@@ -1,3 +1,3 @@
 DIST stb-20240201.tar.gz 1510288 BLAKE2B f11e802c6e9efe60bf08bb6071b6e8a12fc7a0713f450379534c2a4fc96c2023a190f4fed598fa7fa9b577e19f14bffbfa2f54dff1ebf72d933dc0113aa820c5 SHA512 2403ddb14b7c1a49f12bb0b43e52c612d58e4382ed03f59b4255560900eb7f08651b6688ec8b468b89e999611a67de5bd1102aa03d3847e3dd2d464175a11905
-EBUILD stb-20240201-r1.ebuild 986 BLAKE2B 9652971b7a9a4d4485bf767e8a6f81fea34e14863186858772c776663b67f1d1414ff75807488ca586bfcf67c7e2fc4e3325f7a0526fe7da4b9a8f647f5df6d2 SHA512 0e69b12f5cb2dd12848b507f7cff027252f42b651d93bb0fba80b753c770b2ccf94503bda12fd6cf1ee7fe3899b90fd788d9ebb4cf4de5ba15f82eb79f3a54f7
+EBUILD stb-20240201-r1.ebuild 992 BLAKE2B 5ef3a8357358832220e29082d9b0af717b644976db64880fd2b50ad096c32c4b68bbc16166914c203371ec880af0fc01b609d93899cac42955bfb00f9840644a SHA512 1e7ffb346d0019d728b3fc56a2dd1c2dad283679e690ec8c69c633d22a66e1ccd76702401bac053face6a12f9d24c24b178e0c915a52a625c5316868c2dc3e44
 MISC metadata.xml 657 BLAKE2B 981e6b50cf2d4583dcd230e5fc5ed2adcd26c193d932fed79658e117f553593dace68d57a43a4a59e7046f5c11aaa82ec251fea664a9dcdada691846119820f9 SHA512 086f821db8f43371e2d411251afa1f17af5c7d3ac213daa4480ed15b00e0505e1368c73f73f91ae176dc92a3e96bdb4d002745f394069879bb8d980f83405479
diff --git a/dev-libs/stb/stb-20240201-r1.ebuild b/dev-libs/stb/stb-20240201-r1.ebuild
index be12aa9b9f5d..4e25b5d92f63 100644
--- a/dev-libs/stb/stb-20240201-r1.ebuild
+++ b/dev-libs/stb/stb-20240201-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${CHECKSUM}"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 src_prepare() {
 	default