gentoo auto-resync : 25:09:2023 - 11:25:16

6 files changed, 75 insertions, 8 deletions

diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index b888caa613ec..085d0b11cde0 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,5 +1,7 @@
-AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
-AUX 1.0.3-libsablot-expat.patch 195 BLAKE2B ec916a15bbcd86eff5c28c4f4ff2f5cc1f81bf43a4c8d5d26f2bc63fa14e509ae68e531e17051c09037932ea45043d4d94f9886aa5155610a52fa411c5b7a858 SHA512 3f769da06b06548bac82fb505d3f3aa9f2111c448e5b18ea3b553ecce9b627e3e0f02cdc6afb9491f9dab0b89946f6b056486395e0fd6a0822be0f549ccbf035
+AUX sablotron-1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
+AUX sablotron-1.0.3-drop-register-keyword.patch 431 BLAKE2B fa6549e313468f035d2d3c01d63c7cd36ca54e612fa6e880e6b129bb88a7489f6c48c399f8f0773688868542fdb00a11a08930c6c53e8ed4c182c162615c9d56 SHA512 7684a064dae059d94260b6370820e93943b273eee78071b7cdc2ca111708c1bd44de4a48faf8e239c10563133770fb8044ae22a60a3237ef364581ab17a59566
+AUX sablotron-1.0.3-libsablot-expat.patch 193 BLAKE2B 4fc1aa2401257e1f50a09d91e5b65a0de819515fd24d8abc4f6b271d6eaae21113413b81a125041c71f4ededc39f8710514ff1bdcc00c164bab9c39dcc62f2b5 SHA512 4a63627d1888a102b645a69860a6ebc834c34d08d9779626942bf7384c852a25fb96d7b369375ae195a6a0d5e7d4f5e9e4ea83fa4f23649aab13ba958b021fb9
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r2.ebuild 1139 BLAKE2B a8d85d068908b8659752bf48e19ed6cb4052759e74079d5f9b8649e8c35ddd9da3221797f043179b3cf22a36df2ff08bd8565945d65199c65dedfd57437924ce SHA512 61c6c96c087a6ca54e5233ae2c709ff5d049b954e392656f9a1259e6f99c1968d324fdd4f6157fd41e614b375877934114efd76346a746eb3d245a301ee09404
+EBUILD sablotron-1.0.3-r2.ebuild 1151 BLAKE2B dd8ba2629bab4d0493dbb76cbd28356c9797b1140c084084dbc8acff206a10d6fa004a3f80f80562a5e78e7dc9f6c8810579fa04dce753a92a620ee4703b9c60 SHA512 073dfe01381e52c9f48a4e84bfa21310f8ac8484aa5c0c43ca3c296a59eeafb71424e88eb0a5d272bb11f725b199ff5102495e2a58dcec75bf2fd07ee2bbea60
+EBUILD sablotron-1.0.3-r3.ebuild 1205 BLAKE2B 0dbf59fb6b1d69679c3f91809cae929e8a61ecc2b705107e6b2fbeab12e69979e9f59e93309473aff889790409926805a96b8194d24fbe6099387309ceedf2c0 SHA512 c6b6664f2cc5e493d7dc8a50e18fe92dcb152a593eee2248a3146637851841b057d07ee094b02b36c4542abc524b395865cc3c5071c66928f2ff3b441137fc7b
 MISC metadata.xml 247 BLAKE2B 03888b860f85ea6690f71e27d2d6d87f3dec604b35ac2b14b23c5bb4b926901b22876470032d6ae72d1e78f177c832dae3b54e895cf9dcbf9bb620026004ec76 SHA512 eb395f541767b9c949d9385cf5e95bff8f31889cd10dd002d4ec1f92690214153e4f23f5f8864a630515b008946d73d4c3b131b0ec58308795e69933bc6f6475
diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
index edc1e3141d94..edc1e3141d94 100644
--- a/app-text/sablotron/files/1.0.3-cxx11.patch
+++ b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
diff --git a/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
new file mode 100644
index 000000000000..3dcf8c881efa
--- /dev/null
+++ b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/894710
+--- a/src/engine/hash.cpp
++++ b/src/engine/hash.cpp
+@@ -305,8 +305,8 @@ void HashTable::report(Sit S, MsgType type, MsgCode code, const Str& arg1, const
+ 
+ oolong hash(const Str& key)
+ {
+-   register oolong a, b, c, len;
+-   register const char *k = (const char*) key;
++   oolong a, b, c, len;
++   const char *k = (const char*) key;
+ 
+    /* Set up the internal state */
+    len = key.length();
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
index e4f6c3fdfab3..614a6d7ffe24 100644
--- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch
+++ b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
@@ -2,7 +2,7 @@
 +++ b/src/engine/Makefile.am
 @@ -76,4 +76,5 @@ include_HEADERS = \
  	sabcfg.h
- 
+
  libsablot_la_LDFLAGS = -version-info 100:3:100
 +libsablot_la_LIBADD = @EXPAT_LIBS@
- 
+
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 1b8ec6960d0a..0dcfdf96034b 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,8 @@ DOCS=(
 	README README_JS RELEASE src/TODO
 )
 PATCHES=(
-	"${FILESDIR}"/1.0.3-libsablot-expat.patch
-	"${FILESDIR}"/1.0.3-cxx11.patch
+	"${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/${PN}-1.0.3-cxx11.patch
 )
 
 src_prepare() {
diff --git a/app-text/sablotron/sablotron-1.0.3-r3.ebuild b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..d702dafc4941
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="Sablot-${PV}"
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="https://sourceforge.net/projects/sablotron/"
+SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+# Sablotron can optionally be built under GPL, using MPL for now
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+DEPEND=">=dev-libs/expat-1.95.6-r1"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-perl/XML-Parser-2.3"
+
+DOCS=( README README_JS RELEASE src/TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/${PN}-1.0.3-cxx11.patch
+	"${FILESDIR}"/${PN}-1.0.3-drop-register-keyword.patch
+)
+
+src_prepare() {
+	default
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable perl perlconnect)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}