5 files changed, 2 insertions, 232 deletions
diff --git a/sys-libs/libnbd/Manifest b/sys-libs/libnbd/Manifest
index fe4cfdaffbd1..0da684ae2d08 100644
--- a/sys-libs/libnbd/Manifest
+++ b/sys-libs/libnbd/Manifest
@@ -1,8 +1,3 @@
-DIST libnbd-1.14.1.tar.gz 1257547 BLAKE2B 4c2fc02abc1d069b23fb8cc52b3359f10ebd23f2bc8cb359274a4fc2781413445d64ca1013b3123dff090d359a0e28076aa410220a05b155f95320238d1b99ee SHA512 9d95cf7a66926d00ec9aacfc6d04f2dc885ccfed07c78f1e6693190dd14132d30d6d1ff7d46e46007732a8a20a9fbf648775bc0b3371ad49eff4ce1e44e47209
-DIST libnbd-1.16.1.tar.gz 1379437 BLAKE2B 13020c21663e988d46fb5a048b31c58b0256c7c547fee2b95bde139324043d6102a0a901c98ffa75f88eca38cd0293329c62d6613435b74e65802c083af3c58f SHA512 e840cff964e847015955f0a0dcc7d03899d5e0fb0bdd3f5597ec87169d0b2689213fed72fd3afc84300ec86ed10703e9396599c11750ef10df66cf61853210a5
 DIST libnbd-1.18.1.tar.gz 1482736 BLAKE2B d3f0b2993fa1392df93b0bbc5d63805489ad1a82cf5bcc5eb5c3b5b7e7e6c40095471ab8fc964cc0e5c7a99affa7150f7be38cc16c42f27fc4cdc16bd0ca0359 SHA512 f4262666be55d580550e053355f14f80d352bf869ae7241e9fa032a9b5cd9e027eb89a536871c1206422413fc7ed745da7d612b3e1413f76ec17168705fbf12c
-EBUILD libnbd-1.14.1.ebuild 1312 BLAKE2B 9972d0595b29b56b6d9f4ed1bcc32b95576522ce50c185effec698101e8d903220c6153fcaaac7cd58388f79c17f4c160e02667639838f8b3cfc92a874327c88 SHA512 ee216b3776d71fbd30569aa243b09a4432346082f0d2c077b3ff1959575d586d3d5528fea20a7dae03544e5be24d11fb5771c1730d4262d5ca59187aa1a8167d
-EBUILD libnbd-1.16.1-r1.ebuild 1676 BLAKE2B e53214b35a0e5cc1a0b6fa78d86b523c70d9cde10e0ae54692842a3708884e9fed8a8fd83fbd3960e7d9fa8119d5fd3dda59395be511bbac6201da6121034b68 SHA512 26401e140d446408021ab5d1fddb84fdebbbf783a4646ac2e2cd7b7b228065377c893dfa9be63597e09201a4d723ea258626f15fa1583d8b6ec3a484b7dcc971
-EBUILD libnbd-1.18.1-r1.ebuild 1744 BLAKE2B f69184d3f32c3a2a408a783de66dbd6d7af1de1de1f5ac2f29fab589619d348b163fe126b879f1184ffb73bcd6ba60931232a69e6718cd03f78ace1d300cf805 SHA512 0764c78694353fb62d66c2a213cc871b3e60415f0a26673f55855180742bb3887dd5a07500baf527fd027f3bb5ef1afef18d57f87fbea6d5b96c8ea5731ab9ad
-EBUILD libnbd-1.18.1.ebuild 1744 BLAKE2B 5ebb35d2a7d18d53dbd87d587a047f5b0a0a81dcd6008677d1baa92d1d298d6cff96b57159f40c6654c7c1b7fa6f329bff9514c081b1d7df25508109d8fb0acc SHA512 91d1990dbc79272c2657fac22d73025685ec1eb8472f271061f788bc5cdf4c2daf35158707765139f6d87b820c5a40e49271768430e41014f7e65290c0608d37
+EBUILD libnbd-1.18.1-r2.ebuild 1745 BLAKE2B ef296572dd182df9e490b21854cc0f747ec75c6f7ab171fee3de4797b0f9d970b5e90938d7a7aba9da5eb5e73332e108ff61d7ed755a9409256442147c551727 SHA512 68787e305f869ebe20c88098842e3d117b5717da90102ff26420c2a77c797a55c2b7720e0f363456ed8b9fbadfeafd77603b65981a9f5e5ec6c8f7f498711f9e
 MISC metadata.xml 602 BLAKE2B 5a657a646d5638c03e07f7c6fadc74f781f3dfe2e20078f944b86019fee6589324b96ead60413fba552a746917f8f4182bd577fe96fe2a2efb1182c930fbd03e SHA512 cda017b596de15628ac1c93647ab76beac4fbd0fa2dcbd2cd3d668d9a295c2ce195a6873c71b4612a209c93e112a9d4d52f5884534b8da8de069b770bd6098d4
