gentoo auto-resync : 26:06:2024 - 00:12:24

22 files changed, 219 insertions, 140 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 168e0211774f..2dbb916ce830 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 3406f68ee029..8758aa922c58 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,6 @@
 AUX c-blosc-1.21.4-no-unaligned.patch 1275 BLAKE2B 899242fa0cf21d1a177e9633b7e7b38c764f424c327b832b54a16da1f6b519bfcda0493056c1d6db35678e73109e0e766e724dcfabb65c828b1cfa81b3b84677 SHA512 75796e0aae655cc1099ed84c51082adb50db0f7376c7f32925423206bb82b86f995a6ae5d311551fba4fdfb1f0c86c17e0dd43c30f94344680f66a9b9d7e5761
 DIST c-blosc-1.21.5.gh.tar.gz 2458960 BLAKE2B f56e19146a1522554d5e8de23f580125a6181b50f1898c8e622e8ac50f2f40ab4cdaba62a5a2bc6ff437257550e205090ebe66bb8840202a26567abfc63fbf53 SHA512 01e6d80e1114d76c4bd1b413778c293d0455879ec38e1e1ec46e8e7eaf2997b47cc2de35bc52cdc4c2c70341b6f87d70626a9a9c24ffc8b7b170d760efa60c07
+DIST c-blosc-1.21.6.gh.tar.gz 2495309 BLAKE2B 87d3368a5070bb9be84b648c6727248630b97fbeda1cfcecf3da41256370436b719f943c63b84c196a2653e19c699a5f8c6aeffc0da4fffeda9fa7afeb81b853 SHA512 f32ac9ca7dd473f32201cdf4b7bb61a89e8bc3e3d16e027d2c6dc1aa838cb47c42dfed6942c9108532b3920ed22a8c662e7451890177c9bbe6ec5b8ab65362b3
 EBUILD c-blosc-1.21.5.ebuild 1253 BLAKE2B 44845b86edb6909b2abf636a0add291e7b5351e136047575f97123e56d5b8dad600df119378f52df71b3b241b0c9520ee785a44beaeb9df0be459b5ae7567a9a SHA512 b6cd123dd2ae759fbe83afc1311310b5b42c594cf397624ecd5d628798ca163d9630a96d444c608b8b8313cbfc34893d9d02fcfcd243f54e54d6c8396b5d86b2
