diff options
| author | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-26 12:18:33 +0200 |
|---|---|---|
| committer | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-26 12:18:33 +0200 |
| commit | e01b317d5597330098acff7ac52958a9e42da5ea (patch) | |
| tree | 861923965acce92a3cc47884c9c0ea74a761f2ef | |
| parent | 514b97ed7dacca01d406c451f573fd78794f45a9 (diff) | |
| download | kde-e01b317d5597330098acff7ac52958a9e42da5ea.tar.gz kde-e01b317d5597330098acff7ac52958a9e42da5ea.tar.bz2 kde-e01b317d5597330098acff7ac52958a9e42da5ea.zip | |
Revert removing of EAPI2_preX. from eclass.
| -rw-r--r-- | eclass/kde4-base.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 4e7dbd1ea26..4670e703b54 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -24,7 +24,7 @@ kde4-base_set_qt_dependencies() { # use dependencies case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) qt="[" case "${OPENGL_REQUIRED}" in @@ -100,7 +100,7 @@ RDEPEND="${RDEPEND} ${COMMONDEPEND}" # Add the kdeprefix use flag case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) IUSE="${IUSE} kdeprefix" ;; esac @@ -270,7 +270,7 @@ if [[ ${NEED_KDE} != none ]]; then # Block install of other SLOTS unless kdeprefix case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) for KDE_SLOT in ${KDE_SLOTS[@]}; do # block non kdeprefix ${PN} on other slots if [[ ${SLOT} != ${KDE_SLOT} ]]; then @@ -286,7 +286,7 @@ if [[ ${NEED_KDE} != none ]]; then # We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs" if [[ ${PN} != "kdelibs" ]]; then case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]" RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]" ;; @@ -297,7 +297,7 @@ if [[ ${NEED_KDE} != none ]]; then esac if [[ ${PN} != "kdepimlibs" ]]; then case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]" RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]" ;; @@ -365,7 +365,7 @@ kde4-base_pkg_setup() { # Set PREFIX case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) if use kdeprefix; then KDEDIR="/usr/kde/${_kdedir}" KDEDIRS="/usr:/usr/local:${KDEDIR}" @@ -391,7 +391,7 @@ kde4-base_pkg_setup() { unset _kdedir case "${EAPI}" in - 2) + 2 | 2_pre3 | 2_pre2 | 2_pre1) [[ -n ${QT4_BUILT_WITH_USE_CHECK} || -n ${KDE4_BUILT_WITH_USE_CHECK[@]} ]] && \ die "built_with_use illegal in this EAPI!" ;; |