sys-block/nbd: bump to v3.20

EAPI bumped to EAPI=7

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 269f5b58a75eafea9280bd426a31e1cb543dd5dd..c5d439ef0d03955551e078e28da683a30804c4e9 100644 (file)
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,3 +1,4 @@
 DIST nbd-3.15.3.tar.xz 505856 BLAKE2B 8536b01908eb84733448382dcafe011e2786fe5e1363d6d957f1f8895ff257a35c56cecba3b177a1eb2270cec2a7c00082db7408cb8023aa3f20a22eb28bc295 SHA512 c4cd580272faa6a0564469d188decd2db99a5b9d691dca511eea16154ce6185c38e6f695a05bd18941d42cb9e4bb92e30e9eca70d38dce8054a0785ab16b711a
 DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a689be498959d90bb44dd39681fdcd005fe8e48f9a79fbe29bfd67d98fc0eb6440e51b1ac3a5de4d002060d SHA512 f9fe221b585c126efa3fb65e2344477a38f2ce42164b04d0dc4681c5a3bfd34d5d3e227454fff24eee9039853eb38a8707ea0aab0337f44906cccf379c185ce8
 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16
+DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc

diff --git a/sys-block/nbd/nbd-3.20.ebuild b/sys-block/nbd/nbd-3.20.ebuild
new file mode 100644 (file)
index 0000000..fad2a1d
--- /dev/null
+++ b/sys-block/nbd/nbd-3.20.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+if [[ "${PV}" = 9999 ]] ; then
+       inherit autotools git-r3
+       EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
+else
+       SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls netlink zlib"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+       >=dev-libs/glib-2.26.0
+       gnutls? ( >=net-libs/gnutls-2.12.0 )
+       netlink? ( >=dev-libs/libnl-3.1 )
+       zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+if [[ "${PV}" = 9999 ]] ; then
+       DEPEND+="
+               app-text/docbook-sgml-dtd:4.5
+               app-text/docbook-sgml-utils
+       "
+fi
+
+src_prepare() {
+       default
+       if [[ "${PV}" = 9999 ]] ; then
+               emake -C man -f Makefile.am \
+                       nbd-server.1.sh.in \
+                       nbd-server.5.sh.in \
+                       nbd-client.8.sh.in \
+                       nbd-trdump.1.sh.in \
+                       nbdtab.5.sh.in
+               emake -C systemd -f Makefile.am nbd@.service.sh.in
+               eautoreconf
+       fi
+}
+
+src_configure() {
+       local myeconfargs=(
+               --enable-lfs
+               $(use_enable !debug syslog)
+               $(use_enable debug)
+               $(use_enable zlib gznbd)
+               $(use_with gnutls)
+               $(use_with netlink libnl)
+       )
+       econf "${myeconfargs[@]}"
+}

diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
index c02131c2e6287b67b621552037196e0fc4088795..fad2a1deedeedaf96f32c4d9954bbdf88f12eb17 100644 (file)
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
@@ -16,15 +16,15 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug gnutls netlink zlib"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
        >=dev-libs/glib-2.26.0
        gnutls? ( >=net-libs/gnutls-2.12.0 )
        netlink? ( >=dev-libs/libnl-3.1 )
        zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 if [[ "${PV}" = 9999 ]] ; then
        DEPEND+="