+EBUILD c-blosc-1.21.6.ebuild 1259 BLAKE2B 8e07d5d360b73c64cc119e8a85d676013d9e274bd59c1f6aa68b0a29dfe38405d4f0d979961f897cc863cd1592d1335b6e63091590710e1e4c17b1c5eac841cf SHA512 d9b6e31d0b619bcf5031f3e657db85dda3834dea96e94070e4b8d73e50b3b08706b999f3f63a1a507665dc57eac5b3f29d7070c037458dd3be482aba291baead
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.6.ebuild b/dev-libs/c-blosc/c-blosc-1.21.6.ebuild
new file mode 100644
index 000000000000..784aa67e6e7e
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.21.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="
+	https://www.blosc.org/
+	https://github.com/Blosc/c-blosc/
+"
+SRC_URI="
+	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lz4 +snappy test zlib zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	lz4? ( >=app-arch/lz4-1.7.5:= )
+	snappy? ( app-arch/snappy:= )
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.21.4-no-unaligned.patch
+)
+
+src_configure() {
+	# remove bundled libs (just in case)
+	rm -rf internal-complibs || die
+
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_FUZZERS=OFF
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		# snappy is always external
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 175b747f4d7c..49a81fcfe793 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,3 +1,3 @@
 DIST concurrencykit-0.7.2.tar.gz 257817 BLAKE2B e9b58c2e5fc7f39d03a3800117bc215f933cd5b542c293e07934597788e2d33e33cf6d02bbaa54d829b57e2dcaabcf79220398bef3a903a1d39c70bb5553ccb2 SHA512 c3a93a8bbdab2c81ccbfe8f38a17677b912bc157c231c960330cb130e93c35e3aab6b2fd1695d0ea28dbe3e12297851f1b96ef1ee21ca4e4c0065c91b83f51c3
-EBUILD concurrencykit-0.7.2.ebuild 798 BLAKE2B 12dcc7a67197dcbe73f2da4b9f84448008e83d96aa6a8808dbf54b67250b7d579e226b8250989d28dd862438bd3400a2bdba3e207ee151be91b7e46f1381088a SHA512 a9f9f7f26d802c59db730b29bd777c8394326a77e95cfc309bfe859eaf6a650c338eeeb8efa93c0bb2cc0f4bbd765d868a6d22fead0685936149c42844a2a8aa
+EBUILD concurrencykit-0.7.2.ebuild 805 BLAKE2B 8f7c319fa61081fc4cb5a98823db4f8f86412b51b43fbab1ef65ebe508312f94954177c1f6b5c45392de9fc07829d0e24beab1bfd7d2b0593367b06d0315babd SHA512 224ce3355aff6fc7cad81403083828e8716b6665906dc2df864b94659939715471760463f3ab8c767c58ed6d4ff31275e652b18edf5fe127fe0c3abeec2b620d
 MISC metadata.xml 333 BLAKE2B 2fd93fa762629a64c971530a13139a483bda381f9fca9a7f8869f13e4a92ab04290ab7bcf3ada28d59a51489d90d3c68c034da3c09dda238c85e753355bc732b SHA512 0c1de28692b06be50656859e8453b4e8e5ca120b1215627a2f07d655f936f352ab0e893042a635fd1204e9d4387af618f7f925574208cea138f130f60e2431e9
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild
index 7eda380be3dd..e4db47d51ef1 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 # The 'libck.so' has a name collision.
 # See bug #616762 for more information.
diff --git a/dev-libs/hyprland-protocols/Manifest b/dev-libs/hyprland-protocols/Manifest
index 4470ee7c7c08..458b7cdf4ed6 100644
--- a/dev-libs/hyprland-protocols/Manifest
+++ b/dev-libs/hyprland-protocols/Manifest
@@ -1,4 +1,6 @@
 DIST hyprland-protocols-0.2.gh.tar.gz 6342 BLAKE2B a5179bc465156043903a5f17b1a4593ca15694ef22c52b1ba8a306d3680f1443a3c2ccf5947ace533244cc5b19ce02e8f3014053984f121f8e049882c1e21fa0 SHA512 cd1f9309a69236d6fd2ffc1a09f5f8a1196f357367779c08f30aeaaca7646be364c40fa8c207751012873085d24581fe7b7252c825e89958c20adfb48b029274
+DIST hyprland-protocols-0.3.0.gh.tar.gz 7423 BLAKE2B 1ecc6625152e9bd530490d8321dcbe41396dd7306066f6cd6d97c22a0ebb2c914348b6829e8d5e210f07807a7df282a1cc63fa44a93bd08df22987850bd27a3a SHA512 15bb0c45eed1949d888d228c671139fefd48e32d634823ed8041a4901e15e73409b0fd368d4c1f6197bd6980e723b20303697ad46b1171330cfd27821118ba32
 EBUILD hyprland-protocols-0.2-r1.ebuild 536 BLAKE2B 2d1f7559cd73c432e0a7309f064125c8715b1276d5274c9946d47779385c4085cdcc6f4a9eb72e2e67f8940fe52ea1776c2a3f057994de2f4ed9480840493434 SHA512 d8d279d26715cabfebc962258d3d0a96d8c9f2186e21ec9f2b9fb8c144e1db7005bf990849cda396064df6ec887851088fbcaf31a0099bd558b7a86ab7d2ceec
+EBUILD hyprland-protocols-0.3.0.ebuild 537 BLAKE2B 9bb30ee0635a772203ac8ed670c029ebbd8918a40bf7c5698fcdccb49f070f6da51ecdd256d88c18ba30918162a97d62a9566dfa9037660ef3ff5676363936b3 SHA512 535c76604a1108348ab09c006489a318af44fca66ba8ad03c17a68631aa76146fda5f19b79f4e43164027cd41fc9bb87c44a24bb87f3132898ee3b2dec3b1421
 EBUILD hyprland-protocols-9999.ebuild 536 BLAKE2B 2d1f7559cd73c432e0a7309f064125c8715b1276d5274c9946d47779385c4085cdcc6f4a9eb72e2e67f8940fe52ea1776c2a3f057994de2f4ed9480840493434 SHA512 d8d279d26715cabfebc962258d3d0a96d8c9f2186e21ec9f2b9fb8c144e1db7005bf990849cda396064df6ec887851088fbcaf31a0099bd558b7a86ab7d2ceec
 MISC metadata.xml 478 BLAKE2B c6796b24b6747f8435dc6c2119bac1423a250d04127f4b6404b4ab194ce882da386d8e9b8778c49182f71dfb8ac61dc6530d43b5f66f59f4246eb8d954ac5d77 SHA512 d0b0f6fbea6829908600510cfe92ae8ef5106d60ff62e51955a9f15234412920273a05e6922ef09d469edcbe49788d35a7307dfeee57df657fbd9dedd724611d
diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild
new file mode 100644
index 000000000000..f5179590cd2f
--- /dev/null
+++ b/dev-libs/hyprland-protocols/hyprland-protocols-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Wayland protocol extensions for Hyprland"
+HOMEPAGE="https://github.com/hyprwm/hyprland-protocols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index f1a5426d66ee..a8839c387e96 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -4,7 +4,10 @@ DIST libassuan-2.5.7.tar.bz2 605076 BLAKE2B 67cb01b7ed9be13a52a37db439666bb8eb70
 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 1719 BLAKE2B 2572ec877ae597485ef373ffb9bf6f6e4dc57b0b16a11b931fa864c862cc796d5fe6e04ec303156175fbbc341007c84a6e10591be8705acf37707c1ee3efac94 SHA512 2be0385bd99aae8a4bf97e9f6a05d19ffcfa2e0542badc9930e3d1414d8f8d20d69afa69c370f4604bdac3ac5953f031d13a36f83f7680f6ab2fd505dad9b7ff
 EBUILD libassuan-2.5.7.ebuild 1719 BLAKE2B 589dcf64e927789f2b347bfb38fb2c3b92ac620b32d5428700a4afb9da8f1750fdc867253b7e910027832f8f75ee49e571eea6b252dabb8171801841aa91ea3f SHA512 71f07ceaa22df17586252f59007feac3ac8294decc86860d8ff881ca8102c1c30f1604821c6b3e17f710fc7e8fb307d1df4df5f39be106e74688a43818f885a8
 EBUILD libassuan-3.0.0.ebuild 1742 BLAKE2B da038aedf625423182e33d637fd2f642fa2d53974426fba8f78a8216f778b721d680270ce358ee11c81c62cb84afceab53fb3d4d44ba35caa9a734e6227dd37a SHA512 5de880a7a64828366c6d4ba59c247bebb62b2f688ce46c8ed3b1913a8a7b88ef3d49046467aa79be298f139bb81422e9e7e125f3083c1ec652fde405b92db31c
+EBUILD libassuan-3.0.1.ebuild 1742 BLAKE2B da038aedf625423182e33d637fd2f642fa2d53974426fba8f78a8216f778b721d680270ce358ee11c81c62cb84afceab53fb3d4d44ba35caa9a734e6227dd37a SHA512 5de880a7a64828366c6d4ba59c247bebb62b2f688ce46c8ed3b1913a8a7b88ef3d49046467aa79be298f139bb81422e9e7e125f3083c1ec652fde405b92db31c
 MISC metadata.xml 882 BLAKE2B ca08da3ad8be4a39e30e8e28f58bd5c4c9e70147a29bc55c9b71b45921141326ccd86d9086b6ae8652465c51fabfe4e024a00be0656042011a27423ac2146f01 SHA512 603d947fcaa43d364136558cd158610edfc2349fe0227259992209894f34fcd21f393fe81aa9f2d40ecb41377c8f7c1d6f8528d6a678709d28820d3b6f253b62
diff --git a/dev-libs/libassuan/libassuan-3.0.1.ebuild b/dev-libs/libassuan/libassuan-3.0.1.ebuild
new file mode 100644
index 000000000000..e4a7ca4da130
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-3.0.1.ebuild
@@ -0,0 +1,56 @@
+# 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 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/$(ver_cut 1-2)"
+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"
+
+# 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/libbpf/Manifest b/dev-libs/libbpf/Manifest
index fe0e5b1f11fa..bfbab759a4f8 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,13 +1,9 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
-DIST libbpf-1.2.2.tar.gz 1000104 BLAKE2B 45a2ceabd38b3ea55f466de68d0806df6ae802b509063ca12d670ba972bac3dc5c7e518e8c9904915dbc9877c27ea892a7b857aa03d4e86016969b2d278b0b4a SHA512 bc7620207e6f521b9b5baab00bd81346084b8eabf81bff3ec24e5367d389f2a331a0b082798f8bb5d4fea836c3c0cc961fc881abc3a4e05d91152150bdfe47be
 DIST libbpf-1.3.0.tar.gz 999282 BLAKE2B 5ee0a45cd06be482c9523ec2a9bb26cf12b89df23f515b037badda868770069d5ffb751c011222b86b1d43034a1cdd537cb263883ed0645641548adc9c9896eb SHA512 59990189538e47765542e9ed6e88bc78c9d29bc077b5666bb1303cf15579c90b3d35a0d631b9bbd4bff2708243dc91d901bd68c119fb74dfd10a3e1066aa9acc
-DIST libbpf-1.4.0.tar.gz 1015490 BLAKE2B 46932f972201581f9f5be98063888216fd522ac549561efdec09603dfcbf0132418f50c2aed80d656fd25b235a9dc3b4ffe459cab9445a8508a7af620989072f SHA512 400c91a4870be8bb115f7abcc12c460700980fb6a3afdf43c885b1cdbe28fed1d37142d3987a85e12b4c565787a48f5cd0b07cafff067d91902d70713528929f
 DIST libbpf-1.4.2.tar.gz 1016045 BLAKE2B 7529e6521337d45210ee2e3d00aae7c8cac309a4b3f36ffdd9c4a6c4439f266ee654b6ad6abaea2e43310260182bd9ad52ff162339545027050329d8307fe0d5 SHA512 b0faf45e77fc0197239b87d74010bad6b7ef7d48c1b3de2a3960164d9029851e2ad204b92d0cccb2fde2d0dfe44d9fa7f24b35a4917179dbab1bee192d3780db
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
-EBUILD libbpf-1.2.2.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
 EBUILD libbpf-1.3.0.ebuild 1244 BLAKE2B 1d5e177c1413d136a9e27220d7e3a7da0eb315191eaecdb32bc3409120e5bea0082cbee6110bdfec47c12c39a69de2a67cb2a7944deeecb0f9675983b3892d74 SHA512 e7b817cc258547e83399e3546ded27a1074f36c27aa0a47fd631e520d8a43a7c10277f45bc45acd48ec2176b7df0e516736797276cca594e8eda90d4a423fe59
-EBUILD libbpf-1.4.0.ebuild 1257 BLAKE2B 34b5183bd4bb8c605eb8de29a6f4634e173fc6f435bbbc05ef233ec6e6a75416083e447c861c8f7c5762c520d7d83a1dd90528b3352273becab8ef272df93555 SHA512 6b08a58ae46cb5c7927e7e2591cb14e56ba01eb0512c0e3bf877eb2d1454f239cd2cba7e649963167bab16b5bd588e45d4c60fe6f2b73e0a86734cebdce153f4
 EBUILD libbpf-1.4.2.ebuild 1257 BLAKE2B 34b5183bd4bb8c605eb8de29a6f4634e173fc6f435bbbc05ef233ec6e6a75416083e447c861c8f7c5762c520d7d83a1dd90528b3352273becab8ef272df93555 SHA512 6b08a58ae46cb5c7927e7e2591cb14e56ba01eb0512c0e3bf877eb2d1454f239cd2cba7e649963167bab16b5bd588e45d4c60fe6f2b73e0a86734cebdce153f4
 EBUILD libbpf-9999.ebuild 1251 BLAKE2B 2ede02f43b6d6849a3ecc57bbfa29d2089013cb14c18604ea57454fe5ced1c3bcc77aff74684e7b1286acca7d7c42dcbce2c4553e3c694813b83ff1e5f54317b SHA512 9bd941c52ea5b4582f1818a728dabb4668358c0eab1a20444c4c2249a1d92290207f50c16647c267e04155a6c0148c42c424f3db13de84aba7e2fef81ef550ff
 MISC metadata.xml 306 BLAKE2B 6af2288a09cffb8801efe6841d11dae5e8f3659dd75be45f746bab3f48686458916dab796fd9d535e1a6fa0ca78567e8227e29ef06cc22c4a9d0b1cbebd30ab0 SHA512 c027c14965069ece90130984bab710dc19f199a184e834666449f4bc0874de3b5f5d878f3a1fe6f817a85eef2bc45914e640f0140878b7454a32738a7f500032
diff --git a/dev-libs/libbpf/libbpf-1.2.2.ebuild b/dev-libs/libbpf/libbpf-1.2.2.ebuild
deleted file mode 100644
index a82b4169cdc1..000000000000
--- a/dev-libs/libbpf/libbpf-1.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR PKG_CONFIG
-	export LIBSUBDIR="$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	export V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBSUBDIR="${LIBSUBDIR}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-1.4.0.ebuild b/dev-libs/libbpf/libbpf-1.4.0.ebuild
deleted file mode 100644
index 6cd9245fc9a6..000000000000
--- a/dev-libs/libbpf/libbpf-1.4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/$(ver_cut 1-2 ${PV})"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=(
-	../{README,SYNC}.md
-)
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR PKG_CONFIG
-	export LIBSUBDIR="$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	export V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBSUBDIR="${LIBSUBDIR}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	dodoc "${DOCS[@]}"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4c542359ef29..ce5edcae9738 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,6 +2,7 @@ AUX libgcrypt-1.10.2-darwin.patch 566 BLAKE2B 26819835249672cb95500a7edf01864244
 AUX libgcrypt-1.10.3-hppa.patch 4077 BLAKE2B 70636355c6218261db91171b8c579ad0f4a1515cdd945ddea223a88a9dcdf32b19bff181d48b858d5fe32a50fa8fcadd0517a6e6eeefac1162f1990ddb036939 SHA512 4e84284766f673d9adb848056ae14e29ed14a727be5a152d61a350a5a83f5166b9a33484d46e53210478d0d9c1381ce07c11bbc7d0af9d3a730ac745a0abe454
 AUX libgcrypt-1.10.3-x86-refactor.patch 15984 BLAKE2B 3de41f263b512060b5f0e4aea9392666746241226b9a5b52a3229cb50f014504fbfb94b5eb1b4c1e69632f5546f37e34e04ebfc63beb8eba87bfb30bccfe72c8 SHA512 36cca10afcf1c2e4cd2f1f180601aea4a38688927ec142d93a1d4342640d69fea7ce1c43b26d8aae9c010274cb6733f475695e5fff4e513a8b276f77d9babda8
 AUX libgcrypt-1.10.3-x86.patch 3600 BLAKE2B 6daea43af8019bba84e1015c5a0e82c557e2c7098fa6fb14d3f6a46bfcb6df4dcb32d9c9b6653098c06c2cd139ce696b2a21f791934925ec35175d1cfe147fc4 SHA512 71e03f8a59388be48077723716b8c5b1ea7d4206a20fddd318b9e2d4ffebfc99ef799ac1709e3e4eeadd007357c63d3c9f337a930716fdc24c82c05e4edd4a81
