gentoo auto-resync : 30:01:2024 - 11:49:23

5 files changed, 188 insertions, 40 deletions

diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 025edfc2b144..06b63c635cdc 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,6 +1,7 @@
-AUX yaz-3.0.47-icu-automagic.patch 804 BLAKE2B 37016fbe77f2f611f4118ee5995b6f9050cc6e47bd8546bf8b681084a6844b888e084d567f943b5734a0c33cd12918ae5cec5c6b7ab19dc169d8e9950792cb1d SHA512 b0b38a85342045ef68e0b866a6f15f30605e246c7f795402238e68e70aec26ad7b985257879cbba2698d6f0c40a8373b522dd7fbea9253dbd6d2ceed2a0d4dcf
-DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
+AUX yaz-5.34.0-fix-atoi-header.patch 1288 BLAKE2B 2ca0a3045ea5f15ecb90bdf277c02732f7d40ebc109a5af8dcd801b2c7419cf463c78cdb5d1788fd320bed1cb2e773f48f9cf9ee5fde50b004483704866ce898 SHA512 948a0d715422edb35bd9a6dd9c953769362c83b9f251bb615f8423fd65142ebe4cffef21b13d8f4b815b57d6d4534116a40a4941f1c446aee0af23beadba1ed6
+AUX yaz-5.34.0-fix-libxml2-2.12.patch 2284 BLAKE2B 6d0b9ed696570ce3cf4d2cdf032646ba5e2be3f74ef8659507831e8a787f62f0a613971a2c7a0827df78832f90f3b66e52a7a6db254d6269b3df3ea3ac804963 SHA512 4301be54f021e056786a7fa01db02b3cc0c902d0411bdb02e3c79b2ca2c2c0fa1c2862259c7eae886c0803ad61b439539363efc2a701bc7a99d2050ff9b0621e
 DIST yaz-5.32.0.tar.gz 2607933 BLAKE2B 9119b77a262ef2d6f0b1140425384575218a5b93cbe50a716bb254b07e2427eaad55de3c4590d0d6843af31b987b201fa733fdf010e463648a35b5600d055d5a SHA512 a4d40b5c20b1d4acab0e687235eda361fe0550c00396f6aa26d1965d2ecdd217433ba65160eda07fcc4c263d9e2e47b607e4b668412f81123b2904b9deece763
-EBUILD yaz-3.0.53.ebuild 1535 BLAKE2B d5450a2a4966e8a3fce716699a758c78cf0513edc063f6405dec1dc5cca56b46c7184c21b4574d28b501662580d12d3a5a9c64073ea08a8033dda246a9b8c755 SHA512 d9426db75f171481a1ebda3d9d35847b72040bd1db9905c75308f921c2775af7d40118fb7ab1580265d43982674b698d80f7e0efa2b6607abaee9282738207ec
+DIST yaz-5.34.0.tar.gz 2656382 BLAKE2B 7a16974dc815c1121aaea4179843a6982600a0491c8c95a03f28cf0c68725b986ebc39049e2159cd0d105b23811d35ae3d3538a83e945b64951cc9215efe7f3d SHA512 0c835b98b4640e077459c9ead8043cea941a75f39dace9501efbb56c38837b1525349b8668c135ac0753ba7a4803e38d9c90d7bf3f6f2951c0e7e863b4c51f65
 EBUILD yaz-5.32.0.ebuild 1514 BLAKE2B d4d13982df3dd4a79f12b183051d94ea3f2b2f67096132c93a5eaa171922b876d1e9054230836f6c7e5b4e06e2b6e39bd1910489a6eec57631f50114920f6400 SHA512 9f3c71cd2d95e7ad0719d07f1eac9932621805b7c26e5072e48c26dc94239665f8bab0bb93bed3c27b62b772f8562568f7d9c3f3484b6f92a2e4a8bcd7a655e9
