gentoo resync : 01.08.2021

6 files changed, 58 insertions, 5 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 97df54f26709..fd14465c02ab 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
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
 }
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index f6d39bf3d7f5..7475eca4e217 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -2,5 +2,5 @@ AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
-EBUILD parted-3.4.ebuild 1467 BLAKE2B 255a22fd0e407793f428091bd6c64f18f709e254d020a98ebe7b25eda24ef98b9acd00a7f90f811800e56dfd99067038f1cd78e6ef36978b5ee88146bc6ad4a7 SHA512 d887a2dd9fba74ce72a43275d4e00da42f0993157ad73347364c9b032a9829a52671e8b5caf788bb974b68bc7c73130e6c44a8a0a61fc4384980e03e69237fd9
+EBUILD parted-3.4.ebuild 1465 BLAKE2B f2d03a3250e869fedc29428ecae13f88c2bb1b7e4f2693d0893db7ff9e37c8cce1e3e2caf8bddcb1f4f06bdc77e3195d3afc1f840d0356fd72fa33934262d12d SHA512 997295b4cfc791632cb6902a01ed06750b5a4cff47de3513b7e4fb9bb610a1d799985168c219305758345d035fc967a8e33198e37033384045bd0188f09769f7
 MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index 573a9aca4f70..2e26bc74904e 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${EPREFIX}/usr/share/openpgp-keys/bcl.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/bcl.asc
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch