diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-02-13 21:27:39 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-02-13 21:27:39 +1100 |
| commit | 8fda1f7bca027410308d7a7c98146875bab36cd8 (patch) | |
| tree | 65abba767e4e472e4ced1d41c6111c7757daa32a /eclass | |
| parent | 8a9e065a76ba962107766884fa8c1d2ec42c7148 (diff) | |
| download | kde-8fda1f7bca027410308d7a7c98146875bab36cd8.tar.gz kde-8fda1f7bca027410308d7a7c98146875bab36cd8.tar.bz2 kde-8fda1f7bca027410308d7a7c98146875bab36cd8.zip | |
[eclass] Add multiple-inheritance protection.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 5 |
5 files changed, 25 insertions, 0 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index bbc944727b9..414951646b2 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -18,6 +18,9 @@ # 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" + # @ECLASS-VARIABLE: WANT_CMAKE # @DESCRIPTION: # Specify if cmake-utils eclass should depend on cmake optionaly or not. @@ -621,3 +624,5 @@ _execute_optionaly() { use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@" fi } + +fi diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 9e0570ce2df..309727e5a9e 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -13,6 +13,9 @@ # NOTE: KDE 4 ebuilds currently support EAPIs 3, 4, and 5. This will be # reviewed over time as new EAPI versions are approved. +if [[ ${___ECLASS_ONCE_KDE4_BASE} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank" + # @ECLASS-VARIABLE: KDE_SELINUX_MODULE # @DESCRIPTION: # If set to "none", do nothing. @@ -901,3 +904,5 @@ kde4-base_pkg_postrm() { fdo-mime_mime_database_update buildsycoca } + +fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ecd8de452ae..56baa760fc4 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -12,6 +12,9 @@ inherit versionator # This eclass contains all functions shared by the different eclasses, # for KDE 4 ebuilds. +if [[ ${___ECLASS_ONCE_KDE4_FUNCTIONS} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_KDE4_FUNCTIONS="recur -_+^+_- spank" + # @ECLASS-VARIABLE: EAPI # @DESCRIPTION: # Currently kde4 eclasses support EAPI 3 and 4. @@ -477,3 +480,5 @@ get_kde_version() { (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) fi } + +fi diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 9a0cc0c4e16..186c686c75e 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -9,6 +9,9 @@ # @DESCRIPTION: # This eclass should only be used for defining meta packages for KDE4. +if [[ ${___ECLASS_ONCE_KDE4_META_PKG} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_KDE4_META_PKG="recur -_+^+_- spank" + inherit kde4-functions HOMEPAGE="http://www.kde.org/" @@ -17,3 +20,5 @@ LICENSE="metapackage" IUSE="aqua" SLOT=4 + +fi diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 95242d848c3..a70658f7712 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -12,6 +12,9 @@ # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. +if [[ ${___ECLASS_ONCE_KDE4_META} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_KDE4_META="recur -_+^+_- spank" + [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" inherit kde4-base versionator @@ -682,3 +685,5 @@ kde4-meta_pkg_postrm() { kde4-base_pkg_postrm } + +fi |
