gentoo resync : 28.04.2021

3 files changed, 35 insertions, 25 deletions

diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 0096262227f3..369e6c651e55 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,4 +1,4 @@
-AUX yaz-3.0.47-icu-automagic.patch 899 BLAKE2B b6eafa42b369a76f085efb0b89424c4c182c1604a68bebd7f8fee47a925fdc859973bfceab912b8aeeef2aab288f326fadc0ba2fb63e6e13d047c9811ea326d4 SHA512 55185162a381ae3cb7a880568b2a0a04c1b2f7d8e579e1494df0c2047d021648bce15d223f99a36f59e8b1a14fea161a128a2c01ea7f0e5b2e167e09cf6f856e
+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
-EBUILD yaz-3.0.53.ebuild 1393 BLAKE2B 6dc7470244c53d8d4bba4f911304c970e3b0c274b35dee69a7474cc18b7a76bbc8fce6b0381d7113ae63c7a91f3c0872ee4b82c60eb01471bf4e7e0029738a50 SHA512 e10540ac9a9ead5a2ce30bc2b02de603c040aec505092c7cf1f6f8e327d16fe2996529fd8aecc0bf2c6561280f20ad5c37847bfb87467cb25feba5361d7f5498
+EBUILD yaz-3.0.53.ebuild 1505 BLAKE2B b810f7445c4580f824eed4613a50df7de3c57110126d3a6a6c903b225c71e2de7401bff616bc7a29fef3fe837a6cb481faf7a10549d3cd484c51957ce26ee462 SHA512 66b03d37d144c635621782a9fad5e43481c31ff58aa81dcb4e32aa1b726d2813387dc317c6f7ffc0f40c26aa7fbcccaa4e8624d3cf17daf87ddc6fc0585e48ae
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
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
index a0aedfe05105..dd78635e013e 100644
--- a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
+++ b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
@@ -1,5 +1,5 @@
---- yaz-3.0.47/configure.ac.orig	2009-07-08 04:58:43.000000000 -0700
-+++ yaz-3.0.47/configure.ac	2009-07-31 01:46:21.764545198 -0700
+--- a/configure.ac
++++ b/configure.ac
 @@ -367,14 +367,14 @@
  
  dnl
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index fa044ba4bf87..847579e85f6b 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers"
 HOMEPAGE="http://www.indexdata.dk/yaz"
@@ -11,22 +12,34 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug icu libressl tcpd ziffy"
+IUSE="debug icu gnutls tcpd ziffy"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	dev-libs/libxslt
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	sys-libs/readline:=
+	sys-libs/ncurses:=
+	virtual/libintl
+	!gnutls? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls:= )
 	icu? ( dev-libs/icu:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ziffy? ( net-libs/libpcap )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	ziffy? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/tcl:0
-	>=sys-devel/libtool-2"
+	sys-devel/bison
+	>=sys-devel/libtool-2
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch
+	default
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -35,22 +48,19 @@ src_configure() {
 		--enable-static \
 		--enable-shared \
 		$(use_enable debug memdebug) \
+		$(use_with gnutls) \
 		$(use_enable icu) \
 		$(use_enable tcpd tcpd /usr)
 }
 
-src_compile() {
-	emake
-}
-
 src_install() {
 	local docdir="/usr/share/doc/${PF}"
-	emake DESTDIR="${D}" docdir="${docdir}" install
+	emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install
 
-	dodir ${docdir}/html
-	mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
-	mv -f "${D}"/usr/share/doc/${PN}/common "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
-	rm -rf "${D}"/usr/share/doc/${PN}
+	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
 }