gentoo auto-resync : 30:08:2024 - 12:00:55

46 files changed, 198 insertions, 381 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bd0546f06051..89ad52738e07 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bitshuffle/Manifest b/dev-libs/bitshuffle/Manifest
index 2e1a9ca94589..3b24d98f1c1b 100644
--- a/dev-libs/bitshuffle/Manifest
+++ b/dev-libs/bitshuffle/Manifest
@@ -1,4 +1,4 @@
-AUX bitshuffle-0.3.5-Makefile 1770 BLAKE2B 38debe6516431e20f133b95873ce94f5df9dfe9424fa501d8bf9e20c864957e8c1c3b69bfffe1587c9ec1a58beb4408bfe568e3b055ece87954084cdde753a73 SHA512 1eba096b1cffe0fee28236df877636421066e00d44b021e1f9d42e8a1012f314f2fd4dbcc4e4339bc669242e8c5ed661d36619c1cc2bbd6344d60abd98cbe693
+AUX bitshuffle-0.3.5-Makefile 1793 BLAKE2B d1498d9d66b6ba9f8f3fdc1e4498da0de8146dab0a063c8e6e3e861ebb61357cacf842cb5e00c2774b06c431b4b66da1cf7c1b72c1e7a831b14b3a30fbcb497c SHA512 4437424747c84bf3d7c83caa9cb13c90cf9aa09fc11b6e1dd2bd52c9548299b20caf32f87ec20a1561b8298e0b4a5fac804a22007639286243ecc28581814eaf
 DIST bitshuffle-0.3.5.tar.gz 112312 BLAKE2B e9e70608217743a93d2bf5319af0f48feff391bb2893b161a1a4c391ab630c90fc59483041d7594eb8366a9469feb309f3b8054c8ecc630d070a9170735f61f5 SHA512 4ae371ab2e1adedb5c3a2c047e0583d320c87f0687d9dc1c921ed9e38d8b90a447fb305f399cd591adf48a473471fd5827f4da2777dd7f0fb6d5fd145fdeb36f
-EBUILD bitshuffle-0.3.5.ebuild 729 BLAKE2B 5b1730a5c444b40e71c9aef857f1fbe96fe51b2241453c19be24c092da9b413e8a579435f0265f3f19044296b0863ea71fa864555f48c8f2a2169a90a8b98ca1 SHA512 af3b9cdf51cacea4955ae32c85498699dde6112119aea19ae8a8fd439cba4371c6ef7bffacc8654595df1361e2c031a35dd0153b04167c2988927c53a6fd6646
+EBUILD bitshuffle-0.3.5-r1.ebuild 756 BLAKE2B a39c29ee9b8080370adca6a87b6904ac3902de3f77395b06f16257283551e1fd64bed845e0c141b9bc1e1d0f370c8477b87d70ea1a2fad1197eb76717bce0381 SHA512 499d3a679ccf9b8038d400007caa53499f7a0aa0005018ddf167dcc1e557f7d1b9ac28b73873dae8c4e987a66638f035dd759e65d5c59f0af2e46028b77207e4
 MISC metadata.xml 323 BLAKE2B 395bf88139bea1ee92d2142ff9644b73d9f188c33377e2998a8899dbaf13eee43272ca9e06ad4ae7814c4e31db47255725f99a9a08231d4a6d3e93cd408030a2 SHA512 1e6d7f797d98eb00d3887e204e5be66af1cadd51051c5fe34ed32bf890b487f77874ff6484fad03fe5f72ee718f16e44218b65bd7eb84121605aaa73fe222d00
diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild
index 964fad44dbd0..9ffb25cf41d1 100644
--- a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
+++ b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,10 @@ DEPEND="
 	app-arch/lz4
 "
 
