gentoo auto-resync : 25:02:2025 - 19:25:33

6 files changed, 110 insertions, 2 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8c67aa1474f2..e060d142b3dc 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 243a78e50fca..9d7ae9ee1093 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -2,5 +2,5 @@ AUX cmark-0.31.0_fix_api_test.patch 635 BLAKE2B 8dab955156da6958fb80acfa88bf6eb6
 DIST cmark-0.31.0.tar.gz 251922 BLAKE2B 9532255066cd21e99de430787f261b3014c4d270e8243aa258bb9c90cf2ccfd7138dcff2e15f576cc28ee6b6b7901c0f321f5ead6a9202e06b4223288f326897 SHA512 768d456147cb8f5cf36e8122213ad053098201e118109a316518a6a5e721ac94f62af29abe1e69120c84bdc227a5c320803ea2cf320c6d9a719d62909b6533bd
 DIST cmark-0.31.1.tar.gz 264170 BLAKE2B c1de1cf035ff5c706455889413c8cfdaa4b5da39a333d21ed77e2091d1a2f5ef9c90c34100c18be62426aea68c2d5ce157719964a761312f7e4b11e05dae0024 SHA512 3b4f8b47d8ea270078ab986aa22fc32b227786459bd33c7225aac578d8dd014e3d8788a6add60ea10571fdb4c7dc6a1ece960815a02f04f153b1775c73ccff8f
 EBUILD cmark-0.31.0.ebuild 805 BLAKE2B df315aaf9288f605d214043eb5ab8d52850c1e9c938ac4360acf894262e2d64425e97f12f43e96afd1392711da5f72e3e1d5851886da52135ccd458e77f08b7c SHA512 0c3ab8e1b097d3c2c9f22ce2f0582bc203c59f242d8533ceb1e95893fc846112de25768013e9ed20761fca1e1e04c51c49bd2d7da4c9cbca11020cca03b0b20a
-EBUILD cmark-0.31.1-r1.ebuild 811 BLAKE2B 7d0c12f5a02b626decca4faeb533d83e06216fd889b986cb79069e2d44bf55a9fed8565c2133e944f0d00efd4de75d73a88425678a37e9e88f4f3402b0ea449c SHA512 9417f9ed5498a8f8540d8ddca0dfc284500af12ab60fe5e49f322d797553778ee6e1d509336d66d7072ccce8c4be14fb68fe03c32bda601ce9303cc554a213e0
+EBUILD cmark-0.31.1-r1.ebuild 806 BLAKE2B 28b7890be47131431dc05e4cd590a214b98c9c1a3b92b29b1cb899de6ae69f03bec8027715518daf96644c6e342cc528bc7a853ac2fa74268fefc9354a340ec7 SHA512 9846156f7e091ba34239caeb150fa359275a79136d848165b797e7541cb1b5050143bae801800b0ca019e17d862ce7fc6a6170992c802019ae1081cda8f1c961
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.31.1-r1.ebuild b/app-text/cmark/cmark-0.31.1-r1.ebuild
index 66e1ac7da6e6..1c6158d3194b 100644
--- a/app-text/cmark/cmark-0.31.1-r1.ebuild
+++ b/app-text/cmark/cmark-0.31.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/0.31.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 2542aec6c4ea..60c44d1634f6 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -2,6 +2,8 @@ AUX docbook2X-0.8.8-drop-htmldir.patch 326 BLAKE2B dde7c28c224fc8c04b45adc2b7064
 AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1099 BLAKE2B 814d2102ea782d9098b2899e50b577b4bdd0e0d1b5df372db14ebb20ca022a259088213e64c22713382d0bf8042f4059e37b64289e5f19f713458778f1ef7486 SHA512 bcf507adafb7342d505354ea5134e3734dfd46e9853d597e2cb847b6853a8768c1317b47d9db9639cb95fb14526bb9bd4897e30a327c13cffc4e2a85eecfaa22
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 1702 BLAKE2B e72498323f32b6e8ba8d98bd1a3f5a614eedad4fb6d939f699ab7abf6d674ffab76b99f4ee218864c0f7b1351c6a62399dbb6606c466c4acbbd4b8300b655576 SHA512 38920a5f9dd142f7f76a5aa1ceb6a3c0e71dbb5c73b4f0408e249f5151a32898821f3e28c5f8250c2e2c29dd7453fde387a69890768d7d89f090f61a5db74b16
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3048 BLAKE2B 556e6c51091710087fb951430e83358978f00247629a7f5242e388e019f7ace467efbc7e6a1559642ceef6b7e941ed26c0bf00643ed8c81586998e215481a1a0 SHA512 9cbe0850aa255531b24cded169dc114f12cc40b34bb0d0be0d9461f413655633aaaa61267840d6b288d9090340d00631d717ab0d0f346e140dee16c92f1bc9e6
+AUX docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch 1190 BLAKE2B 6afa251b38c1360bde214fc422ff54772bedccf62d9d3f3b120ddbec8be6edebea31a167c48e33122da128cc011c54a66ed28494741d58007b6d1e255b6c1f84 SHA512 a08a27d4ff5bc3c9f43c921b29f740df8919dad18129be58edc05042cc9062338d46d8f72a6b781a064930053e7cef3e63df31ac50e425b27027cc1660fb624a
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
 EBUILD docbook2X-0.8.8-r4.ebuild 1483 BLAKE2B 42d1f253f4d84a3696c5f802d26a3343187c68da2208762b1206f1c7733357f3996004dfc0b853f1ba1f809f875dd9e1a06d57d762c7e5139e293816448186a6 SHA512 e8cd824e78a327f5b5091b3b264742c3c4907739918fac0f51b1dfcd72dbdc1bd407fdc32c9ceffdc100288ea0fbdb42aa6818b65686744afd81e05564857069
