9 files changed, 221 insertions, 4 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d8bc43f3e0d5..c7fe680dd1b7 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 191485627fdd..c0364efb637d 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,12 +1,17 @@
+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.71.ebuild 1408 BLAKE2B 34440eb84bd7e3d9623ee7fd379e4baf33100d4302dfd32e1278e78c3ca28dc18e31f97c56bc37e6c0df0141b76984e68c693b1392b2add822bb333b4cd1bf5c SHA512 bf334dbb24048941866fe80eabf1bb06fed718a13872eb6783e5900c22a520b50a6e5634502c1c8eca6ebe3876e316a9cd9f0f22ff63ba407cfd73d3b3789e52
-EBUILD po4a-0.72.ebuild 1408 BLAKE2B 34440eb84bd7e3d9623ee7fd379e4baf33100d4302dfd32e1278e78c3ca28dc18e31f97c56bc37e6c0df0141b76984e68c693b1392b2add822bb333b4cd1bf5c SHA512 bf334dbb24048941866fe80eabf1bb06fed718a13872eb6783e5900c22a520b50a6e5634502c1c8eca6ebe3876e316a9cd9f0f22ff63ba407cfd73d3b3789e52
+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 1462 BLAKE2B 49ec645c16063329e3b1cda560f71111ece6eb0ef32261e39311fc2fd254105ee392781c8b360bbbf327aefdec619f60ccc9be3b8de78555520f690fc76c9783 SHA512 66b32214e9679b3c062518bee47c46c09e136fb8f6a4dafa2098c73ebe8a36a25f92196c3c3152d0c9f02d686a13a83b12f7a02c876281d22d6425795ee137e0
 EBUILD po4a-0.73.ebuild 1409 BLAKE2B 45cf1a31a7cbeb86da5d06bb78c671d7cc0ee33b7963b6cb4c17992d84f2f6795fa89fe7a329acbbb43ad3b702c8c6c20f0185f129201f57e50271536522fa8c SHA512 49e8e9f9c798fe63a7599da1021a1950b399e1ae457026b3a90c75db2416f35360e6965fbf39734eeb061bbe12664d129b1cefb3b41e1f85a421530858cde7d5
 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
new file mode 100644
index 000000000000..f1f230a95b48
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.69-invalid-byte.patch
@@ -0,0 +1,27 @@
+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-perl5.40.patch b/app-text/po4a/files/po4a-0.69-perl5.40.patch
new file mode 100644
index 000000000000..8c7d7d8573e8
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.69-perl5.40.patch
@@ -0,0 +1,31 @@
+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-perl5.40.patch b/app-text/po4a/files/po4a-perl5.40.patch
new file mode 100644
index 000000000000..221e45f79198
--- /dev/null
+++ b/app-text/po4a/files/po4a-perl5.40.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/938967
+https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306.patch
+
+From 28fe52651eb8096d97d6bd3a97b3168522ba5306 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
+---
+ 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 7bf59ef05..7b6112433 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.16.0;
+ use strict;
+ use warnings;
diff --git a/app-text/po4a/po4a-0.69-r2.ebuild b/app-text/po4a/po4a-0.69-r2.ebuild
new file mode 100644
index 000000000000..836210177e04
--- /dev/null
+++ b/app-text/po4a/po4a-0.69-r2.ebuild
@@ -0,0 +1,62 @@
+# 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.ebuild b/app-text/po4a/po4a-0.71-r1.ebuild
index 18c3ed6fdf91..0d85bd31b9c0 100644
--- a/app-text/po4a/po4a-0.71.ebuild
+++ b/app-text/po4a/po4a-0.71-r1.ebuild
@@ -38,7 +38,10 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-man.patch
+	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
+)
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.72.ebuild b/app-text/po4a/po4a-0.72-r1.ebuild
index 18c3ed6fdf91..0d85bd31b9c0 100644
--- a/app-text/po4a/po4a-0.72.ebuild
+++ b/app-text/po4a/po4a-0.72-r1.ebuild
@@ -38,7 +38,10 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-man.patch
+	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
+)
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.73-r1.ebuild b/app-text/po4a/po4a-0.73-r1.ebuild
new file mode 100644
index 000000000000..63e8819d32c6
--- /dev/null
+++ b/app-text/po4a/po4a-0.73-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 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
+}