gentoo auto-resync : 10:10:2024 - 04:03:57

4 files changed, 2 insertions, 118 deletions

diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index db2a5d47e9a5..2969f3d90634 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,7 +1,5 @@
 AUX xmlstarlet-1.6.1-clang16.patch 1140 BLAKE2B 5adade599c64b6598754be6b15f118ddc3fc91d850ec8e01b956355c972d3afeb107a98aad4fc398dede34b3d2e61483c89667693403a47c01b04953d52a110c SHA512 4197ed29065608ae5dcff398a339237c2bd3af1f329b25acc0ff567668856262882e703c1299ad578dea2b1fb9c9e114bd667504668018eff2eecb8bd0f4b9e3
 AUX xmlstarlet-1.6.1-clang17.patch 2408 BLAKE2B 0f14db846fb7ab201b256ca60bb43175d6023407df647ebdde78f5ec44afe8252de5fb51707a7526058e461d639143d842787167e10024c669fbbbde90f83bef SHA512 269773daa93d7ce3f2325f846566b4db48137143a6605462393313b3023c79c8f25b9cee9a15be834bfa9208df57e5620fdda5b808930f722896ede879c7519b
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1-r1.ebuild 1562 BLAKE2B 9a1f535c07e69221543f2d60655def546b3e4dd17f1e19162f3a4b1e81ee9d7a027e2e2c0a1fd27b40b2307771d43e4e57f0dab6ec67c3b8322602aca725b6df SHA512 b664735a2e53626d8d909732455e37cec7646d2fe51a811f0a83e5fe95adc42528852f6e010423d16445752c5fb9ebd95bcbc2a986cab1a7f6f6bf4827df2535
-EBUILD xmlstarlet-1.6.1-r2.ebuild 1603 BLAKE2B edcbe0c64f1bf06c92ac330a0a61ad8e58000a42e43376f81070e00501a0b5714b00e1e9a7c5e465ea38f9e58c5ccc578d0f096d4bea80bf5a38a3806604152b SHA512 0caaa421f64a1cc15ac3981712ba77edf15e23af6a21a98c430fb40b65fa4882317b4637f6a89a330d0acbd156d41fe08ed73bd7d601843f9dfbe39e463cba52
-EBUILD xmlstarlet-1.6.1.ebuild 1505 BLAKE2B 7bbab02e1497c4868bdba9ed8eb5986f4813bd7556608c6699ea82aab9889641c7a7a710bf91cb20846e69184ad72c20c3fcf664d395d94a368c89f4534feaae SHA512 fce25f527df7b78946b7bb102e1e8b57112673f8656b1c951dccf5f061a56e6a649b3eaccbfd5016d151c728aebc80121cfe0e091b976267e9b2eb4af567ab0b
+EBUILD xmlstarlet-1.6.1-r2.ebuild 1600 BLAKE2B 0aa8ca44e0891487844284818504606df03cbf6a875590a8c05605a9d00f546e59f544e2115908c94e1b6b47fb6e08ef42c28aac0b5d65e14f941e33182f560d SHA512 d7f23d1fc2d39b72c8f1add08b4b0fa8f5b186ed0e4bdf17ef2c21d9616d21578b4023f5a3438a7df8f14ecb46ebf3528d5a9021b1f895d92a991154ec8f61d9
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
deleted file mode 100644
index 02d1abdb08d0..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="https://xmlstar.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libgcrypt:0=
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-clang16.patch
-)
-
-src_prepare() {
-	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).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	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
-}
-
-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 \
-		--disable-build-docs \
-		--disable-static-libs
-}
-
-src_install() {
-	default
-	dosym xml /usr/bin/xmlstarlet
-}
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
index 7ef84964c69e..2bb5d2f5bb41 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
deleted file mode 100644
index 9b034dcdacb7..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="https://xmlstar.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libgcrypt:0=
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	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).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	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
-}
-
-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 \
-		--disable-build-docs \
-		--disable-static-libs
-}
-
-src_install() {
-	default
-	dosym xml /usr/bin/xmlstarlet
-}