gentoo auto-resync : 28:03:2024 - 01:12:44

4 files changed, 121 insertions, 0 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 957908d42f64..4f215f00426b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index a4245db3ff8a..3470226a2b56 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,5 +1,7 @@
 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 1555 BLAKE2B 4e201fceb88038f197998b96440f9b14d43a2ac5bb16cdf732427c843f5e52e553524ddd09523f2dd2c9f5f73f8baac7a6789ff8b821ad45747825ae56fbdf67 SHA512 65f06a89215f5118749a1f722fcffff5c14187c9f8afa98ac9a6e02fc15d601e7da1b946ccf4c1ead0d111449f2a5883613f8e406c1b043c666afcbd29fafff4
+EBUILD xmlstarlet-1.6.1-r2.ebuild 1596 BLAKE2B d8657f96395e15205b486fc3591a5976c81ebb13313881705f49ea5f153a7ac7c1163917e847e963233b24e2ccaaed3e7f2c642178bbe241708f0eeed9f3a012 SHA512 25231397b5561fd026eba55dc7e7bd799425d138a7f0c75334e870edb833ab2197cc89698bbeababaa42f4cdb83c968aa375431eb3d5637750d8e429b9c025f7
 EBUILD xmlstarlet-1.6.1.ebuild 1498 BLAKE2B f5586ad77fd7009f26f742327aa3be3001f8e21ec43ed608865ca73d21555acfc57e65aaa91d1b7a0493432c0834bb3edb53fb5cd920f7ee91aa07d6d2d1577e SHA512 7de636b3a72e72167a589cb8030fdb97b9691cb8b2af1e75e231a19eba3d0e41f8a54a9b3bb69bb6c397d9dd1f98d80f965a7a298840a30ab8f3d5ff4f2254a7
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch
new file mode 100644
index 000000000000..9269349726d5
--- /dev/null
+++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch
@@ -0,0 +1,59 @@
+From e1da090da24f5620784daf853eb1353aa164583f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 27 Mar 2024 23:25:39 +0100
+Subject: [PATCH] Address -Wincompatible-function-pointer-types for Clang 17
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Also showed with -Werror=incompatible-pointer-types with GCC.
+
+Bug: https://bugs.gentoo.org/927838
+
+Symptom with GCC was:
+> src/xml.c: In function ‘main’:
+> src/xml.c:300:43: error: passing argument 2 of ‘xmlSetStructuredErrorFunc’ from incompatible pointer type [-Werror=incompatible-pointer-types]
+>   300 |     xmlSetStructuredErrorFunc(&errorInfo, reportError);
+>       |                                           ^~~~~~~~~~~
+>       |                                           |
+>       |                                           void (*)(void *, xmlError *) {aka void (*)(void *, struct _xmlError *)}
+> In file included from /usr/include/libxml2/libxml/valid.h:15,
+>                  from /usr/include/libxml2/libxml/parser.h:19,
+>                  from /usr/include/libxml2/libxml/tree.h:17,
+>                  from /usr/include/libxslt/xslt.h:13,
+>                  from src/xml.c:37:
+> /usr/include/libxml2/libxml/xmlerror.h:898:57: note: expected ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void *, const struct _xmlError *)’} but argument is of type ‘void (*)(void *, xmlError *)’ {aka ‘void (*)(void *, struct _xmlError *)’}
+---
+ src/xml.c     | 2 +-
+ src/xmlstar.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xml.c b/src/xml.c
+index cf47cc2..e6f19c1 100644
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) {
+ /* by default all errors are reported */
+ static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE };
+ 
+-void reportError(void *ptr, xmlErrorPtr error)
++void reportError(void *ptr, const xmlError *error)
+ {
+     ErrorInfo *errorInfo = (ErrorInfo*) ptr;
+     assert(errorInfo);
+diff --git a/src/xmlstar.h b/src/xmlstar.h
+index 3e1eed3..e8d7177 100644
+--- a/src/xmlstar.h
++++ b/src/xmlstar.h
+@@ -32,7 +32,7 @@ typedef struct _errorInfo {
+     ErrorStop stop;
+ } ErrorInfo;
+ 
+-void reportError(void *ptr, xmlErrorPtr error);
++void reportError(void *ptr, const xmlError *error);
+ void suppressErrors(void);
+ 
+ typedef struct _gOptions {
+-- 
+2.44.0
+
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..8d84085ae390
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
@@ -0,0 +1,60 @@
+# 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="mirror://sourceforge/xmlstar/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+	"${FILESDIR}"/${PN}-1.6.1-clang17.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
+}