From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Fri, 17 May 2019 18:59:19 +0000 (-0700)
Subject: sys-fs/zfs-kmod: port back version check to 0.8.0_rc5 ebuild
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e05b9a47295391f6a4b03210a68883cbb2f0f701;p=gentoo.git

sys-fs/zfs-kmod: port back version check to 0.8.0_rc5 ebuild

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
index 779b7451566b..9474ad475580 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
@@ -15,8 +15,8 @@ else
 	MY_PV="${PV/_rc/-rc}"
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64"
-	ZFS_KERNEL_COMPAT="${ZFS_KERNEL_COMPAT_OVERRIDE:-5.1}"
 	S="${WORKDIR}/zfs-${PV%_rc*}"
+	ZFS_KERNEL_COMPAT="5.1"
 fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
@@ -69,10 +69,13 @@ pkg_setup() {
 	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
 
 	if [[ ${PV} != "9999" ]]; then
-		local KV_MAJOR_MAX="${ZFS_KERNEL_COMPAT%%.*}"
-		local KV_MINOR_MAX="${ZFS_KERNEL_COMPAT##*.}"
-		kernel_is -le "${KV_MAJOR_MAX}" "${KV_MINOR_MAX}" || die \
-			"Linux ${KV_MAJOR_MAX}.${KV_MINOR_MAX} is the latest supported version"
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
 	fi
 
 	check_extra_config