From b6fa31c964a602f8461a77d5b83355e8750c12eb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 16 Jul 2024 12:27:58 +0100
Subject: gentoo auto-resync : 16:07:2024 - 12:27:58

---
 dev-libs/Manifest.gz                               | Bin 100990 -> 100983 bytes
 dev-libs/gom/Manifest                              |   2 +
 dev-libs/gom/gom-0.5.2.ebuild                      |  62 ++++
 dev-libs/immer/Manifest                            |   1 +
 dev-libs/immer/immer-0.8.1-r1.ebuild               |  51 +++
 dev-libs/lager/Manifest                            |   1 +
 dev-libs/lager/lager-0.1.1-r1.ebuild               |  52 ++++
 dev-libs/libdex/Manifest                           |   2 +
 dev-libs/libdex/libdex-0.6.1.ebuild                |  70 +++++
 dev-libs/liblouis/Manifest                         |   2 +-
 dev-libs/liblouis/liblouis-3.29.0.ebuild           |   2 +-
 dev-libs/skalibs/Manifest                          |   2 +-
 dev-libs/skalibs/skalibs-2.14.2.0.ebuild           |   2 +-
 dev-libs/xapian-bindings/Manifest                  |   6 -
 .../xapian-bindings/xapian-bindings-1.4.22.ebuild  | 346 ---------------------
 .../xapian-bindings/xapian-bindings-1.4.23.ebuild  | 346 ---------------------
 .../xapian-bindings/xapian-bindings-1.4.24.ebuild  | 346 ---------------------
 dev-libs/xapian/Manifest                           |   8 +-
 dev-libs/xapian/metadata.xml                       |   4 -
 dev-libs/xapian/xapian-1.4.22.ebuild               |  67 ----
 dev-libs/xapian/xapian-1.4.23.ebuild               |  67 ----
 dev-libs/xapian/xapian-1.4.24.ebuild               |  63 ----
 dev-libs/zug/Manifest                              |   1 +
 dev-libs/zug/zug-0.1.1-r1.ebuild                   |  42 +++
 24 files changed, 289 insertions(+), 1256 deletions(-)
 create mode 100644 dev-libs/gom/gom-0.5.2.ebuild
 create mode 100644 dev-libs/immer/immer-0.8.1-r1.ebuild
 create mode 100644 dev-libs/lager/lager-0.1.1-r1.ebuild
 create mode 100644 dev-libs/libdex/libdex-0.6.1.ebuild
 delete mode 100644 dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
 delete mode 100644 dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
 delete mode 100644 dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild
 delete mode 100644 dev-libs/xapian/xapian-1.4.22.ebuild
 delete mode 100644 dev-libs/xapian/xapian-1.4.23.ebuild
 delete mode 100644 dev-libs/xapian/xapian-1.4.24.ebuild
 create mode 100644 dev-libs/zug/zug-0.1.1-r1.ebuild

(limited to 'dev-libs')

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 810a6f2ab51e..a2a40ecf28a6 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 1705e93cc4ce..48b8be3b215b 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,5 +1,7 @@
 DIST gom-0.4.tar.xz 102744 BLAKE2B 8116ac388a56e85effbb37c3d5ea5036f6de2f4ad7ee8fe119bd058e1ac3e293eab612a739cdba7467202bc9e258f7cd65b1f116e146577d3a103fc03afba37f SHA512 d847928ce09c53a3f64777c313cb843052e5e001873f29d3f7acf02772cadf0e4b133fb0137aa0463b4ff95dd54810bde87062d8e396ff4fc6d142ba59c8e9c8
 DIST gom-0.5.1.tar.xz 106004 BLAKE2B 60cb744a77b4f7069430d27a88c6dce87cb5229758c637a49aa0ed05ff659099ba33923e5f576d797776b5af576beb57b0790633a1866f048279d5ae04e74f54 SHA512 6757a664f21cd8c1fb78b6446ed833e7290c9b91a39029363984049af840cd2685f43ebb184f7c966d9e395a1080454c182637fd64a1ff8b63272f4649db6a8a
