gentoo resync : 01.08.2021

3 files changed, 56 insertions, 3 deletions

diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index 397e30a6cbc0..da1493e21fdc 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,3 +1,4 @@
+AUX ndctl-71.1-bash-completion-configure.patch 1717 BLAKE2B 167bc8e1bdb8fb9c31451c7ca7ed0edd28ecdc03185a06d96b125a604b34816df1927788d5208d229704778c356d26cd41b2d031af29e66686d0dbd0c2206f74 SHA512 b688bc49e413cb41c0b611f304a91f074a99fbcd60393c18d36435a7e3fa0a4326bf2107ff731adda96d0f14b57cf37d265de6156e903f43beec225cf8a7474f
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
-EBUILD ndctl-71.1-r1.ebuild 1203 BLAKE2B 8a5c0832c4ee85cb04f512e87dccd937c223870e1476ce1d080dc64184bd2681546795ad6d0b609510f4ffdc8e0987e148630afc170a0d68215ae73bdfaf1d93 SHA512 46b8429fa942fb278a72ffd6980932359acba2146e5ff72070e56c3240144e9a4535836902cf5eab4edbc47a61bfb4d434f31e6d30220f0166f62b61827a53ec
+EBUILD ndctl-71.1-r2.ebuild 1266 BLAKE2B eea6e5193230abe91775fade34483046f5bed0ac5a0fe2ff739fee84c1ec368d044b12ec3032c20f6219c038df1abcc656b948c352477570131ec4bfff639d86 SHA512 a6e207637e43d707b6263edf84b8eb1186e3da517d932767b66a1e1f6b78d4c072efec2b5a32e81c188bfb0d807c03ddb15a401c224b77a2c45cdec288505fee
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch b/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch
new file mode 100644
index 000000000000..d6a796ab9796
--- /dev/null
+++ b/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch
@@ -0,0 +1,48 @@
+https://github.com/pmem/ndctl/pull/174
+
+From 92485810ce872c92b925ccdf4e3b58fa37ccbb8e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 17 Jul 2021 19:31:56 +0100
+Subject: [PATCH] change bash-completion
+
+---
+ configure.ac | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ec8d2f..f7b1aed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,19 +133,22 @@ PKG_CHECK_MODULES([UUID], [uuid],
+ 	[AC_DEFINE([HAVE_UUID], [1], [Define to 1 if using libuuid])])
+ PKG_CHECK_MODULES([JSON], [json-c])
+ 
+-AC_ARG_WITH([bash],
+-	AS_HELP_STRING([--with-bash],
+-		[Enable bash auto-completion. @<:@default=yes@:>@]),
++AC_ARG_WITH([bash-completion-dir],
++	AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
++		[Enable bash auto-completion. Uses pkgconfig if no path given. @<:@default=yes@:>@]),
+ 	[],
+-	[with_bash=yes])
++	[with_bash_completion_dir=yes])
+ 
+-if test "x$with_bash" = "xyes"; then
++if test "x$with_bash_completion_dir" = "xyes"; then
+ 	PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
+-		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)], [])
++		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)],
++		[BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
++else
++	BASH_COMPLETION_DIR="$with_bash_completion_dir"
+ fi
+ 
+ AC_SUBST([BASH_COMPLETION_DIR])
+-AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash" = "xyes"])
++AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash_completion_dir" != "xno"])
+ 
+ AC_ARG_ENABLE([local],
+         AS_HELP_STRING([--disable-local], [build against kernel ndctl.h @<:@default=system@:>@]),
+-- 
+2.32.0
+
diff --git a/sys-block/ndctl/ndctl-71.1-r1.ebuild b/sys-block/ndctl/ndctl-71.1-r2.ebuild
index 4f2aa941c70a..d6c230f369cd 100644
--- a/sys-block/ndctl/ndctl-71.1-r1.ebuild
+++ b/sys-block/ndctl/ndctl-71.1-r2.ebuild
@@ -40,6 +40,10 @@ DOCS=(
 	CONTRIBUTING.md
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-71.1-bash-completion-configure.patch"
+)
+
 src_prepare() {
 	default
 	printf 'm4_define([GIT_VERSION], [%s])' "${PV}" > version.m4 || die
@@ -49,7 +53,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with bash-completion bash) \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
 		$(use_with systemd) \
 		--disable-asciidoctor
 }
@@ -61,5 +65,5 @@ src_test() {
 src_install() {
 	default
 
-	use bash-completion && bashcomp_alias ndctl daxctl
+	bashcomp_alias ndctl daxctl
 }