From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 sys-block/nbd/Manifest           |  4 +--
 sys-block/nbd/nbd-3.21-r1.ebuild | 67 ++++++++++++++++++++++++++++++++++++++++
 sys-block/nbd/nbd-3.21.ebuild    | 60 -----------------------------------
 sys-block/nbd/nbd-9999.ebuild    |  9 +++++-
 4 files changed, 77 insertions(+), 63 deletions(-)
 create mode 100644 sys-block/nbd/nbd-3.21-r1.ebuild
 delete mode 100644 sys-block/nbd/nbd-3.21.ebuild

(limited to 'sys-block/nbd')

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index c295ba322ce2..70e0a58475ab 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -3,6 +3,6 @@ DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2
 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
 EBUILD nbd-3.19.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5ae960b29fa126651a24b8d163397303e1d60ddf6805e8fbf1eb7da424a9f17cce965a3364efe5e392c693 SHA512 62c3e5d72ab82bac59a5bae71e05231d7cdfe2102799c5e6d345987cfe4a94fba4b69343e9615b2e2bbc168bac4e394ed190e891eebdee97e814f96c4d23d4dd
 EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
-EBUILD nbd-3.21.ebuild 1309 BLAKE2B 73495cbbfd1fc4c702e855f5a000a2e4727f5da7f52e44468146affaa30cbd7569b04cbeeb9b758c7b809c8b80871debdce7952c5b34c7e68c359785d71e4554 SHA512 2189fa47adaf7c300bd525eebc906512d3c4747571b3548930b1d2fc8a21b8900db247bc9c68ec16e3d1db48af6c773020b836b37757cb584cb86804fda34012
-EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
+EBUILD nbd-3.21-r1.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+EBUILD nbd-9999.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
 MISC metadata.xml 489 BLAKE2B 13de137846e31045a97f7672b54d57e90dfaa1fc5af93ea634db818fa289a088d2a0aa8be2ca14c5f68c2fcace77373ae991425730fce7fee8fef1790fc54053 SHA512 b03527f176309631c352662713ce1dfd9ba1c1325dfe3180047edc01e440c92885a3f17cc7ca170ec9add3ada0022d34b455de25e7117b99b795a30afc3971a1
diff --git a/sys-block/nbd/nbd-3.21-r1.ebuild b/sys-block/nbd/nbd-3.21-r1.ebuild
new file mode 100644
index 000000000000..732367ad8970
--- /dev/null
+++ b/sys-block/nbd/nbd-3.21-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 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="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[@]}"
+}
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
diff --git a/sys-block/nbd/nbd-3.21.ebuild b/sys-block/nbd/nbd-3.21.ebuild
deleted file mode 100644
index 57890d32bc1c..000000000000
--- a/sys-block/nbd/nbd-3.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 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 fad2a1deedee..732367ad8970 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 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="http://nbd.sourceforge.net/"
 if [[ "${PV}" = 9999 ]] ; then
@@ -58,3 +60,8 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
-- 
cgit v1.2.3