diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2019-08-20 09:08:44 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2019-08-23 11:27:21 +0200 |
| commit | 83bc26fc927ec573ff25105032b49beb470d2e2b (patch) | |
| tree | 9a9492dfe75bb7a395a088ffb55d6efdba7e6bb4 /eclass | |
| parent | net-misc/bgpq3: Remove dohtml which is banned in EAPI 7 (diff) | |
| download | gentoo-83bc26fc927ec573ff25105032b49beb470d2e2b.tar.gz gentoo-83bc26fc927ec573ff25105032b49beb470d2e2b.tar.bz2 gentoo-83bc26fc927ec573ff25105032b49beb470d2e2b.zip | |
check-reqs.eclass: Drop unused code for EAPIs without MERGE_TYPE.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/check-reqs.eclass | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 95f73a3012eb..242abde4e279 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Bo Ørsted Andresen <zlin@gentoo.org> # Original Author: Ciaran McCreesh <ciaranm@gentoo.org> -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 4 5 6 7 # @BLURB: Provides a uniform way of handling ebuild which have very high build requirements # @DESCRIPTION: # This eclass provides a uniform way of handling ebuilds which have very high @@ -60,13 +60,13 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then # @DESCRIPTION: # How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M -EXPORT_FUNCTIONS pkg_setup -case "${EAPI:-0}" in - 0|1|2|3) ;; - 4|5|6|7) EXPORT_FUNCTIONS pkg_pretend ;; - *) die "EAPI=${EAPI} is not supported" ;; +case ${EAPI:-0} in + 4|5|6|7) ;; + *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; esac +EXPORT_FUNCTIONS pkg_pretend pkg_setup + # Obsolete function executing all the checks and printing out results check_reqs() { eerror "Package calling old ${FUNCNAME} function." @@ -123,9 +123,6 @@ check-reqs_run() { # some people are *censored* unset CHECKREQS_FAILED - [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE="" - - # use != in test, because MERGE_TYPE only exists in EAPI 4 and later if [[ ${MERGE_TYPE} != binary ]]; then [[ -n ${CHECKREQS_MEMORY} ]] && \ check-reqs_memory \ |