From fbe1e64cf651fcf73e25d2d3115003bf59e231cd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 11 Jul 2022 07:29:23 +0100
Subject: gentoo auto-resync : 11:07:2022 - 07:29:23
---
eclass/Manifest.gz | Bin 36126 -> 36121 bytes
eclass/epatch.eclass | 20 ++++++--------------
eclass/java-utils-2.eclass | 1 -
3 files changed, 6 insertions(+), 15 deletions(-)
(limited to 'eclass')
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6adc9f13f5dc..94ae80efea4b 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
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
}
--
cgit v1.2.3