| 1 |
commit: 20018132667c2c787a3284ff52dbc01f85bc7c22 |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 06:17:24 2016 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 06:17:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=20018132 |
| 7 |
|
| 8 |
eclass: mate*: Switch back to case statements |
| 9 |
|
| 10 |
eclass/mate-desktop.org.eclass | 7 ++++--- |
| 11 |
eclass/mate.eclass | 14 ++++++++------ |
| 12 |
2 files changed, 12 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass |
| 15 |
index c57528d..6587957 100644 |
| 16 |
--- a/eclass/mate-desktop.org.eclass |
| 17 |
+++ b/eclass/mate-desktop.org.eclass |
| 18 |
@@ -13,9 +13,10 @@ |
| 19 |
# exporting some useful values like the MATE_BRANCH |
| 20 |
|
| 21 |
# EAPIs < 6 are banned. |
| 22 |
-if [[ "${EAPI:-0}" != "6" ]]; then |
| 23 |
- die "EAPI=${EAPI:-0} is not supported" |
| 24 |
-fi |
| 25 |
+case "${EAPI:-0}" in |
| 26 |
+ 6) ;; |
| 27 |
+ *) die "EAPI=${EAPI:-0} is not supported" ;; |
| 28 |
+esac |
| 29 |
|
| 30 |
if [[ ${PV} == 9999 ]]; then |
| 31 |
inherit git-r3 |
| 32 |
|
| 33 |
diff --git a/eclass/mate.eclass b/eclass/mate.eclass |
| 34 |
index 6e31a46..59feac2 100644 |
| 35 |
--- a/eclass/mate.eclass |
| 36 |
+++ b/eclass/mate.eclass |
| 37 |
@@ -15,9 +15,10 @@ |
| 38 |
# fact that MATE is a GNOME fork. For additional functions, see gnome2-utils.eclass. |
| 39 |
|
| 40 |
# Check EAPI only |
| 41 |
-if [[ "${EAPI:-0}" != "6" ]]; then |
| 42 |
- die "EAPI=${EAPI:-0} is not supported" |
| 43 |
-fi |
| 44 |
+case "${EAPI:-0}" in |
| 45 |
+ 6) ;; |
| 46 |
+ *) die "EAPI=${EAPI:-0} is not supported" ;; |
| 47 |
+esac |
| 48 |
|
| 49 |
# Inherit happens below after declaration of GNOME2_LA_PUNT |
| 50 |
|
| 51 |
@@ -32,9 +33,10 @@ GNOME2_LA_PUNT=${MATE_LA_PUNT:-""} |
| 52 |
|
| 53 |
inherit gnome2 autotools mate-desktop.org |
| 54 |
|
| 55 |
-if [[ "${EAPI:-0}" == "6" ]]; then |
| 56 |
- EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm |
| 57 |
-fi |
| 58 |
+case "${EAPI:-0}" in |
| 59 |
+ 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; |
| 60 |
+ *) die "EAPI=${EAPI:-0} is not supported" ;; |
| 61 |
+esac |
| 62 |
|
| 63 |
# Autotools requires our MATE m4 files |
| 64 |
DEPEND=">=mate-base/mate-common-${MATE_BRANCH}" |
Archives