+AUX libgcrypt-1.11.0-o-flag-munging.patch 1836 BLAKE2B 856f0b36074c0548f3b3c2314cb3f0b4a6e8cb9540706df5f747d1aa94fd1da0673e786d9df924d385b1a8903f5b5d9c87f5d01700d37172d8968ce8f05a7f91 SHA512 87ec07d2c5e82d618e69cb7f27b6318602d1865ab042fcee900d445fcb85a36c3670c79d4d3a72efd51f0f603fb8e72f4baaaeb531b93e7cac0d40464126c5d7
 AUX libgcrypt-1.11.0-s390x.patch 1890 BLAKE2B 5ff6456e5edecdaabde6e1d6c9a711bd0759568c446a02a41cf96d400f65204529cddd440cda7ba8e4eebf51033240bedaa3dd13f600f2990a4506febb81b396 SHA512 4d0b743f0903ae5dcbfdb56a6e30e5804b482582b17c75098cbc54aba078b7dbcfbc5572c2e0de56862fbc420d488dab86ab4d80436ea4995c19b1f0f07db60b
 AUX libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch 646 BLAKE2B a6a4b46dfa9a113446fb10e3c66ab64c08ea2cb768acfe0f5057e102c827ca6e3d676e1970f9234db5bec86ea6745b765a412c1b5cdc263bd7154b169960b136 SHA512 a49af765a1175dd8041a500d3c7213df27c00699bf8a5202b080539bf2909084214d008509039c81d6a28a0f4a3b9fe1f45f89aaa87742bce9a5dd8c8c469fbf
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
@@ -15,5 +16,5 @@ DIST libgcrypt-1.11.0.tar.bz2.sig 119 BLAKE2B e64d59dae5556e2826f6d297988a3300c3
 EBUILD libgcrypt-1.10.2.ebuild 6279 BLAKE2B fd28a7d7f44d24dd9e8e773eeb11142fe88392ad875d6f44a539b128c25522593979e0b76fc2342d5f477a9e62bef50cc4bfcf2c7f6efddf5a24c46f35661935 SHA512 32d24c6936468a549950899444bbfa2a09a380ff16051de263cea5deb289d0e4f49b45f4fd077e381b3d09db1f7f6e916a801b455e18f828d8bd8ae75553c1ef
 EBUILD libgcrypt-1.10.3-r1.ebuild 6034 BLAKE2B a71c451082e294098fe4ad4ed6c82f925adfc662ea5cc9c3e934eaca22c3f0e960f8007222624b17f98138e187d46febae179cf02cd8807ae43ad83a871b951b SHA512 3a89c7f21462b51aa5c8398233932492f74d1a98513260bf5f62bb281eadd776c903b850391b0af657226aaea575b919590fb0d2c6449366e079cbca13ce6950
 EBUILD libgcrypt-1.10.3-r2.ebuild 6164 BLAKE2B 355cb523d36087e96ff8f903a48d8f3c0d20e29c8217551f32b728c69ded94abe1e77182dfdb2b294a39f86e28faa78e658614861fd123d08137b602b01c6a8a SHA512 cc0e0ab68773ee03f17547cd2e1da953ad0fa922977d9c573c9a97a761903a59ea35290168c32d4ca136c164c618fbe33650b13f507d28b22454705a5fce6bd9