+RDEPEND="
+	app-arch/lz4
+"
+
 src_prepare() {
 	cp "${FILESDIR}/${P}-Makefile" "Makefile" || die "Failed to copy Makefile"
 	default
diff --git a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
index f38d0cc5f149..6ccea469dbae 100644
--- a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
+++ b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
@@ -26,8 +26,10 @@ OBJS = \
 	src/bitshuffle_core.o \
 	src/iochain.o
 
+LIBS := -llz4
+
 $(SOFILE): $(OBJS)
-	$(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^
+	$(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^ $(LIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -Isrc -c $< -o $@
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 5a3f4c25adc9..0482353f2878 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,8 @@
 DIST girara-0.4.0.tar.xz 60804 BLAKE2B 4653986945b89c87c597f20425c0009473679578b9a92fd3f4480aa2decc5dcbb2c1a2b0db07bef67c818c2e2940b6c363da0020fa24e7001be13cb68e2ba945 SHA512 a8753231cb9de7d60ddaf6e7b19537f23ce447be5885725c982e395068466089fca46980d413cc4ea8e4a8059ccd4615366297600bcf7ef5bddf02d649703dec
 DIST girara-0.4.2.tar.xz 61468 BLAKE2B 7be287045c269c8a1f2b51b14f0b7f840d7d5929f81c27410a86653943f73b07a1ce16c5a5fe420e7df6f02d4f426b48a622d4cf483dc5065cd8551e273d8fcf SHA512 70dddf8998e37acce25325ddeb5a9b5c5844669b51320733d9d7a572831f28c72207aa6d608b7a856969d7fd0785cbab076596b814eb2e9ef37bf49bb5d476ae
+DIST girara-0.4.4.tar.gz 74211 BLAKE2B d73914011fb62e29ed9510f081cd6d85b5d0dfdf28b2b6ca9847f146ce5861836ace26043fcd54396c5b23509c14a943fc526ee11d3d91b8a13c559837e0a52f SHA512 4c106c2156ff397caad2c173cbfb5f2dc8f4574a59c70e7d04e941fd5273948c7e2cc4662b91a489dc689e6537b72bdb1771849cf7775d6afa167f2616a3d4c7
 EBUILD girara-0.4.0-r1.ebuild 1187 BLAKE2B 857f22512034a4011c61eb12613d75c99ece895734f9e0a009808645dc57f22210ff6a71a871202856bd39fd8c0b24ab95ffa7641c54badac1ae582da3c2f58b SHA512 871e383e3164809bd4dcb8a1c4927be370c3268469d6a2ea72a3c3ec6d078e984bd969ed381e9b801d2bb76024ad02d35a343f5c7f06d5bb6ee2aada16fdb46a
 EBUILD girara-0.4.2.ebuild 1186 BLAKE2B 85a7f6ed844d5566c9a11a3ff63ce0d1fe9020ba9c7d669b1064c575772c2a6540b339f54f469af9dc72a7f95d712061028911fde14762af1e5835bd1999121c SHA512 97e983429ae77826e617beaf576fdee1f31a7aa55166cadc31421eda3408bed10e2ec8a12e3cda9c1e63776cb87c151363d6fa4cae949b2c77efc598e1d8bbe0
+EBUILD girara-0.4.4.ebuild 1177 BLAKE2B 38e16a8b3ac36d0cf797569c3de55f5329945774079fd2bcff864916943df635dcd2cf705a8aa93e79bd60f8721ac08e1cca356dd3e0515ee6e4f84e328159f1 SHA512 3b04ac46f0a4db000eac2becdc2b1b45ff7d38fc5b9e210880c1694fd0be05bc6a25ae26e31aaddd864326e1447c74860639d572133398f6a78eafa36b041577
 EBUILD girara-9999.ebuild 1101 BLAKE2B 3ba67a2780bd5c314cedf92670f72422a414c3ee922e5d30f215fe055cdf176463befd2c9401e77f67dbe309530ce429189caa635501e74304eeb11ef652933b SHA512 e7429cbce95306ffc46fb262f72eecfeb27984d98c623d538441ebaab3aded43d1bb09a2eb2abccac8057d85400066918c773f89dc10f2edd16cec6ed5755e46
 MISC metadata.xml 837 BLAKE2B ba99a1b35f30b8a4dd19fe21793ada95566bd3066410da554fa8370df42089f7d6c7cf1bfda737033c816b7183b1a91c0f63d879baf8cbaf6a45cdd9fa22ee15 SHA512 9223a09747ba4e7ffea7254300147a9e09fd4a54c897120388512fa1e4d14364573f33db92eecce0434185091535edc4f2cb72af30a8f8ef9a2b6d0dc0651e35
diff --git a/dev-libs/girara/girara-0.4.4.ebuild b/dev-libs/girara/girara-0.4.4.ebuild
new file mode 100644
index 000000000000..3c3053168e30
--- /dev/null
+++ b/dev-libs/girara/girara-0.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/4.4"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-accessibility/at-spi2-core
+	>=dev-libs/glib-2.72:2
+	dev-libs/json-glib:=
+	media-libs/harfbuzz:=
+	x11-libs/cairo[glib]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.24:3
+	x11-libs/pango
+	libnotify? ( x11-libs/libnotify )
+"
+# Tests are run under virtx
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		x11-base/xorg-proto
+		x11-libs/gtk+:3[X]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_configure() {
+	local -a emesonargs=(
+		-Djson=enabled
+		$(meson_feature doc docs)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# TODO: run test on wayland
+	virtx meson_src_test
+}
diff --git a/dev-libs/immer/Manifest b/dev-libs/immer/Manifest
index ef08dca88686..9c2995989378 100644
--- a/dev-libs/immer/Manifest
+++ b/dev-libs/immer/Manifest
@@ -1,4 +1,4 @@
 AUX immer-0.8.1-fix-dvector-test.patch 616 BLAKE2B 9bd70b13da9f5e2c17fa20a4d2c61e2c1c74d559230b5d6ebcb82005d84fc4865ba7acdde859c5dac79d0a8252fbd3a5cfc03c02bb27eb2354955e9aca0d225f SHA512 9b76e01703a5b7633f2af38c7e9755cf759fc831222ef590b7a2cb41270b4dc2cc71eaafa9d48a4ca8ba84a7aa32bb3b1ac5a4ab6e18c9a26764716e5ee7b9d2
 DIST immer-0.8.1.tar.gz 654638 BLAKE2B 23c8fc8d8e341ae271ea2881f3cba8bd446844dc48a79d959623ec9c7e1254feba22ae916d9e8d962d8afd8801671ac3dfc8a136e4ce40d2a1a019449c34554f SHA512 3a9aafeb5daad1881d00fb999b78f86b1c8f0e8ef2d6befe9025d8eea10392557ce7186f14878b36cbce0f2f5d38c8ffb39c9115a9496803acfc0ef2289f5cbf
-EBUILD immer-0.8.1-r1.ebuild 980 BLAKE2B 00849dedc8c6e51e17d36ed93b47af666e192d6769d303906ed44bd3c48026429939e11657ff505847311e3b891ace908a17c5503e4657016d885780246fe69b SHA512 6510dc97a0ff34bdc27b139618a2100d9563988ba55f128ac0d94cffaa125f283827bb230647ff482e5f1189079e62f2bae130d47726398a98df31d1b1982369
+EBUILD immer-0.8.1-r1.ebuild 979 BLAKE2B ded1d106bcb131140a9c347bc2de8e59db3481722687ca2b3e50a44c4bca0037754186a353e5391e16bf9fb11ec3f92e2b62319771c04cf8c0d649cbcb60381a SHA512 cd73e93a1191093ca18bdc8ea0b87870ce28ba51ebb8791edcb52779620cc768f1fe562586dacd7f1999807b1ae806c8bcd4cc3feb2fe5edfe9ee758a0ffdb76
 MISC metadata.xml 483 BLAKE2B 7ded9309ad46060a624a1eed80845a752070fbdc606cee368b1fad5b73bdb1f1628657b9efa298f4c90c8d4f1ce809abe9558596f613e6e91edb4e817c6e81bb SHA512 3e086a36cf68feaf501df66a59e9d3f3c7b2576293bd0ef0c1eb80de5bb2737e1a13ecb36af60541504f3c4b572909e919fed2c7f0d18505d6a85e5fc1b25589
diff --git a/dev-libs/immer/immer-0.8.1-r1.ebuild b/dev-libs/immer/immer-0.8.1-r1.ebuild
index 65da2ecbf6f6..c8dc26c2312f 100644
--- a/dev-libs/immer/immer-0.8.1-r1.ebuild
+++ b/dev-libs/immer/immer-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/kdsingleapplication/Manifest b/dev-libs/kdsingleapplication/Manifest
index 56334cfa3cbf..e99a5ee13732 100644
--- a/dev-libs/kdsingleapplication/Manifest
+++ b/dev-libs/kdsingleapplication/Manifest
@@ -1,3 +1,3 @@
 DIST kdsingleapplication-1.1.0.tar.gz 73558 BLAKE2B 26eda1d7a9a48f6167db9d2d7cd143ab45a08e96eef277cf1099c1ed24528f56ec54e8ab44671e7584937dc21d3437b15c033991e48fafd8b9fab10473e07864 SHA512 61b34a36b05c58ede881f38d78c767726f8e23dc230e292568013fa428f50ff674f7eb12bc4d76ceaa9ef444264b2e86d95ab14cc41c6a275bf917edb8832c1f
-EBUILD kdsingleapplication-1.1.0-r1.ebuild 1401 BLAKE2B 40db373ae4f42419f561506b68854b9e7ce7de297f745c396e4e80c6dc7863c8a6d3d1a784cdaec3de39eead48c45d1c5c39d42ac18f34c9732e13bbf21788c1 SHA512 51c3568b1568ba0132fbfadd8f30f9b72446789cc0051e7c03159171bddaeb6f40a652236a5b23c07f9cae4c61df1e2bc5f081c670ddb83a0c147f8b825d6fde
+EBUILD kdsingleapplication-1.1.0-r1.ebuild 1399 BLAKE2B ff5ed3476d5094ebcc34e8e70a98c0f6c7448d15e5fd97e158c724ab39ad297cdc6f8af98222b8aa227156cc5a9695853ef5707a7cb37f0ce48f6bebb483c73f SHA512 e92014c857241c4798474fd1452b6e527b24a1d2080894820d3162cf4e494bc469c67aaa0cc2535e902e5c98f2292ed4f34d8d038298755d424ba4c8e2b02a0c
 MISC metadata.xml 342 BLAKE2B 9ecf17f92c2336c8059191f759d29d72ed4b8685387749198e6f3586f032f85c6254787b510037289cd29c90ae7c63cdf9f1eead23c649dceb53897edc16a62b SHA512 335f04722822a3030141ad5f00ed42176d243f0414cb7c9d94f9856261125147b87b38647eb8bd42596470800fefdcaca5af4b1c57a215264810624bfb43e468
diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index 1d7dcfa84e12..17e8f739c4a8 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kd
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 70c7909c9c7b..0897ccc5ad12 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,4 @@
 AUX kopeninghours-22.04.0-boostpython.patch 3555 BLAKE2B 1d22b48e5574ffada0b89a0828bf5258321b57161061534939e95256ab3501a887a026231568e09b1d20499238284107c34c6835d33853096be62e1345356cde SHA512 562b30fe66a9e8904e79c95496c4b06e50dbbb8d328db93a655ffa7f8829ff70bc8a6b0ee7beb7840e7046b74d4d858265ec67703c6317c3fe4c87b54b40a349
-DIST kopeninghours-24.05.2.tar.xz 74584 BLAKE2B 54ec52b2f59f714794f35d2e4b131beeb931b4a9d248afbcc49b0d0708c98c91501e782433cd4bcffd61b81a4d0bfd551b216c4886f8ec72cf79321840b7b5d2 SHA512 72f2276d9e48836dda32320695ab35e333336c8204d8bc84f8c777a81ebf5ff0a4a83e87375b5af9458ab46755a2456a54451fd2f50cfe4ff3d7d4067d30297a
 DIST kopeninghours-24.08.0.tar.xz 74612 BLAKE2B 66bf4bbc405e53746679ddb00aa3ab481e43ca041658bcf62875057881d079fc698563bcad49cd4c0a03f31fa9a3b8c027b3ff69d1fb6052cc73d2bffc539538 SHA512 a5f71f6c95d9a4ef9c78148ef960893240707a73faa917510a52fe821789cf88cc7bd46af43d9d46f83e36129e13ab4de42fa080198e36c49e6a84830ce39f9a
-EBUILD kopeninghours-24.05.2.ebuild 1252 BLAKE2B 11e727b8be959d82dc24b387987077cd482930b3fedb75c41e1e0240f104a431a3c64cfb6e023668f39ece3812961426ada58808f7b030ecd744e4b302520c40 SHA512 9159b346376246f43a91e40485558f3b10d062b4d328cf09494ed82a50be72637098e9894c6df7222396c9c55e86b25b589f43fd671b6d8117ffd834ccca1e96
 EBUILD kopeninghours-24.08.0.ebuild 1252 BLAKE2B 67c92e74292277dc82766b722b949e827ce11b71b8baf5771a3055e39256ed2b1e05ba35d318e63cbbf67d463a2cebb7c16b2fdd8883ab15c429923654ff40b2 SHA512 4500a5246fedc88330c94a829f314adc7505a04d970d0cfee43b3569229962354449176a6cc020d2f5063eaf0bc810ce10403bbedc4e602e2a3ef4cb8f14402e
 MISC metadata.xml 385 BLAKE2B b4e1572a93c2fd0cda349614b40efe3cb8c08921fb3f98ca07d7fb03b0cb1f94b7d7c163e63252b191f9e4655d7a0e56604efa61f3f2555e04db4182c128af01 SHA512 a67020858217bd47ebab751b5a96b475b9d1becbca7b06c963c058c65fd4eb6436dd24a4703902386e0fc9fb7893953764f6d43381a908cde568fad687b0d67b
diff --git a/dev-libs/kopeninghours/kopeninghours-24.05.2.ebuild b/dev-libs/kopeninghours/kopeninghours-24.05.2.ebuild
deleted file mode 100644
index 4e0fba0806c9..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-24.05.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.3.0
-QTMIN=6.6.2
-PYTHON_COMPAT=( python3_{10..12} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
-HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
-https://invent.kde.org/libraries/kopeninghours"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:6
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package python Boost)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	python_optimize
-}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 1ecf11beb88d..fc14287fc621 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,6 +1,3 @@
-AUX kosmindoormap-24.05.1-cmake.patch 2566 BLAKE2B 0002710f3130df5b5e0c61489ec86a73ba4b422a2bf2e1ac2bf39aacefeb14342baa7748cd562016bf93cf57a7805242660bbadd6fd5db38d9778c3f131e54d0 SHA512 e24f5b4d0705818d23632a43ef95fdc813bec4f00a44eb92b5cc53496d9319efb8f7972b06cba0c375ae3bccd79563f2ac182511f4fb425314c4812e12bbab14
-DIST kosmindoormap-24.05.2.tar.xz 647752 BLAKE2B 9464b424669a412b4b32958ced91c0dae9980e9387cc97b823bcdaecffca850d29f25e9b437fc1d3b4d8b0d8022c6fc7b0a8e176a20f72ee2714da1691207838 SHA512 2bf2998be61893d651dbd1a9a0e509c6cf83a122e9ee95c265bf0507706c77b20b7e64d462840d76c7b1aa6f9d884305812e32dc4058c09a0f724994d2e073b1
 DIST kosmindoormap-24.08.0.tar.xz 691616 BLAKE2B f325622978ac6054b4523cb90e692087005412fd5e420e2e1e8f1940bd71bbc49a9777e5d2b66b7d995c024819f5f368e3111f9ae807182f86a5dbc18fbbf4db SHA512 926561007d47ec4ba60d488431785762f78835f0202c6f87b1ca7e5f0d38c6928a56181dd79d852140f1d54cae6d9f964ffa8c518f587c3b29a8c9f11ef61c25
-EBUILD kosmindoormap-24.05.2.ebuild 1219 BLAKE2B 002be95cf7f44f2238a7a533135d9168ece08a88b7b246670f0db8bb676384d903a8226fd28f654c7c10767937cdd6b9cee6b0599c9f05ba03e335275f3770e9 SHA512 9707c175b3b078c1bafcc39859243b98983340782002d796b25a441cbb280f61cc719af54d684fbe5624a9f17d3d1668c85d5792f004cfb447700ac7e1122d4a
 EBUILD kosmindoormap-24.08.0.ebuild 1088 BLAKE2B 0fd74d8ab166e0c791a906f59a7a22aa23953974c040ff30040d2f3ad974f7791f3c38afd5268362615e26173e07a81821009cde44b882dce1063ec38b7a08a2 SHA512 ff670034cafe4a59ffa0223d9423817346e10939ed6089481b8c6c8fc6a4bea86740ab7f15b7fba666c0cfac781ab37f2d9b5a774c4f969c576de3d5a97cd079
 MISC metadata.xml 385 BLAKE2B 09cdfbec2c328805a9fb4f3c1b6860ae6be84c1bed50bf905bdc6233c69a6af7fa983844629ed60cc5224181b7e27df9da845ed11aadb33a71387028062f76d7 SHA512 e85e6da9c667c7587a9ec0e2854bbeb5a6e3d07fbecd7e0fb83eac52030f5c07da7c16ab89208d1d7117ef64d8a63f8d28167dd2a7d592d7f36cd26dae711254
diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch b/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
deleted file mode 100644
index 77d51d1da9be..000000000000
--- a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 88cdec4c0bc40f4e98105a0b69c968fdd94ac7f4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:17:00 +0200
-Subject: [PATCH 1/3] Fix/simplify BUILD_STANDALONE_APP decisionmaking
-
-BUILD_STANDALONE_APP=ON guarantees Qt::Widgets so no need for this check.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 79f07df..cdd99e1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,7 +10,7 @@ if (TARGET Qt::Quick)
-     add_subdirectory(map-quick)
-     add_subdirectory(map-publictransport-integration)
- endif()
--if ((NOT ANDROID AND TARGET Qt::Widgets) OR BUILD_STANDALONE_APP)
-+if (BUILD_STANDALONE_APP)
-     add_subdirectory(app)
- endif()
- if (NOT CROSS_COMPILING)
--- 
-2.45.2
-
-
-From 09d0bda83e6de957ad8883926d8b9f9b3adfe762 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:23:22 +0200
-Subject: [PATCH 2/3] Use more QT_MIN_VERSION
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbf417f..6da25de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,7 +54,7 @@ if (NOT BUILD_TOOLS_ONLY)
- endif()
- 
- if (BUILD_TESTING)
--    find_package(Qt6 6.5 REQUIRED COMPONENTS Test Widgets)
-+    find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Widgets)
- endif()
- 
- if (BUILD_STANDALONE_APP)
--- 
-2.45.2
-
-
-From 74c3516e698a4fc53e45585a5846a170a8f25e2f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:25:46 +0200
-Subject: [PATCH 3/3] Add missing KF6I18n dependency for BUILD_STANDALONE_APP
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6da25de..dd55077 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,7 +61,7 @@ if (BUILD_STANDALONE_APP)
-     if (NOT ANDROID)
-         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets)
-     else()
--        find_package(KF6 REQUIRED COMPONENTS Kirigami2)
-+        find_package(KF6 6.3 REQUIRED COMPONENTS I18n Kirigami)
-         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS QuickControls2 Svg)
-         find_package(OpenSSL REQUIRED)
-         if (NOT DEFINED BREEZEICONS_DIR AND EXISTS ${CMAKE_SOURCE_DIR}/../breeze-icons)
--- 
-2.45.2
-
diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild
deleted file mode 100644
index 5dc6d3d36d64..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+gui"
-
-# kservice is optional and only used to find and open josm
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui?,network]
-	sys-libs/zlib
-	gui? (
-		>=dev-libs/kopeninghours-${PVCUT}:6
-		>=dev-libs/kpublictransport-${PVCUT}:6
-		>=dev-qt/qtdeclarative-${QTMIN}:6
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/ki18n-${KFMIN}:6
-		>=kde-frameworks/kservice-${KFMIN}:6
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
-"
-BDEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc
-"
-
-# Pending: https://invent.kde.org/libraries/kosmindoormap/-/merge_requests/40
-PATCHES=( "${FILESDIR}/${PN}-24.05.1-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOOLS_ONLY=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index e69acaf99ace..fb58997549c5 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,3 @@
-DIST kpublictransport-24.05.2.tar.xz 662684 BLAKE2B eb331cfa35f41992182df54e051de18608ccb6b6650f83c5c2ed8382dc5f945579b237a6c64bc1ba820d1906715b42493258f8f7f2006bd49734a9aa303c5561 SHA512 5bb89da0039e372ae8b6b6dfb33850517ca9d71bc32540e5b4dc19ce89b5910a57aff6f4f7182544f90ad89da4eceaad0bc9438bc1958887158fe8f0afabaf59
 DIST kpublictransport-24.08.0.tar.xz 734560 BLAKE2B efcf887f1d72f29235a8466e8d36d6c2caa69d754a06973d68deec176038e856770d512c60fa158cb2c39437215b59e7fc3084a91dca4583b9b8d7f05a814b76 SHA512 7b05e717132a236ec53951fc27be8ad07e8c3bf74c78ef7e30d14f10ff08efb2d4c9a62549b52398a84a8d92f17efa14e19b4ce13b27842b46ade413aa130c56
-EBUILD kpublictransport-24.05.2.ebuild 987 BLAKE2B bd5bf4ff4b41f22de39037d1f62d5d8c7b12787c89f1fcb8f41ab9c228dccbcf15ed106eb79f437541a1b25655b59c424fa820571cc48ce298da254f790b40ec SHA512 c7f2ab3522510f291c3d44c49d844ef1ce3b05ea9f64bda1ad05ebe841fd1993921dd6dadc0ed21b87e088badf73d2abc3c209290f7ff49f25aa049912b8cae3
 EBUILD kpublictransport-24.08.0.ebuild 987 BLAKE2B 157387d4053c3de59b15de0e00522ccdb053fc707a86593e138b4d381f64e07b0bb84a12d9de3a0e203ee21acf62fc95e3595644c06f498cf654cae22fb08892 SHA512 36c72c9b0e25e86272e8fd32b1e662b1b41f96eeb71cb43e3bc228fd4b9a2d06de29226f9adc4cbee69662c488961b4465cfd95a8643500604242ae296a21f46
 MISC metadata.xml 388 BLAKE2B a5ab7966c17200f79bad40dffdce29d2077a122179e8afa69d7e381d018062c563f309d57b2d409eaee5e271a64961aea1d11a7733739c51211219ab97892061 SHA512 ea7dc1d0206f82d54a1cdb18ba8225287ef2b28a97d302d4e239dd16358db2a4ef33f890c1e080a34d4211a92dab91fbb7bfb067865164afbeb5b49a637cf4a4
diff --git a/dev-libs/kpublictransport/kpublictransport-24.05.2.ebuild b/dev-libs/kpublictransport/kpublictransport-24.05.2.ebuild
deleted file mode 100644
index 4a96d36d5103..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-24.05.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing public transport timetables and other information"
-HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
-	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="networkmanager"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,ssl]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/lager/Manifest b/dev-libs/lager/Manifest
index a010eae93847..4fa1eaa21334 100644
--- a/dev-libs/lager/Manifest
+++ b/dev-libs/lager/Manifest
@@ -1,3 +1,3 @@
 DIST lager-0.1.1.tar.gz 874540 BLAKE2B d2ab1dcd7b94a9251f6b0c55a41dd94d47d8d11715f44f694e129031bb698843144deb4c70d1b86c1c4fc6be108d6ccdd24d79af89e08815686b72ff8b8278ba SHA512 f88f22dbe1d0e099b1c1f0d8b165c155c44db61a51297ca445d82db8ed4efb918016678a5d6977147214540c69b72f7364d0d14ddc7f300625c19553c88a4e39
-EBUILD lager-0.1.1-r1.ebuild 983 BLAKE2B 32f843a5654ad133975ec1171044d446792a92e428bac2c2c7564931683b2095215e0daac9d5b4806ebd857b56fa61b351ed3275cc6533656eb838a6db20a179 SHA512 ccc4773aeba39bae7d943810ceb6b9e5700ff29fb831eeed8558a4c15f1fe29dd2dba048c65f695b3c5af58af5e40b432f3b40f8a6c3073115964aae7529fbd8
+EBUILD lager-0.1.1-r1.ebuild 982 BLAKE2B 157735dd30305e88bd66c247deb8e07b53e34417c7fb836ce5d96c67ef41ae4fd204fe7ff13a24a2c9a709846072db3b67b0e2d5153c6d451885252fa8a49c0b SHA512 5908c4828aa7a9da1fcc510e7f7eed9c288318054361fe79a8659f588a2d955329dff3bc582d83ad9c3a2bcb8a09fb2d2f799e3fb69ba1c612c42a434f1b645a
 MISC metadata.xml 483 BLAKE2B e0dcd48fbc0a4a3d09a2e69cf9cd8a29ac6fcde1462033b5c1423b20331bfbabd249838f187dea9c20fed27c2231ee24c756814250f4180584f2862c98f62ab9 SHA512 67c2d9b611be8222e075e403f76bedff2cb4c49a31aa5945f0177614c79c1c87f9d1c1c89411d692b02cef5c787e447ae1a6efd3ec25f5dec7cee857c7ccff55
diff --git a/dev-libs/lager/lager-0.1.1-r1.ebuild b/dev-libs/lager/lager-0.1.1-r1.ebuild
index 720534be9154..76f20f1d7ed8 100644
--- a/dev-libs/lager/lager-0.1.1-r1.ebuild
+++ b/dev-libs/lager/lager-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
index a60e64a29732..676b4691bf67 100644
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@@ -1,5 +1,7 @@
 DIST libcpuid-0.6.4.tar.gz 338722 BLAKE2B ad23c13c48b0244f401a60d07fb569712f24b4d1f2bcd16f8d0240c6a39f8afae8944c9d3b4f486d3e1727157d642915c794fc89f9af315a2c4daf64625fdf25 SHA512 5396301d2a5485c6cf15a2fa8eab0ce28d967fe0dcf0776fec3618b963bc786499032150037f6b9123738e094d41583a331bcea25e502b5025ec6f03d318f77e
 DIST libcpuid-0.6.5.tar.gz 370297 BLAKE2B 56394c0f99ee514bad115e614a27e3771e3ab0a27c7e980ed50419f6b22c268461db97aed8c879a66894ea34c788ed7a154ea403ec07a552fb524e321aa931e0 SHA512 c38381e0f768a2cd2a5df601cbcc50d1cb93a276c477bc09e69ff61de01aef30c0b3163f4a0c8e7641caa3cf692d468410ebc90a3cad93e0476cddeb0c444d7b
+DIST libcpuid-0.7.0.tar.gz 442324 BLAKE2B fb3248227ac43fe536b66ee0b13dcb514aeb5be43d09b5a3ada5d944b869b9e6d311b4f1046869aa1f1b00c5c5a7254eeb8206094af1cd6487cefa2aafe78458 SHA512 26353763461cbbe664ddaa6933cbd9016e3b11d8a056bc8c2b92818dfe3a43fcda76a92270f716eeb00ae61b75288c7079add8d7ac2290a0a0d5c3bd7d898d44
 EBUILD libcpuid-0.6.4.ebuild 753 BLAKE2B 6d2af2ea5a2c8ea9f811fdf685c632ab2a4f3004e9ab4a452e1b1c606ab9e98d3922b118539c0191253950ae256d67d01cc728896850b291f89925937b9cf811 SHA512 cca9245d54533536d1e00f873231a7414a36f96f0079f732448c7cadaa88aadba45cefc2c64b2500ab2ae6715724e37c5c21defaea73eb42a870484115d2941d
 EBUILD libcpuid-0.6.5.ebuild 753 BLAKE2B 6d2af2ea5a2c8ea9f811fdf685c632ab2a4f3004e9ab4a452e1b1c606ab9e98d3922b118539c0191253950ae256d67d01cc728896850b291f89925937b9cf811 SHA512 cca9245d54533536d1e00f873231a7414a36f96f0079f732448c7cadaa88aadba45cefc2c64b2500ab2ae6715724e37c5c21defaea73eb42a870484115d2941d
+EBUILD libcpuid-0.7.0.ebuild 753 BLAKE2B 6d2af2ea5a2c8ea9f811fdf685c632ab2a4f3004e9ab4a452e1b1c606ab9e98d3922b118539c0191253950ae256d67d01cc728896850b291f89925937b9cf811 SHA512 cca9245d54533536d1e00f873231a7414a36f96f0079f732448c7cadaa88aadba45cefc2c64b2500ab2ae6715724e37c5c21defaea73eb42a870484115d2941d
 MISC metadata.xml 2130 BLAKE2B 729a7382c0d844c94da0f24c0a96d6570fbb75202436298dafe21611c8047ddbf5d1479e5ab73655bfa28af5165bde93028ed662ae2c9c294474958bb6b5ef60 SHA512 62b2bdbeb95b3716b40532658720a63825e54c64f312151dd220070ac84d3a067658fbc69b1804afc00c861ebd4f0f0c389c007b1b70a06ffe1e4a7975bd5f3c
diff --git a/dev-libs/libcpuid/libcpuid-0.7.0.ebuild b/dev-libs/libcpuid/libcpuid-0.7.0.ebuild
new file mode 100644
index 000000000000..b50a14f5886c
--- /dev/null
+++ b/dev-libs/libcpuid/libcpuid-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..12})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/16"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index fd98a26ed1f4..aee0e54dac1f 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -2,6 +2,5 @@ AUX libfstrcmp-0.7-docdir.patch 4491 BLAKE2B 31bfda4805b99de8e590861ff5445bbc884
 AUX libfstrcmp-0.7-libtool.patch 1905 BLAKE2B d74c235e4bbfc7a5e3e055beecdda3cd0b215adb537fead2b76bd0ed070cc4f24d4d2d27839ba7cb13dd79004d1ecfd61db5d4202b6ef2d81102c1f970dd356b SHA512 36f3a43dca917fbca4b43236b02033c627c1e36221ab98f0bfc7f85cf926c5634fe05410d87649cf30541bcb014b8c40f18c6f040a74a6e1bb8af21ecde49860
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
 EBUILD libfstrcmp-0.7-r1.ebuild 936 BLAKE2B aec038edb10757e1e674b8bf6cce2cc455651d6d4c44fcb9144b766f3e515ff7a8be4e00f2fad33db2b5832b2ad36d924d25c70f51766a4dfe10d3acdd325242 SHA512 93a6953dfd66031ff561a0693aece3c1a2a518e9f2d9f4f4d4e77fcf4e922eb87708a31a9dcbb9f625c138d3247aa1ef80d9ad2d38eb71e68fadb49af592657b
