13 files changed, 89 insertions, 398 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5bbcba2a9cde..e2192d6d580b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b6059a3883e5..833215c52a69 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,17 +1,5 @@
-AUX po4a-0.69-invalid-byte.patch 1028 BLAKE2B 642c530713177bd152e356e1612a99b33c5121125c3dc31ed56cf31c32218ce986f904dc0dfcbd5add6e202acd45721a3fd9bbf68b434518d84fd931e63de8ec SHA512 ce494690ef79b168ed77f25d19acb6debf53f3c3a1e50ff3d520025465febbe520730f60b50c7b040eca8a12b9331d74d7c4e19f0fea35641a719311dfa1954b
-AUX po4a-0.69-man.patch 626 BLAKE2B 4cd81301b8544a971c8a3b387b23098cf21235474dd6eb4f8eb320d49d3b69610c8b4127b7cd5d40e11fac5ca43974fccec000d449dc180d01c292d3e44fb8b2 SHA512 27e2b85f6e95ae4a93b2f764600252a10c0a3ad72cf531ae4e1e3ae651e76a9b8eb12754c7139d22c14881bde45143f5fe7464bedabdbb637c9bcbcb659a8eda
-AUX po4a-0.69-perl5.40.patch 981 BLAKE2B b5a64f1d1e674e81583a6f6ed401c231e65fcd52c50070af6fe5ad5044fd938b28048c4f9d703176a18ce3421665cba0ed637112fa2573d85ed6699a7ea1b078 SHA512 24098fef05f928a4e757ab0e51d95f7a624ab8104134ad3fb874eaa23abf7f8697e65e1016844a41eee1be9cc474cc5fd465b69ec194be196f21a8cae57a6df5
-AUX po4a-0.69-xmlcatalog.patch 1684 BLAKE2B 402fc78d7cebc51631ef2b7d21e850ef50c5c796caa2b8d9a7dedee288b4cb731bde1e5bda9b3827627d9801544fcd3be8b4aa378428a11eb2a12be0083a3ccd SHA512 3ae84fe13dc7c96799febdfe866e485d0874f6d978c812166db021e3d7a34ddea77bf180133dd00ecb22c4d46ed241f65c75c25f7c9367dd93cb90598f81321d
 AUX po4a-man.patch 591 BLAKE2B 3b71c7f56c51f8e2f2d188654c7c670b9fa33cc0b8013a18a4bc462bbdeaa7ee1103a73e0cb0fd7c4c73a1d0be161cfca829dd38daca12d535d2f84197904525 SHA512 0357b455be34ca96d98cf28db3f01a7ef9921cf0782b6757fb6ad6a0f16ab15fa9b791f3f3d80c1008612eb4dcb3aa62e17ff61239beb15cb0d7d36a2b3a305d
 AUX po4a-perl5.40.patch 909 BLAKE2B 4af51487b6aef41d4d98acc981eb2190b52e44cb349b80192263f53e6792c16c203c5a0e5d29297ab8e9fc09b8d1d733ad3f9a02b0c2caad4b28f6aafffc13ef SHA512 d761d5e55b6ba43bb983a3890e0f94be300bfc49909f09410120c1e16e65c53748902afee97b0881c36c154fc2ead3e32d176405d502ef0d214e29b4d88aa1fc
-DIST po4a-0.69.tar.gz 4665710 BLAKE2B 2fc1b6cd53f1b282f20cd4932de7f5d6d9882de9f50181f0de89995c9d9b79b5fd2bc53d3757c56c519478e67ac636deb5a011cc8810a002b6bb6dabdb44442b SHA512 9cb5eec547ab18d1c3ebdda212b909fc4f5489a74641ba2d7e0a3a1d060f245d23667c16e687c678c5ccc3809c9315d20673266dcc3764172a899caa397238e3
-DIST po4a-0.71.tar.gz 4860322 BLAKE2B 8a5d1f8dd17b435bf1ada91b4c49862eed97775c574d2972d749f6126eb5f654cc4f8a1def3d4b9ddf50f86c8d02e4f328cbb0406eb91e5224e9373c2063441e SHA512 67ba925433d95ebd6675ce2e58b2664a07a00016ca4b5029845e485dfad1804737a00935e2da162e2488e4c21b947e7fa32b40ac3d9b28d4729d8f93c3f2040b
-DIST po4a-0.72.tar.gz 4888348 BLAKE2B f97b14a3c686bdb0cab0088375dd6d190582df57bd36cb4c44b436fd1618d88cbe7551484d453596669e16920ceac459efc085fd50a2b25cc6c9dd5f62213f9e SHA512 f47f7cf2718ff0690c82202e1a5eff3dedd0b35c4f139658c600c307c8f073689fa50ec4ad4b948881863631be6f8d1944b56b13ba2b63ec5323368724286859
 DIST po4a-0.73.tar.gz 5117198 BLAKE2B 3072c3a55751610e565b71a754d79b20529d8d6f1cfd2e1c691b6de77c3a13b8a5f1c3306be4574627a0078b27f32fe38864faca5c6c03da6a92049387476f72 SHA512 5860af1da2a0ab1875a994b09ae2da481c12a6777655610e8c8ded4a6132048a33aeea10eaa756a73af1a7bf1e3e65f7ab5ded9d799904ae3240c6ec3b0a31d2
