commit: 6a470680b42baff9450208773e208c4d2221c4ab
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 13:39:52 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 13:42:20 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a470680
[eclass] Adjust EAPI handling as per review from pesa.
:-0 is unnecessary in "case ${EAPI:-0}" as it will be matched by "*)", so it
can be moved to the die statement.
---
eclass/cmake-utils.eclass | 4 ++--
eclass/kde4-functions.eclass | 4 ++--
eclass/kde5-functions.eclass | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7fe95c7..baaea56 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -118,9 +118,9 @@ case ${WANT_CMAKE} in
esac
inherit toolchain-funcs multilib flag-o-matic eutils
-case ${EAPI:-0} in
+case ${EAPI} in
2|3|4|5) : ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
esac
CMAKE_EXPF="src_prepare src_configure src_compile src_test src_install"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a5af8bd..3b3f251 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -18,9 +18,9 @@ _KDE4_FUNCTIONS_ECLASS=1
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
# Currently kde4 eclasses support EAPI 4 and 5.
-case ${EAPI:-0} in
+case ${EAPI} in
4|5) : ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
esac
# @ECLASS-VARIABLE: KDE_OVERRIDE_MINIMAL
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7b355b1..5247950 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -18,9 +18,9 @@ _KDE5_FUNCTIONS_ECLASS=1
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
# Currently EAPI 5 is supported.
-case ${EAPI:-0} in
+case ${EAPI} in
5) : ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
esac
# @ECLASS-VARIABLE: KDEBASE