-EBUILD libgcrypt-1.11.0.ebuild 6180 BLAKE2B 98c08bf2a14d981c723181171f2326a38f6335d50cc197886a048d44b83b62d3ab4411ea7883e7c551be3dec472c371f64bbd191545b36e847e1d7586be12982 SHA512 e1a9e3cc482c9489ee07c6d50848c7b9ccb03db9b1765c1091424ce8e7778cf6b39e5026102ac4a981c0993499d116ad984975af91c1a52e19ea03fbeb403dc5
+EBUILD libgcrypt-1.11.0.ebuild 6221 BLAKE2B dc0649a5fd738b466c7bc78206b1871bd1976b671e2fa9c32f4ab0d470186469d65540c33f3a4fce8cf43a0cb81c59025c5c5c84fb3e3337a90ad3269cbb6db0 SHA512 2514a841d7f336218e422cf4eb0bac25138a46c03147b24b0523e88404d81c98b6bb1e2f59e08f1d69b2943f62b01302fe2e696f94801a1d50ba2522bca9ce80
 MISC metadata.xml 451 BLAKE2B 3be914b8449db0938d868c7cf2df7fbcf29d7f2e9b91320dfb97f0c1bf6c22326f3a1c3f3b695eaacbe4d74bb3a0b733a7afc1f88e04a37d06a9d9ed25358efb SHA512 add260d64091e3aa1de6fb802f4cfd076c1520622ebe93ddf7a0312f8d46232bd330d9bd380e2bdef6aec15563b6d27f2733b5ebe624ad9d0965ed9c6456939d
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch
new file mode 100644
index 000000000000..161e4ad5c132
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/934801
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=e96df0c
+
+From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
+From: "simit.ghane" <simit.ghane@lge.com>
+Date: Tue, 11 Jun 2024 07:22:28 +0530
+Subject: [PATCH] random:cipher: handle substitution in sed command
+
+* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
+expression.
+* random/Makefile.am (o_flag_munging): Likewise.
+--
+
+It was there earlier and accidentally removed from
+Makefile.am of cipher and random
+
+Signed-off-by: simit.ghane <simit.ghane@lge.com>
+[jk: add changelog to commit message]
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+---
+ cipher/Makefile.am | 2 +-
+ random/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cipher/Makefile.am b/cipher/Makefile.am
+index ea9014cc..149c9f21 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
+ 
+ 
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
+ else
+ o_flag_munging = cat
+ endif
+diff --git a/random/Makefile.am b/random/Makefile.am
+index c7100ef8..a42e4306 100644
+--- a/random/Makefile.am
++++ b/random/Makefile.am
+@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
+ 
+ # The rndjent module needs to be compiled without optimization.  */
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
++o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
+ else
+ o_flag_munging = cat
+ endif
+-- 
+2.30.2
+
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
index 10b42d5ca451..9e28b00286b3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
 	"${FILESDIR}"/${P}-s390x.patch
