diff options
| author | Theo Chatzimichos <tampakrap@gmail.com> | 2008-12-24 08:08:37 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gmail.com> | 2008-12-24 08:08:37 +0200 |
| commit | 4c83e5ea40bb0d44879663f47b98b0c71077ac3c (patch) | |
| tree | 709954a4519f24452779d48e411939bc8f317dd4 | |
| parent | 506d24926b67f65e394a5747254922ecc34f5be2 (diff) | |
| download | kde-4c83e5ea40bb0d44879663f47b98b0c71077ac3c.tar.gz kde-4c83e5ea40bb0d44879663f47b98b0c71077ac3c.tar.bz2 kde-4c83e5ea40bb0d44879663f47b98b0c71077ac3c.zip | |
merge eclasses
| -rw-r--r-- | eclass/kde4-base.eclass | 28 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 12 |
2 files changed, 19 insertions, 21 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 837835fc432..30a576cb287 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -97,12 +97,14 @@ DEPEND="${DEPEND} ${COMMONDEPEND} ${CMAKEDEPEND} x11-proto/xf86vidmodeproto" RDEPEND="${RDEPEND} ${COMMONDEPEND}" -# Add the kdeprefix use flag -IUSE="${IUSE} kdeprefix" - # Do not allow to run test on live ebuilds if [[ "${BUILD_TYPE}" == "live" ]]; then RESTRICT="${RESTRICT} test" + # Live ebuilds default to kdeprefix, but can be changed if desired + IUSE="${IUSE} +kdeprefix" +else + # All other ebuild types default to -kdeprefix as before + IUSE="${IUSE} kdeprefix" fi # @ECLASS-VARIABLE: OPENGL_REQUIRED @@ -227,7 +229,7 @@ case ${NEED_KDE} in # this creates dependency on any version of kde4 _operator=">=" _pv="-${KDE_MINIMAL}" - _pvn="-${KDE_MINIMAL}" + _pvn=${_pv} fi ;; @@ -335,21 +337,15 @@ if [[ ${NEED_KDE} != none ]]; then !kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[kdeprefix=] )" if [[ ${PN} != "kdepimlibs" ]]; then DEPEND="${DEPEND} - kdeprefix? ( - ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=] ) - !kdeprefix? ( - ${_operator}kde-base/kdepimlibs${_pvn}[kdeprefix=] )" + kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=] ) + !kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[kdeprefix=] )" RDEPEND="${RDEPEND} - kdeprefix? ( - ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=] ) - !kdeprefix? ( - ${_operator}kde-base/kdepimlibs${_pvn}[kdeprefix=] )" + kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=] ) + !kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[kdeprefix=] )" if [[ ${PN} != "kdebase-data" ]]; then RDEPEND="${RDEPEND} - kdeprefix? ( - ${_operator}kde-base/kdebase-data${_pv}[kdeprefix=] ) - !kdeprefix? ( - ${_operator}kde-base/kdebase-data${_pvn}[kdeprefix=] )" + kdeprefix? ( ${_operator}kde-base/kdebase-data${_pv}[kdeprefix=] ) + !kdeprefix? ( ${_operator}kde-base/kdebase-data${_pvn}[kdeprefix=] )" fi fi fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 5eda981592f..ceda83fab38 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -5,13 +5,15 @@ # @ECLASS: kde4-functions.eclass # @MAINTAINER: # kde@gentoo.org -# @BLURB: Common ebuild functions for monolithic and split KDE 4 packages +# @BLURB: Common ebuild functions for KDE 4 packages # @DESCRIPTION: # This eclass contains all functions shared by the different eclasses, -# for KDE 4 monolithic and split ebuilds. -# -# NOTE: This eclass uses the SLOT dependencies from EAPI="1" or compatible, -# hence you must define EAPI="1" in the ebuild, before inheriting any eclasses. +# for KDE 4 ebuilds. + +# @ECLASS-VARIABLE: EAPI +# @DESCRIPTION: +# By default kde eclass wants eapi 2 which might be redefinable. +EAPI=${EAPI:-2} # BLOCK FOR EAPI OLDER THAN 2. case ${EAPI} in |