-EBUILD libfstrcmp-0.7-r3.ebuild 1049 BLAKE2B 7e94b1e2be49525209fa4f1214b39cf2dc191a00cacd2fbb73b6c678468f3bc6bc431b261a0ce66323ebb88219058a771bfe75653beb9f007b05fd03c7fbacb1 SHA512 6e9b81b6da49941255a018f7a515e9535c95d3724dcfbb16f9cd1aed22e1c95401e529d32a494c7281e10aa6d47e7265a1f2864fa8bf73df63c6a2039d61c0d2
-EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
+EBUILD libfstrcmp-0.7-r3.ebuild 1046 BLAKE2B 453496f0c85098804a067e821bdf003b0f099c6bc06a0223c595f3fdc385c7d9886f5ed8c9041816a3817afa6e142463bb1c25e09add1d2d19206cff0d3d8e9a SHA512 ca8f4857f504554c6cc55cd1a7ada59d26f053a697bfa2df8242ebcac130e2963b6cece2a9e688127e2855e56bad8f80e2b1f7ed054972929a57497624d99e1b
 MISC metadata.xml 326 BLAKE2B 926108a5954c15305765e37bb63c177e30757266bdc7267d0693f8d9412cca3bc0f1eab55463fe5198980e5adafe191e36fec7bf0dbde4fc72d203d0666b3608 SHA512 abd7abb1a7b5d420e540dae2eea944bad4b16334c40e677277b9a610cf342781e9a38613218ec215a5c3c3abe14c1f83b24185c6061f70d20a28b1c3af6dd395
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
index 658767df2545..bb4f66c93e58 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/fstrcmp-${PV}.D001"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="doc static-libs test"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 BDEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
deleted file mode 100644
index 91ebc6ed8a52..000000000000
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
-HOMEPAGE="http://fstrcmp.sourceforge.net/"
-
-LICENSE="GPL-3+"
-IUSE="doc test"
-SLOT="0"
-
-SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	sys-apps/groff
-	doc? ( app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )
-"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	emake all-bin
-	use doc && emake all-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
-	use doc && emake DESTDIR="${D}" install-doc
-	einstalldocs
-}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 08daab86a533..7440281dac54 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 AUX 238-clang18-export-dynamic.patch 1102 BLAKE2B 18b09d058e9d1973bc19dce367d81d670cc034321a31623740ba61530087cb695e242892d6d89f91f1a48346ab1318c4260a2a6b40918fe7a0bac00e96ed5365 SHA512 e10ae5314baac83b1470c250eefd72366a1c928f3e927fd7049e3d84a0326908540e0c4114826657c61dc65b541735bef50408c49cd0d6123016470d82d4031e
 DIST libgudev-238.tar.xz 30548 BLAKE2B 386491e78c82081e89dad897d16ea6733430a67db3f75f2d9fdee5474b074ad6fede9f08e429f4eb6feaa9bbbb982d9d039db738aac5b5ce0ffac2d3a19430d4 SHA512 684061b4fc64a6ea3dd1ac34835279330c7eb2728fad6e3a9d34c0d501be3103d0f96c6d6866c8e257a0027e4f78a6314cb8ba81cda5ddf42ee9ea1a576ec5dc
 EBUILD libgudev-238-r1.ebuild 1149 BLAKE2B 4fb368f4cc448f69110f80922e4fee61f45c017a00f256672902f3df2bb08aa5724b7d121913b465a27e78a972501ee235c26863f3e37c4095fdd8700e4edfaa SHA512 e96389ddda32b24eab6f7c4369b2813d6dda82cba53994c464f07cf30bf99638261ca53506357f6829a6a205de24538da6653917b236b19087509edb415359c4
