commit: f2325564c3bc91a16993aa4b780fe1f5b8bd10c3
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 16 17:41:27 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 17:41:27 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f2325564
[eclass] Avoid reserved names wrt bug #516092.
---
eclass/cmake-utils.eclass | 4 ++--
eclass/kde5-functions.eclass | 4 ++--
eclass/kde5.eclass | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1b3283c..1803129 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -17,8 +17,8 @@
# builds (default), in-source builds and an implementation of the well-known
use_enable
# and use_with functions for CMake.
-if [[ ${___ECLASS_ONCE_CMAKE_UTILS} != "recur -_+^+_- spank" ]] ; then
-___ECLASS_ONCE_CMAKE_UTILS="recur -_+^+_- spank"
+if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
+_CMAKE_UTILS_ECLASS=1
# @ECLASS-VARIABLE: BUILD_DIR
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 6f365f1..94aec5a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -12,8 +12,8 @@ inherit versionator
# This eclass contains all functions shared by the different eclasses,
# for KDE 5 ebuilds.
-if [[ ${___ECLASS_ONCE_KDE5_FUNCTIONS} != "recur -_+^+_- spank" ]] ; then
-___ECLASS_ONCE_KDE5_FUNCTIONS="recur -_+^+_- spank"
+if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
+_KDE5_FUNCTIONS_ECLASS=1
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 30c5702..ef6be2d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -9,8 +9,8 @@
# @DESCRIPTION:
# The kde5.eclass provides support for building KDE 5-related packages.
-if [[ ${___ECLASS_ONCE_KDE5} != "recur -_+^+_- spank" ]] ; then
-___ECLASS_ONCE_KDE5="recur -_+^+_- spank"
+if [[ -z ${_KDE5_ECLASS} ]]; then
+_KDE5_ECLASS=1
CMAKE_MIN_VERSION="2.8.12"