+DIST gom-0.5.2.tar.xz 106068 BLAKE2B 4510f4e5c7cb85c2e05f43978d9995192a05d1270af9bb2ac16d44a57a76d4b31b2ffff8f8548cbd59f564ab59b903000090edc53d05ea0999a29250ec87e978 SHA512 e82e628a62da2a93282f75ebfd2ec158c54b734a107418972085520536f8aebf50701253afb3a2fa3927c637d75403881aed96c175fcf9ae9f71a735f16f6f19
 EBUILD gom-0.4.ebuild 1453 BLAKE2B 6beefcd48a01062886ec1207a70f5c3e2b14792bc003f319a0794b01796c6370602cfbbb34a505fbd9681b527a3ae25fcf753ab3e9c346897f5eff38902e86c9 SHA512 33d0bc52523e334047418cda15f85900ca59d27d3f0dc2bc662d141a4732571e9ca098d783986ae06b6a359782ecc2a6a7dc4986fc9624aaa67e46f16a84e4c3
 EBUILD gom-0.5.1.ebuild 1436 BLAKE2B 584fc1317533d4eae433672469491d007a24d5d93d8f35f60f1d7fb7eff5f62dc5158c998400da86c6d9d2e88e0382d0696e4e558e1689758b6b47c69a9d7e5d SHA512 5ed71f8708e7e48ec69ebb3a8cb847c5e9ef6a5c82cbac03e7d68a9cf4da9150288e081acc0c63d1104f0a128606bfc087cf25a039ca54494b77e2490fcd0999
+EBUILD gom-0.5.2.ebuild 1466 BLAKE2B ba68819f97ce624cb66514dc140b3d588cf3412e3b88290aac08509352d14ab6ac7dfa619b007cf928f9c40f719d67fcfbf5f926df4af79f3f0b33dd238e0563 SHA512 cb58830d8bfefb640d9d7c46abaa5dfc114181eccbfcdc4df6747167cfe022108edbc6ed9cc27e99ad2c2bcd1c79fed0a0dfe506d5bc8880937489be0810c51e
 MISC metadata.xml 344 BLAKE2B 773bd02395869023734519494abc83b069dc9909f5a26dba1e6eebe95e10b02b52813aa77437faf67cd580d7192948afd1200e9b3c5f1d5f2908392b4f3199f3 SHA512 831e318fb427b09863c6554405105b3db50bd0986510d80d46b35221d3d3362e708c2b606c888fca263601bc70d60ef92096169bbdae53b6597bdc0bb224edce