+	"${FILESDIR}"/${P}-o-flag-munging.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index b44c4d9092e2..8913643d58bc 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -6,11 +6,11 @@ DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e
 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 119 BLAKE2B 6d290318fc8759b6c8bf09a2e2622ed645dded003ffdd76b599cd3ec8af3ca51abf237e35c0c942d78c72e95f6cd644df7eb63fabd8b69b9566bb4f878648f14 SHA512 7f36f603dbb492c4dcafe3eae153b35fede29bf85f50d8908c517330003babd8e357aa54e3f354cd0abbcb9862435d5756ac85aff3c2968ce9fcde8cbf6565de
+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
-EBUILD libgpg-error-1.47-r1.ebuild 2597 BLAKE2B d3bc8c927d3ddd8d4723f92602364e970a1ab6eb033b0640a2363ba367ba60a07ba559c57c8a298a03d6dcad05ba58dd8ea8d4d73a3108010623af1f2468c155 SHA512 70d59e48d08fe6ec6ce74ea59d64cd796fbac232f1b0f7bc6317bfd7828587c4970e0b33cb47e883287682d3885b2703334d9a7efff75de73d6e5e72a6cfba64
+EBUILD libgpg-error-1.47-r1.ebuild 2590 BLAKE2B e2e4285d5ac760decf0e91b31b44cc1d11e43b078861dc4fd9986be3e71900bcf1884899073cc7b87e5b2c7def5bdcacf1a0bc6d6a2e4079d5f7ee33c17086eb SHA512 717429d3b2190bfc2fff6a9d3af01d0e4f68febd5de29cdcc0f10b09a7e4dc207ae2e2043dd2d939fae26cb50bcc138b5eed002a8ba0d31b01f458a890b9e6fb
 EBUILD libgpg-error-1.48.ebuild 2590 BLAKE2B 3e01c243e1b31a978f64103975a0a04edd38afd6899420f6ed0db078cb209c3b641384dd2344ed17c144c50fb4bd146c859a5831393648834309af69c2421152 SHA512 2490ab0a4616a773072e5670fcc6c026a9114fcae1ffc633ec31bf013b6c474d9f1865a2064802747a18115e4ed663f08372bddf5add6b5bf0668cb34da10626