-EBUILD po4a-0.69-r1.ebuild 1441 BLAKE2B d90da4214906984bf5d4280338dc309c5138319548ddf076648f283fefda09aac7ff4ae241b3abaa016935350d75c5bf0f46d27a681a28956a462601ae98967d SHA512 cc766a1b6c2206723aa4c29a6148b7e5707710551aa2a8f7cc205b84bd7bad0ff449518a70f08462c9935bba9d9df82ac163b3be2e9fb745d6f3930c6f3aaf1f
-EBUILD po4a-0.69-r2.ebuild 1688 BLAKE2B fde1d06a42816aa1a7ee5997cd6d0d2d568d4f452755cf324b6e4e35846fde3a732f9e11678b9e910d62f23c16bbfd363a2942504630fc547d6b0316deaf180a SHA512 951178f09efbd69be53db2aac39033025aa04ed70ce90071d3f04cd3f8f96bd55f0ede2f1bb7b7330bfe4195057c9e34ece36423c8cfbd8ebd19ac0f60a79595
-EBUILD po4a-0.71-r1.ebuild 1459 BLAKE2B 511befec495e36dce93efce1a423c25a4f24ed6d027da097ce2e29a4d98181c655edd00d7f7b73539aaa33cc17f75db3ea5831b4384b3ed3dd6064e12bb7118d SHA512 a3e65c0c020a09d17df218fdf6bd003d02f489bf9679aaad2e6b52c3cbde38c514b755c06f91247214acf90ce353cb63277d3b80aeadde73c3158477d22fdc8c
-EBUILD po4a-0.72-r1.ebuild 1459 BLAKE2B 511befec495e36dce93efce1a423c25a4f24ed6d027da097ce2e29a4d98181c655edd00d7f7b73539aaa33cc17f75db3ea5831b4384b3ed3dd6064e12bb7118d SHA512 a3e65c0c020a09d17df218fdf6bd003d02f489bf9679aaad2e6b52c3cbde38c514b755c06f91247214acf90ce353cb63277d3b80aeadde73c3158477d22fdc8c
 EBUILD po4a-0.73-r1.ebuild 1454 BLAKE2B c6e775243e7844e682bdcb1811239a1344788723750c75856da2066229323a81388553f71e6622b7777d6dc30029a92c73be563dba74996eeab4374807b94d50 SHA512 4d7fac4dc106c3d77bcb37530c17edf486f4083b50bc35ba696874e55966ca05cc9b0ed9b774549a8b5f08af5e215308dc3824ede3f381508963e207e51c804e
