diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:33:18 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:33:18 +0000 |
| commit | c58517fead7d6b5de5da34aeb0c1d3a1ecbe307f (patch) | |
| tree | d472ecb2bbdfe99c136df49f048a02017d977a4e /eclass | |
| parent | Switch to python-r1, bug #458788. Do not install gtester-report man page with... (diff) | |
| download | gentoo-2-c58517fead7d6b5de5da34aeb0c1d3a1ecbe307f.tar.gz gentoo-2-c58517fead7d6b5de5da34aeb0c1d3a1ecbe307f.tar.bz2 gentoo-2-c58517fead7d6b5de5da34aeb0c1d3a1ecbe307f.zip | |
Guard against multiple inheritance.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 7 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ce006fc49dd1..d7c58913a8b4 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.63 2013/02/07 03:38:33 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.64 2013/04/07 17:33:18 kensington Exp $ inherit versionator @@ -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 8dab97034719..252402057e15 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.11 2013/02/07 03:38:33 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.12 2013/04/07 17:33:18 kensington Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: @@ -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 |