-EBUILD libgudev-238-r2.ebuild 1221 BLAKE2B 5482d635b553b0f6ef16891bffd395889fdd2555bbb3dd4f538091cb174a6ce07478f71340923bbdac4711f0a8983525f591adac70257f98fccd911876f97fae SHA512 c6cea9a61b0ceea24dc51f48dc9aeaa4a11bb9ea6a6efb497390883fff5b8357e6ca4ce578610a634eed58705caab102024a3584ad589784cfcefdce2bfb8460
+EBUILD libgudev-238-r2.ebuild 1220 BLAKE2B 4a72434f8071494565ff7d427d76be6252bfc028e6f1461104825f2fe14ae5900324f3d5122678dea5ce32bb824e197113f527a84809031ebff494255f2be20f SHA512 a9a4563ab3b78ddc15a41eedd037d50c2959e40349ad2675775e84707c9120514f95bac97aa2d06ebeeec7dc589239a278a11e7401b44c29f7f3ea92a929d621
 MISC metadata.xml 433 BLAKE2B c77ed222bd177c28f97dc28ba5361572570604716fb21260de83c5854e87bf8a0aeb41ec61da1e5859da21f50417f8e16e4b41dc052b3c021ccfd8af0ac75c9c SHA512 dff4708abd60c2ffb1d5cf442094b9fc4962346b7cbc8079aa2002258aa195aa636ef04ff1d0d9d0a67904456f5a0c9d05777828da04c0124d05c272c5ab75a3