+EBUILD docbook2X-0.8.8-r5.ebuild 1605 BLAKE2B 1b89b466ef2b0de70bf4d13064f0f5dd6817ac5a5ed89aabc295b19c46f0f5735f9f5323781c2c7308706adbc2ae6e8d4695b84896fafd8b4e083a3d107e093e SHA512 483b20f62e46d46ef5eaa5ce2946dc50929a3d65a316bea57063438140ba070e33d5abe607452bc5f6c0920be66b056416c2020c55d26d09e27a4ae455754783
 MISC metadata.xml 247 BLAKE2B 9f5b9b6ee9ab8d215d4fd1287c3c94e717e97b5bab58f6b2c9bd5e8f777b8bd72ed434b8a1f65cc6ab83726bd921150ec2326e453a1bb1faf50a05bd78029c84 SHA512 316eca21bc921eb5351154de220f24bef97e2442c87129fa23528eb601425733e4ef91da4d09a3059112688d546ca3943ff378772b5cc75b58a582bbb628c86f
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild
new file mode 100644
index 000000000000..cdf42519d9f5
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tools to convert docbook to man and info"
+HOMEPAGE="https://docbook2x.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/docbook2x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+# dev-perl/XML-LibXML - although not mentioned upstream is required
+# for make check to complete.
+DEPEND="dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-NamespaceSupport
+	dev-perl/XML-SAX
+	dev-perl/XML-LibXML
+	app-text/docbook-xsl-stylesheets
+	=app-text/docbook-xml-dtd-4.2*"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Patches from debian, for description see patches itself.
+	"${FILESDIR}/${P}-filename_whitespace_handling.patch"
+	"${FILESDIR}/${P}-preprocessor_declaration_syntax.patch"
+	"${FILESDIR}/${P}-error_on_missing_refentry.patch"
+	# bug #296112
+	"${FILESDIR}/${P}-drop-htmldir.patch"
+	# https://sourceforge.net/p/docbook2x/bugs/25/
+	"${FILESDIR}/${P}-stop-redeclaring-predefined-entity-lt.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
+
+	# bug #290284
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-xslt-processor=libxslt
+		--program-transform-name='/^docbook2/s,$,.pl,'
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dosym docbook2man.pl /usr/bin/docbook2x-man
+	dosym docbook2texi.pl /usr/bin/docbook2x-texi
+}
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch b/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch
new file mode 100644
index 000000000000..76463be75e27
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch
@@ -0,0 +1,42 @@
+From 040f468fcfae3fe67818023ebc54f3f48fc1bfd9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 24 Feb 2025 23:25:40 +0100
+Subject: [PATCH] Fix invalid redeclaration of predefined XML entity "&lt;"
+
+Section "4.6 Predefined Entities" of XML 1.0r4 is clear that:
+
+> If the entities lt or amp are declared, they MUST be declared
+> as internal entities whose replacement text is a character reference
+> to the respective character (less-than sign or ampersand) being escaped[.]
+
+Source:
+https://www.w3.org/TR/2006/REC-xml-20060816/#sec-predefined-ent
+---
+ xslt/common/text/l10n-set.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xslt/common/text/l10n-set.xml b/xslt/common/text/l10n-set.xml
+index 0ed7454..b2c334b 100644
+--- a/xslt/common/text/l10n-set.xml
++++ b/xslt/common/text/l10n-set.xml
+@@ -21,7 +21,7 @@
+ <!ENTITY it SYSTEM "it.xml">
+ <!ENTITY ja SYSTEM "ja.xml">
+ <!ENTITY ko SYSTEM "ko.xml">
+-<!ENTITY lt SYSTEM "lt.xml">
++<!ENTITY lt_ SYSTEM "lt.xml">
+ <!ENTITY nl SYSTEM "nl.xml">
+ <!ENTITY nn SYSTEM "nn.xml">
+ <!ENTITY no SYSTEM "no.xml">
+@@ -65,7 +65,7 @@
+ &it;
+ &ja;
+ &ko;
+-&lt;
++&lt_;
+ &nl;
+ &nn;
+ &no;
+-- 
+2.48.1
+