+EBUILD yaz-5.34.0.ebuild 1758 BLAKE2B 9fbefdd2fc248de5b5cf3e36cc5d70638e0ef39d7bdfbb95ddff0a120b124a7fcb251e6f1f59b4db4decd5b2bb8e9688f233fc70bcf43f2c6563efe44898c60d SHA512 d2943d654d2d69d36ff8ce1a810f3c346aa75f4754106f467db667e382fbafe5f48c7add3282787f1df3663c0f1c98155c40b541962be3237b808f12cfad4d86
 MISC metadata.xml 347 BLAKE2B 19555e3c2c7609fe2af5c064fbfe51a27dd44a512a33b53d8968e1a5824da8cb39df6b0507a6cef8364275b7f78abfef25f929139a7662efc841364917c81dc1 SHA512 7239ce6a2a684a53a4e1769e08bc86650798c772e2b95da476e96f189646a5fd8bf4d46d655eb9c3796a7784efd20ed64d4ef3daf287772518ba8f91a4c6719b
diff --git a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
deleted file mode 100644
index dd78635e013e..000000000000
--- a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -367,14 +367,14 @@
- 
- dnl
- dnl 
--AC_CHECK_ICU([3.4],[
--	if test "$xml_enabled" = "true"; then
--	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
--	else
--	    ICU_CPPFLAGS=""
--	    AC_MSG_WARN([ICU support disabled because XML support is unavailable])
--	fi
--])
-+dnl ------ ICU
-+AC_ARG_ENABLE(icu, [  --enable-icu            enable ICU support],[enable_icu=$enableval],[enable_icu=no])
-+if test "$enable_icu" = "yes"; then
-+    AC_CHECK_ICU([3.4],[
-+       ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"],[
-+       AC_MSG_ERROR([For ICU support please install libicu34-dev or similar])
-+    ])
-+fi
- dnl
- dnl ------ Memory debugging
- AC_ARG_ENABLE([memdebug],[  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
diff --git a/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch b/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch
new file mode 100644
index 000000000000..c68b85c7017e
--- /dev/null
+++ b/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/923291
+https://github.com/indexdata/yaz/issues/104
+https://github.com/indexdata/yaz/pull/105
+
+From 3c61afce2c2517369c2bf1ba6846ff17f81c4b18 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Tue, 21 Nov 2023 23:47:18 +0900
+Subject: [PATCH] FIX: fix build error with glibc 2.39
+
+glibc 2.39 does some refactoring for header file inclusion
+and some additional header inclusion is needed for yaz
+source.
+
+Closes #104 .
+--- a/src/record_conv.c
++++ b/src/record_conv.c
+@@ -11,6 +11,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <yaz/log.h>
+ #include <yaz/yaz-iconv.h>
+--- a/src/xmlquery.c
++++ b/src/xmlquery.c
+@@ -10,6 +10,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
+ 
+--- a/test/test_record_conv.c
++++ b/test/test_record_conv.c
+@@ -9,6 +9,7 @@
+ #include <yaz/record_conv.h>
+ #include <yaz/test.h>
+ #include <yaz/wrbuf.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <yaz/log.h>
+ #include <yaz/proto.h>
+--- a/test/test_retrieval.c
++++ b/test/test_retrieval.c
+@@ -9,6 +9,7 @@
+ #include <yaz/retrieval.h>
+ #include <yaz/test.h>
+ #include <yaz/wrbuf.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <yaz/log.h>
+ #include <yaz/oid_db.h>
diff --git a/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch b/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch
new file mode 100644
index 000000000000..379d15e4ab2d
--- /dev/null
+++ b/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch
@@ -0,0 +1,108 @@
+https://bugs.gentoo.org/917537
+https://github.com/indexdata/yaz/issues/102
+https://github.com/indexdata/yaz/pull/103
+
+From b10643c42ea64b1ee09fe53aec2490129f903bcb Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Tue, 21 Nov 2023 23:39:48 +0900
+Subject: [PATCH] FIX: fix build error with libxml2 2.12.0
+
+libxml2 2.12.0 changed which header file to define functions
+and header inclusion. Due to this refactoring, some yaz source
+files need additional inclusion of libxml2 header file,
+especially for libxml/parser.h .
+
+Closes #102 .
+--- a/client/client.c
++++ b/client/client.c
+@@ -73,6 +73,10 @@
+ #include <readline/history.h>
+ #endif
+ 
++#if YAZ_HAVE_XML2
++#include <libxml/parser.h>
++#endif
++
+ 
+ #include "admin.h"
+ #include "tabcomplete.h"
+--- a/src/record_render.c
++++ b/src/record_render.c
+@@ -23,6 +23,7 @@
+ #include <yaz/base64.h>
+ 
+ #if YAZ_HAVE_XML2
++#include <libxml/parser.h>
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+ #endif
+--- a/test/test_ccl.c
++++ b/test/test_ccl.c
+@@ -11,6 +11,9 @@
+ #include <yaz/log.h>
+ #include <yaz/test.h>
+ 
++#if YAZ_HAVE_XML2
++#include <libxml/parser.h>
++#endif
+ 
+ static int tst_ccl_query(CCL_bibset bibset,
+                          const char *query,
+--- a/test/test_icu.c
++++ b/test/test_icu.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #if YAZ_HAVE_XML2
++#include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ #endif
+ 
+--- a/test/test_xml_include.c
++++ b/test/test_xml_include.c
+@@ -12,6 +12,9 @@
+ 
+ #include <yaz/xml_include.h>
+ #include <yaz/test.h>
++#if YAZ_HAVE_XML2
++#include <libxml/parser.h>
++#endif
+ 
+ static void tst_xml_include1(void)
+ {
+--- a/util/cclsh.c
++++ b/util/cclsh.c
+@@ -20,6 +20,9 @@
+ #include <readline/history.h>
+ #endif
+ 
++#if YAZ_HAVE_XML2
++#include <libxml/parser.h>
++#endif
+ 
+ static int debug = 0;
+ static char *prog;
+--- a/util/yaz-icu.c
++++ b/util/yaz-icu.c
+@@ -17,6 +17,8 @@
+ 
+ #if YAZ_HAVE_ICU
+ 
++#include <libxml/parser.h>
++
+ #include <unicode/ucnv.h>
+ #include <unicode/ustring.h>
+ #include <unicode/ucol.h>
+--- a/util/yaz-record-conv.c
++++ b/util/yaz-record-conv.c
+@@ -13,6 +13,10 @@
+ #include <yaz/record_conv.h>
+ #include <yaz/backtrace.h>
+ 
++#if YAZ_HAVE_XML2
++#include <libxml/parser.h>
++#endif
++
+ const char *prog = "yaz-record-conv";
+ 
+ static void usage(void)
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-5.34.0.ebuild
index 1425841a824e..c625bf890ffe 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-5.34.0.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers"
 HOMEPAGE="https://www.indexdata.com/resources/software/yaz/"
-SRC_URI="https://ftp.indexdata.com/pub/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/indexdata/yaz.git"
+else
+	SRC_URI="https://ftp.indexdata.com/pub/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
 
 LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug icu gnutls tcpd ziffy"
+SLOT="0/5"
+IUSE="gnutls tcpd ziffy"
 
 RDEPEND="
+	dev-libs/icu:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	sys-libs/readline:=
@@ -22,7 +29,6 @@ RDEPEND="
 	virtual/libintl
 	!gnutls? ( dev-libs/openssl:0= )
 	gnutls? ( net-libs/gnutls:= )
-	icu? ( dev-libs/icu:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ziffy? ( net-libs/libpcap )
 "
@@ -35,21 +41,23 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch
+	"${FILESDIR}"/yaz-5.34.0-fix-atoi-header.patch
+	"${FILESDIR}"/yaz-5.34.0-fix-libxml2-2.12.patch
 )
 
 src_prepare() {
 	default
-	AT_M4DIR="m4" eautoreconf
+
+	# Hardcoded assumption of libraries residing in lib/,  bug #730016
+	sed -i -e "s|/lib\"|/$(get_libdir)\"|" configure.ac || die
+
+	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--enable-static \
 		--enable-shared \
-		$(use_enable debug memdebug) \
 		$(use_with gnutls) \
-		$(use_enable icu) \
 		$(use_enable tcpd tcpd /usr)
 }
 
@@ -57,10 +65,12 @@ src_install() {
 	local docdir="/usr/share/doc/${PF}"
 	emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install
 
+	find "${D}" -name '*.la' -delete || die
+
 	dodir "${docdir}"/html
 	mv -f "${ED}"/${docdir}/*.{html,png} "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
 	mv -f "${ED}"/usr/share/doc/${PN}/common "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
 	rm -rf "${ED}"/usr/share/doc/${PN} || die
 
-	dodoc ChangeLog NEWS README
+	dodoc ChangeLog NEWS
 }