-EBUILD libgpg-error-1.49.ebuild 2687 BLAKE2B 2742fd09fe610437e21b83aa2d2c11786c958907a3fc92f578df5d943e6b76f799f9b1af6f78ffdef1b659363b60117eb82a3dcc15c0a70bca221923b2a93315 SHA512 13f811bd0f714be108580fbab42b6cbed8809fd0fed120fe7aeb116d2a4af6382eaed81c6ef52554bed2c3f401842a80500fc6d7cba0dc11d50ddf73bfa8ac5d
-EBUILD libgpg-error-1.50.ebuild 2742 BLAKE2B 64568b3ecceef2333ebbb744a28fa3e3ad1bd2f55bbedc03726a0d659260cb578a9bbaf629b08919652e8e553a13ce9fffc63d9e00370ec925d7e71c22c3c10d SHA512 ac2832a2204bea250db4435a24b531c56880e84f6c1c36a07c4da725dc64f3693ee81c3b7d4b819e2d0170383bc9da1245c5d9f05ad69f490e8197f881371795
+EBUILD libgpg-error-1.49.ebuild 2709 BLAKE2B ff90388590468880f92230499d1a2e23e0e64eed3925ba33f4c6d50e734670ded8aaf922104b53e57a1aee262e7a03b5798cf831e89c06672ab4e4d0b73473c8 SHA512 ca165089888aa109c6968bb0849a2ea9edd1cfb793add731f6d1d8a39c2d19a176c32b812590d9ecf0d6ddb404d3eea244c824aa318f677b0b04e09386cebfc3
+EBUILD libgpg-error-1.50.ebuild 2764 BLAKE2B 7f77a14f78ad208cc1dd5eeac73ac095204b5d44fda85b5b21a6871b074c19ce460ad4b5e58496ff8d06fc2067a4270d5a88cbd8246c7653fd356787c9accbdc SHA512 06bcf60bebee77d8c5eb0e025700378cebdef016baf10ce69a9ef9f48f45b6bd0c530e5e3378df9f6ce32a1567d1778c085288ee66a5e7b7447bf7c789945edd
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
index 1d2b90ba2690..34bcbed599b4 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.47-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ EAPI=8
 # 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 prefix verify-sig
