[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Mikle Kolyada]

commit:     cf9316cbf5341d9b29482d1d130082146bbf8df9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 15:53:21 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 21 15:53:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9316cb

app-text/xmlstarlet: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-text/xmlstarlet/Manifest                |  2 --
 app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild | 39 -----------------------------
 app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild | 39 -----------------------------
 3 files changed, 80 deletions(-)

diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 1b73a32d46c..41329b83566 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1 @@
-DIST xmlstarlet-1.4.2.tar.gz 407336 BLAKE2B d9e452666622c5419bad6e52ee0bfc2bf86f484e30cd949fbb77cb6f71a893aeb9f88c7ea821a95c651b2086b786609af00f5f01896a669a624348d6c274d6a6 SHA512 4e29825b503212d3dd436b892bdedd371af65dabbcdc1b0ff09dfe440fd3031c5c8c3a9b69903bd196c62ff944d9f91fe556354df6b90b990fbf6ad72be4ad33
-DIST xmlstarlet-1.5.0.tar.gz 414036 BLAKE2B 4cd68d0fa56e633b47a2f836bb3cab277d7843c16918cd32ad2990f2d6645c1d305397ebbcbbdefe95cfa64c9d4a165dd40e0ce46e2fb97c04e52d32d9a37e11 SHA512 7f2626ae724d943c4809d9772c39dc36c7050fa105aa607d368d74491582551798750e15ff00bde6d8bf1b459543d68375e670d7c9c9eff43a117c1410226ec3
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b

diff --git a/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
deleted file mode 100644
index 83992e77afb..00000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
-	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_configure() {
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dosym xml /usr/bin/xmlstarlet
-}

diff --git a/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild b/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
deleted file mode 100644
index 83992e77afb..00000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
-	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_configure() {
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dosym xml /usr/bin/xmlstarlet
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[David Seifert]

commit:     797bcd6e68bec1123145981ea92d7210e86b06b8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 21:50:43 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 21:50:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797bcd6e

app-text/xmlstarlet: Port to EAPI 7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 96f6d174f1c..48e432677af 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -10,30 +12,28 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/libgcrypt:0=
 	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
 	# NOTE: Fully built documentation is already shipped with the tarball:
 	# - doc/xmlstarlet-ug.{pdf,ps,html}
 	# - doc/xmlstarlet.txt
 	# - doc/xmlstarlet.1
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
+		--disable-static-libs
 }
 
 src_install() {
 	default
-
 	dosym xml /usr/bin/xmlstarlet
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Sebastian Pipping]

commit:     50b1b854dcc2c8edf99916c8acfc1610619adce3
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 19:00:59 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 19:02:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b1b854

app-text/xmlstarlet: Fix linking for lld + profile 17.1 + amd64

Closes: https://bugs.gentoo.org/729600
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index c2ad4628c94..81ac6ed97cc 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -21,6 +21,20 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	eapply_user
+
+	# We need to patch use of /usr/lib because it is a problem with
+	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600)
+	# The grep sandwich acts as a regression test so that a future
+	# version bump cannot break patching without noticing
+	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+
+	eautoreconf
+}
+
 src_configure() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
 

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Sebastian Pipping]

commit:     40c7d31fee74fa7698c288a649f869e6c6b2a3b9
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 19:44:19 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 19:44:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c7d31f

app-text/xmlstarlet: Minor QA fixes

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 81ac6ed97cc..0ff17e1a810 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -22,14 +22,14 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
 
 	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600)
+	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
 	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing
+	# version bump cannot break patching without noticing.
 	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
 	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
 
 	eautoreconf

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Sebastian Pipping]

commit:     cd06c9384096477b8dcfe3c12ec27f3c2c293d9d
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 13:05:57 2022 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 13:05:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd06c938

app-text/xmlstarlet: Fix compile for libdir "lib"

Closes: https://bugs.gentoo.org/830062
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 37ed9694ee5f..a234631ef8b8 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -28,9 +28,11 @@ src_prepare() {
 	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
 	# The grep sandwich acts as a regression test so that a future
 	# version bump cannot break patching without noticing.
-	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-	sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
-	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	if [[ $(get_libdir) != lib ]]; then
+	    grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+	    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	    grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	fi
 
 	eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Sam James]

commit:     3f10335d8da5fa2857ae047b33d195540d538a10
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 21:25:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 21:25:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f10335d

app-text/xmlstarlet: Keyword 1.6.1 arm64, #905030

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index a234631ef8b8..a7df54a5e4c1 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libxml2

[gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/

[Sam James]

commit:     2ba59c711e2802773a1c5016e57570b82ef9358c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 03:26:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 11 03:26:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba59c71

app-text/xmlstarlet: HTTPSify HOMEPAGE

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index a7df54a5e4c1..38978c303d6c 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
+HOMEPAGE="https://xmlstar.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"