gentoo resync : 22.05.2021

4 files changed, 2 insertions, 126 deletions

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 70e0a58475ab..333f5cd9a5cc 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,8 +1,4 @@
-DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16
-DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc
 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-r1.ebuild 1391 BLAKE2B 972f386515c90969add5399770d5cdb5eee86f246357ac620d13a24efbd52067d21486d31f8fc15747511afdacb04016581a3f34e77583f3243b4621a182ec81 SHA512 7b85ad69be35850d5cceac88d8c53054c0d330b47313e7e80ab14a43312e0b9b2f299d9d7832f2fe52b688a65fd37efc3173144add13f7df26edc84bfeb03b4c
+EBUILD nbd-3.21-r1.ebuild 1386 BLAKE2B 94b7f258041f7cf8b0e492ff3ca9b590041b534aa8ef3b08d0ff7567eb4c673ee0512adf94a0bfd6b80bb00ed825b3172071a9a5aeeac3bd3be53116276b7553 SHA512 a5a5e49e15dc7111d5f0bf7c017180f06067172e11682e25de2a3b852ce15af3ec62edd8c0306f36f34b3b04b9bf55c3e858cec6930cd8a6bcddd032c92f5d46
 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.19.ebuild b/sys-block/nbd/nbd-3.19.ebuild
deleted file mode 100644
index 34c5f3a353a8..000000000000
--- a/sys-block/nbd/nbd-3.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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[@]}"
-}
diff --git a/sys-block/nbd/nbd-3.20.ebuild b/sys-block/nbd/nbd-3.20.ebuild
deleted file mode 100644
index fad2a1deedee..000000000000
--- a/sys-block/nbd/nbd-3.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-3.21-r1.ebuild b/sys-block/nbd/nbd-3.21-r1.ebuild
index 732367ad8970..8e28515c51fc 100644
--- a/sys-block/nbd/nbd-3.21-r1.ebuild
+++ b/sys-block/nbd/nbd-3.21-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"