| 1 |
commit: 79bf6dd5f617db3f1aeb13bbf3607c06673ea28a |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 21 10:26:40 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 23 10:21:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bf6dd5 |
| 7 |
|
| 8 |
git-r3.eclass: Support EAPI 8, drop support for EAPI 4 |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/git-r3.eclass | 18 ++++++------------ |
| 13 |
1 file changed, 6 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass |
| 16 |
index 9c4f2c9d778..365f21a4ed4 100644 |
| 17 |
--- a/eclass/git-r3.eclass |
| 18 |
+++ b/eclass/git-r3.eclass |
| 19 |
@@ -4,21 +4,15 @@ |
| 20 |
# @ECLASS: git-r3.eclass |
| 21 |
# @MAINTAINER: |
| 22 |
# Michał Górny <mgorny@g.o> |
| 23 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 25 |
# @BLURB: Eclass for fetching and unpacking git repositories. |
| 26 |
# @DESCRIPTION: |
| 27 |
# Third generation eclass for easing maintenance of live ebuilds using |
| 28 |
# git as remote repository. |
| 29 |
|
| 30 |
-case "${EAPI:-0}" in |
| 31 |
- 0|1|2|3) |
| 32 |
- die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}" |
| 33 |
- ;; |
| 34 |
- 4|5|6|7) |
| 35 |
- ;; |
| 36 |
- *) |
| 37 |
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" |
| 38 |
- ;; |
| 39 |
+case ${EAPI:-0} in |
| 40 |
+ 5|6|7|8) ;; |
| 41 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 42 |
esac |
| 43 |
|
| 44 |
EXPORT_FUNCTIONS src_unpack |
| 45 |
@@ -28,7 +22,7 @@ if [[ ! ${_GIT_R3} ]]; then |
| 46 |
PROPERTIES+=" live" |
| 47 |
|
| 48 |
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then |
| 49 |
- if [[ ${EAPI:-0} != [0123456] ]]; then |
| 50 |
+ if [[ ${EAPI} != [56] ]]; then |
| 51 |
BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 52 |
else |
| 53 |
DEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 54 |
@@ -612,7 +606,7 @@ git-r3_fetch() { |
| 55 |
local commit_date=${4:-${EGIT_COMMIT_DATE}} |
| 56 |
|
| 57 |
# support new override API for EAPI 6+ |
| 58 |
- if ! has "${EAPI:-0}" 0 1 2 3 4 5; then |
| 59 |
+ if [[ ${EAPI} != 5 ]]; then |
| 60 |
# get the name and do some more processing: |
| 61 |
# 1) kill .git suffix, |
| 62 |
# 2) underscore (remaining) non-variable characters, |
Archives