diff options
| author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2008-08-20 13:37:37 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2008-08-20 13:37:37 +0000 |
| commit | b90881e756ef21fc6d8ba826e406865a45a9ac30 (patch) | |
| tree | 430bbc8415cc526048dd82a545296a9dc2e31f03 /eclass | |
| parent | 0180ffbbcaff5a781b198586f28f3e4e4372b650 (diff) | |
| download | kde-b90881e756ef21fc6d8ba826e406865a45a9ac30.tar.gz kde-b90881e756ef21fc6d8ba826e406865a45a9ac30.tar.bz2 kde-b90881e756ef21fc6d8ba826e406865a45a9ac30.zip | |
Applied several small fixes to the eclasses.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 12 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 28 |
3 files changed, 26 insertions, 17 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 2e24aacb60e..db51e34b757 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -77,8 +77,16 @@ kde4-base_set_qt_dependencies() { } kde4-base_set_qt_dependencies -DEPEND="${DEPEND} ${COMMONDEPEND} - >=dev-util/cmake-2.4.7-r1 +case "${PV}" in + 9999*|*:kde-svn) + CMAKEDEPEND=">=dev-util/cmake-2.6" + ;; + *) + CMAKEDEPEND=">=dev-util/cmake-2.4.7-r1" + ;; +esac + +DEPEND="${DEPEND} ${COMMONDEPEND} ${CMAKEDEPEND} dev-util/pkgconfig x11-libs/libXt x11-proto/xf86vidmodeproto" diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 35b763a3553..0f88eae15f8 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -301,7 +301,6 @@ kde-base/kdesdk kde-base/kstartperf kde-base/kdesdk kde-base/kuiviewer kde-base/kdesdk kde-base/lokalize kde-base/kdesdk kde-base/poxml -kde-base/kdesdk kde-base/strigi-analyzer kde-base/kdesdk kde-base/umbrello kde-base/kdetoys kde-base/amor kde-base/kdetoys kde-base/kteatime @@ -312,11 +311,9 @@ kde-base/kdeutils kde-base/ark kde-base/kdeutils kde-base/kcalc kde-base/kdeutils kde-base/kcharselect kde-base/kdeutils kde-base/kdessh -kde-base/kdeutils kde-base/kdessh kde-base/kdeutils kde-base/kdf kde-base/kdeutils kde-base/kfloppy kde-base/kdeutils kde-base/kgpg -kde-base/kdeutils kde-base/kjots kde-base/kdeutils kde-base/kmilo kde-base/kdeutils kde-base/kregexpeditor kde-base/kdeutils kde-base/ktimer diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 30fde97f63d..34c8b915917 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -49,7 +49,7 @@ case ${KMNAME} in RDEPEND="${RDEPEND} >=kde-base/qimageblitz-0.0.4" ;; kdepim) - DEPEND="${DEPEND} dev-libs/boost" + DEPEND="${DEPEND} dev-libs/boost app-office/akonadi-server" RDEPEND="${RDEPEND} dev-libs/boost" if [[ ${PN} != kode ]]; then DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}" @@ -58,8 +58,8 @@ case ${KMNAME} in case ${PN} in akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker) IUSE="+kontact" - DEPEND="${DEPEND} kontact? ( >=kde-base/kontact-${PV}:${SLOT} )" - RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontact-${PV}:${SLOT} )" + DEPEND="${DEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )" + RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )" ;; esac ;; @@ -248,14 +248,18 @@ kde4-meta_create_extractlists() { esac # Don't install cmake modules for split ebuilds to avoid collisions. case ${KMNAME} in - kdebase-workspace|kdebase-runtime|kdepim|kdegames|kdegraphics) - if [[ ${PN} != "libkdegames" ]]; then - KMCOMPILEONLY="${KMCOMPILEONLY} - cmake/modules/" - else - KMEXTRA="${KMEXTRA} - cmake/modules/" - fi + kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics|kdepim) + case ${PN} in + libkdegames|libkdeedu|marble) + KMEXTRA="${KMEXTRA} + cmake/modules/" + ;; + + *) + KMCOMPILEONLY="${KMCOMPILEONLY} + cmake/modules/" + ;; + esac ;; esac @@ -303,7 +307,7 @@ __list_needed_subdirectories() { case ${PV} in - scm|9999.4) : ;; + scm|9999*) : ;; *) topdir="${KMNAME}-${PV}/" ;; esac |