diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-02 14:36:19 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-02 14:49:55 +0100 |
| commit | 8998711d6454591b5838f5a5d3539db7dc5e1fdf (patch) | |
| tree | b0040878048ba9d07c56298721624bd62017d9f5 | |
| parent | 18770b92e2c3aca98f1c1b3447988284e7b0a070 (diff) | |
| download | kde-8998711d6454591b5838f5a5d3539db7dc5e1fdf.tar.gz kde-8998711d6454591b5838f5a5d3539db7dc5e1fdf.tar.bz2 kde-8998711d6454591b5838f5a5d3539db7dc5e1fdf.zip | |
eclass: use the slot handling more sanely.
| -rw-r--r-- | eclass/kde4-base.eclass | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 14fb46c67e7..b346da9a9b7 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -606,7 +606,7 @@ _calculate_live_repo() { *) # set ESCM_BRANCH and ESCM_COMMIT to ${SLOT} case ${_kmname} in - kdeplasma-addons) + kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs) ESCM_BRANCH="${SLOT}" ;; *) ESCM_BRANCH="KDE/${SLOT}" ;; @@ -614,29 +614,20 @@ _calculate_live_repo() { ;; esac - # set various git branching variables based on kmname - # each repo can use different branch names and so on :/ case $_kmname in kdepim|kdepim-runtime) case ${PV} in + # kdepim still did not branch 4.6.9999) ESCM_BRANCH="master" ;; - *.9999) - ESCM_BRANCH="${SLOT}" - ;; - esac - ;; - kdepimlibs) - case ${PV} in - *.9999) - ESCM_BRANCH="${SLOT}" - ;; esac ;; esac - ESCM_REPO_URI="${ESCM_MIRROR}/${_kmname}" + + debug-print "${FUNCNAME}: Repository: ${ESCM_REPO_URI}" + debug-print "${FUNCNAME}: Branch: ${ESCM_BRANCH}" ;; esac } |