| 1 |
commit: 83bc26fc927ec573ff25105032b49beb470d2e2b |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 20 07:08:44 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 23 09:27:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bc26fc |
| 7 |
|
| 8 |
check-reqs.eclass: Drop unused code for EAPIs without MERGE_TYPE. |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/check-reqs.eclass | 15 ++++++--------- |
| 13 |
1 file changed, 6 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass |
| 16 |
index 95f73a3012e..242abde4e27 100644 |
| 17 |
--- a/eclass/check-reqs.eclass |
| 18 |
+++ b/eclass/check-reqs.eclass |
| 19 |
@@ -7,7 +7,7 @@ |
| 20 |
# @AUTHOR: |
| 21 |
# Bo Ørsted Andresen <zlin@g.o> |
| 22 |
# Original Author: Ciaran McCreesh <ciaranm@g.o> |
| 23 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 4 5 6 7 |
| 25 |
# @BLURB: Provides a uniform way of handling ebuild which have very high build requirements |
| 26 |
# @DESCRIPTION: |
| 27 |
# This eclass provides a uniform way of handling ebuilds which have very high |
| 28 |
@@ -60,13 +60,13 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then |
| 29 |
# @DESCRIPTION: |
| 30 |
# How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M |
| 31 |
|
| 32 |
-EXPORT_FUNCTIONS pkg_setup |
| 33 |
-case "${EAPI:-0}" in |
| 34 |
- 0|1|2|3) ;; |
| 35 |
- 4|5|6|7) EXPORT_FUNCTIONS pkg_pretend ;; |
| 36 |
- *) die "EAPI=${EAPI} is not supported" ;; |
| 37 |
+case ${EAPI:-0} in |
| 38 |
+ 4|5|6|7) ;; |
| 39 |
+ *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; |
| 40 |
esac |
| 41 |
|
| 42 |
+EXPORT_FUNCTIONS pkg_pretend pkg_setup |
| 43 |
+ |
| 44 |
# Obsolete function executing all the checks and printing out results |
| 45 |
check_reqs() { |
| 46 |
eerror "Package calling old ${FUNCNAME} function." |
| 47 |
@@ -123,9 +123,6 @@ check-reqs_run() { |
| 48 |
# some people are *censored* |
| 49 |
unset CHECKREQS_FAILED |
| 50 |
|
| 51 |
- [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE="" |
| 52 |
- |
| 53 |
- # use != in test, because MERGE_TYPE only exists in EAPI 4 and later |
| 54 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 55 |
[[ -n ${CHECKREQS_MEMORY} ]] && \ |
| 56 |
check-reqs_memory \ |
Archives