gentoo auto-resync : 05:06:2023 - 09:36:29

3 files changed, 105 insertions, 15 deletions

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index abfabc839a88..0d043666009d 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,6 +1,8 @@
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
 DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
+DIST nbd-3.25.tar.xz 566360 BLAKE2B dce56fb91f6358955b0173b589df19ce2682e3cd6810b0bd74eeb973c24e52307ed55e197c13dcb9c2a62ac92e0dddb046fd1f4348862c7f7dc17bc479ba8cad SHA512 e8b83475a698b5c3718331b55a2c28fd10ca031e347aac7c439f1653d78a405fefa5cb2618e60f73b2f170a8c93d68e79a2cd5875e5c6a970cb1ef9d8e08ebda
 EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
 EBUILD nbd-3.24.ebuild 1549 BLAKE2B eac4399742e9efe53e9c8d789a04a5fbd741f6780a713891b6d7860cdcc7fba7456fc425bde110c722aba1f17ce392052d876d31b481fa695d18efdf89b560e6 SHA512 0a83717fbf95097b82f9e54fa2ecd1ab36bae7458b868ddbf387d8a85758250cfbf94cd2054b90febc6ce6397eb94e4a15e6239b4aab5c262f658c42b7064f52
-EBUILD nbd-9999.ebuild 1546 BLAKE2B 6cdbd7096e47d71c66ade45d0fbc3bcaffc04084e11e99d1f79564583bf19d94184a6d16d36ed45efbb979bde2661348565d7a114e3114d16bf349f06376a586 SHA512 01f2cf21b2980a7be2b5228f2db52c07bf5285774f351891b64966988c80fe730ae6700c8c98a585d92c69fd4c83138e3d64ab2464ed2ae117bdc472f7104c8c
+EBUILD nbd-3.25.ebuild 1636 BLAKE2B 17ba4fc9673b4c0050b1967290f3b802acbbda0d7a7781e23f3e5bc74ce1febd264dc90d10b140931b59036cc2e2d0e42b64b3721128f2e3f8d7b0a546c06708 SHA512 e4deaf77ba049464cce2eb30fccefbf55bb4d4f79943d3d2b2b532822f1080659b1b8ddad4d1b5bd8d9d136dc4c07346c6cf77b531497736843bdc601b232e96
+EBUILD nbd-9999.ebuild 1636 BLAKE2B 17ba4fc9673b4c0050b1967290f3b802acbbda0d7a7781e23f3e5bc74ce1febd264dc90d10b140931b59036cc2e2d0e42b64b3721128f2e3f8d7b0a546c06708 SHA512 e4deaf77ba049464cce2eb30fccefbf55bb4d4f79943d3d2b2b532822f1080659b1b8ddad4d1b5bd8d9d136dc4c07346c6cf77b531497736843bdc601b232e96
 MISC metadata.xml 490 BLAKE2B b6fff304d62aee96038650fd12b2f4f9d82f7a8be72214766699437563da6f4d305effe58c0beba58ad1c537d8d3ec9ee4d3a698480977be6020317f3279335b SHA512 3e495bb823aae9aa2ce314b31cfe49dc40721e01f45b0d2179f18701b18fef89732d831cd1c0ebbdf1dcef1044a0b507262c586f81897e594ef1394a41211665
diff --git a/sys-block/nbd/nbd-3.25.ebuild b/sys-block/nbd/nbd-3.25.ebuild
new file mode 100644
index 000000000000..a0554e3c6d37
--- /dev/null
+++ b/sys-block/nbd/nbd-3.25.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="https://nbd.sourceforge.io/"
+
+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"
+	SRC_URI+=" mirror://sourceforge/nbd/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls netlink zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0
+	gnutls? ( >=net-libs/gnutls-2.12.0 )
+	netlink? ( >=dev-libs/libnl-3.1 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+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 mans.mk \
+			nbd-server.1.sh.in \
+			nbd-server.5.sh.in \
+			nbd-client.8.sh.in \
+			nbd-trdump.1.sh.in \
+			nbd-trplay.1.sh.in \
+			nbdtab.5.sh.in
+
+		emake -C systemd -f Makefile.am nbd@.service.sh.in
+
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# Needs Bison
+	unset YACC
+
+	local myeconfargs=(
+		--enable-lfs
+		# https://github.com/NetworkBlockDevice/nbd/issues/149
+		--disable-gznbd
+		$(use_enable !debug syslog)
+		$(use_enable debug)
+		$(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 72e1b43ee6b1..a0554e3c6d37 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,37 +1,39 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
 DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="https://nbd.sourceforge.net/"
-if [[ ${PV} = 9999 ]] ; then
+HOMEPAGE="https://nbd.sourceforge.io/"
+
+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"
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz"
+	SRC_URI+=" mirror://sourceforge/nbd/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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
+	>=dev-libs/glib-2.32.0
 	gnutls? ( >=net-libs/gnutls-2.12.0 )
 	netlink? ( >=dev-libs/libnl-3.1 )
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
 
-if [[ ${PV} = 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	BDEPEND+="
 		app-text/docbook-sgml-dtd:4.5
 		app-text/docbook-sgml-utils
@@ -42,7 +44,7 @@ fi
 src_prepare() {
 	default
 
-	if [[ ${PV} = 9999 ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		emake -C man -f mans.mk \
 			nbd-server.1.sh.in \
 			nbd-server.5.sh.in \
@@ -58,11 +60,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs Bison
+	unset YACC
+
 	local myeconfargs=(
 		--enable-lfs
+		# https://github.com/NetworkBlockDevice/nbd/issues/149
+		--disable-gznbd
 		$(use_enable !debug syslog)
 		$(use_enable debug)
-		$(use_enable zlib gznbd)
 		$(use_with gnutls)
 		$(use_with netlink libnl)
 	)