9 files changed, 45 insertions, 235 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fced56025d69..f665246afee3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 73ae55dc577c..7d371c2c75bb 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,8 +1,3 @@
-AUX pastebinit-1.5.1-distro.patch 379 BLAKE2B c843acae6267fe2408945cabc0951f9d8cf01cbec1e472658369782a7ded31670eda5a4778df0d89597b5579cf647e47140842cc35b6c3f16eb704d3fb3eefd1 SHA512 bf75d156035e2e08752d7ecd371f5a92b4eb88ea834b4c7a23a533b6c650069d68d0069220e1f0eb04adf8e399c7cf2cf49c93047b42b6fd9d0d2e529dd1dda1
-DIST pastebinit-1.6.2.tar.gz 53444 BLAKE2B 1e8853f0f37ac98eb1537dcc01f7c2ee33a3cf72fb5b10fc18b3f6b1662f3e15acf29c1674c2a34e234c6636ac70f59b265862a48c0860d1ff3725eabe11d7c4 SHA512 a04863bc748340bd8bc9d6170dedb2b234b53996cbaf5d1fdd0a078d0d6f03c4c558d2a5029359eb95d25c1339af25d74dbf247af1de0ae278a7664869e8841d
 DIST pastebinit-1.7.0.tar.gz 54026 BLAKE2B 11d049333cd08866765ccd22292d1c13e13248ace2e713b69a30a0100d65ff16554368e0c875752d07050de2728ff5ad327f0f8fdbbaa6b53bd7fa98a7286cde SHA512 01f65eb91803926bc401d01781d29ff5e409e1caf0aa593744a6e137571db6308893ce327b954131d55b2a5f764d4598fcfbfbab40cdc74a3fdb776566ab4488
-DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
-EBUILD pastebinit-1.5.1-r1.ebuild 1507 BLAKE2B 273d73391a9f5be527c323a539bdc3f07c222fc9bc266be82bbe4ff695c5ef9657b41cef810c9132bdcf82f6c456d5056cc76d2bbb9bf8a5c3ac84cfaa543062 SHA512 f1f769347d704bff655f0ed4285f4a439a242f8d70f0a25e14dba2cac06acb30ca2d38aa7e9199b64cabf5cffb44791db988ef7a9c7845e45741135585def50e
-EBUILD pastebinit-1.6.2.ebuild 1319 BLAKE2B 21138fd01ea65555664714f9c5c5309152ee919effbcc1ba2325bc7d0fd31e0f002aa16ac1041cf46f1348f277cc31cddefba69580fc684e7e6204e08a0aa992 SHA512 f86603a6233c3e2e734626a1550fe7c16c03fad3fe2f6fccb9e092070f5fc6ef288c1f4dc0c88ed7a49a08e99589d6457eb784cf0a052c93c20702d9b8b40449
 EBUILD pastebinit-1.7.0.ebuild 1316 BLAKE2B fb745c01ffbf331e262cc900496af54a3dd5d38b027bb9e83ca7bf3973bc37f5198137d8b9c93f9b6a46259f306511a30a58ce34ba12528bafc904db13846cf8 SHA512 ba3c7047f7d4b764aeb9553561fdd25b84e6f182224c8b5fc805df9fb548c8a1fa0150a87f98315cb27e9c76cd587eded3f508fc05ec45130a36964800bb6d3d
 MISC metadata.xml 329 BLAKE2B 231c5095d0163f6e8d88a96db132c8d8fe6e51b8c6e4ab02103c16c777096676d7b3b2a0b304840dd7b3ebcd5498d8ea94395be1075ae70ae3e7783623a7f855 SHA512 3130c3eb7d1c11976d3f3704ea7e520d9e82c676bce2e6207482a1660c9da5b0c55cdc7df1a7b744106c3b925760df168c0b02d5475a3c406e231d058ef4079c
