sys-fs/zfs : version bump

11 files changed, 13 insertions, 51 deletions

diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.4 b/metadata/md5-cache/sys-fs/zfs-2.1.0
index 45cb1c24..d6fa38b2 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.4
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DEPEND=~sys-fs/zfs-utils-2.0.4 ~sys-kernel/zfs-dkms-2.0.4
+DEPEND=~sys-fs/zfs-utils-2.1.0 ~sys-kernel/zfs-dkms-2.1.0
 DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild)
 EAPI=5
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=~sys-fs/zfs-utils-2.0.4 ~sys-kernel/zfs-dkms-2.0.4
+RDEPEND=~sys-fs/zfs-utils-2.1.0 ~sys-kernel/zfs-dkms-2.1.0
 SLOT=0
 _md5_=fd9a7a332ff735b0d15efacf4e8ceb45
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.0.4 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.0
index 1bb2568a..7f9ad3dd 100644
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.0.4
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://zfsonlinux.org/
 IUSE=debug pam python test-suite static-libs python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1756c9c7d600f274ba3b414723a07fed
+_md5_=332639468a8a8a2a0678ff410d2da163
diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.0.4 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.0
index 620329ca..cf67bb53 100644
--- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.0.4
+++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.0
@@ -7,6 +7,6 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sys-kernel/dkms
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c99b139394da5f09fe55671b0f12322c
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 3e79c5b4..5bbb8192 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -58,8 +58,8 @@ sys-fs/cryptsetup 2.3.4-r10: Tool to setup encrypted devices with dm-crypt
 sys-fs/eudev 3.2.10-r10: Linux dynamic and persistent device naming support (aka userspace devfs)
 sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20190831-r2: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-sys-fs/zfs 2.0.4: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.0.4: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 2.1.0: ZFS meta-package (Gentoo compatibility ebuild)
+sys-fs/zfs-utils 2.1.0: Userland utilities for ZFS Linux kernel module
 sys-kernel/bbswitch-dkms 0.8-r1: BBswitch sources for linux
 sys-kernel/broadcom-sta-dkms 6.30.223.271-r5: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r1: Dynamic Kernel Module Support
@@ -77,7 +77,7 @@ sys-kernel/nvidia-drivers-legacy-dkms 390.143: NVIDIA driver sources for linux
 sys-kernel/rtl8821cu-dkms 5.8.1: Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver for Linux
 sys-kernel/vhba-dkms 20190831: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 6.1.18-r1: Kernel Modules source for Virtualbox
-sys-kernel/zfs-dkms 2.0.4: ZFS sources for linux
+sys-kernel/zfs-dkms 2.1.0: ZFS sources for linux
 sys-libs/binutils-libs 2.35.2-r10: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
 sys-libs/glibc 2.33-r10: GNU libc C library
 sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index 6e14611b..38a12b59 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
+DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
diff --git a/sys-fs/zfs-utils/files/bash-completion-sudo.patch b/sys-fs/zfs-utils/files/bash-completion-sudo.patch
deleted file mode 100644
index 8ae9d25d..00000000
--- a/sys-fs/zfs-utils/files/bash-completion-sudo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3829d0b867f6aa4bde8798147dee74a86435d12c Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 22 Mar 2019 22:04:40 -0700
-Subject: [PATCH] contrib/bash_completion.d/zfs: remove sudo reference
-
----
- contrib/bash_completion.d/zfs | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/contrib/bash_completion.d/zfs b/contrib/bash_completion.d/zfs
-index 914db43c..b1aded36 100644
---- a/contrib/bash_completion.d/zfs
-+++ b/contrib/bash_completion.d/zfs
-@@ -21,13 +21,13 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- # OTHER DEALINGS IN THE SOFTWARE.
- 
--if [[ -w /dev/zfs ]]; then
-+#if [[ -w /dev/zfs ]]; then
-     __ZFS_CMD="zfs"
-     __ZPOOL_CMD="zpool"
--else
--    __ZFS_CMD="sudo zfs"
--    __ZPOOL_CMD="sudo zpool"
--fi
-+#else
-+#    __ZFS_CMD="sudo zfs"
-+#    __ZPOOL_CMD="sudo zpool"
-+#fi
- 
- __zfs_get_commands()
- {
--- 
-2.21.0
-
diff --git a/sys-fs/zfs-utils/zfs-utils-2.0.4.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.0.ebuild
index 205c4a30..ee5703b3 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.0.4.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.1.0.ebuild
@@ -26,7 +26,6 @@ DEPEND="
 	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
 	virtual/libudev[static-libs(-)?]
 	dev-libs/openssl:0=[static-libs?]
 	pam? ( sys-libs/pam )
@@ -60,8 +59,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
 src_prepare() {
 	default
 
diff --git a/sys-fs/zfs/zfs-2.0.4.ebuild b/sys-fs/zfs/zfs-2.1.0.ebuild
index c91d103c..c91d103c 100644
--- a/sys-fs/zfs/zfs-2.0.4.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0.ebuild
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index 6e14611b..38a12b59 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
+DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 477eeed7..83285524 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="2.0.4"
+PACKAGE_VERSION="2.1.0"
 PACKAGE_CONFIG="/etc/sysconfig/zfs"
 NO_WEAK_MODULES="yes"
 PRE_BUILD="configure
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.0.4.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.0.ebuild
index cec96ca3..cec96ca3 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-2.0.4.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-2.1.0.ebuild