commit: 2852d81456555a90b6790374c3eb94d3f76b354e Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Feb 27 09:39:00 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 13:50:22 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2852d814
dev-libs/yaz: drop 5.34.0-r1, 5.34.2-r1, 5.34.4-r1 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/160 Merges: https://codeberg.org/gentoo/gentoo/pulls/160 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/yaz/Manifest | 3 - .../yaz/files/yaz-5.34.0-fix-atoi-header.patch | 54 ----------- .../yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch | 108 --------------------- dev-libs/yaz/metadata.xml | 1 - dev-libs/yaz/yaz-5.34.0-r1.ebuild | 76 --------------- dev-libs/yaz/yaz-5.34.2-r1.ebuild | 71 -------------- dev-libs/yaz/yaz-5.34.4-r1.ebuild | 72 -------------- 7 files changed, 385 deletions(-) diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest index c252eb953aec..f359ab962131 100644 --- a/dev-libs/yaz/Manifest +++ b/dev-libs/yaz/Manifest @@ -1,5 +1,2 @@ -DIST yaz-5.34.0.tar.gz 2656382 BLAKE2B 7a16974dc815c1121aaea4179843a6982600a0491c8c95a03f28cf0c68725b986ebc39049e2159cd0d105b23811d35ae3d3538a83e945b64951cc9215efe7f3d SHA512 0c835b98b4640e077459c9ead8043cea941a75f39dace9501efbb56c38837b1525349b8668c135ac0753ba7a4803e38d9c90d7bf3f6f2951c0e7e863b4c51f65 -DIST yaz-5.34.2.tar.gz 2601365 BLAKE2B 525197c4c10e3a41fb0b050a78f00a8122de844a5c7e53d115a079c0ec16144312e7861b048c31cecf00cac900d8fc7dffd98e2ac18c6b046ac9ae521c7d60aa SHA512 8fd22b97cf46c7db8083198ad67745f4b99b303253b669e28f8c509fe3fee223de64d79a7b0a5d9318637b65d056129ca220e3ecbfc7ad392ef634c87543a16b -DIST yaz-5.34.4.tar.gz 2632926 BLAKE2B 63b057066604a562f6174c327b5699d60a465aa4814311205d94257fd51df11cdc60fe52a17cc356f57cf04e84afae5351c02f17715225d5927863a887e0aab8 SHA512 f5c9dfce5817cdd6ac0c4b038dbe3eba7cb4b91cc1001fe256019160fb86bcb58bf067e40c83d789f3d0fbed8f1f970f79e048c8906ba44ea81a95f3086bb232 DIST yaz-5.35.1.tar.gz 2635632 BLAKE2B a83cff0af98bf8a9fea8f5e22eec0ed13131624512dbc4c38f78c71ee69b25dc15aa444134426948ce3eb9cbc0bb53e9d07e265f4706cc995fb020b0a07f6649 SHA512 20534114906d33c650d15218bf3e4edbca99d6d17577ef6c7205e9edf140baabb76db798f739e926a2405ba54f97208c6ffd365fa308d62c626328962b956dcd DIST yaz-5.37.0.tar.gz 2655431 BLAKE2B d48de77c1cb4fa4475ebd4d4a8ccfd234289b6b01143b39848cb7de3e6d5664878088ff3f954bcf48fe2098da1e87e45e650d0e5bfb013fb0946ec5db16cfb71 SHA512 c930abaff56a936c16689cf02c165c214e22122c8591e7aa27e14da3d64e6afc3c492bf52703c407ed4690aa038fdd5599048c5e2c802eff4a5622b994779d29 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 deleted file mode 100644 index c68b85c7017e..000000000000 --- a/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 <[email protected]> -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 deleted file mode 100644 index 379d15e4ab2d..000000000000 --- a/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch +++ /dev/null @@ -1,108 +0,0 @@ -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 <[email protected]> -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/metadata.xml b/dev-libs/yaz/metadata.xml index bc5f17876c39..9336e4cdfc7e 100644 --- a/dev-libs/yaz/metadata.xml +++ b/dev-libs/yaz/metadata.xml @@ -8,6 +8,5 @@ </upstream> <use> <flag name="redis">Enable cache via <pkg>dev-libs/hiredis</pkg></flag> - <flag name="ziffy">Install ziffy, a promiscuous Z39.50 APDU sniffer</flag> </use> </pkgmetadata> diff --git a/dev-libs/yaz/yaz-5.34.0-r1.ebuild b/dev-libs/yaz/yaz-5.34.0-r1.ebuild deleted file mode 100644 index 61bd5b292ce2..000000000000 --- a/dev-libs/yaz/yaz-5.34.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers" -HOMEPAGE="https://www.indexdata.com/resources/software/yaz/"; - -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 ~ppc ppc64 ~s390 ~sparc x86" -fi - -LICENSE="BSD GPL-2" -SLOT="0/5" -IUSE="gnutls tcpd ziffy" - -RDEPEND=" - dev-libs/icu:= - dev-libs/libxml2:= - dev-libs/libxslt - sys-libs/readline:= - sys-libs/ncurses:= - virtual/libintl - !gnutls? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls:= ) - tcpd? ( sys-apps/tcp-wrappers ) - ziffy? ( net-libs/libpcap ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/tcl:0 - app-alternatives/yacc - >=dev-build/libtool-2 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/yaz-5.34.0-fix-atoi-header.patch - "${FILESDIR}"/yaz-5.34.0-fix-libxml2-2.12.patch -) - -src_prepare() { - default - - # Hardcoded assumption of libraries residing in lib/, bug #730016 - sed -i -e "s|/lib\"|/$(get_libdir)\"|" configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - $(use_with gnutls) \ - $(use_enable tcpd tcpd /usr) -} - -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 -} diff --git a/dev-libs/yaz/yaz-5.34.2-r1.ebuild b/dev-libs/yaz/yaz-5.34.2-r1.ebuild deleted file mode 100644 index aeb604652880..000000000000 --- a/dev-libs/yaz/yaz-5.34.2-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers" -HOMEPAGE="https://www.indexdata.com/resources/software/yaz/"; - -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 ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -LICENSE="BSD GPL-2" -SLOT="0/5" -IUSE="gnutls tcpd ziffy" - -RDEPEND=" - dev-libs/icu:= - dev-libs/libxml2:= - dev-libs/libxslt - sys-libs/readline:= - sys-libs/ncurses:= - virtual/libintl - !gnutls? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls:= ) - tcpd? ( sys-apps/tcp-wrappers ) - ziffy? ( net-libs/libpcap ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/tcl:0 - app-alternatives/yacc - >=dev-build/libtool-2 - virtual/pkgconfig -" - -src_prepare() { - default - - # Hardcoded assumption of libraries residing in lib/, bug #730016 - sed -i -e "s|/lib\"|/$(get_libdir)\"|" configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - $(use_with gnutls) \ - $(use_enable tcpd tcpd /usr) -} - -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 -} diff --git a/dev-libs/yaz/yaz-5.34.4-r1.ebuild b/dev-libs/yaz/yaz-5.34.4-r1.ebuild deleted file mode 100644 index 32e9f5d5b752..000000000000 --- a/dev-libs/yaz/yaz-5.34.4-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers" -HOMEPAGE="https://www.indexdata.com/resources/software/yaz/"; - -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 ~ppc ppc64 ~s390 ~sparc x86" -fi - -LICENSE="BSD GPL-2" -SLOT="0/5" -IUSE="gnutls tcpd ziffy" - -RDEPEND=" - dev-libs/icu:= - dev-libs/libxml2:= - dev-libs/libxslt - sys-libs/readline:= - sys-libs/ncurses:= - virtual/libintl - !gnutls? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls:= ) - tcpd? ( sys-apps/tcp-wrappers ) - ziffy? ( net-libs/libpcap ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/tcl:0 - app-alternatives/yacc - >=dev-build/libtool-2 - virtual/pkgconfig -" -DOCS=( NEWS README.md ) - -src_prepare() { - default - - # Hardcoded assumption of libraries residing in lib/, bug #730016 - sed -i -e "s|/lib\"|/$(get_libdir)\"|" configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gnutls) \ - $(use_enable tcpd tcpd /usr) -} - -src_install() { - # make install is a mess, we need to clean it - local docdir="/usr/share/doc/${PF}" - - emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install - - find "${D}" -name '*.la' -delete || die - - einstalldocs - dodir "${docdir}"/html - mv -f "${ED}"/${docdir}/*.{html,png} "${ED}"/${docdir}/html/ || die - mv -f "${ED}"/usr/share/doc/${PN}/common "${ED}"/${docdir}/html/ || die - rm -r "${ED}"/usr/share/doc/${PN} || die -}
