commit: ac3b8bc87c1494bfdb18e40cd5fa876a5e8168b4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 00:53:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 01:04:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3b8bc8
sys-fs/zfs: add 2.2.0_rc5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/zfs/Manifest | 2 ++
.../zfs/files/2.2.0_rc5-bash-completion-path.patch | 24 ++++++++++++++++++++++
.../zfs/{zfs-9999.ebuild => zfs-2.2.0_rc5.ebuild} | 1 +
sys-fs/zfs/zfs-9999.ebuild | 1 +
4 files changed, 28 insertions(+)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 8d72400873aa..c032b3e43f79 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.0-rc3.tar.gz 33666688 BLAKE2B
37c47bcbf34d9238f42bbc80e2b0712a9e64a
DIST zfs-2.2.0-rc3.tar.gz.asc 195 BLAKE2B
cbbced9255a3b6a5ec0190806b73e62533600975dad073b82532fb1e488bf81b8d056c7a4f59b9e212a9825ec4900d6f2e2c0141b3d4d58577fe36d9bc3c15b9
SHA512
45424815e39b33107805da737ecfcb95c761ab774143e72449dacfe98a851ddf52c7cb08a587548159305b4c4fe51a0fb9cfbf30fdadf093518eb4c8ce49e12c
DIST zfs-2.2.0-rc4.tar.gz 33660298 BLAKE2B
c8179cf7a8caaa07e6898d9169fa3f825d070d1e7f26552797ebaeb4a6cdddd122072903f93113b4bf817acc47911d6c32b4f4801f09382b7a6376369086f329
SHA512
ae389b24616d1800cff2df1e06b22d0fc507ccd573cda47cd84c7aa3271a5e3b78668a135224e8d0747eb63104544fc284d814073e4061908553faf3d2b0f075
DIST zfs-2.2.0-rc4.tar.gz.asc 195 BLAKE2B
496f5163235f743e64da3862245a8dfabd95d06071183514ab11f7dd7792b32823b73864888d7a2fbf2dee16ca374772b07139287a1e66416dbd82e062b25ba9
SHA512
6a0ce528e0b15b4c1b8f02db9aaa9ce61bdf9a7c1c88336b91042802535618fd95aa4f59211bef0d1d79f833d8ae2030c4be8ee5a2244b13ec3f684aa1cdee4e
+DIST zfs-2.2.0-rc5.tar.gz 33674415 BLAKE2B
89187462b9f544779e331fe06a84763918bfedcccb3ecfe28cfef00f6ee30690e5a1983bc670a73f0b9db809f4aa23b59255b66907b5ca2c9e236b471b9a8a63
SHA512
68610a68526c79486b7cd8ca28abd0d8dd42814c37a82ea2be05b0044998ef36c5aaa3fc7598c1a8426b73116351a9b00c8ffdab3e5ae3aecc4954fb9378c422
+DIST zfs-2.2.0-rc5.tar.gz.asc 195 BLAKE2B
59c204bb0eb2140a82cb4066e5bb2b66c1331aabf65c807869fbab89a177b0e09aa8b23bdbc46bb18785db554405a085841605885b3931119d1e3eb0335e257a
SHA512
83101a1e350db4276296f9ed52a556ea36f4238c272ab565926ec69dca495c645a7b41164baee39768123c5982459d10b54819ba9d9ac6c37fe851952db29887
diff --git a/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch
b/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch
new file mode 100644
index 000000000000..abfc80e07ff8
--- /dev/null
+++ b/sys-fs/zfs/files/2.2.0_rc5-bash-completion-path.patch
@@ -0,0 +1,24 @@
+https://github.com/openzfs/zfs/pull/15372
+
+From bb6ce273b2e04b609cc3d75d60afc3105251bc1f Mon Sep 17 00:00:00 2001
+From: Sam James <[email protected]>
+Date: Sun, 8 Oct 2023 02:00:29 +0100
+Subject: [PATCH] config/zfs-build.m4: add Gentoo's bash-completion path
+
+Followup e69ade32e116e72d03068c03799924c3f1a15c95 by adding Gentoo's
+bash completion path.
+
+We should probably consider using/honouring the standard
--with-bashcompletiondir
+autoconf option as well, but that's something to do later.
+
+Signed-off-by: Sam James <[email protected]>
+--- a/config/zfs-build.m4
++++ b/config/zfs-build.m4
+@@ -626,6 +626,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
+ ubuntu)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ debian)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ freebsd) bashcompletiondir=$sysconfdir/bash_completion.d;;
++ gentoo)
bashcompletiondir=/usr/share/bash-completion/completions ;;
+ *) bashcompletiondir=/etc/bash_completion.d ;;
+ esac
+ AC_MSG_RESULT([$bashcompletiondir])
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-2.2.0_rc5.ebuild
similarity index 99%
copy from sys-fs/zfs/zfs-9999.ebuild
copy to sys-fs/zfs/zfs-2.2.0_rc5.ebuild
index ce763553b647..28557faa6f92 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-2.2.0_rc5.ebuild
@@ -105,6 +105,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.0_rc5-bash-completion-path.patch
)
pkg_pretend() {
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index ce763553b647..28557faa6f92 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -105,6 +105,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.0_rc5-bash-completion-path.patch
)
pkg_pretend() {
