diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2011-07-10 17:53:37 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-07-10 17:53:37 +0000 |
| commit | 44fa8a1851b6b3ddcce09cdac19885a1372418a7 (patch) | |
| tree | 45410d51a4057fccc6604430e004ef92dafd3569 /eclass | |
| parent | Revbump for sidebar patch fix, folder names were incorrectly truncated, bug #... (diff) | |
| download | gentoo-2-44fa8a1851b6b3ddcce09cdac19885a1372418a7.tar.gz gentoo-2-44fa8a1851b6b3ddcce09cdac19885a1372418a7.tar.bz2 gentoo-2-44fa8a1851b6b3ddcce09cdac19885a1372418a7.zip | |
Sync kde eclasses with kde overlay
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 34 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 2 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
3 files changed, 24 insertions, 16 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 8ead641e523c..94dbe76d133a 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.101 2011/07/06 19:26:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.102 2011/07/10 17:53:37 tampakrap Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -565,29 +565,37 @@ _calculate_live_repo() { 9999*) ;; *) # set EGIT_BRANCH and EGIT_COMMIT to $(get_kde_version) + # every package is listed explicitly now, as upstream + # seems to love being different :( case ${_kmname} in - kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs | okular) - EGIT_BRANCH="$(get_kde_version)" - ;; - kdeedu) + blinken|cantor|kalgebra|kalzium|kanagram|kbruch| \ + kdeplasma-addons|kdepim|kdepim-runtime|kdepimlibs| \ + kgeography|khangman|kig|kiten|klettres|kmplot|kstars| \ + ktouch|kturtle|kwordquiz|libkdeedu|mobipocket|okular| \ + parley|rocs|step) EGIT_BRANCH="$(get_kde_version)" ;; marble) EGIT_BRANCH="kde-$(get_kde_version)" ;; - *) EGIT_BRANCH="KDE/$(get_kde_version)" ;; + gwenview|kamera|kate|kcolorchooser|kde-baseapps| \ + kde-runtime|kde-workspace|kgamma| \ + kdegraphics-strigi-analyzer|kdegraphics-thumbnailers| \ + kdelibs|kimono|kolourpaint|konsole|korundum| \ + kross-interpreters|kruler|ksaneplugin|ksnapshot| \ + libkdcraw|libkexiv2|libkipi|libksane|perlqt|perlkde| \ + pykde4|qtruby|qyoto|smokegen|smokekde|smokeqt|svgpart) + EGIT_BRANCH="KDE/$(get_kde_version)" + ;; + *) + ewarn "Unknown KMNAME ${_kmname}: Guessing branch name 'KDE/$(get_kde_version)'" + EGIT_BRANCH="KDE/$(get_kde_version)" ;; esac ;; esac # default repo uri - case ${_kmname} in - kdeedu) - EGIT_REPO_URI="${EGIT_MIRROR}/${PN}" - ;; - *) - EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" - esac + EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}" debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}" diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 8f3db614587d..c6b4fdc32328 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.6 2011/06/15 22:03:13 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.7 2011/07/10 17:53:37 tampakrap Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 15498473f7ec..88c40b96b5f7 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.55 2011/06/15 00:11:05 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.56 2011/07/10 17:53:37 tampakrap Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -377,7 +377,7 @@ kde4-meta_create_extractlists() { # it may be possible to formulate this shorter, but it should also # still be understandable... if [[ ${KMNAME} != kdegraphics || ( ( $(get_kde_version) != 4.6 || ${PV} < 4.6.2 ) && $(get_kde_version) < 4.7 ) ]] \ - && ! [[ ${KMNAME} == kdeedu && ${PV} == 4.6.4 ]]; then + && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]]; then case ${KMNAME} in kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics) case ${PN} in |