gentoo resync : 19.04.2018

4 files changed, 65 insertions, 31 deletions

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index b5eb65db0546..d61403c79b44 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,9 +1,8 @@
-DIST nbd-3.11.tar.xz 451992 BLAKE2B e716825fceaf830542ecff8c2b4ca050a5a8121c24c838a6377010ce38e0b531aef95c770a6488bd2f28bb992b99de761fa92425314fcdef3a969ca1122cd6c3 SHA512 8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a
 DIST nbd-3.15.3.tar.xz 505856 BLAKE2B 8536b01908eb84733448382dcafe011e2786fe5e1363d6d957f1f8895ff257a35c56cecba3b177a1eb2270cec2a7c00082db7408cb8023aa3f20a22eb28bc295 SHA512 c4cd580272faa6a0564469d188decd2db99a5b9d691dca511eea16154ce6185c38e6f695a05bd18941d42cb9e4bb92e30e9eca70d38dce8054a0785ab16b711a
 DIST nbd-3.16.2.tar.xz 504880 BLAKE2B 12579169755f4f57ec295531dc11b88ff412678270cf77cb80b7c76cf3193d115c4602432b7913e58abe417a6e59a13c3ffaee84bd9b4a1f0f34ae104491ce5c SHA512 ebdf42a837aeed7625420958d136c7a98c0b168d80fbfbab4b96cb6510dbc12ec2410716301f68385d69f68329c751aef3266cc74c6e341540e1df5f6c531349
 DIST nbd-3.17.tar.xz 511224 BLAKE2B 9289419e6d1c030d37704e1482f6fbdd2cacb8a1d0f5403e307fbef9b307e842a3bb7ee7240a6b31467ced3ecef1f244fbd916138a32521d26848b3fd1fdc42e SHA512 bcbd025d829d407dc3c0b837cbc1c16f673c5f4c0483d5bee83a52b40d528088499860c775e4e77cf47a8ac1d83dcda24df1092d658dd915ed01c638b3ebc57b
-EBUILD nbd-3.11.ebuild 627 BLAKE2B 9756d464c5c43d474bfaddbf8462b74f47405474e6ae5d2dd45be15310c865fa0343187f62cf641958b30fd25ef8373e8121d506c4a80580c9488eb8b28cebdb SHA512 494ff87d7cb237eb5a7d8347955bd0b158794425444af5cc9afa442c08d5399ce9459a8f13639dcb60c699b3ed26854c30f5a573842d624933de6bc053c1b5af
 EBUILD nbd-3.15.3.ebuild 692 BLAKE2B 7726d0000f9ebaa2c6490dda7f9483ffe546bdfb77ed2f30524666b01505d4b5678bd0b98f17dfc53e57eafb3445625fcc97a20cc32125dd727d9b2094eae317 SHA512 d0bf5937ebe43552c3415f8957b87efd7a651d7a7ecec9243e81b3b6666352255b781b4cf1a09e111ed5c1ff17c76b8865ee66733d623ffdbb2927b64be0fc1a
 EBUILD nbd-3.16.2.ebuild 702 BLAKE2B e3e10fc916cbede8773876a8e87bd99269c48116b2f7b30879d1b0fe95552e88d653cf73b381895e70c3775d51d71d3c54ace15e380ed6b795bd2f8e17f19dbe SHA512 d4344bf7b98c4ff46dc7f1d20763ed64da940b84b0074212a08f7a86752e4ecde408a43a1ee04c3a2f1e735d87d6f2b1269562231b088dcbe1a585ca9e3b607c
 EBUILD nbd-3.17.ebuild 727 BLAKE2B f51ca61d5b7ad61b904c3b15c71f0f2469c71ed7d0628e07b14501689d377364a136a099573574155567ea1476034b45e414c74b3935fe123b5b7cd1196249c1 SHA512 0228b016b62479e4457b58ea635754dff0319109b600d390d057623c54604f1a1af9df7a9c913e366df0f72ee2ebd126e673671dd5a342643ba9fd1b9af552eb
-MISC metadata.xml 323 BLAKE2B 9af4fa4742fa2c06d4d6842f3ddca49882bc0adcdf62958cedb9c8cba299085f1c1f7448a6c41bf6e4e7c6d5b4d1ea2157302af564712582c0d3553d11795549 SHA512 c8dd4e26b9e937aa4f00668ddfe8fa62bae81c98d559978242645d063feffe5585b5a47e38377f11e4d478305fdfe15e695ac1da03f54e3148c875e02a85fae0
+EBUILD nbd-9999.ebuild 1303 BLAKE2B cc38bdafe7c889d2c8960b9e1fe7e7f3dd347a35adbcb1a82ab7681f83dfa5e44b4c186bc84de2b66ce16027a6b5ca2b90b27905ce3174ca8c13dffc7629d796 SHA512 cc8cacad9661ba30fae805e82df0916256b5d50ade3f36225c507be9933d7d32bfd73a6914bf886c9877e4c4f2f7a789fb0388d1c2554ad11d3c411959bbd3a9
+MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index f583809ec477..e233f07bc3f4 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -5,6 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
+</use>
 <upstream>
 	<remote-id type="sourceforge">nbd</remote-id>
 </upstream>
diff --git a/sys-block/nbd/nbd-3.11.ebuild b/sys-block/nbd/nbd-3.11.ebuild
deleted file mode 100644
index bd3b8677d0e0..000000000000
--- a/sys-block/nbd/nbd-3.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="http://nbd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="debug zlib"
-
-RDEPEND=">=dev-libs/glib-2.0
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-lfs \
-		$(use_enable !debug syslog) \
-		$(use_enable debug) \
-		$(use_enable zlib gznbd)
-}
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
new file mode 100644
index 000000000000..c02131c2e628
--- /dev/null
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+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
+"
+
+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[@]}"
+}