summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-09-17 12:52:15 -0400
committerJonathan Callen <abcd@gentoo.org>2011-09-17 12:52:15 -0400
commitc83812643d03520f709fd5cdfa0c24707ab0ce2c (patch)
tree939b3033d8b69fb71f9ae68dd07f06e5369cc7c2
parentb1e46f5add7b7501a40f359d6c1174286a2ec22d (diff)
downloadkde-c83812643d03520f709fd5cdfa0c24707ab0ce2c.tar.gz
kde-c83812643d03520f709fd5cdfa0c24707ab0ce2c.tar.bz2
kde-c83812643d03520f709fd5cdfa0c24707ab0ce2c.zip
[kde4-base.eclass] Upstream simplified branching: everyone uses KDE/4.x now
-rw-r--r--eclass/kde4-base.eclass34
1 files changed, 2 insertions, 32 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 4a5545b30b0..7ef89e8b1af 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -569,38 +569,8 @@ _calculate_live_repo() {
fi
# default branching
- case ${PV} in
- 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
- ark|blinken|cantor|filelight|kalgebra|kalzium|kanagram|kbruch| \
- kcalc|kcharselect|kdeplasma-addons|kdepim|kdepim-runtime|kdepimlibs| \
- kdf|kfloppy|kgeography|kgpg|khangman|kig|kiten|klettres|kmplot|kremotecontrol| \
- kstars|ktimer|ktouch|kturtle|kwallet|kwordquiz|libkdeedu|mobipocket| \
- okular|parley|printer-applet|rocs|step|superkaramba|sweeper)
- EGIT_BRANCH="$(get_kde_version)"
- ;;
- marble)
- EGIT_BRANCH="kde-$(get_kde_version)"
- ;;
- gwenview|jovie|kaccessible|kamera|kate|kcolorchooser|kde-baseapps| \
- kde-runtime|kde-workspace|kgamma| \
- kdegraphics-strigi-analyzer|kdegraphics-thumbnailers| \
- kdelibs|kimono|kmag|kmousetool|kmouth|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
+ [[ ${PV} != 9999* && ${KDEBASE} == kde-base ]] && \
+ EGIT_BRANCH="KDE/$(get_kde_version)"
# default repo uri
EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"