net-dns/knot: Clean ebuilds

Package-Manager: portage-2.2.28

net-dns/knot/knot-2.3.0.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1 eutils systemd user
 
@@ -21,7 +21,10 @@ RDEPEND="
 	>=dev-db/lmdb-0.9.15
 	>=dev-libs/userspace-rcu-0.5.4
 	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	idn? ( net-dns/libidn )
 	dev-libs/libedit
 	systemd? ( sys-apps/systemd )
@@ -29,13 +32,15 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+	doc? ( dev-python/sphinx )
 "
 
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
 	epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch"
+	epatch "${FILESDIR}/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch"
+	eapply_user
 }
 
 src_configure() {
@@ -55,15 +60,11 @@ src_configure() {
 
 src_compile() {
 	default
-	use doc && emake -C doc html-local singlehtml pdf-local info-local
+	use doc && emake -C doc html
 }
 
-# Portage's automatic test code runs "make -n check" to see if there
-# is a "check" target, but that fails here because the test
-# infrastructure hasn't been built yet. Just run "make check", which
-# will build it and then run the tests.
 src_test() {
-	emake -j1 check
+	emake check
 }
 
 src_install() {
@@ -71,21 +72,12 @@ src_install() {
 	keepdir /var/lib/${PN}
 
 	if use doc; then
-		dodoc doc/_build/latex/KnotDNS.pdf
-
 		docinto html
 		dodoc doc/_build/html/*.html doc/_build/html/*.js
 		docinto html/_sources
 		dodoc doc/_build/html/_sources/*
 		docinto html/_static
 		dodoc doc/_build/html/_static/*
-
-		docinto singlehtml
-		dodoc doc/_build/singlehtml/index.html
-		docinto singlehtml/_static/
-		dodoc doc/_build/singlehtml/_static/*
-
-		doinfo doc/_build/texinfo/KnotDNS.info
 	fi
 
 	newinitd "${FILESDIR}/knot.init" knot