diff --git a/dev-libs/gom/gom-0.5.2.ebuild b/dev-libs/gom/gom-0.5.2.ebuild
new file mode 100644
index 000000000000..7f4067709254
--- /dev/null
+++ b/dev-libs/gom/gom-0.5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit gnome.org meson python-r1
+
+DESCRIPTION="GObject to SQLite object mapper library"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gom"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="dev-build/gtk-doc-am"
+RDEPEND="
+	>=dev-db/sqlite-3.7:3
+	>=dev-libs/glib-2.38:2
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	gtk-doc? ( dev-util/gi-docgen )
+	virtual/pkgconfig
+	test? ( x11-libs/gdk-pixbuf:2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e '/subdir.*python/d' bindings/meson.build || die
+	# drop test building and deps if not enabled
+	if ! use test; then
+		sed -i -e '/gdkpixbuf_dep/d' meson.build || die
+		sed -i -e '/subdir(.*tests.*)/d' meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	docinto examples
+	dodoc examples/*.py
+
+	meson_src_install
+
+	if use python; then
+		python_foreach_impl python_domodule bindings/python/gi
+	fi
+}
diff --git a/dev-libs/immer/Manifest b/dev-libs/immer/Manifest
index beb6688bed60..c390680aa602 100644
--- a/dev-libs/immer/Manifest
+++ b/dev-libs/immer/Manifest
@@ -1,4 +1,5 @@
 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.ebuild 959 BLAKE2B c1191b6bc3bea59aea76516bc782bfa6749806a406f77fc30184c0170f29942cdcac07ae5bf89426578333a76a425ec7df6406f7148d7af9fbe7a2b01ee3d57d SHA512 5e8e7b34367214bd6df4ef85176bb174b038e5836893df355d200339ac8d6f2fff445cb83038e8bbc631f1d87537134b7584259291bb2043180735d531414c65
 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
new file mode 100644
index 000000000000..65da2ecbf6f6
--- /dev/null
+++ b/dev-libs/immer/immer-0.8.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library of persistent and immutable data structures written in C++"
+HOMEPAGE="https://sinusoid.es/immer/"
+SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/boehm-gc
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+		dev-libs/libfmt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-dvector-test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE=no
+		-Dimmer_BUILD_DOCS=OFF # Recheck if documentation is in a better state when bumping
+		-Dimmer_BUILD_EXAMPLES=OFF
+		-Dimmer_BUILD_EXTRAS=OFF
+		-Dimmer_BUILD_TESTS=$(usex test)
+		-DDISABLE_WERROR=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		cmake_build tests
+	fi
+}
diff --git a/dev-libs/lager/Manifest b/dev-libs/lager/Manifest
index 80b19d0d692f..b750d7207720 100644
--- a/dev-libs/lager/Manifest
+++ b/dev-libs/lager/Manifest
@@ -1,3 +1,4 @@
 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.ebuild 916 BLAKE2B f43ed4a7dd4a24f98af3b844c33d066b56c8d122331d3df4d39afe0758ca7614e75494f099354ff09f9baa35a5678a126d74fe155c3922af3de1bff08a6b3011 SHA512 b41dcd5d0c4ed8ccfe6f6111105dead9f79701e68f3b1028392086b7931e514e0dd1c68edbb330aefe20f416a51005163d98bc5ff0a42c0483689a584a5b4d0a
 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
new file mode 100644
index 000000000000..720534be9154
--- /dev/null
+++ b/dev-libs/lager/lager-0.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library to assist value-oriented design"
+HOMEPAGE="https://sinusoid.es/lager/"
+SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/zug
+	dev-libs/immer
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+		dev-libs/cereal
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtdeclarative:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE=no
+		-Dlager_BUILD_DEBUGGER_EXAMPLES=OFF
+		-Dlager_BUILD_DOCS=OFF # Check if docs are more complete on version bumps
+		-Dlager_BUILD_EXAMPLES=OFF
+		-Dlager_BUILD_FAILURE_TESTS=OFF
+		-Dlager_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		cmake_build tests
+	fi
+}
diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest
index 3ec791d15de9..eaa2e1deeabe 100644
--- a/dev-libs/libdex/Manifest
+++ b/dev-libs/libdex/Manifest
@@ -1,3 +1,5 @@
 DIST libdex-0.4.3.tar.xz 96820 BLAKE2B 51f6c9a209d8ff19d7e97f4d8cbc9065739f08c555712076c9b6f4d345d56522f31afa1b8dffe8da2cfc128d368d7dc5f6a93757f0fe5cfd0a55de17587d776e SHA512 26691373d560d20cefa3a23e31677259b234cdf623b17b8fb2b6976b03768e86e458d2670aa3b260638b595994f278240e972bf3ff5b765013fb6d3114f46cef
+DIST libdex-0.6.1.tar.xz 99056 BLAKE2B 3899f89ac652c2790c93e2799a5b0d066c45ee314c6f773bb586e49c89a8a78e6a09ebf08263b88b25900a15ac736d2bd37590720e0ac0e074581342534eaba3 SHA512 36be15d2da9edeae195abcb6f97639dd7fdea74463cdfdf752293007e44ab41a5e5350a7005883f202d70f96047567fba6370f1a2c45a0f898c242bebc88e847
 EBUILD libdex-0.4.3.ebuild 1481 BLAKE2B b88a3f2ee52b2ded6c15eaf019b022b4b732bf4ab548a98256dbd40133bf5938728a26708825130cce5a7651ebed72a4e8093724b98a02b7164ba8f75f9149f5 SHA512 cc31ea3c815fc288b4b18a542823ba60564af86944f1993437746d2924def8525ed8588b6e5bc1fa992a7fc9b2a10c56299d4c4bc3e0c5faea948ac6f8aff78b
+EBUILD libdex-0.6.1.ebuild 1503 BLAKE2B edd7f2cee68bdc8f3fca67d0c6cdec1c937659e0c8d5f8c3fd563211f0488e80bea43a07a5fb8e044d49b75641815a09109ca49ffba965dfc68e6082593d3e9d SHA512 a7df20f8a4d866ebfc5b175da0e829c9dbb25d927b66c806ce88dad76903cea9ccf681da58b76f864c088e67ec0dae81231982a653cdd7a9f3089a85f0dea7e6
 MISC metadata.xml 1034 BLAKE2B 279009c53ff4ecfd3fc2b053ec13f7497aeb65b5a6f0b225633067c173e353662654adbdf3cdd3eb5dc94fdf4c06b44750108309f917309b09957467eb3f12a3 SHA512 0d87d47c39375628cd18abdfb97db9a8d9d3ae1dab37f7937a60aa6935132dbcb36407bf7308b1b4239401676bbe65a1868e2a06f79e8da16f7f96e246bf5f8f
diff --git a/dev-libs/libdex/libdex-0.6.1.ebuild b/dev-libs/libdex/libdex-0.6.1.ebuild
new file mode 100644
index 000000000000..8da02332bd2d
--- /dev/null
+++ b/dev-libs/libdex/libdex-0.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org linux-info meson vala
+
+DESCRIPTION="Dex provides Future-based programming for GLib-based applications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+eventfd gtk-doc +introspection +liburing sysprof test vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	liburing? ( >=sys-libs/liburing-0.7:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+"
+
+pkg_setup() {
+	if use eventfd && linux_config_exists; then
+		if ! linux_chkconfig_present EVENTFD ; then
+			ewarn "CONFIG_EVENTFD must be enabled for USE=eventfd"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dexamples=false
+		$(meson_use vala vapi)
+		$(meson_feature introspection)
+		$(meson_use sysprof)
+		$(meson_use test tests)
+		$(meson_feature liburing)
+		$(meson_feature eventfd)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 9c0bdbf96f68..114b0de3b081 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -3,5 +3,5 @@ DIST liblouis-3.25.0.tar.gz 16939419 BLAKE2B f67dc1ee3aa9eb32fcf0693b3a31d40c56f
 DIST liblouis-3.29.0.tar.gz 17073843 BLAKE2B b7735f4c59c46cef55f4748b54395b95f4f3623be37bd42bbed4249232d5ab4ad966e4f08945f91516be30f19735ed774411cfe4bc8e1c7822f04af2d0b0db27 SHA512 c2f51686e869921658a95a58102799ebcf45da9b73f7d81912462451236134be7c148b78f35a1e0586cd349bbcb62238218c9ae547092bed9303238c22963589
 EBUILD liblouis-3.23.0.ebuild 1759 BLAKE2B 912ab7776d3d0e4dad6906c993f4bc3dc47466ebb286705edac8205ec188187897769881181026839c2057ea6c11cc433d6a648fa99af5fd8a58c305ce177b58 SHA512 c2e7c1ff3ad718f1ebc651dcc87c516a96599468f9d3f3605a4715fccc2e6bc0353e77c409b6c5355ad6080fa5a9523a12a9e69040b52ac621e07d4c95a5e3d4
 EBUILD liblouis-3.25.0.ebuild 2418 BLAKE2B d91afdba655494c4e8c7f350ae675d6a4647b52d2732d418b9cd2bc3279dae85726d472b9d0d3d1c4190975eda3f3dc2362e4136f1a3f5b5035b6341ccf93592 SHA512 cb5ff4d9424be649235e31cf3af3e84a5386bcd293dd87b60a7d24d06360a44687ad5444b0dcd435dc27b39f2fbfe6de49fead1dc000edae850825813d6a6a95
-EBUILD liblouis-3.29.0.ebuild 2836 BLAKE2B 116a70679950f694f132df8a9cbd64e97a4b7795107b7cb65aba516ccd19e0a19a10a85142075e02393c10b82a3e244624a39ef890621c485b5f69307bd262d6 SHA512 bd8ec8938709b5a0dff2d9a221f5ca086be6cc13b77078757baba9e4f9b89fb001b230b4c5712085e87c6696c2c52ffac28ee53ed69bdda1619687189e4bbf3e
+EBUILD liblouis-3.29.0.ebuild 2832 BLAKE2B 4a2e7aafbae058e88ec2ff02435eaaf75bad7e836f93abc4b3e714925ddf7dedf25ca7b307a5da063236cf8774514a0a327ad1ebddc24f5a77f3ffcf71ddf26e SHA512 8e4361236ca0a2b53fe5403017560ffa64a1b09e51c28780612d17bf09c73856cc989e5038a895277671a2dd323d4d52b8c6bf8d7d6fee42bffb2f848912e1c3
 MISC metadata.xml 352 BLAKE2B 5c562663af1cb8a830ef585416cd7dbd4977393310fb2216ac6fb5bbaa594ad4fb144bac1a49d161e5946978cbc28acdbaf5d59e781da5438d7116f34c259290 SHA512 23c7fd40c40c8e574d995d0fdbe56242e9b1874d576ba8a34cee80e3c3e41785e782ca37fb3f89665c24d5857cb956b70c9219dc3dc35cb209f947f0b267c4be
diff --git a/dev-libs/liblouis/liblouis-3.29.0.ebuild b/dev-libs/liblouis/liblouis-3.29.0.ebuild
index fdd585cad1e6..2392affc6e35 100644
--- a/dev-libs/liblouis/liblouis-3.29.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.29.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0/20" # follows LIBLOUIS_CURRENT in configure.ac
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 98c6c995ec5d..b627f6c75206 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,5 +1,5 @@
 DIST skalibs-2.14.1.1.tar.gz 237220 BLAKE2B 880f40a640e7680f847f8d9eb5e90ca472583d0badfbf233707be9bf64e2eb172543fdc9b663c99c3a5839ed58dbf7befebf9aa75820c9be9d70cd0c37959665 SHA512 01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9
 DIST skalibs-2.14.2.0.tar.gz 242763 BLAKE2B 5a172245ae27eeb6a41f943e285f3e40d66324a60a1190afbbb4cdbc3fbbd0cace0feac9666c02c2adddbbac477741e578d2a3d4af707799704ed8050245783b SHA512 b96491e6429cc69bc75f50be99b7b18769cb756c1a82f698994c23aefb16bc68ee5558076993b948a6674203ecd82a454a978c89f450c219cc2728d52b7f5656
 EBUILD skalibs-2.14.1.1.ebuild 911 BLAKE2B 18789dbc3969551197f38ec4721b024f386421e4924d358393b07e66272c4cc668c076147f51e95387fb6e3f44f4c3b183158df00965a033fe669ae44c91156d SHA512 3801feda4d890e081f3600be2bb1bc6da078ababf6dcf1e2ceb4b770f2990885cfc6ae651f3df4e82689e99e5f5f787a7956cb554c6dc56b495f7703f6fb1dae
-EBUILD skalibs-2.14.2.0.ebuild 914 BLAKE2B ade48389d40027bf0fe8014e7f09385dfc21997ca43b3a92a20358d00457ad99c2590a73f842be8c448074d0a41216b47746eda6dd17427d911a4bce25c6c05f SHA512 a6c915330c434ba010d04dd6ba6a74bac9f8f949703009136f8a489314ede17075a5d040d7975ac5cc5b27907b84cb32ea5a9c9fceb45232bada69388503ea18
+EBUILD skalibs-2.14.2.0.ebuild 911 BLAKE2B 18789dbc3969551197f38ec4721b024f386421e4924d358393b07e66272c4cc668c076147f51e95387fb6e3f44f4c3b183158df00965a033fe669ae44c91156d SHA512 3801feda4d890e081f3600be2bb1bc6da078ababf6dcf1e2ceb4b770f2990885cfc6ae651f3df4e82689e99e5f5f787a7956cb554c6dc56b495f7703f6fb1dae
 MISC metadata.xml 355 BLAKE2B 66e0a671da1ad125bd77d9d05bf03ea2e4bb9f8ec0c91bfe2f5b87192ce2de48a5137105af6e34260fb53c0a858577bc63681a53436d40ae635d87b2a346da25 SHA512 c6240c87d05a08450803a5887077715842112da1fa49264a8594735909d07e76a25a10bff4b09e7cf6049081153f520ac12019d93384357b692734ce82b07089
diff --git a/dev-libs/skalibs/skalibs-2.14.2.0.ebuild b/dev-libs/skalibs/skalibs-2.14.2.0.ebuild
index 64c6328ea9cd..1740c9906c0f 100644
--- a/dev-libs/skalibs/skalibs-2.14.2.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.14.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
 
 HTML_DOCS=( doc/. )
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index a163af4bdf60..d479c00a9500 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,11 +1,5 @@
 AUX xapian-bindings-1.4.22-fix-java-installation.patch 462 BLAKE2B 7a938410063dc240041a498ee48d42663f57deb7bf2bfa83023111d163ccd194d98f79dcc4f158955f671bdfe00b023f456629c274575c5277b21f9528eed22a SHA512 92ca8665c7339becb5e159efbb4de5cd921a47e217dac2252b0854aefab25270c4c08e89424466ae6350fca5feb07e2e7b9170978ffb31a4e6475237300da598
 AUX xapian-bindings-1.4.22-remove-precompiled-python.patch 774 BLAKE2B c6c75b017867f7460b426a3adcfc83f00f2705c0e20c967db2a561dd83bdde95d872d739033c0ee83e0959e9e7eb405b3f8aec852ffb4ab3c755844a81a789d7 SHA512 25712eb39d9297a727284d4d12bfd4affcaa6acb71e345e52229246ef4db5269d30d61f4c990f4d5f9fcdbc9781577afb46d0223edbc9225e5ffb375f09c95b4
-DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
-DIST xapian-bindings-1.4.23.tar.xz 1076480 BLAKE2B 521563f86d3be88458cee220065cbdbf27633f87535b1702c8c3484860533dc9395060c72582420e32b854601c1ee1eb424e03a9251965215de834f2b130b154 SHA512 25ac17baf1f288dedce70b983cba294d4ce100f6f5b607c76f5b697c04f6b08c276a55ccd5b9cc9c429664e1bb86f0fc31d88c72481a9cc951942efdfa9726a2
-DIST xapian-bindings-1.4.24.tar.xz 1112744 BLAKE2B 1910ad8b78c9ae011b51001e90d74eaa2ecc9ff0c44dae34e1a63a3de79e041dd25e6c0aff06e1cf954aecd0a2ab899f7474c25fddc55676dcad6bf8d12eae14 SHA512 e3d178679aaaf99efa1a19f764014f835783e72b057cb8c8a83eb4cb610e93bd4e6756410321770f6d7fa14986c71be19aaa140fb8267a848d4c8c96cc26d540
 DIST xapian-bindings-1.4.25.tar.xz 1076644 BLAKE2B 190c560d341039c68b35421c1a75e791537f9c2c353a5f0871d45055909e2863cd4ede3062a6b641e1572b74db8c049a0266a6c305e7d41bfb5d5c63057ef3e3 SHA512 119f62b53d487319e33aaf0c473e479a52b3831a46b23724188dada13f341e08facc7b79641c00ba7b0507c22b55c7b700182e65b5a195cd322be2098bcca183
-EBUILD xapian-bindings-1.4.22.ebuild 6976 BLAKE2B ea23791aa486a3b066a8da0b3695c0bdd0b66de3272ab3c25205f9fe2ccd8d73c4ecf15b525acf62495c319f1098da6f0744f1be6710c51e649b12984bdeef92 SHA512 1d4ca57739273a4e2e1ae3a3c511c35cd1132d3d44419388213dc1285fd00af822fc52a17901cf792043ec90999d904c5b862d56710c8c127932ecee093b9671
-EBUILD xapian-bindings-1.4.23.ebuild 6998 BLAKE2B f61ba4fc7c25795b6462d0ffcc3295bb8614a078cae3e3d6924055f0552cdaf5c6c9a4f2c7decbbd2ca62c2168bfb1c6fd4a6b4be3ac8371b7452c398597892b SHA512 36950daac189c644d5ec77c6c653b96125c42720744fa692a1e793c15f298db97141aabc1d7eff8a0a6e52fdd00f1e524bb39a12371b29b74959ce1a259ffb74
-EBUILD xapian-bindings-1.4.24.ebuild 6993 BLAKE2B 59cfb88061fe1b91ed3b611d43ffa5c61f1c529f4f9aa63f0218e8f5fdc3146a9d455eb41c2e54f18a8f9c6b8be5a38423bde575543fdfb290c827fdf8fa672e SHA512 6637e2f96890c161f54c0871ac0fd9dcce19f855421b03205967a132954061f15aefba896a1e93ddab7cb246e8a5436a63415b6581c0eb8b31416a17ede529b4
 EBUILD xapian-bindings-1.4.25.ebuild 6987 BLAKE2B e168895160760f3af9bcd6e1e2fab5ec50296a5ea085c5eb79e12f6f18837be2a2a3ba2ac383dd37c9c598e22d128a4d6b3632f92a5979b4bcf4626b3108d3e3 SHA512 e46661d5c282a91b1af0e21e81b89def294c5616be316f5baf54c49adc237a131ddd8c9de7525423cf7dafe027c7e2e349c98cfa6509a3fc07cab6099689e92c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
deleted file mode 100644
index 5398a4350466..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php8-1 php8-2"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby30 ruby31 ruby32"
-RUBY_OPTIONAL="yes"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${P}"	# need this here, some inherited eclasses change it
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )
-"
-
-COMMONDEPEND="
-	>=dev-libs/xapian-1.4.21
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-"
-DEPEND="
-	${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMONDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-precompiled-python.patch
-	"${FILESDIR}"/${P}-fix-java-installation.patch
-)
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eautoreconf
-
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	# Needed to get e.g. test failure details
-	MAKEOPTS+=" VERBOSE=1"
-
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-			--with-php
-		)
-		local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		java-pkg_doso java/.libs/libxapian_jni.so
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		find "${ED}"/usr/share/doc/${PF}/ruby/rdocs/js -name \*.gz -delete || die
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
deleted file mode 100644
index afb64e3d13bd..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php8-1 php8-2"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby30 ruby31 ruby32"
-RUBY_OPTIONAL="yes"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${P}"	# need this here, some inherited eclasses change it
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )
-"
-
-COMMONDEPEND="
-	>=dev-libs/xapian-1.4.23
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-"
-DEPEND="
-	${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMONDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.22-remove-precompiled-python.patch
-	"${FILESDIR}"/${PN}-1.4.22-fix-java-installation.patch
-)
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eautoreconf
-
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	# Needed to get e.g. test failure details
-	MAKEOPTS+=" VERBOSE=1"
-
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-			--with-php
-		)
-		local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		java-pkg_doso java/.libs/libxapian_jni.so
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		find "${ED}"/usr/share/doc/${PF}/ruby/rdocs/js -name \*.gz -delete || die
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild
deleted file mode 100644
index bc39434724f1..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php8-1 php8-2"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby31 ruby32"
-RUBY_OPTIONAL="yes"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${P}" # need this here, some inherited eclasses change it
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )
-"
-
-COMMON_DEPEND="
-	~dev-libs/xapian-${PV}
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.22-remove-precompiled-python.patch
-	"${FILESDIR}"/${PN}-1.4.22-fix-java-installation.patch
-)
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eautoreconf
-
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	# Needed to get e.g. test failure details
-	MAKEOPTS+=" VERBOSE=1"
-
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-			--with-php
-		)
-		local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		java-pkg_doso java/.libs/libxapian_jni.so
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		find "${ED}"/usr/share/doc/${PF}/ruby/rdocs/js -name \*.gz -delete || die
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 6daf3e1e4a13..204880c55259 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,9 +1,3 @@
-DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B f4aec86cd5f63f6f1825a4f8f427ea23be2092ffb4ca11a2fdf20bdf652e7b9f768b1155bcf7ee5e5c5313206c92e1725d1b4d562e3074539a2e8f9901c44f8e SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29
-DIST xapian-core-1.4.23.tar.xz 3024644 BLAKE2B e26a9fd5e79daf553b474e3c794178df2cdcd83ce7d7a45ae112dde624d6e7add157c76fda3a333afce6103b2edaf7e3c928e78c47aa1fd19821c3c73926442f SHA512 52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380
-DIST xapian-core-1.4.24.tar.xz 3194164 BLAKE2B fc3484df448d2102d47005b2819eea8eee3fdb4337a42967e2b535187e4b7be9841a8e12b19291f29bdef52b3270529f94376fe91d5e4c70afebaf690a23b18f SHA512 2b156dd90784264d6bf64e66aca559578f946c013bb52e14e56fcd96e9c2fece71c236735b13d2baad0d7f2d410dea3ae54c94cd80f735baf1071bafe2e5c01c
 DIST xapian-core-1.4.25.tar.xz 3205904 BLAKE2B 7b03a8fabc3c688f58b3451541dedb664de0a02d7c46a4e8eac080c004232575c00428110eaab0ea463df5c3f43f2b4cebfbe6754f897e55f113683c1db43b2b SHA512 e8069f2cb75554978716a99580fb57fc73bbdd607c82394f53d07205d8c78fb59265004be0c676a6806bb2840a3933499dfc867e36a28855278569a0676d469d
-EBUILD xapian-1.4.22.ebuild 1398 BLAKE2B 6e07efec41d17aed2bad9aeb396297a541143eed799dec4fddb0b07f98a2dab9a910ee94f02a3ada2fba4d4d21795477d22132738f6a232333a7dcc9d8c20e6c SHA512 13dca9f8cc0c0e91612540d39042b7928026c4fdeb5bedf624c83dec045d82fcdedeaac18dbc3235f9d2702777cb68923ed86e560f79984cad503620c78a2785
-EBUILD xapian-1.4.23.ebuild 1405 BLAKE2B 09494d14f4d2655ac5c159ec16c5e5bd3b4bb1e044037f434c1205e511108b4159eb22a77b0624a7145dceceab89225f70a73577089f98609c426c252db0e25c SHA512 d39ede4bc59862166324c994c01af32a17731619b85ca4da832c40b1262fb1c971c321702015e9b4b08f16dc4446856bd3e20b1392a3814a2883a1ba0f6c0904
-EBUILD xapian-1.4.24.ebuild 1524 BLAKE2B d76e93f55f218b1ec6328c996d8dd56b2a49a396a18b9fc5fb341836a4bb357bcf696e9df9280d1ff4d8518209a6c4cd22d9390f50b0434c0962b9e1e13218b8 SHA512 ecdc47a3a92d964ab9a17a15d4bc9da46caa0fe61c3d3bef297dfeec2c7c0d244865b228e0c5cdfb4414b23494c675bc02e881873f1a2fb2a802d675e6ff2a64
 EBUILD xapian-1.4.25.ebuild 1553 BLAKE2B 8d0c0220fee94e6c2407237f2c043c9b413e7d1b0e8d82f20f6aeaba5d1fb6890d14d6d2cc45115a42410544c639860494e18eeadb8b76fc3c89c11813c21d89 SHA512 4b5a979658474fdc6a2b4712a65ae0df9d41894ea1161c7638c03ff858308b22aed64b9c5f2a72031cc9e89d465816b0f8c7b81b0c30ebd23ba1e652320d20db
-MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
+MISC metadata.xml 583 BLAKE2B 171ba94d14d632c0654d7a7035c1a2ea8b02e7c2ed43b37cae25d8af91f90341cb4dc3cc7982b270bde8667f085eef568236a53d34add2127bbdaee668af4dcb SHA512 cc7bfffe1db364b1ddb9859ae27a2775ef57498d8668470c0b719579d5d8656f8eb1b5a0288e938f80b88b42489aa7e3dbea282140b5a7143f8ff106efb60274
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index 883360ac2aee..0f6e2a741a7e 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -11,8 +11,4 @@
 		to easily add advanced indexing and search facilities to their own
 		applications.
 	</longdescription>
-	<use>
-		<flag name="inmemory">Enabled inmemory backend db support</flag>
-		<flag name="remote">Enabled remote backend db support</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/xapian/xapian-1.4.22.ebuild b/dev-libs/xapian/xapian-1.4.22.ebuild
deleted file mode 100644
index bd255b5fb495..000000000000
--- a/dev-libs/xapian/xapian-1.4.22.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS HACKING PLATFORMS README NEWS"
-
-src_configure() {
-	local -a myconf
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=( --enable-sse=sse2 )
-	else
-		if use cpu_flags_x86_sse; then
-			myconf+=( --enable-sse=sse )
-		else
-			myconf+=( --disable-sse )
-		fi
-	fi
-
-	myconf+=( $(use_enable static-libs static) )
-
-	use inmemory || myconf+=( --disable-backend-inmemory )
-	use remote || myconf+=( --disable-backend-remote )
-
-	myconf+=(
-		--enable-backend-glass
-		--enable-backend-chert
-		--program-suffix=
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake check VALGRIND=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.23.ebuild b/dev-libs/xapian/xapian-1.4.23.ebuild
deleted file mode 100644
index 40a621af6000..000000000000
--- a/dev-libs/xapian/xapian-1.4.23.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS HACKING PLATFORMS README NEWS"
-
-src_configure() {
-	local -a myconf
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=( --enable-sse=sse2 )
-	else
-		if use cpu_flags_x86_sse; then
-			myconf+=( --enable-sse=sse )
-		else
-			myconf+=( --disable-sse )
-		fi
-	fi
-
-	myconf+=( $(use_enable static-libs static) )
-
-	use inmemory || myconf+=( --disable-backend-inmemory )
-	use remote || myconf+=( --disable-backend-remote )
-
-	myconf+=(
-		--enable-backend-glass
-		--enable-backend-chert
-		--program-suffix=
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake check VALGRIND=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.24.ebuild b/dev-libs/xapian/xapian-1.4.24.ebuild
deleted file mode 100644
index dc4d3f009870..000000000000
--- a/dev-libs/xapian/xapian-1.4.24.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
-
-inherit toolchain-funcs
-
-MY_P="${PN}-core-${PV}"
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug static-libs"
-
-DEPEND="
-	sys-libs/zlib:=
-	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux ) )
-	elibc_SunOS? ( sys-libs/libuuid )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HACKING PLATFORMS README NEWS )
-
-src_configure() {
-	tc-export_build_env BUILD_CC
-	local -x CC_FOR_BUILD="${BUILD_CC}"
-
-	# skip certain autoconf checks
-	local -x VALGRIND=
-	local -x EATMYDATA=
-
-	local -a myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--disable-werror
-		--enable-backend-chert
-		--enable-backend-glass
-		--enable-backend-inmemory
-		--enable-backend-remote
-		--program-suffix=
-		$(use_enable debug assertions)
-		$(use_enable debug log)
-		$(use_enable static-libs static)
-	)
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=( --enable-sse=sse2 )
-	elif use cpu_flags_x86_sse; then
-		myconf+=( --enable-sse=sse )
-	else
-		myconf+=( --disable-sse )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/zug/Manifest b/dev-libs/zug/Manifest
index 1d1243df86eb..1aa07bf02656 100644
--- a/dev-libs/zug/Manifest
+++ b/dev-libs/zug/Manifest
@@ -1,3 +1,4 @@
 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.ebuild 732 BLAKE2B 0a68960a1c573c5dea2edaaf3728a1e41c4b59a71fdab843b5c024231c7b2050fed4431c538b38e92534813cb95a0902e968e9b5f0951215614bac6da40217f0 SHA512 960605a77a1ee13248d2a69b152a4cabb6da23c0599416ee5e1b093cf69dbc8a1da891448587a50060054d5110a38c7638745ff0b6a9764b7144570ccbe3283d
 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
new file mode 100644
index 000000000000..6cccaf41364f
--- /dev/null
+++ b/dev-libs/zug/zug-0.1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Transducers for C++"
+HOMEPAGE="https://sinusoid.es/zug/"
+SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/boost:="
+
+BDEPEND="
+	test? ( <dev-cpp/catch-3:0 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE=no
+		-DDISABLE_WERROR=yes
+		-Dzug_BUILD_DOCS=no # Recheck if documentation is in a better state when bumping
+		-Dzug_BUILD_EXAMPLES=no
+		-Dzug_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		cmake_build tests
+	fi
+
+}
-- 
cgit v1.2.3