diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-11-01 18:57:36 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-11-01 18:57:36 +0000 |
| commit | e246474aaa47912276face0ff92cea995d9ffa0f (patch) | |
| tree | af7f37f8f83816a018781d0b3be90c43f2a23bbe /eclass/kde-functions.eclass | |
| parent | spelling fix for 10051 (diff) | |
| download | gentoo-2-e246474aaa47912276face0ff92cea995d9ffa0f.tar.gz gentoo-2-e246474aaa47912276face0ff92cea995d9ffa0f.tar.bz2 gentoo-2-e246474aaa47912276face0ff92cea995d9ffa0f.zip | |
add support for kde 3.1 and qt 3.1 versions - general fixums. also remove the KDEAPPENDAGE stuff i never used.
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 4be3addbc3a1..df256646dd7a 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.38 2002/10/31 20:47:41 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.39 2002/11/01 18:57:36 danarmak Exp $ # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.) ECLASS=kde-functions @@ -64,15 +64,6 @@ need-kde() { else newdepend "~kde-base/kdelibs-${KDEVER}" fi - elif [ -n "$KDEAPPENDAGE" ]; then - # special status - installs into $KDEDIR not $PREFIX - # and needs an exact minor version of kde. - # this exists for stuff that is part of a kde-base package, - # but also has older standalone ebuilds which must then go - # into the older kde's directory and cannot work with the - # newer kde. - newdepend "=kde-base/kdelibs-${KDEVER}*" - export PREFIX="$KDEDIR" else # everything else only needs a minimum version if [ "$KDEMAJORVER" == "2" ]; then @@ -262,8 +253,9 @@ qtver-from-kdever() { case $1 in 2*) ver=2.3.1;; + 3.1*) ver=3.1_pre20021024;; 3*) ver=3.0.5;; - 5) ver=3.1;; # cvs version + 5) ver=3.1_pre20021024;; # cvs version *) echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;; esac @@ -292,8 +284,9 @@ min-kde-ver() { 3.0) selected_version="3.0";; 3.0.*) selected_version="3.0";; 3.1_alpha1) selected_version="3.1_alpha1";; - 3.1_beta1) selected_version="3.1_alpha1";; - 3.1_beta2) selected_version="3.1_alpha1";; + 3.1_beta1) selected_version="3.1_beta1";; + 3.1_beta2) selected_version="3.1_beta2";; + 3.1_rc1) selected_version="3.1_rc1";; 3.1.*) selected_version="3.1";; 3*) selected_version="3.0";; 5) selected_version="5";; |