[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/files/, app-text/sablotron/
commit: 2dc1d5534a2c067fc129497905211bc0d0cf89db
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Sep 25 06:55:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Sep 25 07:02:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc1d553
app-text/sablotron: cleanup, rename patches
- use array for econf args
- add ${PN} prefix to FILESDIR patches
- organize global scope assignments
Signed-off-by: Arthur Zamarin gentoo.org>
...0.3-cxx11.patch => sablotron-1.0.3-cxx11.patch} | 0
...=> sablotron-1.0.3-drop-register-keyword.patch} | 0
...patch => sablotron-1.0.3-libsablot-expat.patch} | 4 +--
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 6 ++--
app-text/sablotron/sablotron-1.0.3-r3.ebuild | 36 +-
5 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch
b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
similarity index 100%
rename from app-text/sablotron/files/1.0.3-cxx11.patch
rename to app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
diff --git a/app-text/sablotron/files/1.0.3-drop-register-keyword.patch
b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
similarity index 100%
rename from app-text/sablotron/files/1.0.3-drop-register-keyword.patch
rename to app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
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
similarity index 97%
rename from app-text/sablotron/files/1.0.3-libsablot-expat.patch
rename to 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
index 75dc3320a516..d702dafc4941 100644
--- a/app-text/sablotron/sablotron-1.0.3-r3.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -5,13 +5,12 @@ EAPI=8
inherit autotools
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
+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"
@@ -19,22 +18,16 @@ 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
-)
+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}"/1.0.3-libsablot-expat.patch
- "${FILESDIR}"/1.0.3-cxx11.patch
- "${FILESDIR}"/1.0.3-drop-register-keyword.patch
+ "${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() {
@@ -45,10 +38,11 @@ src_prepare() {
}
src_configure() {
- econf \
- --disable-static \
- $(use_enable perl perlconnect) \
+ local myeconfargs=(
+ $(use_enable perl perlconnect)
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/, app-text/sablotron/files/
commit: 26f1197752cd095e4a8d2edc4facbae32b9a192d
Author: Brahmajit Das gmail com>
AuthorDate: Mon Sep 11 17:41:16 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Sep 25 07:02:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f11977
app-text/sablotron: Fix C++17 does not allow register storage class
And update EAPI 7 -> 8
Closes: https://bugs.gentoo.org/894710
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32726
Signed-off-by: Arthur Zamarin gentoo.org>
.../files/1.0.3-drop-register-keyword.patch| 14 ++
app-text/sablotron/sablotron-1.0.3-r3.ebuild | 57 ++
2 files changed, 71 insertions(+)
diff --git a/app-text/sablotron/files/1.0.3-drop-register-keyword.patch
b/app-text/sablotron/files/1.0.3-drop-register-keyword.patch
new file mode 100644
index ..3dcf8c881efa
--- /dev/null
+++ b/app-text/sablotron/files/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/sablotron-1.0.3-r3.ebuild
b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
new file mode 100644
index ..75dc3320a516
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+ "${FILESDIR}"/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() {
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 99b53420d538c3b2bfaac4c95c358aa39b19a5df
Author: Sam James gentoo org>
AuthorDate: Tue Mar 16 18:34:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 16 19:22:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b53420
app-text/sablotron: drop 1.0.3-r1
Signed-off-by: Sam James gentoo.org>
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 44
1 file changed, 44 deletions(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
deleted file mode 100644
index 2ab9d95c096..000
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html;
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${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}
- >=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
- default
- sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- $(use_enable perl perlconnect) \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README README_JS RELEASE src/TODO
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 876fb01a26ba2210a2c64dd388d754049fd71b93
Author: Sam James gentoo org>
AuthorDate: Thu Jan 7 20:14:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 7 20:15:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876fb01a
app-text/sablotron: Stabilize 1.0.3-r2 ppc64, #763462
Signed-off-by: Sam James gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 89bf12dd2bb..1b8ec6960d0 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: f533c8ccb80d5efa13b7bbf0496d9f0b35f0e3a2
Author: Sam James gentoo org>
AuthorDate: Thu Jan 7 10:42:56 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 7 10:43:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f533c8cc
app-text/sablotron: Stabilize 1.0.3-r2 ppc, #763462
Signed-off-by: Sam James gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index f3b15980df7..89bf12dd2bb 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 6fbbd7d4f52cd88db8a7ef92e9f49df519fdb05c
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Jan 4 19:39:04 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Jan 4 19:39:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbbd7d4
app-text/sablotron: stable 1.0.3-r2 for sparc
stable wrt bug #763462
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index f40d010222d..7f685083a3c 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 41625d727bae23ce1349f9ddfdee32b77d8d5ba3
Author: Sam James gentoo org>
AuthorDate: Mon Jan 4 03:33:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 4 03:33:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41625d72
app-text/sablotron: Stabilize 1.0.3-r2 arm, #763462
Signed-off-by: Sam James gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 21251c3f564..f40d010222d 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: cd852e16b77edb5f2e367cb0cc1eef60c83fa63c
Author: Sam James gentoo org>
AuthorDate: Mon Jan 4 03:30:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 4 03:30:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd852e16
app-text/sablotron: Stabilize 1.0.3-r2 amd64, #763462
Signed-off-by: Sam James gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 9910b99b55b..21251c3f564 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 9b4764edf92363879e74f1dc346fc68542db9546
Author: David Seifert gentoo org>
AuthorDate: Fri Aug 14 12:27:03 2020 +
Commit: David Seifert gentoo org>
CommitDate: Fri Aug 14 12:27:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4764ed
app-text/sablotron: [QA] Remove 'static-libs' from IUSE
Closes: https://bugs.gentoo.org/726732
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: David Seifert gentoo.org>
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 3d8288a19d6..9910b99b55b 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools
MY_PN="Sablot"
@@ -16,7 +17,7 @@ SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
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 static-libs"
+IUSE="perl"
RDEPEND="
>=dev-libs/expat-1.95.6-r1
@@ -38,14 +39,14 @@ PATCHES=(
src_prepare() {
default
sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+ mv configure.{in,ac} || die
eautoreconf
- elibtoolize
}
src_configure() {
econf \
+ --disable-static \
$(use_enable perl perlconnect) \
- $(use_enable static-libs static) \
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/, app-text/sablotron/files/
commit: 8e1c3c9177201436f99353384bfd73c66d79299e
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Aug 14 10:04:28 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Aug 14 10:08:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1c3c91
app-text/sablotron: Format sabcmd.cpp for C++11 compatibility
While there:
- Add IUSE=static-libs and remove .la files
- Clean up patch
- EAPI=7
- Replace defunct HOMEPAGE/SRC_URI
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Closes: https://bugs.gentoo.org/show_bug.cgi?id=726732
Closes: https://bugs.gentoo.org/show_bug.cgi?id=729590
Signed-off-by: Jeroen Roovers gentoo.org>
app-text/sablotron/files/1.0.3-cxx11.patch | 11 +
.../sablotron/files/1.0.3-libsablot-expat.patch| 2 -
app-text/sablotron/sablotron-1.0.3-r2.ebuild | 55 ++
3 files changed, 66 insertions(+), 2 deletions(-)
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 000..edc1e3141d9
--- /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 328c9e90685..e4f6c3fdfab 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 000..3d8288a19d6
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -0,0 +1,55 @@
+# 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 static-libs"
+
+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
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ $(use_enable perl perlconnect) \
+ $(use_enable static-libs static) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 7b2cd4419b2b0fd3a489ceabaef84755596a878e
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Dec 17 13:33:14 2017 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Dec 17 13:33:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2cd441
app-text/sablotron: Drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-text/sablotron/sablotron-1.0.3.ebuild | 45 ---
1 file changed, 45 deletions(-)
diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild
b/app-text/sablotron/sablotron-1.0.3.ebuild
deleted file mode 100644
index c9118189fdc..000
--- a/app-text/sablotron/sablotron-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit base autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html;
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=dev-libs/expat-1.95.6-r1"
-DEPEND="${RDEPEND}
- >=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
- base_src_prepare
- sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- $(use_enable perl perlconnect) \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-
- dodoc README README_JS RELEASE src/TODO
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 4bff62265b5bc04d746ec0dc0f30583ad4968479
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Dec 17 13:31:32 2017 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Dec 17 13:31:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bff6226
app-text/sablotron: alpha/amd64/arm/ia64 stable wrt bug #640516
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index ae771353665..622e9320de0 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 ~sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: c9ffc6162b05d12167c8bce5b784861f077663a3
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Dec 12 17:49:23 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Dec 12 18:39:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ffc616
app-text/sablotron: x86 stable (bug #640516)
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index d5a8a6a898e..ae771353665 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 ~sh sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: e10b86748a668bc928cf46db9637ea1c76f77eed
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Dec 10 21:32:27 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Dec 10 21:32:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10b8674
app-text/sablotron: stable 1.0.3-r1 for sparc, bug #640516 (thanks to Rolf Eike
Beer)
Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 14ab8b9196c..d5a8a6a898e 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 ~sh ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 97e833c706212397ba431b148d67202fda0451b1
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Dec 10 17:53:57 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Dec 10 21:22:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e833c7
app-text/sablotron: stable 1.0.3-r1 for hppa/ppc/ppc64, bug #640516
Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa ppc ppc64"
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 4bceeb87bd1..14ab8b9196c 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: df1e8831e12258beaaa9d5910ca6ba25f113e62a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Apr 10 19:55:31 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Apr 10 19:55:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df1e8831
app-text/sablotron: EAPI bump
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 44
1 file changed, 44 insertions(+)
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
new file mode 100644
index 000..4bceeb87bd1
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN="Sablot"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="http://www.gingerall.org/sablotron.html;
+SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+RDEPEND=">=dev-libs/expat-1.95.6-r1"
+DEPEND="${RDEPEND}
+ >=dev-perl/XML-Parser-2.3"
+
+PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
+
+src_prepare() {
+ default
+ sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ $(use_enable perl perlconnect) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc README README_JS RELEASE src/TODO
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/sablotron/
commit: 3ef3a332d47f64d5b80574fcd077788c08d366d5
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Jan 29 15:17:52 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Jan 29 15:24:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef3a332
app-text/sablotron: dropped ~x86-freebsd
Package-Manager: portage-2.3.3
app-text/sablotron/sablotron-1.0.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild
b/app-text/sablotron/sablotron-1.0.3.ebuild
index fb65a2e..97bab903 100644
--- a/app-text/sablotron/sablotron-1.0.3.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@
SRC_URI="http://download-1.gingerall.cz/download/sablot/${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 sh sparc x86
~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
