gentoo auto-resync : 13:11:2023 - 16:26:20

4 files changed, 124 insertions, 1 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 544f59b417ea..256af21e068a 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/nbdkit/Manifest b/sys-block/nbdkit/Manifest
index 88499e4011ce..060fe268a1a2 100644
--- a/sys-block/nbdkit/Manifest
+++ b/sys-block/nbdkit/Manifest
@@ -1,4 +1,6 @@
 AUX nbdkit-1.32.4-automagics.patch 5620 BLAKE2B dca814d7d72607dd55284a58261820cf1b065ae1047846158a1e71d78c5182c060e653b89cf786ca9d7fe72514d5f034a2d4350b97a1b007f03eca7834c97e71 SHA512 52741eb9f04e5c40db0cc80e81000dd272d755de311d8ebe42ae16fa373e87ae887afc2153d0e51ff6676200ecaca31ecdab34704957e1090de0a645e8f39ce9
 DIST nbdkit-1.32.4.tar.gz 2342420 BLAKE2B 3ea6692a534548707bc488560b0f0bd0ddeb0daa4b2432da5de18a9a735408370c61b8c0a30d7d4ed6c915eb118948d2462ff4565036bec8a77c2c2fb712f4da SHA512 0eb1f0f492ce3558fba8d472b26f7ca3db7beeba411c98e7e06b55c5456399be56f6b4cd4adb54567f744f8e07986af9f676a983da052d174ce2e3c28109dbc5
+DIST nbdkit-1.36.1.tar.gz 2400838 BLAKE2B afbfbda18122b17cbcdcc5b3a04ab37b7dffb139d084b196ef45e33717f376af61189beb63b2541444eaae0ed860b752c20cfe9cf27bf06bfb04bba1b5ce60c8 SHA512 ca0e6e6729fb6f43a9717a3815dfb8ff54a2f182ef079e72b0e5e1b018c55f2205be52a10abc0b0a2243d0737f27b1ccf67c0d9586135454a460d39dad79f042
 EBUILD nbdkit-1.32.4.ebuild 2633 BLAKE2B 8d71870e032877f490f6cf6241cf4a90a84bde3b90cd2c4041b2a5bd558f7b1527b04e2b9fe253dbd3d3d4f1c18bc448e48c3734d20358f09c35ad050b4cd172 SHA512 bc8ac13a271eb147cd20088b90b05d8370f16fb82e70285868468c637a93383545703fe3b08222ce33e94cc2996ba1f81f0a15744af2862ec43f45789a202945
-MISC metadata.xml 917 BLAKE2B b355eef93f73c32b33e12413b4c6164259586567c33ca6280237c965df0d6eab83e4769091554da275a25bfb5743b77a2ece69825d8ce92fa7e88dfd4c077d57 SHA512 0ade3a6f8a2a699339d54cd3df0351231a1c7147e0051da3b66d9c9e9a243f0137122e8279a30066f170e9e0111dc6ed2d457cadc26c168d448f6f8527f15c81
+EBUILD nbdkit-1.36.1.ebuild 2783 BLAKE2B fb34e75809c54a47de01defa4ccb7a9ded5ec26119ea4d2657158dd2406e7b8ad8db5d27dee2ad2dcf44513f79a38822d3de4c015f8784d3b1eaa49d92a19d00 SHA512 22176e024af34fd2b9398e35053a6d4cffa13921402cde44e5976e3b66ca12793664b7c42a98e611d0edf6f608aa4484defb8ed3adb260e6368774cb428687bf
+MISC metadata.xml 1009 BLAKE2B 1cc756e97a1068bacbdca4f757e3566352fed7588725d82dd675ddcc66a3bfdcb53b73db0d9555df8666422ed7fe68532defbe4e9d3b595769019eba61c4e716 SHA512 7378d4694f1825428b6421f75953dd9b494ff37c811710a1767d52303e32041a7eca21f139d9f42d2455888cdd2f55379db81e6b9554e84030f1867fbbb948a3
diff --git a/sys-block/nbdkit/metadata.xml b/sys-block/nbdkit/metadata.xml
index fef0d9dee6e7..ba85f17afedd 100644
--- a/sys-block/nbdkit/metadata.xml
+++ b/sys-block/nbdkit/metadata.xml
@@ -16,5 +16,6 @@
 		<flag name="libvirt">Enable the <pkg>app-emulation/libvirt</pkg> plugin.</flag>
 		<flag name="nbd">Enable the nbd plugin via <pkg>sys-libs/libnbd</pkg>.</flag>
 		<flag name="torrent">Enable the torrent plugin via <pkg>net-libs/libtorrent-rasterbar</pkg>.</flag>
+		<flag name="zlib-ng">Use <pkg>sys-libs/zlib-ng</pkg> to handle zlib decompression.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-block/nbdkit/nbdkit-1.36.1.ebuild b/sys-block/nbdkit/nbdkit-1.36.1.ebuild
new file mode 100644
index 000000000000..34ea8cc1967c
--- /dev/null
+++ b/sys-block/nbdkit/nbdkit-1.36.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature bash-completion-r1
+
+DESCRIPTION="NBD server with stable plugin ABI and permissive license"
+HOMEPAGE="https://gitlab.com/nbdkit/nbdkit"
+SRC_URI="https://download.libguestfs.org/nbdkit/$(ver_cut 1-2)-stable/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	curl ext2 nbd gnutls libguestfs libssh libvirt lzma selinux torrent
+	valgrind zlib zlib-ng zstd
+"
+
+RDEPEND="
+	virtual/libiconv
+	selinux? ( sys-libs/libselinux )
+	gnutls? ( net-libs/gnutls:= )
+	curl? ( net-misc/curl )
+	libssh? ( net-libs/libssh:= )
+	libvirt? ( app-emulation/libvirt:= )
+	zlib? ( sys-libs/zlib )
+	zlib-ng? ( sys-libs/zlib-ng )
+	nbd? ( sys-libs/libnbd )
+	lzma? ( app-arch/xz-utils )
+	zstd? ( app-arch/zstd:= )
+	libguestfs? ( app-emulation/libguestfs:= )
+	ext2? ( sys-fs/e2fsprogs )
+	torrent? ( net-libs/libtorrent-rasterbar:= )
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+
+	# TODO(arsen): This test fails for some reason.
+	cat <<-HACK > tests/test-file-extents.sh || die
+		#!/bin/sh
+		echo Gentoo: This test is skipped
+		exit 77
+	HACK
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-extra=Gentoo
+
+		--with-iconv
+		--with-manpages
+
+		$(use_with selinux)
+		$(use_with gnutls)
+		$(use_with curl)
+		$(use_with libvirt)
+		$(use_with zlib)
+		$(use_with zlib-ng)
+		$(use_with nbd libnbd)
+		$(use_with lzma liblzma)
+		$(use_with zstd libzstd)
+		$(use_with libguestfs)
+		$(use_with ext2)
+		$(use_enable torrent)
+		$(use_enable valgrind)
+
+		--disable-linuxdisk # Not in Gentoo.
+		--disable-libfuzzer # Should not be used normally according to upstream
+		--without-libblkio # Not in Gentoo.
+		--without-bash-completions # Handled manually.
+
+		# TODO(arsen): Bindings left out
+		--disable-perl
+		--disable-python
+		--disable-ocaml
+		--disable-rust
+		--disable-ruby
+		--disable-tcl
+		--disable-lua
+		--disable-golang
+
+		# This just enabled a few code paths with no extra library
+		# dependencies, but it does have an extra xorriso runtime
+		# dependency.  Seeing as it's optional, and it conflates BDEPEND
+		# and RDEPEND; I think it's okay to just specify that it uses
+		# XORRISO installed as xorriso.  Maybe the user should be able
+		# to override this in the future if they prefer one of the other
+		# ISOPROGs?
+		--with-iso
+		ac_cv_prog_XORRISO=xorriso
+
+		# Involves proprietary code and a dlopen mess, see
+		# plugins/vddk/README.VDDK.
+		--disable-vddk
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	dobashcomp bash-completion/nbdkit
+}
+
+pkg_postinst() {
+	optfeature "virtual ISO plugin via xorriso" dev-libs/libisoburn
+}