diff --git a/dev-libs/libgudev/libgudev-238-r2.ebuild b/dev-libs/libgudev/libgudev-238-r2.ebuild
index d717ec411e89..648f593bddb0 100644
--- a/dev-libs/libgudev/libgudev-238-r2.ebuild
+++ b/dev-libs/libgudev/libgudev-238-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index a7cd79783075..5b1e6ef634b3 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,7 +1,9 @@
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
 DIST libtool-2.5.1.tar.xz 1043544 BLAKE2B ae1e45c9d56a94980549476ed5abb7d617491360ff23ce88da9e884630280004152a9f5a96267be710930f14917bf7b00ab212acd4c65ceba1e201d2f01809e0 SHA512 ac0a6a8570ff81099585f6c3bf5a8f94851457a068b808e505422276a22638b1912a81f94e185bc2f8661b7abe2f2b2482b1af2cf42307787cbbd71d1b1612da
+DIST libtool-2.5.2.tar.xz 1046372 BLAKE2B 12e3d1f948f64031519ad5619573593b2518ec63cb8e3d69487a4b6104f5ee385c2123d3163c036fe10ca7214ba7558b6bd7fb56d22f1e249945a50091e18862 SHA512 cd6eb8ea470dd5bbfdfcfb06f31b36c84962f09c7155ca8175bc340b0a0289ca85dc9ea6e49c02e6876630913031739ef71dae231bc76c44f0c24e1be09d8cee
 EBUILD libltdl-2.4.7-r1.ebuild 1112 BLAKE2B 8ae2894bbb7e705f052cbdae69a94e76f5783a753cc53d04c9589353f0b89f195403b593b894e5a227985593b4163f42150193835e59e48e85d7c0ccde9fa916 SHA512 3af2d93462b30c0ac3c1db9c6473fca1bd0063be54e6d68810b1559deb7fa814bd9801ad48f996a9c40c101f5168f4585322a50bf0aa5022aa4509537f68a3f8
 EBUILD libltdl-2.5.0.ebuild 1265 BLAKE2B 6af9debd1c57df924462bb6e00e6444e7e651e3b174606deaf56a73eaa903dd9dcea313a92e9abafea8d3172bd5068aa04a50d80a924d6f70798d60cd2e720b8 SHA512 eaa4d407fbe022bbccf9262b5aa3f7ef0470558aea026d5c61795f91e9b2962e0f44a974b035854a1eff5d2086df5ec3f90bfbb36774b0ec857547e758aefe6b
 EBUILD libltdl-2.5.1.ebuild 1265 BLAKE2B 6af9debd1c57df924462bb6e00e6444e7e651e3b174606deaf56a73eaa903dd9dcea313a92e9abafea8d3172bd5068aa04a50d80a924d6f70798d60cd2e720b8 SHA512 eaa4d407fbe022bbccf9262b5aa3f7ef0470558aea026d5c61795f91e9b2962e0f44a974b035854a1eff5d2086df5ec3f90bfbb36774b0ec857547e758aefe6b
