diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-07-10 19:49:50 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-07-10 19:49:50 +0000 |
| commit | f8d3f8474b3b986f6e06d7b7f21b0b46915f05c1 (patch) | |
| tree | 323bcc510bad2b37c78cfb49c3b9f8395e860fa3 /eclass/kde-functions.eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f8d3f8474b3b986f6e06d7b7f21b0b46915f05c1.tar.gz gentoo-2-f8d3f8474b3b986f6e06d7b7f21b0b46915f05c1.tar.bz2 gentoo-2-f8d3f8474b3b986f6e06d7b7f21b0b46915f05c1.zip | |
make kde-base packages depend on the exact version of kdelibs they're distributed with (~ not
>=) to avoid compile errors as with the 3.0.2 update. other packages are unaffected.
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index ffbb034e2464..385df80bae45 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 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.12 2002/07/09 20:25:54 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.13 2002/07/10 19:49:50 danarmak Exp $ # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.) ECLASS=kde-functions @@ -48,9 +48,17 @@ need-kde() { debug-print-function $FUNCNAME $* KDEVER="$1" - min-kde-ver $KDEVER - newdepend ">=kde-base/kdelibs-${selected_version}" - set-kdedir $KDEVER + # if we're a kde-base package, we need an exact version of kdelibs + # to compile correctly. + if [ "$ECLASS" == "kde-dist" ]; then + newdepend "~kde-base/kdelibs-$KDEVER" + set-kdedir $KDEVER + else + # everyone else only needs a minimum version + min-kde-ver $KDEVER + newdepend ">=kde-base/kdelibs-${selected_version}" + set-kdedir $KDEVER + fi qtver-from-kdever $KDEVER need-qt $selected_version |