gentoo resync : 28.04.2021

1 files changed, 31 insertions, 21 deletions

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
 }