diff --git a/sys-libs/libnbd/libnbd-1.14.1.ebuild b/sys-libs/libnbd/libnbd-1.14.1.ebuild
deleted file mode 100644
index 7e6f7e91caf7..000000000000
--- a/sys-libs/libnbd/libnbd-1.14.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="NBD client library in userspace"
-HOMEPAGE="https://gitlab.com/nbdkit/libnbd"
-SRC_URI="https://download.libguestfs.org/libnbd/$(ver_cut 1-2)-stable/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
-IUSE="fuse gnutls uri-support test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:3 )
-	gnutls? ( net-libs/gnutls:= )
-	uri-support? ( dev-libs/libxml2 )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-block/nbd[gnutls?] )
-"
-BDEPEND="dev-lang/perl"
-
-src_prepare() {
-	default
-
-	# Some tests require impossible to provide features, such as fuse.
-	# These are marked by requires_... in the functions.sh shell
-	# library.  Rather than listing these tests, let's list out the
-	# impossible to support features and make them skip.
-	cat <<-EOF >> tests/functions.sh.in || die
-		requires_fuse ()
-		{
-			requires false
-		}
-	EOF
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_with gnutls)
-		$(use_with uri-support libxml2)
-		--disable-ocaml
-		--disable-python
-		--disable-golang
-	)
-
-	export bashcompdir="$(get_bashcompdir)"
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libnbd/libnbd-1.16.1-r1.ebuild b/sys-libs/libnbd/libnbd-1.16.1-r1.ebuild
deleted file mode 100644
index 6be886ede4e7..000000000000
--- a/sys-libs/libnbd/libnbd-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="NBD client library in userspace"
-HOMEPAGE="https://gitlab.com/nbdkit/libnbd"
-SRC_URI="https://download.libguestfs.org/libnbd/$(ver_cut 1-2)-stable/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="fuse gnutls go ocaml python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# libxml2 - URI support
-RDEPEND="
-	dev-libs/libxml2
-	fuse? ( sys-fs/fuse:3 )
-	gnutls? ( net-libs/gnutls:= )
-	python? ( ${PYTHON_DEPS} )
-	go? ( dev-lang/go )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		sys-block/nbd[gnutls?]
-		sys-block/nbdkit[gnutls?]
-	)
-"
-BDEPEND="dev-lang/perl"
-
-src_prepare() {
-	default
-
-	# Some tests require impossible to provide features, such as fuse.
-	# These are marked by requires_... in the functions.sh shell
-	# library.  Rather than listing these tests, let's list out the
-	# impossible to support features and make them skip.
-	cat <<-EOF >> tests/functions.sh.in || die
-		requires_fuse ()
-		{
-			requires false
-		}
-	EOF
-
-	# Broken under sandbox.
-	cat <<-EOF > lib/test-fork-safe-execvpe.sh || die
-	#!/bin/sh
-	:
-	EOF
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable go golang)
-		$(use_enable ocaml)
-		$(use_enable python)
-		$(use_with gnutls)
-		--with-libxml2
-	)
-
-	export bashcompdir="$(get_bashcompdir)"
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-	use python && python_optimize
-}
diff --git a/sys-libs/libnbd/libnbd-1.18.1-r1.ebuild b/sys-libs/libnbd/libnbd-1.18.1-r2.ebuild
index f7da6412c679..fb0dce4f9e00 100644
--- a/sys-libs/libnbd/libnbd-1.18.1-r1.ebuild
+++ b/sys-libs/libnbd/libnbd-1.18.1-r2.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
 # libxml2 - URI support
 RDEPEND="
 	dev-libs/libxml2
-	fuse? ( sys-fs/fuse:3 )
+	fuse? ( sys-fs/fuse:3= )
 	gnutls? ( net-libs/gnutls:= )
 	python? ( ${PYTHON_DEPS} )
 	go? ( dev-lang/go )
diff --git a/sys-libs/libnbd/libnbd-1.18.1.ebuild b/sys-libs/libnbd/libnbd-1.18.1.ebuild
deleted file mode 100644
index f113c5cc6050..000000000000
--- a/sys-libs/libnbd/libnbd-1.18.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="NBD client library in userspace"
-HOMEPAGE="https://gitlab.com/nbdkit/libnbd"
-SRC_URI="https://download.libguestfs.org/libnbd/$(ver_cut 1-2)-stable/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="fuse gnutls go ocaml python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# libxml2 - URI support
-RDEPEND="
-	dev-libs/libxml2
-	fuse? ( sys-fs/fuse:3 )
-	gnutls? ( net-libs/gnutls:= )
-	python? ( ${PYTHON_DEPS} )
-	go? ( dev-lang/go )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		sys-block/nbd[gnutls?]
-		sys-block/nbdkit[gnutls?]
-	)
-"
-BDEPEND="dev-lang/perl"
-
-src_prepare() {
-	default
-
-	# Some tests require impossible to provide features, such as fuse.
-	# These are marked by requires_... in the functions.sh shell
-	# library.  Rather than listing these tests, let's list out the
-	# impossible to support features and make them skip.
-	cat <<-EOF >> tests/functions.sh.in || die
-		requires_fuse ()
-		{
-			requires false
-		}
-	EOF
-
-	# Broken under sandbox.
-	cat <<-EOF > lib/test-fork-safe-execvpe.sh || die
-	#!/bin/sh
-	:
-	EOF
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable go golang)
-		$(use_enable ocaml)
-		$(use_enable python)
-		$(use_with gnutls)
-		--disable-rust # TODO(arsen): security bump takes priority
-		--with-libxml2
-	)
-
-	export bashcompdir="$(get_bashcompdir)"
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-	use python && python_optimize
-}