gentoo auto-resync : 12:12:2024 - 02:01:23

3 files changed, 29 insertions, 2 deletions

diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b1c3375c336d..191485627fdd 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,10 +1,11 @@
 AUX po4a-0.69-man.patch 626 BLAKE2B 4cd81301b8544a971c8a3b387b23098cf21235474dd6eb4f8eb320d49d3b69610c8b4127b7cd5d40e11fac5ca43974fccec000d449dc180d01c292d3e44fb8b2 SHA512 27e2b85f6e95ae4a93b2f764600252a10c0a3ad72cf531ae4e1e3ae651e76a9b8eb12754c7139d22c14881bde45143f5fe7464bedabdbb637c9bcbcb659a8eda
+AUX po4a-0.69-xmlcatalog.patch 1684 BLAKE2B 402fc78d7cebc51631ef2b7d21e850ef50c5c796caa2b8d9a7dedee288b4cb731bde1e5bda9b3827627d9801544fcd3be8b4aa378428a11eb2a12be0083a3ccd SHA512 3ae84fe13dc7c96799febdfe866e485d0874f6d978c812166db021e3d7a34ddea77bf180133dd00ecb22c4d46ed241f65c75c25f7c9367dd93cb90598f81321d
 AUX po4a-man.patch 591 BLAKE2B 3b71c7f56c51f8e2f2d188654c7c670b9fa33cc0b8013a18a4bc462bbdeaa7ee1103a73e0cb0fd7c4c73a1d0be161cfca829dd38daca12d535d2f84197904525 SHA512 0357b455be34ca96d98cf28db3f01a7ef9921cf0782b6757fb6ad6a0f16ab15fa9b791f3f3d80c1008612eb4dcb3aa62e17ff61239beb15cb0d7d36a2b3a305d
 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.ebuild 1403 BLAKE2B 665d272634bc39a1a45d5f0a01971bc4710c9d4e49b83e5b40e5e75e81c3b25d852bc708fc199c28370ba1f6a308cc25514f9b7a7cc265324f223a7513144b2b SHA512 e5e6232e4de1d5da7c7e9c650781e9aa8b6ad0e69c7ed85983c561d9cdf4003a87a787f686503f1fd14ebebe7e4fee27d8c223cf2be076449c701ac4a1c41c0f
+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.73.ebuild 1409 BLAKE2B 45cf1a31a7cbeb86da5d06bb78c671d7cc0ee33b7963b6cb4c17992d84f2f6795fa89fe7a329acbbb43ad3b702c8c6c20f0185f129201f57e50271536522fa8c SHA512 49e8e9f9c798fe63a7599da1021a1950b399e1ae457026b3a90c75db2416f35360e6965fbf39734eeb061bbe12664d129b1cefb3b41e1f85a421530858cde7d5
diff --git a/app-text/po4a/files/po4a-0.69-xmlcatalog.patch b/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
new file mode 100644
index 000000000000..2d05a5b2ac75
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
@@ -0,0 +1,23 @@
+--- 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.ebuild b/app-text/po4a/po4a-0.69-r1.ebuild
index 7cae274325d9..cf6b84cfb464 100644
--- a/app-text/po4a/po4a-0.69.ebuild
+++ b/app-text/po4a/po4a-0.69-r1.ebuild
@@ -38,7 +38,10 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-xmlcatalog.patch
+)
 
 DIST_TEST="do"