gentoo resync : 29.12.2022

3 files changed, 93 insertions, 8 deletions

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index d1ee4fe63789..b339216fb878 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,4 +1,6 @@
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
+DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
 EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
-EBUILD nbd-9999.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+EBUILD nbd-3.24.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
+EBUILD nbd-9999.ebuild 1526 BLAKE2B 18b7f47587ee6873b8b19a3b0a7090d86f9571b7487153c6eaa0fe6851a5a25f70c1ff38dc4f164af706cad24e71ea576de95aedf8c76d192c020076b70e9aeb SHA512 0fe662088839a0cc786a32fb0ee371e5c73b4858b9705ed497277e094bb9ebcba6cbee44a4384fff0ecb9ef695a15971bdd3ca8fa51172b45189696cae8f500e
 MISC metadata.xml 490 BLAKE2B b6fff304d62aee96038650fd12b2f4f9d82f7a8be72214766699437563da6f4d305effe58c0beba58ad1c537d8d3ec9ee4d3a698480977be6020317f3279335b SHA512 3e495bb823aae9aa2ce314b31cfe49dc40721e01f45b0d2179f18701b18fef89732d831cd1c0ebbdf1dcef1044a0b507262c586f81897e594ef1394a41211665
diff --git a/sys-block/nbd/nbd-3.24.ebuild b/sys-block/nbd/nbd-3.24.ebuild
new file mode 100644
index 000000000000..04319fda899d
--- /dev/null
+++ b/sys-block/nbd/nbd-3.24.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="https://nbd.sourceforge.net/"
+if [[ ${PV} = 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
+else
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
+		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}"
+BDEPEND="sys-devel/bison"
+
+if [[ ${PV} = 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-sgml-dtd:4.5
+		app-text/docbook-sgml-utils
+		sys-devel/autoconf-archive
+	"
+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[@]}"
+}
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
index 732367ad8970..04319fda899d 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,14 +6,16 @@ EAPI=7
 inherit systemd
 
 DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="http://nbd.sourceforge.net/"
-if [[ "${PV}" = 9999 ]] ; then
+HOMEPAGE="https://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"
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
+		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"
@@ -27,24 +29,29 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
 
-if [[ "${PV}" = 9999 ]] ; then
-	DEPEND+="
+if [[ ${PV} = 9999 ]] ; then
+	BDEPEND+="
 		app-text/docbook-sgml-dtd:4.5
 		app-text/docbook-sgml-utils
+		sys-devel/autoconf-archive
 	"
 fi
 
 src_prepare() {
 	default
-	if [[ "${PV}" = 9999 ]] ; then
+
+	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
 }
@@ -58,6 +65,7 @@ src_configure() {
 		$(use_with gnutls)
 		$(use_with netlink libnl)
 	)
+
 	econf "${myeconfargs[@]}"
 }