+EBUILD libltdl-2.5.2.ebuild 1265 BLAKE2B 6af9debd1c57df924462bb6e00e6444e7e651e3b174606deaf56a73eaa903dd9dcea313a92e9abafea8d3172bd5068aa04a50d80a924d6f70798d60cd2e720b8 SHA512 eaa4d407fbe022bbccf9262b5aa3f7ef0470558aea026d5c61795f91e9b2962e0f44a974b035854a1eff5d2086df5ec3f90bfbb36774b0ec857547e758aefe6b
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/dev-libs/libltdl/libltdl-2.5.2.ebuild b/dev-libs/libltdl/libltdl-2.5.2.ebuild
new file mode 100644
index 000000000000..0dc5df4fd2b2
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.5.2.ebuild
@@ -0,0 +1,48 @@
+# 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 ! [[ $(( $(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 ~ia64 ~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/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 7bdda459b999..9aa47ee4068e 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -10,5 +10,5 @@ DIST pcre2-10.44.tar.bz2.sig 310 BLAKE2B a03943d4b04af319ca18992188c9fdd089fc20e
 EBUILD libpcre2-10.42-r1.ebuild 2554 BLAKE2B 029cb4de0eedb460178d31381099e357a9638b3e0832950209e5952b63d494f05ac9da2efb875c1c0887d8d97d862cce784e1309dd458adbcbddff8c961884dc SHA512 9225c0894edc026422e1769755aeb35bd6eaaad1e47a3a953345409d48d089319f03b6b19ec0de683ab5809f8a9e1034eca3694f067dd44835d29721160f59ad
 EBUILD libpcre2-10.42-r2.ebuild 2474 BLAKE2B 92c3764ff9df1054d0f34d3476e1dce2a11ea6046915ac302dabfd4b9e62d70cbe35df2691ced447601a490c3a273d77df607471bf547b277b156dd3a709c209 SHA512 13bf73ac1f7ec46702f976be073bd3989af92e35873ad582c868be5ff2ee4b91b67be7f41b51a944ff365e679624a58b406746175f2dcc475e3804ca64984144
 EBUILD libpcre2-10.43.ebuild 2407 BLAKE2B aa19c4252f61c60364e18595fd5486849c4a5b4904f07fe122c44be13f208a29dc3f4a6fb8d9883bfdc5f5242857a22b344ce9925055f328de838e340db746ee SHA512 99478576c69be84b57bcfcbffe334f9512076dd859449ab32b6df24c374631ff558300fc8ff9f77fd43e9280c844450ea790f2c59a08d2ee38d65d6253454e06
-EBUILD libpcre2-10.44-r1.ebuild 3206 BLAKE2B 0522e92380202b7cf4d2ddf6b5cc3aa90322904d6825edebf438144dd0df94c9d75475bb756dd8fc1a1dca5c780d7f9de146ea3b1482b95655f744b75f63fc3e SHA512 7794886cdde4a26000ac2cd0c8103268b2c9997effd4f944973a4f2b9b29cd1173314a9a7ebf9c2479c067b4c176877ae4e9dd5576bf1dd5b1ea9b6bb2d9336e
+EBUILD libpcre2-10.44-r1.ebuild 3205 BLAKE2B 276e457bdb198a13dd4225efc696e6a45703f7cf30971c0d90bfab8b322bbfa6ae5b5aa97cf19b2bfcd4044ddb69b0c960f367a8e1aff0c88e3e4e102ad336eb SHA512 f6bd610fb420584f5e421a0df0a76fe1d97b601455358b806a2919488b878b61d190a47ddfcee042594b9e889127d0c4a7c6dda970db905cbf7413133473cc35
 MISC metadata.xml 1088 BLAKE2B 4adc3d90d0a974c796b33195448d4a1ebaefef89f76137b3501fb2d35a05cbc78d2131742110737720d32ff239cc5c8a5df694330362a261cbbf5da3a0a285ef SHA512 d01ea4e26b1335c2fea7fb39c489411b72e777f6e4173adedb782387f34b6197fab65723071811fa9e69708909ae49091f7467cb0254b669a3d1a8320dccab16
diff --git a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
index 40725ef70f62..3e0f2e9729b2 100644
--- a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 if [[ ${PV} != *_rc* ]] ; then
-	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
 IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 5d3d3e599950..ec7c4b1a44f5 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -4,5 +4,5 @@ DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed149
 DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702
 DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb
 EBUILD libsodium-1.0.19_p20240117.ebuild 2045 BLAKE2B ccf03b49b0495cdf89159644672763a013aae0de1609025c18e00b152b11fd23fa57b885dd1c3e2dea2b54dee1374fc1b45f744fe2350a2adc130671e94df5f2 SHA512 e2c9033937ab8b0bf2ad721f9d59fc8b7059f597edd7ad99ed29c3fd10ccf508f05b5a67498824e7fafd11d5a522440ba735b81d8c4a1ee8e33428b03629300e
-EBUILD libsodium-1.0.20.ebuild 2047 BLAKE2B 227599196d5cefa4a22e38e6dd76ba2cdbd4127032973d772f7001b57af0d37d55df613f8b24039468a727462c4511222675a33adf9df750bb7ed86c0cf1e285 SHA512 affe4b541912affbf19e79356d08b5e470a683d89963b51fec23e28fc5d15394dfb00fbd715320ba413e407efea93ad1464ac5da773fa580bc6290cc56b68b53
+EBUILD libsodium-1.0.20.ebuild 2046 BLAKE2B e33c8bf9626944aa5a1a242062e78d95850b90236a40a17c81c519b9887a51dd3aa12dd0b85bd174c8554fc6abf049477afc04120f60b6dca244db7107f80fa2 SHA512 9b4f886e5a6e72e412a61d2ddbb803020e2763b6a88573e02ae5cb4122294a7fe40ba00bb504e2d072ba9f26d223202182de4fc65042219d5c2ece6808fc7091
 MISC metadata.xml 806 BLAKE2B 069f36bae588b263d664f00b50c9a0f4c2348b1a1f0ff2e5c5902217ccf14a81e648997fae2f789220d5b9fa5aef440a7c0526918a7d7f402870dd80067e3744 SHA512 1902268ec9dbb312b9740f9bc9b2df5e66f50dc066ba281b438fbf6d2b5317c589c587305c400c929c068af95c30918fde7a6324ab53b76503ef183aab034886
diff --git a/dev-libs/libsodium/libsodium-1.0.20.ebuild b/dev-libs/libsodium/libsodium-1.0.20.ebuild
index 9049c7b17621..5cf379643c92 100644
--- a/dev-libs/libsodium/libsodium-1.0.20.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.20.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+asm static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 32559c2b511f..d0d185471bcf 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -2,6 +2,6 @@ AUX marisa-0.2.6-loong_word_size.patch 565 BLAKE2B db3c245c896d265545a1b99202c60
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
 AUX marisa-0.2.6-sparc64_word_size.patch 783 BLAKE2B 339bbaecd8686e1af2f6bbcb9709020f2af0d13f9bef4fc49ffd2deb3096ab2ea556c0a32a8ae5b74555bf171c553a43c6bebb4ec05e9696d857c512525550d4 SHA512 d894d7a55cc9a617711a19c8be25a60eea9f808906be7f8ccca4d5cc970e9b5cb2b3e88fc111037e18f831e4c6a7b96c134eea5a2417edc89a402ef96e100689
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.6.ebuild 2993 BLAKE2B c405cef0011d0dec13d5f23a4a1a5395b23794a2612687f987af7126df126730d261b4c860e31d39697c0b5402179e294e5153b07e527a640c88ab3a35ae7b0b SHA512 aff0cd8c9fb2748531802d9ff9a31b01dc09fab491c420758da9ce991a0354ec2b740b51e23e09f0ef30d45adb96a302157ea3ec25f31cc84286cdd90c56bd84
-EBUILD marisa-9999.ebuild 2780 BLAKE2B 310377e8f56fa08895d167ec454a33065ad3da616a1bcdf1efe1b38c2ed21a204162068264f9d2c60adfd6adca93ccccc48f81a2d9bb057d7aca8d603ce8aedf SHA512 84daafc1440f4541ca3377b944f9759cf18292dd1905c684360d72ea0ba26ab739a478e52c95e275ff768a959de812de5e3add95b4422f173a268350c5dccdfa
+EBUILD marisa-0.2.6.ebuild 3031 BLAKE2B 2097b5ab4c2d2e07c8abc3481d62297326d1ddba0d0aa1f2ea7a149ad3588938d0bff3c3a71b3e0c72891e1df8a0a9e24a36ff79c2c88c5c0c14205195797cd6 SHA512 d8db82e9659f67ad7b991e68eb936c1d6bb4a64c293e4645ae4a83d95a94da4f6c1731010e923fe5f1307a3ed19b38fd5e1cdcf91fd0af84aeb026791409b158
+EBUILD marisa-9999.ebuild 2806 BLAKE2B 3e4a87895cb5356f44c0ef67937326d5f7e367af51135eb846953e4826fff65838135bce34ec14edbcd678be6168b1c0e1260d0373a3989f9091d6eec38c4691 SHA512 b60839f23a16c85b565d27d1b13103170626eb449bbc3273692e505a977c91cad9eb165e56a635a95882a4680ef7ba3b45c1c74caafa92c388b6f5a42e44f78a
 MISC metadata.xml 318 BLAKE2B d42d95f7c68f1cd36d197f9e56cba84c6c3f848ee0b3fc2350007963b8cfc6325856078d371d0764f0667404148bf2da1289b38acb5797da3513cb93cbc83b99 SHA512 56330759de72280c5fef38bdb67f4547a38455beaa6697ebfba262232954f4164275a4cd8b713dce35bb9b7acb21aaab2c9b2a429f6fdc50f9770b1fd0e02630
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 6e587ffcb945..47f2023b5fad 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_EXT=1
 
