diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-10 20:07:24 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-10 20:07:24 +0000 |
commit | 8eaa7d9aeb8bf09058570cab5788e2609e3718ef (patch) | |
tree | 88d6a040dda76a8dd6a340734e111982b30ae1f0 /eclass/kde4-functions.eclass | |
parent | Remove old cruft. (diff) | |
download | gentoo-2-8eaa7d9aeb8bf09058570cab5788e2609e3718ef.tar.gz gentoo-2-8eaa7d9aeb8bf09058570cab5788e2609e3718ef.tar.bz2 gentoo-2-8eaa7d9aeb8bf09058570cab5788e2609e3718ef.zip |
Make NEED_KDE=none packages pick correct kdedir :] Fixed thanks to Tomáš Caithaml and pva for helping with this. Per bug #257616.
Diffstat (limited to 'eclass/kde4-functions.eclass')
-rw-r--r-- | eclass/kde4-functions.eclass | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 106ccaeb0713..c4de74dfcd26 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.11 2009/01/12 19:40:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.12 2009/02/10 20:07:24 scarabeus Exp $ # @ECLASS: kde4-functions.eclass # @MAINTAINER: @@ -226,45 +226,43 @@ get_build_type() { # We can check for kdelibs because it is the most basic package; no KDE package # working without it. This might be changed in future. get_latest_kdedir() { - if [[ $NEED_KDE = latest && $KDEBASE != kde-base ]]; then - case ${KDE_WANTED} in - # note this will need to be updated as stable moves and so on - live) - _versions="9999 4.1.69 4.1.0" - ;; - snapshot) - _versions="4.1.69 4.1.0 9999" + case ${KDE_WANTED} in + # note this will need to be updated as stable moves and so on + live) + _versions="9999 4.1.69 4.1.0" + ;; + snapshot) + _versions="4.1.69 4.1.0 9999" + ;; + testing) + _versions="4.1.0 4.1.69 9999" + ;; + stable) + _versions="4.1.0 4.1.69 9999" + ;; + *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;; + esac + # check if exists and fallback as we go + for X in ${_versions}; do + if has_version ">=kde-base/kdelibs-${X}"; then + # figure out which X we are in and set it into _kdedir + case ${X} in + # also keep track here same for kde_wanted + 9999) + _kdedir="live" + break ;; - testing) - _versions="4.1.0 4.1.69 9999" + 4.1.69) + _kdedir="4.2" + break ;; - stable) - _versions="4.1.0 4.1.69 9999" + 4.1.0) + _kdedir="4.1" + break ;; - *) die "KDE_WANTED=${KDE_WANTED} not supported here." ;; - esac - # check if exists and fallback as we go - for X in ${_versions}; do - if has_version ">=kde-base/kdelibs-${X}"; then - # figure out which X we are in and set it into _kdedir - case ${X} in - # also keep track here same for kde_wanted - 9999) - _kdedir="live" - break - ;; - 4.1.69) - _kdedir="4.2" - break - ;; - 4.1.0) - _kdedir="4.1" - break - ;; - esac - fi - done - fi + esac + fi + done } # @FUNCTION: migrate_store_dir |