gentoo resync : 23.09.2020

4 files changed, 5 insertions, 38 deletions

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 656afab5f7a9..f7e5590c9880 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,7 @@
 AUX 0.8.4-powerpc_jmp_weak.patch 1314 BLAKE2B 5cec0c5bf0e7c8ba4fb29539384eeb28e431956a94853d7c7722fc4dfc680f984c3e1567bc27effb28e94b1a411f9d7e57a26536fb4dee9446b12183558ab49b SHA512 dabea2f795e3ee2d7df13c803ac4cb21499e23d6663f14d52a7b270075176a4378cd15d04d051999aa7ec6b8cf49e645435363053e16640f28068c2764580047
-AUX 2.0.0_rc1-U__BMI__.patch 966 BLAKE2B 370c9796450a451cb41aed4df7a927e0a88f674c55273a0680788ea8f42c7ca7ddbd4d75e092c59a6255adecb4dbe94b28d565cd54c03170cda07b15d138c8db SHA512 c568bee17b0a4ef6569fa531cd2bfbd483c766c8f16d045e9ee86c01c1d687701010659b58bbe3874c0d45e5e94a52ae10e5c31ab004a3215ed4dae6be8ba545
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-DIST zfs-2.0.0-rc1.tar.gz 12820598 BLAKE2B 6ea935447e4f95eb4040533843677f0091c9620fc387c76818df69a6653467e10aecd07ece22b2a32f849dc52ab0160149147416af90d78c5284f403571f7962 SHA512 b70cd10672d4424a6ffaaa58b4fa14b7d1b6481413463abd9b6d75698e80d94301fd54c7e091d63ebad9c8838eaaef6449223a55f041a62ae8292882feb195b5
-EBUILD zfs-kmod-0.8.4-r1.ebuild 4558 BLAKE2B 90bab78673ace8d1684f7b06e1392745bc3b7bdbf4e695bac7d9478e35dba9daf0e121e3e72ece248c997cb5f1daa4000db9e9500a686e38d72319c6a3fd9355 SHA512 f2db01438ea0b53a2f964feba65343c15ae69dd3c47bda54321aeda4d0f19affc2cf4fb99e9f829f7968fa2774fffe86b4fce0cc310af775efc5165652425e8b
-EBUILD zfs-kmod-2.0.0_rc1.ebuild 4391 BLAKE2B 06daf5d1387aab0e90d9a3573159afdc58d121f3e8b799a34e4d87dda486113e54ec3bce70fed3fe928b33ce660e0fbfb96ae2529016a352a747ca105c8b6b96 SHA512 24970fd8f61f8bec233b9582858af235fa00cb160c7e7d781001366c6d07ca748b939f802ff8634f222622f936af1c46b764e787ac99387b4d8dc73e30103c4d
+DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
+EBUILD zfs-kmod-0.8.4-r1.ebuild 4593 BLAKE2B cf8a545a1d016c6d9d80717b82b7ce4bfb8434fa8ac4d081b4c1c8c730381a812a645218d9447e9f44b51fd10d57dd900bddfe41157a32a35b250929d2e961c4 SHA512 7d25b489db7696178d59c6953377a023b6e254adfe0f08b33fdda72c936afee3b2421d6ec430c46973967e4d080489585213e147d42eee695c57b360d52e5d7f
+EBUILD zfs-kmod-2.0.0_rc2.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7
 EBUILD zfs-kmod-9999.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch b/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch
deleted file mode 100644
index 9e9a007c3002..000000000000
--- a/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 81a3970fca5759499effc3131e59c9bd8f446cc9 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 26 Aug 2020 16:02:48 -0700
-Subject: [PATCH] module/zstd: pass -U__BMI__
-
-Closes: https://github.com/openzfs/zfs/issues/10758
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- module/zstd/Makefile.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/module/zstd/Makefile.in b/module/zstd/Makefile.in
-index eea749ea8..bfceca920 100644
---- a/module/zstd/Makefile.in
-+++ b/module/zstd/Makefile.in
-@@ -20,6 +20,10 @@ ccflags-y += -O3
- # Set it for other compilers, too.
- $(obj)/lib/zstd.o: c_flags += -fno-tree-vectorize
- 
-+# SSE register return with SSE disabled if -march=znverX is passed
-+# https://github.com/openzfs/zfs/issues/10758
-+$(obj)/lib/zstd.o: c_flags += -U__BMI__
-+
- # Quiet warnings about frame size due to unused code in unmodified zstd lib
- $(obj)/lib/zstd.o: c_flags += -Wframe-larger-than=20480
- 
--- 
-2.28.0
-
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
index 2276604b161c..18afe59c4a99 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
@@ -116,7 +116,7 @@ src_configure() {
 		$(use_enable debug)
 	)
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild
index 73b00ca17e00..689dcbc44941 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_rc/-rc}"
 
 inherit autotools flag-o-matic linux-mod toolchain-funcs
 
@@ -13,6 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
+	MY_PV="${PV/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
@@ -38,8 +38,6 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
-PATCHES=( "${FILESDIR}/${PV}-U__BMI__.patch" )
-
 pkg_setup() {
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
@@ -76,7 +74,6 @@ pkg_setup() {
 
 	fi
 
-	# 2.0.0 requires at least 3.10
 	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 
 	linux-mod_pkg_setup