From: Marty E. Plummer <hanetzer@startmail.com>
Date: Fri, 13 Jul 2018 23:01:04 +0000 (+0200)
Subject: sys-kernel/mips-sources: versionator->eapi7-ver
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4d82f050c6a9aacb851fc1a019ebcd3e4c4c7390;p=gentoo.git

sys-kernel/mips-sources: versionator->eapi7-ver

Originally used versionator functions with the assumption it would
always have it from kernel-2.eclass; switch to eapi7-ver and add
explicit inheritance.

Cherry-picked from https://github.com/gentoo/gentoo/pull/9064 to fix
issue revealed by commit c6b150836dfef848e51ec2cce801b12daf2c77b1.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
index 656f5f1012a3..2aa774a33d25 100644
--- a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
@@ -24,12 +24,12 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
 detect_version
 
 # Version Data
 F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
index ec5f5a516a58..79d5f1e3cf28 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
@@ -24,7 +24,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
 detect_version
 
 # EPATCH Vars
@@ -33,7 +33,7 @@ EPATCH_OPTS="-F3"
 
 # Version Data
 F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
index 06dc974cbd3b..124b95b19f6d 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
@@ -24,12 +24,12 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
 detect_version
 
 # Version Data
 F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars