summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-11-29 17:33:08 +0100
committerUlrich Müller <ulm@gentoo.org>2015-12-01 15:21:30 +0100
commit760f5e9756f6ba4ffc0b31aa71e7c80860b8657e (patch)
treebf52ff18e7a1492de2f1f4575a81844bf2234986 /eclass/eutils.eclass
parenteutils.eclass: Move all deprecated functions to the end. (diff)
downloadgentoo-760f5e9756f6ba4ffc0b31aa71e7c80860b8657e.tar.gz
gentoo-760f5e9756f6ba4ffc0b31aa71e7c80860b8657e.tar.bz2
gentoo-760f5e9756f6ba4ffc0b31aa71e7c80860b8657e.zip
eutils.eclass: In EAPI conditionals, replace "has" by case statements.
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass21
1 files changed, 14 insertions, 7 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 5c7d1aa2d7ac..11630512e8f7 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1614,7 +1614,8 @@ check_license() {
die "you no longer need this as portage supports ACCEPT_LICENSE itself"
}
-if has "${EAPI:-0}" 0 1 2; then
+case ${EAPI:-0} in
+0|1|2)
# @FUNCTION: epause
# @USAGE: [seconds]
@@ -1646,7 +1647,8 @@ ebeep() {
fi
}
-else
+;;
+*)
ebeep() {
ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org"
@@ -1656,9 +1658,11 @@ epause() {
ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org"
}
-fi
+;;
+esac
-if has "${EAPI:-0}" 0 1 2 3 4; then
+case ${EAPI:-0} in
+0|1|2|3|4)
# @FUNCTION: usex
# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
@@ -1669,9 +1673,11 @@ if has "${EAPI:-0}" 0 1 2 3 4; then
# otherwise echo [false output][false suffix] (defaults to "no").
usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
-fi
+;;
+esac
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
+case ${EAPI:-0} in
+0|1|2|3|4|5)
# @VARIABLE: EPATCH_USER_SOURCE
# @DESCRIPTION:
@@ -1821,4 +1827,5 @@ in_iuse() {
has "${flag}" "${liuse[@]#[+-]}"
}
-fi
+;;
+esac