@@ -16,9 +17,7 @@ fi
 
 DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
 HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -30,6 +29,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="python? (
 		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)"
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 7731d92f28e3..45c481f3fb3a 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_EXT=1
 
@@ -16,20 +17,18 @@ fi
 
 DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
 HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS=""
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="python? (
 		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)"
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index a1b03d6494f7..af9ac8868880 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -4,7 +4,7 @@ DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e462856
 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
 DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced
 DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d
-EBUILD nettle-3.10.ebuild 3285 BLAKE2B c80a57767aa18525c4de36aa77415e78ef21e40f49031d52ec7b53c29de7329e3b50087315dc3182d240b17b0060e9a3aa33f688fa51f687c55360df1166b336 SHA512 3ac212b92e69d2dde8c51ca401b6b9560598aa2eded36c2438b87a1eaadb4fee0885e672b58ec2d18475537bd37da2cf6a918e4736c8b53dc3ef7f8230a48a01
+EBUILD nettle-3.10.ebuild 3284 BLAKE2B 4b28b58979b75a9d0f8887ddf1511af6775c56a9b8f93267c166fab08fc7d7589e7bcb70783f84abb14be76cb9f309ce91b1baa053ab7ce3338271f0c8c06974 SHA512 657fb24a9b9e1fe4c2be474a4d2c0fc4657be58a9f52ebcdd85b2ccf7f85ce2b28a33d99ef028ef18ae9171aa847e46ddfb1c673c5ce2fd40ec77384db0a6706
 EBUILD nettle-3.8.1.ebuild 2623 BLAKE2B 60ea85fbaedf21cb3c7a056d08eb46eb1ce1e487e5ef5c69f2e0baef1d312cd514580a48e6f5b0b99b9762e2f9cc01e82dc8ef5d30aabe4b00c1f60313fc93b5 SHA512 3c6ded7aa546c6436a3c1399285928d1192b25e8dfef7c41084eb04987e31cb12860f51e10627aaea03f80d6d394a45b46ce43e37092f6fad6f06c2382b48a30
 EBUILD nettle-3.9.1-r1.ebuild 3109 BLAKE2B 57a2fb5bdf3aa656607ed1c12b578c06f517060903b7f4cf34a9c342e943f9ddf4679c3191a8dbb9f5b5ca1ea6e0f87a18b1e0635e9611ba5b98bd967cdc8531 SHA512 97fd1f6e3b17890e0551d6f02d05ce836ce557bdbe4e20483832dd108c0ea4ff0fdbe94fa32a425013c3b7a5c440579af5a74c2c18aeba40001a1174ea2ae939
 MISC metadata.xml 401 BLAKE2B 8840ace8e513d9ee82322e82f348b15c94ed9ece2b102bc2bb977041e518f56f5f6b068318771759b1895d47db084026ae443841a9f305cf965c37121ef0100b SHA512 b2c4a89887b5882fc8e04a83e047d2f9bdc60e2f1799fd724c83275acd1f7b9b4c1c08c4c3ada810f5d30cf3c6048cd8043c7792dd909969b7e4bf4da66b42c8
diff --git a/dev-libs/nettle/nettle-3.10.ebuild b/dev-libs/nettle/nettle-3.10.ebuild
index b8ebac0c354f..52f51dfba2af 100644
--- a/dev-libs/nettle/nettle-3.10.ebuild
+++ b/dev-libs/nettle/nettle-3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
-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"
 IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 64a05b3c0fdb..eed3509b0da4 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,5 +29,5 @@ EBUILD openssl-3.0.13-r2.ebuild 8583 BLAKE2B 1650cdb16342b99131bc20f49df377cc8c5
 EBUILD openssl-3.0.14.ebuild 8499 BLAKE2B 6498c24cdd33ead5aeb767f59902554fd3972d3bab8fcd3a87379a75807a669e917d9cdcf3897a8b29b60ce7f0bafd5c22a89184e3845755c900ed22456a8057 SHA512 1c4bfaa650a661a0018fa4fce3b7acdac7c0e912fea4a09036b1dc6a7434b9e03d2c456e6b643402c53b7971b11ddc9bab44141a9a3894d0a1235aa3b4750b45
 EBUILD openssl-3.1.6.ebuild 8605 BLAKE2B 841c614b3bcf87dc1129c15e5c413b77c137585fce4c314c47807af5ce6a79ce8296543abbb03857b4a1ef91fe1ee0d98f51bdeb697f04e5d6459c98d65f9dc2 SHA512 dd3061d7be29b22b14c3479541bf5d70ee1a0d5e5257e750dc967fcf693ea7543448ced2cc082281f7d8b5850d2c1ac5977a363b529e94e25f50f624e0bc1171
 EBUILD openssl-3.2.2.ebuild 9250 BLAKE2B 577dd9959d17f63e816f22d06d12379fd68d33f3eb66e4925f2a41dc2821e95aca9ef59558875410e0ad5558bc909e271ea6d7816d98045dd4fd0aabdb7a65ab SHA512 47d2e80fc4aa7fa16388e76ec07d026d2be79eafa2d2e7a52b6208b4ea11d14998d859ee8ecaedad81a528fa5127253b41a3ec23c2e0867c9c639b2947248cfb
-EBUILD openssl-3.3.1-r3.ebuild 9611 BLAKE2B ea130e1e329772f9b0814af7570eb17f7a893e5f340bd917f7edb6075971e7682b1e2cbaeb36c236072623f6fd6c1af04297c4b6981d93955a47c49e7ece08dc SHA512 5ac33040f288a55812c59a03e7d483fa1e3671564a4ee1f3e11632df2850160f0bf3f0da2a6b9b4ea0f2a7d3dcee43cd21775843fb15c45646d66884506e4928
+EBUILD openssl-3.3.1-r3.ebuild 9618 BLAKE2B ddab56cdea600bab19bb2441564c5356af892e3db3cc915ed38a95a0f76a1e193c1bd0a54b5f961331ba0a6ca0f542c674b7e625434c458125919e68d669f833 SHA512 9c02c40f286cc1c75b5acf455564c6fc2d32df2a7f75a157ab0f845f1ef0968915cb4f01f6727f6014da93a0a7f2c74a6ac851bb9838768714c970125a0a45dd
 MISC metadata.xml 1674 BLAKE2B 2195a6538e1b4ec953c707460988f153e40abe7495fd761403c9a54b44ecb7cb5c69ac37ac7d4d18bc0086cf9b4accaaac19926fe5b2ac4b2c547ce1c9e08a6d SHA512 d4eda999c1027f9d8102c59275665f5b01d234c4a7636755a6d3c64b9aad2a657d14256b1527d9b7067cb653458b058db7f5bb20873e48927291092d9ccdd1c6