-EBUILD po4a-0.73.ebuild 1403 BLAKE2B b8556188f5130615b4b78fbf8bd56f90ac55357ddab05b94b803a5931cdfe8f0191edab0b2b38f7229b1e36769d13a80ea504a274aabd3eac645cb7099e13bfd SHA512 c4868df730af88e5c3525efca78b905f65499cd591851d4cc871f034a708031cac4ced74e06fe6d6bf23dbf163fb72e110cd5fe716c9e59a2b4c91e92df8b156
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/files/po4a-0.69-invalid-byte.patch b/app-text/po4a/files/po4a-0.69-invalid-byte.patch
deleted file mode 100644
index f1f230a95b48..000000000000
--- a/app-text/po4a/files/po4a-0.69-invalid-byte.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/938967
-https://github.com/mquinson/po4a/commit/7cf7b79ee28de7e58378b225570d49fd114ff75e.patch
-
-From 7cf7b79ee28de7e58378b225570d49fd114ff75e Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Mon, 3 Jul 2023 14:56:04 +0200
-Subject: [PATCH] SGML: replace invalid byte (0xa0) in comment with space
- (0x20)
-
-Fixes #428
----
- lib/Locale/Po4a/Sgml.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
-index 39dd66f2..d02f269d 100644
---- a/lib/Locale/Po4a/Sgml.pm
-+++ b/lib/Locale/Po4a/Sgml.pm
-@@ -773,7 +773,7 @@ sub parse_file {
-             while ( $origfile =~ /^(.*?)&$key(;.*$|[^-_:.A-Za-z0-9].*$|$)/s ) {
- 
-                 # Since we will include a new file, we
--                #�must do a new round of substitutions.
-+                # must do a new round of substitutions.
-                 $dosubstitution = 1;
-                 my ( $begin, $end ) = ( $1, $2 );
-                 $end = "" unless ( defined $end );
diff --git a/app-text/po4a/files/po4a-0.69-man.patch b/app-text/po4a/files/po4a-0.69-man.patch
deleted file mode 100644
index 02cedf7f1ade..000000000000
--- a/app-text/po4a/files/po4a-0.69-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -234,7 +234,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
--        system("gzip -9 -n -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -253,7 +252,6 @@
-             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-             }
--                system ("gzip -9 -n -f $outdir/$outfile.$section") and die;
-             }
-             unlink "$file" || die;
-         }
diff --git a/app-text/po4a/files/po4a-0.69-perl5.40.patch b/app-text/po4a/files/po4a-0.69-perl5.40.patch
deleted file mode 100644
index 8c7d7d8573e8..000000000000
--- a/app-text/po4a/files/po4a-0.69-perl5.40.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/938967
-https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306 (backport)
-
-From 45c835a04a388940c627f0c6b8c26554c0ee2b14 Mon Sep 17 00:00:00 2001
-From: Martin Quinson <martin.quinson@ens-rennes.fr>
-Date: Fri, 12 Jul 2024 10:21:34 +0200
-Subject: [PATCH] Fix failures with DynaLoader on Perl 5.40
-
-Thanks to dstoecker for the patch provided in the OpenSuse package,
-and to ana for pointing me to it.
-
-Fixes https://github.com/mquinson/po4a/issues/508
-
-(cherry picked from commit 28fe52651eb8096d97d6bd3a97b3168522ba5306)
----
- lib/Locale/Po4a/TransTractor.pm | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Locale/Po4a/TransTractor.pm b/lib/Locale/Po4a/TransTractor.pm
-index b83dd25b..68296cb1 100644
---- a/lib/Locale/Po4a/TransTractor.pm
-+++ b/lib/Locale/Po4a/TransTractor.pm
-@@ -5,6 +5,8 @@ require Exporter;
- package Locale::Po4a::TransTractor;
- use DynaLoader;
- 
-+sub import { }
-+
- use 5.006;
- use strict;
- use warnings;
diff --git a/app-text/po4a/files/po4a-0.69-xmlcatalog.patch b/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
deleted file mode 100644
index 2d05a5b2ac75..000000000000
--- a/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Po4aBuilder.pm	2024-09-14 15:48:58.642546000 +0800
-+++ b/Po4aBuilder.pm	2024-09-14 15:50:38.415546000 +0800
-@@ -242,15 +242,17 @@ sub ACTION_man {
-         foreach $file (qw(po4a-display-man.xml po4a-display-pod.xml)) {
-             copy ( File::Spec->catdir("share", "doc", $file), $man1path) or die;
-         }
-+	my $docbook_xsl_url   = "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";
-+	my $local_docbook_xsl = `xmlcatalog --noout "" "$docbook_xsl_url"` =~ m,file://(.+\.xsl), && $1;
-         foreach $file (@{$self->rscan_dir($manpath, qr{\.xml$})}) {
-             if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
-                 my ($outdir, $section, $outfile) = ($1, $2, $3);
--            if (-e "/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl") { # Location on Debian at least
-+            if ($local_docbook_xsl) {
-             print "Convert $outdir/$outfile.$section (local docbook.xsl file). ";
--            system("xsltproc -o $outdir/$outfile.$section --nonet /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl $file") and die;
-+            system("xsltproc -o $outdir/$outfile.$section --nonet $local_docbook_xsl $file") and die;
-             } else { # Not found locally, use the XSL file online
-             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
--            system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-+            system("xsltproc -o $outdir/$outfile.$section --nonet $docbook_xsl_url $file") and die;
-             }
-             }
-             unlink "$file" || die;
diff --git a/app-text/po4a/po4a-0.69-r1.ebuild b/app-text/po4a/po4a-0.69-r1.ebuild
deleted file mode 100644
index cf6b84cfb464..000000000000
--- a/app-text/po4a/po4a-0.69-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-man.patch
-	"${FILESDIR}"/${P}-xmlcatalog.patch
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.69-r2.ebuild b/app-text/po4a/po4a-0.69-r2.ebuild
deleted file mode 100644
index 836210177e04..000000000000
--- a/app-text/po4a/po4a-0.69-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-man.patch
-	"${FILESDIR}"/${P}-xmlcatalog.patch
-	"${FILESDIR}"/${P}-perl5.40.patch # bug #938967
-	# The perl5.40 patch triggers:
-	# XX Update po/bin/po4a.pot
-	# xgettext: Comment at or before ../../lib/Locale/Po4a/Sgml.pm:776 is not UTF-8 encoded.
-	"${FILESDIR}"/${P}-invalid-byte.patch
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.71-r1.ebuild b/app-text/po4a/po4a-0.71-r1.ebuild
deleted file mode 100644
index 0d85bd31b9c0..000000000000
--- a/app-text/po4a/po4a-0.71-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-man.patch
-	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.72-r1.ebuild b/app-text/po4a/po4a-0.72-r1.ebuild
deleted file mode 100644
index 0d85bd31b9c0..000000000000
--- a/app-text/po4a/po4a-0.72-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-man.patch
-	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.73.ebuild b/app-text/po4a/po4a-0.73.ebuild
deleted file mode 100644
index 4e9d3b56a0b7..000000000000
--- a/app-text/po4a/po4a-0.73.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 94bcd1eaca16..6a4e087c46f3 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,6 @@
 DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a61c8726a5dd3e169ca8902348e2fee9f890ab7496b5ad018d49d6cecd65cb3d3d4a9b4a6bda019ac52c324fa92fad3e7b5dbc680 SHA512 10199c037a57f4b9ed913a8c726a58e376dcd34300a98cdd4cf934fd3a2f9a26d2f92bd85131af7ee1084824d7b082f7becdec9b0731a62f9cde712bfada5a09
 DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
+DIST sigil-2.4.0.tar.gz 19135045 BLAKE2B 311fe0894818c08fc5ecee8b29b04e24aa8f13d4f28b1011f455fcf7944561e68832ddd36885f69f794333bb790b7b84c49bc6d3d2367772150e936708916d0c SHA512 1c5687f31494ea5f1c8e3ac5fe3c3892ee68a0645795c57f10802d4e579c95a4ef5e3cb0fedc598f647282b3fe7b56e1a3efd547e08a44fea4619ae5b9581c20
 EBUILD sigil-2.3.1.ebuild 2239 BLAKE2B b65ea5a5e057f828cb5f8a092de01b2d05d70112c51f3279254ecf8066169c02ac7719ff5cc90465a62a90e07407bc161499622284da8939ec3ddf44094597dc SHA512 ceec367745e5ff537ded0bbc84bdc44b91bcc27d451ebe751dd91e5b547e58ed7835d965584e1fd6eebedf2dcd9c8d8a8267807fb37bfc911c30804609963f5f
+EBUILD sigil-2.4.0.ebuild 2258 BLAKE2B 85f7058dc2c33a9277c4704f1653c24dd649ff78b672025cb1d84e79e53aa0abf0825269b490104a8e670da90732a793ea56ced344b3df08fa0489b302961d5b SHA512 5bfd21c58859fb93c8c09e72e093cd8d34b506ffbd8b9142649f351f6f9a97e4b182c21c43ad1b667afe94caac15d93265fbb7eed0007ac331bbfe053d6b84ee
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-2.4.0.ebuild b/app-text/sigil/sigil-2.4.0.ebuild
new file mode 100644
index 000000000000..c071247e701b
--- /dev/null
+++ b/app-text/sigil/sigil-2.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit xdg cmake python-single-r1
+
+DOC_VERSION="2024.08.15"
+DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
+S=${WORKDIR}/${P^}
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +plugins +system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/libpcre2:=[pcre16]
+	dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
+	dev-qt/qtwebengine:6[widgets]
+	dev-qt/qtsvg:6
+	sys-libs/zlib[minizip]
+	$(python_gen_cond_dep '
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	plugins? (
+		$(python_gen_cond_dep '
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/cssselect[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-python/regex[${PYTHON_USEDEP}]
+			dev-python/pyqt6[${PYTHON_USEDEP}]
+			dev-python/pyqt6-webengine[${PYTHON_USEDEP}]
+		')
+		$(python_gen_impl_dep 'tk')
+	)
+	system-mathjax? ( >=dev-libs/mathjax-3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-qt/qttools:6[linguist]
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DTRY_NEWER_FINDPYTHON3=1
+		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+		-DPython3_LIBRARY="$(python_get_library_path)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DUSE_VIRT_PY=0
+		-DINSTALL_BUNDLED_DICTS=0
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DUSE_SYSTEM_LIBS=1
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+
+	if use doc; then
+		dodoc "${DISTDIR}/${DOC_FILE}"
+		docompress -x /usr/share/doc/${PF}/${DOC_FILE}
+	fi
+}