| 1 |
commit: 4d82f050c6a9aacb851fc1a019ebcd3e4c4c7390 |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 13 23:01:04 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 13 23:03:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d82f050 |
| 7 |
|
| 8 |
sys-kernel/mips-sources: versionator->eapi7-ver |
| 9 |
|
| 10 |
Originally used versionator functions with the assumption it would |
| 11 |
always have it from kernel-2.eclass; switch to eapi7-ver and add |
| 12 |
explicit inheritance. |
| 13 |
|
| 14 |
Cherry-picked from https://github.com/gentoo/gentoo/pull/9064 to fix |
| 15 |
issue revealed by commit c6b150836dfef848e51ec2cce801b12daf2c77b1. |
| 16 |
|
| 17 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 18 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-kernel/mips-sources/mips-sources-4.13.16.ebuild | 4 ++-- |
| 21 |
sys-kernel/mips-sources/mips-sources-4.4.110.ebuild | 4 ++-- |
| 22 |
sys-kernel/mips-sources/mips-sources-4.9.75.ebuild | 4 ++-- |
| 23 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild |
| 26 |
index 656f5f1012a..2aa774a33d2 100644 |
| 27 |
--- a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild |
| 28 |
+++ b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild |
| 29 |
@@ -24,12 +24,12 @@ K_FROM_GIT="yes" |
| 30 |
ETYPE="sources" |
| 31 |
|
| 32 |
# Inherit Eclasses |
| 33 |
-inherit kernel-2 eutils |
| 34 |
+inherit eapi7-ver eutils kernel-2 |
| 35 |
detect_version |
| 36 |
|
| 37 |
# Version Data |
| 38 |
F_KV="${PVR}" |
| 39 |
-BASE_KV="$(get_version_component_range 1-2).0" |
| 40 |
+BASE_KV="$(ver_cut 1-2).0" |
| 41 |
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}" |
| 42 |
|
| 43 |
# Portage Vars |
| 44 |
|
| 45 |
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild |
| 46 |
index ec5f5a516a5..79d5f1e3cf2 100644 |
| 47 |
--- a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild |
| 48 |
+++ b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild |
| 49 |
@@ -24,7 +24,7 @@ K_FROM_GIT="yes" |
| 50 |
ETYPE="sources" |
| 51 |
|
| 52 |
# Inherit Eclasses |
| 53 |
-inherit kernel-2 eutils |
| 54 |
+inherit eapi7-ver eutils kernel-2 |
| 55 |
detect_version |
| 56 |
|
| 57 |
# EPATCH Vars |
| 58 |
@@ -33,7 +33,7 @@ EPATCH_OPTS="-F3" |
| 59 |
|
| 60 |
# Version Data |
| 61 |
F_KV="${PVR}" |
| 62 |
-BASE_KV="$(get_version_component_range 1-2).0" |
| 63 |
+BASE_KV="$(ver_cut 1-2).0" |
| 64 |
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}" |
| 65 |
|
| 66 |
# Portage Vars |
| 67 |
|
| 68 |
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild |
| 69 |
index 06dc974cbd3..124b95b19f6 100644 |
| 70 |
--- a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild |
| 71 |
+++ b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild |
| 72 |
@@ -24,12 +24,12 @@ K_FROM_GIT="yes" |
| 73 |
ETYPE="sources" |
| 74 |
|
| 75 |
# Inherit Eclasses |
| 76 |
-inherit kernel-2 eutils |
| 77 |
+inherit eapi7-ver eutils kernel-2 |
| 78 |
detect_version |
| 79 |
|
| 80 |
# Version Data |
| 81 |
F_KV="${PVR}" |
| 82 |
-BASE_KV="$(get_version_component_range 1-2).0" |
| 83 |
+BASE_KV="$(ver_cut 1-2).0" |
| 84 |
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}" |
| 85 |
|
| 86 |
# Portage Vars |
Archives