commit: 217f3b1ce6f8e03412ea46fa0e5ffed041a77b97 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> AuthorDate: Wed Jan 14 03:08:25 2026 +0000 Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org> CommitDate: Fri Jan 16 21:09:31 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217f3b1c
sys-libs/libnbd: Remove "which", fix bash completions Satisfy Portage's bash-completions check by creating the symlinks even though the corresponding binaries are never built. Closes: https://bugs.gentoo.org/960679 Closes: https://bugs.gentoo.org/962784 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45370 Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org> sys-libs/libnbd/files/libnbd-1.22.5-which-hunt.patch | 13 +++++++++++++ sys-libs/libnbd/libnbd-1.22.5-r1.ebuild | 6 +++++- sys-libs/libnbd/libnbd-1.23.9-r1.ebuild | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sys-libs/libnbd/files/libnbd-1.22.5-which-hunt.patch b/sys-libs/libnbd/files/libnbd-1.22.5-which-hunt.patch new file mode 100644 index 000000000000..e4f53b1d3b93 --- /dev/null +++ b/sys-libs/libnbd/files/libnbd-1.22.5-which-hunt.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 6c7cae8a..d938f140 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,7 +432,7 @@ HEADING([Checking for bash]) + dnl Bash must be at least version 4. If it is too old, fail hard + dnl with a good diagnostic. Note macOS ships an ancient version + dnl of bash (https://gitlab.com/nbdkit/nbdkit/-/issues/21) +-bash=`which bash` ++bash=$(command -v bash) + AC_MSG_CHECKING([for the major version of $bash]) + bash_major=`bash -c 'echo ${BASH_VERSINFO:-0}'` + AC_MSG_RESULT([$bash_major]) diff --git a/sys-libs/libnbd/libnbd-1.22.5-r1.ebuild b/sys-libs/libnbd/libnbd-1.22.5-r1.ebuild index 5db7f1b18f2b..5755e4214343 100644 --- a/sys-libs/libnbd/libnbd-1.22.5-r1.ebuild +++ b/sys-libs/libnbd/libnbd-1.22.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,6 +47,7 @@ BDEPEND="dev-lang/perl" PATCHES=( "${FILESDIR}/${PN}-1.22.2-build-Remove-automagic-compiling-of-examples.patch" "${FILESDIR}/${PN}-1.22.2-Makefile.am-Conditionally-compile-some-SUBDIRS.patch" + "${FILESDIR}/${PN}-1.22.5-which-hunt.patch" ) pkg_setup() { @@ -103,6 +104,9 @@ src_configure() { src_install() { default + use fuse || bashcomp_alias nbdsh nbdfuse + bashcomp_alias nbdsh nbdublk + use ocaml && strip-lto-bytecode find "${ED}" -name '*.la' -delete || die diff --git a/sys-libs/libnbd/libnbd-1.23.9-r1.ebuild b/sys-libs/libnbd/libnbd-1.23.9-r1.ebuild index c3076c1c66ff..122b31cc57b0 100644 --- a/sys-libs/libnbd/libnbd-1.23.9-r1.ebuild +++ b/sys-libs/libnbd/libnbd-1.23.9-r1.ebuild @@ -47,6 +47,7 @@ BDEPEND="dev-lang/perl" PATCHES=( "${FILESDIR}/${PN}-1.22.2-build-Remove-automagic-compiling-of-examples.patch" "${FILESDIR}/${PN}-1.22.2-Makefile.am-Conditionally-compile-some-SUBDIRS.patch" + "${FILESDIR}/${PN}-1.22.5-which-hunt.patch" ) pkg_setup() { @@ -103,6 +104,9 @@ src_configure() { src_install() { default + use fuse || bashcomp_alias nbdsh nbdfuse + bashcomp_alias nbdsh nbdublk + use ocaml && strip-lto-bytecode find "${ED}" -name '*.la' -delete || die