+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"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
index 949d3e4118c1..d548590a1de7 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
@@ -10,10 +10,10 @@ EAPI=8
 # any subsequent ones linked within so you're covered for a while.)
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit multilib-minimal toolchain-funcs verify-sig
+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"
+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 )"
 
@@ -42,6 +42,7 @@ MULTILIB_CHOST_TOOLS=(
 
 src_prepare() {
 	default
+	elibtoolize
 
 	if use prefix ; then
 		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
diff --git a/dev-libs/libgpg-error/libgpg-error-1.50.ebuild b/dev-libs/libgpg-error/libgpg-error-1.50.ebuild
index a2ccb520f561..d4e25d29aa8c 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.50.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.50.ebuild
@@ -10,10 +10,10 @@ EAPI=8
 # any subsequent ones linked within so you're covered for a while.)
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit multilib-minimal toolchain-funcs verify-sig
+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"
+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 )"
 
@@ -46,6 +46,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	elibtoolize
 
 	if use prefix ; then
 		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 181eff9a014d..d3dcff67515a 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -9,10 +9,10 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.11.7.ebuild 5310 BLAKE2B 4e8e6c29a9004453eb62f6676f3808231b45c6b616af48b13ac32d14d8893bc836449cfbca1414af3f293e03abacc26454c54be960b61c264e31955946507818 SHA512 babbb1587967ec402f27607e04650183938f7ca16c3d32b5cf68e94c3a98decb3d97dcfc8f2a4b8afc0ac081338df41d1c7eb0fca5675b53593b37beda5686bf
-EBUILD libxml2-2.11.8.ebuild 5318 BLAKE2B 69f5beb4b641f3a2fc4547aa01a081a382771af00616d1fe33519a88cec66b12e5911f7211aa4fdbdf6b92d5b85a307c8d68c6bd7d400d158e161ef7db33c5d0 SHA512 a16a8ac93379ee896a60823b975a42666dd9cfaed58894884f606133fd7fb46770c24f11928aa73fbc2659af5185603be31cee9ce32a6ce829d2d22b7c4977d9
+EBUILD libxml2-2.11.8.ebuild 5311 BLAKE2B 0bc808cb1bec7e64839e22319c1451b1d56e4c50e54dc921e28934489040d1a2bd5977d6629febf34a19802012d6f15479a935ba771258ee722ddf2e4b3d7b37 SHA512 e34516a927beae62dd310adae955a33cc058a8c7adc4aedca0a0112fac1e5d1d7b9c8dc9e3ca36894657a2ef17b9bee51601cb9dce1f345b54f93653a20c6d20
 EBUILD libxml2-2.12.5.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd881a7933dcc29fea023ed850c9d3630611651b0214f59f2b7ddb6dc0759f37f72c34a09e429e8b7284d339051a SHA512 53766010d7b0f9d9bbd35b9c3df96f777c44b2d003cba8a3d17d075c0fc0ddc7347688980ec597c11623156544896fc4e64870dec56b625a1c36eacdc2a40a0c
 EBUILD libxml2-2.12.6.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd881a7933dcc29fea023ed850c9d3630611651b0214f59f2b7ddb6dc0759f37f72c34a09e429e8b7284d339051a SHA512 53766010d7b0f9d9bbd35b9c3df96f777c44b2d003cba8a3d17d075c0fc0ddc7347688980ec597c11623156544896fc4e64870dec56b625a1c36eacdc2a40a0c
-EBUILD libxml2-2.12.7.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
+EBUILD libxml2-2.12.7.ebuild 5249 BLAKE2B 7ed075e1fb2fcb860e28da0e0d653bccac730180ba61755c76b90db227fdff3194b1504ddfe89a350d72a41b12aaba9854c638412be9e56b5b5949665ee00394 SHA512 a1dbcf241e782a54f04227e61082d6d8706879321ae63bd1f9b3d9e5a0e424e2d58a7ebb7b2c1223bcaebfab5c90f7c7d25ba638a1a12c7d4f5ebb1dce88a82b
 EBUILD libxml2-2.12.8.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
 EBUILD libxml2-9999.ebuild 4906 BLAKE2B 61247853a173e8294c8a6c33dab565acdf761693d9cf098aae9364d11db17168386c84a2e9649b1f140912d1d75c7c9b8abb999097a0a926c267eb61039e46d1 SHA512 184005fcf8fb255e04fdf006b49f4a736dccef59e39adc986de04b133b85cdc69bd1e51acc15ff9cdb30d52195dc55d684676eb1a41d23184582e3486281a1d4
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.11.8.ebuild b/dev-libs/libxml2/libxml2-2.11.8.ebuild
index efd633ea121b..a99823ff15d6 100644
--- a/dev-libs/libxml2/libxml2-2.11.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.11.8.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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+="
diff --git a/dev-libs/libxml2/libxml2-2.12.7.ebuild b/dev-libs/libxml2/libxml2-2.12.7.ebuild
index c4d87530a6d4..bcb12e755d35 100644
--- a/dev-libs/libxml2/libxml2-2.12.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.12.7.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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+="