diff --git a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
deleted file mode 100644
index ee7245c03faa..000000000000
--- a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix DeprecationWarning
---- a/pastebinit
-+++ b/pastebinit
-@@ -32,8 +32,7 @@
- # Now try to override it with a distributor pastebin
- try:
-     import distro
--    release = distro.linux_distribution(
--              full_distribution_name=False)[0].lower()
-+    release = distro.id()
-     if release == 'debian':
-         defaultPB = "paste.debian.net"
-     elif release == 'fedora':
diff --git a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
deleted file mode 100644
index bf613cf69206..000000000000
--- a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit optfeature python-single-r1
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="man"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	sys-devel/gettext
-	man? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-distro.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"/${PN}
-}
-
-src_compile() {
-	emake -C po
-
-	if use man; then
-		ebegin "Generating a manpage with xsltproc"
-		xsltproc --nonet \
-			"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-			pastebinit.xml
-		eend $?
-	fi
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	dosym pbput /usr/bin/pbget
-	dosym pbput /usr/bin/pbputs
-
-	einstalldocs
-	doman utils/*.1
-	use man && doman pastebinit.1
-
-	insinto /usr/share/locale
-	doins -r po/mo/*
-
-	insinto /usr/share
-	doins -r pastebin.d
-}
-
-pkg_postinst() {
-	optfeature "identification of your distribution" dev-python/distro
-	optfeature "pbput and pbputs scripts" app-arch/xz-utils
-	optfeature "pbget and pbputs scripts" app-crypt/gnupg
-}
diff --git a/app-text/pastebinit/pastebinit-1.6.2.ebuild b/app-text/pastebinit/pastebinit-1.6.2.ebuild
deleted file mode 100644
index 9ea08d834305..000000000000
--- a/app-text/pastebinit/pastebinit-1.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-inherit optfeature python-single-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://github.com/pastebinit/pastebinit"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="man"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="
-	sys-devel/gettext
-	man? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"/${PN}
-}
-
-src_compile() {
-	emake -C po
-
-	if use man; then
-		ebegin "Generating a manpage with xsltproc"
-		xsltproc --nonet \
-			"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-			pastebinit.xml
-		eend $? || die
-	fi
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	dosym pbput /usr/bin/pbget
-	dosym pbput /usr/bin/pbputs
-
-	einstalldocs
-	doman utils/*.1
-	use man && doman pastebinit.1
-
-	insinto /usr/share/locale
-	doins -r po/mo/*
-
-	insinto /usr/share
-	doins -r pastebin.d
-}
-
-pkg_postinst() {
-	optfeature "pbput and pbputs scripts" app-arch/xz-utils
-	optfeature "pbget and pbputs scripts" app-crypt/gnupg
-}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index ffe37e34ba9b..2b38aa8a4cd5 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,9 +1,7 @@
 AUX pelican-4.8.0-sphinx-6.patch 636 BLAKE2B 7b18a9025d6443759737b7fb1b2ac0671fbd5bec8b94bc197dcb2015d927c2eb1f82ef8a71997b611eb7c1950ab0092c34e8dc3ca81a8d4b2f60058b29df7efc SHA512 e5a9a93e0eee19ced45fa2f48b1a6561cfccbded2902161fc1542a12fd5f406dcf59014cafeb55f919eef2c98100b2fdb803d097ca9a410a17b83d42eeb646fa
 AUX pelican-4.9.1-no-locales-for-tests.patch 533 BLAKE2B 7baa4e50e616ab580808551676635563c2d195189797d09fad82b2db7158893029125dead319b7a49f672ea411ad8c9e0495949e28709d1a31dfd3b554e55008 SHA512 4f3c16b9fbfb1982f1bea78e3428b5c9d4c3834dfc5c274d0206d63903fe2eb26b1f483ddbf6f0591cdb0c15842003ac62ed6fd9373d81bae3a07d5f971d89e5
 DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
-DIST pelican-4.9.0.gh.tar.gz 1374399 BLAKE2B 2fa91ff9b5ddacac1fd64d9325ccb1fadb9bbfaa9c6098920a43a576f3d8d7be31a98b5250b2ea10bee63993d8b9bb72fdebdf9d57d0518d1f4bddef705e2804 SHA512 a50d0fbad816fa4a73eb94d0aa15cf5f9321ed2bdb50addbebbf0024f2fc7fd73ab94b314b5821068d552dcd1b11a54ca6511117aac732340156f2361a7e832c
 DIST pelican-4.9.1.gh.tar.gz 1374443 BLAKE2B d9dfa234b0f19cd02ccc8867e5b4f6e0444300692d69001baf23943230f27f8a7bc91e98e5c4c3cd194abadf8fb140c0e1a0c3beb39e5d288113ecc4e487c6a6 SHA512 70b7efd7a38dc2069b1eb9141647fa80bf959de36936ad7b4d38407be7e029fc788ef9b9f297d99e5dc6cad67d58fe6ff97f9b542db7e0a9c23e2907d4604e21
 EBUILD pelican-4.8.0.ebuild 2078 BLAKE2B 18476bebe9f5a437b871fb030c31484a276e0dd0e083ec2cb7566a9810977e15a1ecbd22ba02d23b5613aecf588f9efb746ba69beb7a6167719137721995afdf SHA512 f07d2b67daf06fc4ef78987244f4e95e84041105fb0248c26e65ebc218974ba1af18311324484dfc31b8f664c239af06cf7bc49f718a63190b0b527dbbe2dbab
-EBUILD pelican-4.9.0.ebuild 2150 BLAKE2B 8c17aa61ed65f9d5f1525461d9966d7afc6d34e53cfc76575f76f423407d9d48a39b8a434fa3e855c572c4409721832d60499b57c50c0a0e134fbf23d92b0b62 SHA512 5c1f6bc09e7cb1e6977b2e49a165384b4ecbb9e01fc4a7d0b5dbf752f1b59f199ae780c9d1d3cd420d11a1bc8176462e9d7d897005a8be743b02b6f0283a2817
 EBUILD pelican-4.9.1.ebuild 2411 BLAKE2B fc6998bfe9714062576219471190b6518bf96dfe3d0d36d1f5f7eb9727484701bed86ffb30bff63caf19693ad7e5c62b12d76109f5bea0618032d5c78447fce6 SHA512 eb625cffcc5c8dd76651d9ff46db1ad01b0c708527adb62c559c4dce78b3ebfca1d0988cc16630d78ee08030fe2275f3735c89166651bfbecbf00e334d10cd6e
 MISC metadata.xml 463 BLAKE2B 2f062e4ee585182b37fdd094c75fe58aa600c57a416c955da7abef66e0c42eb1cd1d1d2b38c3cb322a6e0f044ffabf3915aedd16dee147f6a94fb92205f0d196 SHA512 5bc95a863d0741b536c3b9d3c2f7f9181ec5a26be18f15a1df4f691c8cafa0498d6ed57db37563ea972f8ea025f92c8f92729d97967b044f885989b996646d12
diff --git a/app-text/pelican/pelican-4.9.0.ebuild b/app-text/pelican/pelican-4.9.0.ebuild
deleted file mode 100644
index a8ec456458a6..000000000000
--- a/app-text/pelican/pelican-4.9.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="
-	https://getpelican.com/
-	https://pypi.org/project/pelican/
-"
-SRC_URI="
-	https://github.com/getpelican/pelican/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc examples markdown"
-
-RDEPEND="
-	>=dev-python/docutils-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.6.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		>=dev-python/markdown-3.1[${PYTHON_USEDEP}]
-		dev-python/typogrify[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-EPYTEST_DESELECT=(
-	# Needs investigation, we weren't running tests at all before
-	pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
-	pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
-	pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
-)
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}
-		docompress -x /usr/share/doc/${PF}/samples
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
-}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 09df9591492c..6215da402cbb 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,3 +1,5 @@
 DIST xapian-omega-1.4.25.tar.xz 578904 BLAKE2B d0bb62741f7c58d1398a4dc8bca3de2b385094fb8126a4e36f424cb09964ac350709bf6dabc38d8d7ebf5f3fcd213d2a444d8e5e5cc52c6353f1c72fc7eebd72 SHA512 2b0d855baaaabbf6da1b86d61f0d3e85d5fb62d1b7d04738a7e15758d0042b9e22f80f0aa273b9a9a21b04dff579c561280e44f2a69a0c0d4f270cb0fbcef169
+DIST xapian-omega-1.4.26.tar.xz 583808 BLAKE2B b5a2779ed5fb4f729e8aa3bd309f09d9867ba8d646121f4f577a5208e1fae605f18c7ecfbcba2fdb8a7ddd54de7f0eb8b8299f0f7d26b272ccdf417fbbf5b2a6 SHA512 576eb82fa972bd0db46c8422695930235ab75677104ec32765421b0e1e813d0c40d3bdace3d88cc66fd28680fbcb75a3adcd808617ae4d7d48e35e0556f908c3
 EBUILD xapian-omega-1.4.25.ebuild 1150 BLAKE2B 8611c77e5bcac4900724d336e6bb24c1930d6ff686a819bd05c43cdebc57730876aee8223e066c099bbd24e29fac5f9b4d39658136455ccda73547fedadc0a89 SHA512 cc0039e772c31f9585001b63c850b31be6a7ad842715f5de0377edb9cc017466e6cc5b0ff76c844c9c13b05f9da0f4c62586b34d172667d69b06ef136a26e33e
+EBUILD xapian-omega-1.4.26.ebuild 1156 BLAKE2B e7e50e70595fb909533d815ca95f86b0478625180d54a8f22689ded1e4ce72d00a03ac3d4415898bc109af25f0e811a87ccca8959cbe7294697b25b1f5a31513 SHA512 ab76f9abc419791bb6c537a6128c189f873832795cbb64b822649144d0d1b951defcee16042d2e7b471d1e19b5214005b3bbe27ab185c96ce8afed72901c2cfe
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/xapian-omega/xapian-omega-1.4.26.ebuild b/app-text/xapian-omega/xapian-omega-1.4.26.ebuild
new file mode 100644
index 000000000000..1e0983f89c26
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.26.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libpcre2:=
+	~dev-libs/xapian-${PV}:0/30
+	sys-apps/file
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}