diff --git a/dev-libs/openssl/openssl-3.3.1-r3.ebuild b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
index ebcca4d12f99..dc14ae4b9b07 100644
--- a/dev-libs/openssl/openssl-3.3.1-r3.ebuild
+++ b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
@@ -25,7 +25,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index b3b051e6049e..1098716b6272 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -2,11 +2,7 @@ AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55
 AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
 AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff831c92629806ee0e78be602a5457b4fa9dc60eaa4cb143fd4a06343d7c0845ed775a74b6bdfa9b2d3524aa9c4a SHA512 4a1dd50fd206045c1c78a577f792c481edd5e1d2220ce4428074c2cc3b78e9cc67d8f3f5830477cbe8ce76b13f3ba9f0dc280aaff4bd072ae5715eee6d14bdd1
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
-DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
 DIST pegtl-3.2.7.tar.gz 249394 BLAKE2B d095ef337e1ff9e01692f07d0b110a685cbe447c36d7d294d0f18a15e076d15112b300232c5b4872b4a0b51d375799fc73261bff31c5b970a3d05b90b0ae6062 SHA512 e996be569e1c25377b13870c4f3e59f1935bbf24bb7c6edca0edc85b304fbe3d05db52a303839b0bd50c78769b773fc2237814787a703c58de8a79398210ee34
 EBUILD pegtl-2.8.3-r1.ebuild 734 BLAKE2B 0ac4b7b00fb7114acd879880a9ec29b05c69ec8ec918f3810b6664086ac9ff52b025ab1e8ef26f7f4e112eb99cce1b67c367569e4e7cb910081752326f00b50a SHA512 a2046d66fe48a82b166609772dce0b3c585b95704c250f43ad487eb6fb0e89faafb83dcf9977015d27b0c37102584e8d5ebc0e9000c2309a102b790ee1f2ed95
-EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
-EBUILD pegtl-3.2.5.ebuild 650 BLAKE2B f5193eb67418417b96bdf848bfdbd91e99868b72a3d7f1bb7cb3b527653aa6335f6850e940f60fc2092c03d88718228483e6b78ebab93cbdf505facd4b285981 SHA512 879957d860b814f3802df2f0b74abb994a1b02fcf22f1f4fb0455b353a553971a696fff469ec4b0d945197d1c0488b09cd22beb539cd8169186e9f6a54e13183
 EBUILD pegtl-3.2.7.ebuild 650 BLAKE2B 6ed59aa29753fbe611ba2dd80d71a5fc523483ea08c0b513f2b2450659f204ee558f687179a4d26cd0d16dc095723fdbdd817e030da39bd4d67f3d537b6f58d4 SHA512 28dbb0836de1d3a2b061697d36806cf8d4b48edde76ccbdc48ab4649c90d76455a074ba9519afeda30fc61d134d7533d69969f80bf6ee7f3488df95e9bb3e8e6
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/pegtl-3.2.1.ebuild b/dev-libs/pegtl/pegtl-3.2.1.ebuild
deleted file mode 100644
index 09fd47749d97..000000000000
--- a/dev-libs/pegtl/pegtl-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
-		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/pegtl/pegtl-3.2.5.ebuild b/dev-libs/pegtl/pegtl-3.2.5.ebuild
deleted file mode 100644
index bde3df726470..000000000000
--- a/dev-libs/pegtl/pegtl-3.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
-		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 0a5bfc0d59bd..94e5457a1a49 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -2,7 +2,7 @@ AUX wayland-1.23.0-c23-clang-fix.patch 4740 BLAKE2B fceae0f54e0d12c8c7651641294c
 DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
 EBUILD wayland-1.22.0.ebuild 1669 BLAKE2B dd25effa4c6a77f44fcf7d06249f0397da9e86186d73b4a2e06fa14decd9e9f9d1d358d43363dc6b8880467b60dab442872c45c4f4d44e2535521a1bdaedb804 SHA512 5e8d283cdf726f0f3ca414ec5c5c43567ef695e4aaec557ec905420f0002be46348f29be8321912b5c559f858c47040206a96019c72b77359dadb992eca23cb8
-EBUILD wayland-1.23.0-r1.ebuild 1739 BLAKE2B 54d29194a30342cce099a2b113b8fb9b51ce68fbed32c6bb7821741863c4f1ce958dbeed4207596ca7f42d466a504e65d9e49e3d2d316b13cb0afefb258609dc SHA512 36b6fc468c4277771db4457f63d23ea7585eb154e3f143ac380a6e1418bcc67fa9dce8da86dac0ca2bef5bcdb867ef49ecf73cdf3f167d74fe4e23fdaf291cfe
+EBUILD wayland-1.23.0-r1.ebuild 1733 BLAKE2B efb9c01cf3a5a28631e052142ae68918bd4c5c53902c10dd01dbf891725de39fe81a08621a1c5dc381444b335669333a60d722985f260090568ebb6de98de086 SHA512 fc004c1045afe56a50553f6476925597f357adfa4fe059033ac56b5b7c1a5a2dd64da04f5e6bd9c3bea1da8e7848b4392842cd119390e75ea7f589d5fc95978e
 EBUILD wayland-1.23.0.ebuild 1676 BLAKE2B 7c400568934443ab15f422950828d01cc0f7530a9b010f089e59ef3ac77d31f3541cd8cfe0d0f426dc27289fc90512f0ccaeb82f171c45104d8c21c815f8856c SHA512 9eae9e9da8564e15a3303eced89699701dcc1347e0177f3e2fdd95aca76d27ea969f0308ae3b59e2d79925dd1a03de086f5582f3cd4368510d26f87fa507988a
 EBUILD wayland-9999.ebuild 1676 BLAKE2B 7c400568934443ab15f422950828d01cc0f7530a9b010f089e59ef3ac77d31f3541cd8cfe0d0f426dc27289fc90512f0ccaeb82f171c45104d8c21c815f8856c SHA512 9eae9e9da8564e15a3303eced89699701dcc1347e0177f3e2fdd95aca76d27ea969f0308ae3b59e2d79925dd1a03de086f5582f3cd4368510d26f87fa507988a
 MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-libs/wayland/wayland-1.23.0-r1.ebuild b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
index ec497be319af..fc0f8eb2831b 100644
--- a/dev-libs/wayland/wayland-1.23.0-r1.ebuild
+++ b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson-multilib
 
diff --git a/dev-libs/zug/Manifest b/dev-libs/zug/Manifest
index 24fec3134188..e7a562d6ec52 100644
--- a/dev-libs/zug/Manifest
+++ b/dev-libs/zug/Manifest
@@ -1,3 +1,3 @@
 DIST zug-0.1.1.tar.gz 102857 BLAKE2B 659e557fcac7c00d8ec3dcb54839bd6fbb23ca46b9d2052197b2f5e983eec1dc4251b36ed920b6f43225ff98a8bd1d3e65218f301dd121bdf8c2394efbb5e1b3 SHA512 1348a0bdd7aed1a590287ff3a1c45c0cb1aef2aca12dc37e77705c2b2015704f766fac82833fa28beb79efe00f6ff63ee1dcb220cdc43517f625ba5edecc090c
-EBUILD zug-0.1.1-r1.ebuild 780 BLAKE2B 2f6c231366d32bfe103ad3996532d80fd6a63f35b744592242eb845843c9f50fcfec64901076c2addaee770a1b5f2f3704ac83bd7bc5a0f56460103c2601fa79 SHA512 e29de7ad523bbf5fa51be194ae4d63e1c8cbeaa767ecf10d43fe865cb8df4c49509027e91cd49af8417bb7a9302b0796daaa7d7bd311ca0bab1b5418f4893e35
+EBUILD zug-0.1.1-r1.ebuild 779 BLAKE2B e92dd2252208b84afc27f60ea08e7ee0ba283245b4211ec77c6a78e4b5f688f219492cb450a6ec0a0cc393e72e635e7d7abc23bee11f4eba3a5ed87d915f0210 SHA512 a9e63021a9ef3c3c9e868fb29b5a72bb36ddf45671d7cf40caa02d767171796e05c23d0f6e20fa7642564198ef95a11ce1be4dd58c95bd2a276d8e8ae0b75bdb
 MISC metadata.xml 481 BLAKE2B 9002b34caea756a7792af4ae8f0fb295dce30af399c19f5a0264bc4c98d460799ddd475fc7566c7f4d296097d3d1392f49133a40bc13255f8a617254f0426afb SHA512 1bbd0646c2569e2ab80869e427239a26a145d3d0c7cd64adf5994c1396f595286f7df26a3e9904f3abf7f5e32a1072d82b7dcf55e40b3a6c5f7bc6ac616e19b7
diff --git a/dev-libs/zug/zug-0.1.1-r1.ebuild b/dev-libs/zug/zug-0.1.1-r1.ebuild
index 6cccaf41364f..e4460dfc0aba 100644
--- a/dev-libs/zug/zug-0.1.1-r1.ebuild
+++ b/dev-libs/zug/zug-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"