diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36126 -> 36121 bytes | |||
| -rw-r--r-- | eclass/epatch.eclass | 20 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 1 |
3 files changed, 6 insertions, 15 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 6adc9f13f5dc..94ae80efea4b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 6a9c460da0a3..181cd8963e4f 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -4,7 +4,7 @@ # @ECLASS: epatch.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 +# @SUPPORTED_EAPIS: 5 6 # @BLURB: easy patch application functions # @DEPRECATED: eapply from EAPI 7 # @DESCRIPTION: @@ -13,11 +13,11 @@ if [[ -z ${_EPATCH_ECLASS} ]]; then -case ${EAPI:-0} in - 0|1|2|3|4|5|6) +case ${EAPI} in + 5|6) ;; *) - die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; + die "${ECLASS}: EAPI ${EAPI:-0} not supported";; esac inherit estack @@ -52,10 +52,6 @@ EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch" # List of patches not to apply. Note this is only file names, # and not the full path. Globs accepted. EPATCH_EXCLUDE="" -# @VARIABLE: EPATCH_SINGLE_MSG -# @DESCRIPTION: -# Change the printed message for a single patch. -EPATCH_SINGLE_MSG="" # @VARIABLE: EPATCH_MULTI_MSG # @DESCRIPTION: # Change the printed message for multiple patches. @@ -235,13 +231,9 @@ epatch() { fi if [[ ${SINGLE_PATCH} == "yes" ]] ; then - if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then - einfo "${EPATCH_SINGLE_MSG}" - else - einfo "Applying ${patchname} ..." - fi + ebegin "Applying ${patchname}" else - einfo " ${patchname} ..." + ebegin " ${patchname}" fi # Handle aliased patch command #404447 #461568 diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 6576712e0104..4f50ce39c5dc 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -316,7 +316,6 @@ java-pkg_rm_files() { [[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting." einfo "Removing unneeded file ${filename}" rm -f "${S}/${filename}" || die "cannot remove ${filename}" - eend $? done } |