commit: 83bc26fc927ec573ff25105032b49beb470d2e2b Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 20 07:08:44 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Fri Aug 23 09:27:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bc26fc
check-reqs.eclass: Drop unused code for EAPIs without MERGE_TYPE. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/check-reqs.eclass | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 95f73a3012e..242abde4e27 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Bo Ørsted Andresen <[email protected]> # Original Author: Ciaran McCreesh <[email protected]> -# @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 \
