gentoo resync : 25.08.2020

4 files changed, 70 insertions, 3 deletions

diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 2cd79880cd66..b39f9ffff298 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,4 +1,6 @@
-AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
+AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
+AUX 1.0.3-libsablot-expat.patch 195 BLAKE2B ec916a15bbcd86eff5c28c4f4ff2f5cc1f81bf43a4c8d5d26f2bc63fa14e509ae68e531e17051c09037932ea45043d4d94f9886aa5155610a52fa411c5b7a858 SHA512 3f769da06b06548bac82fb505d3f3aa9f2111c448e5b18ea3b553ecce9b627e3e0f02cdc6afb9491f9dab0b89946f6b056486395e0fd6a0822be0f549ccbf035
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
 EBUILD sablotron-1.0.3-r1.ebuild 1038 BLAKE2B 951637f5880123c5326b3a8b05d9e756b7b74954582224daef203b8a285ab1c071267fe4c6ba77da435bfbe382cd8ecf626da766e5a6b2f58256669315afafd9 SHA512 997f719e6951465946496933ebf91498dc8b474d33f108cdcb58303356bc76982306d7d33b9a5c93564dbdd985b2a24e9df80185b1d6807be96c8dd5935e8881
+EBUILD sablotron-1.0.3-r2.ebuild 1145 BLAKE2B 762b95b9addbdccd631858b53ab44b4408ca4591cc2925e4a80ede9dbaa32cea71468deb0249c7cb2ea34e37937a20b546a7d20ac77fb6b1d506eacc805556f0 SHA512 284a6a7a79545c3c85dcb938ef5a44a71c419483702a316eb011be0c875e67265e67b9e932915ecfb32f536acbf03269657bd176931abdd4ae30e97e174d4141
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch b/app-text/sablotron/files/1.0.3-cxx11.patch
new file mode 100644
index 000000000000..edc1e3141d94
--- /dev/null
+++ b/app-text/sablotron/files/1.0.3-cxx11.patch
@@ -0,0 +1,11 @@
+--- a/src/command/sabcmd.cpp
++++ b/src/command/sabcmd.cpp
+@@ -168,7 +168,7 @@
+ 
+ char askhelp[] = "Type sabcmd --help to display a help message.\n";
+ char msgConflict[] = "conflict with preceding switches: ";
+-char version_txt[] = "\nsabcmd "SAB_VERSION" ("SAB_DATE")\n"\
++char version_txt[] = "\nsabcmd " SAB_VERSION " (" SAB_DATE ")\n"\
+     "copyright (C) 2000 - 2005 Ginger Alliance (www.gingerall.com)\n";
+ char dbg_usage[] = "\nDebugging options:\n"\
+     "\t--debug\t\t\tdisplay results of the command line parse\n"\
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
index 328c9e906856..e4f6c3fdfab3 100644
--- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch
+++ b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
@@ -1,5 +1,3 @@
-diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
-index abd2041..1307b1c 100644
 --- a/src/engine/Makefile.am
 +++ b/src/engine/Makefile.am
 @@ -76,4 +76,5 @@ include_HEADERS = \
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..9910b99b55bb
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN="Sablot"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="https://sourceforge.net/projects/sablotron/"
+SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+
+# 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"
+
+RDEPEND="
+	>=dev-libs/expat-1.95.6-r1
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=dev-perl/XML-Parser-2.3
+"
+DOCS=(
+	README README_JS RELEASE src/TODO
+)
+PATCHES=(
+	"${FILESDIR}"/1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/1.0.3-cxx11.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() {
+	econf \
+		--disable-static \
+		$(use_enable perl perlconnect) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}