summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-01-19 14:20:16 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-01-19 14:20:16 +0000
commitf15d74c77ba9a12befba54b4eed675d9c34d9151 (patch)
tree3edb5cfd318320ea4194b7dc092b4eaf2944ce4c /eclass
parentfix beta1 (diff)
downloadgentoo-2-f15d74c77ba9a12befba54b4eed675d9c34d9151.tar.gz
gentoo-2-f15d74c77ba9a12befba54b4eed675d9c34d9151.tar.bz2
gentoo-2-f15d74c77ba9a12befba54b4eed675d9c34d9151.zip
kde-functions.eclass: need-kde now adds an {,R}DEPEND on <kde-base/kdelibs-3.80, the first KDE 4 preview, see bug 206528.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde-functions.eclass11
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index a9fe777eb7f9..b2dd9a070f76 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.160 2008/01/17 22:39:22 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.161 2008/01/19 14:20:16 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -661,10 +661,13 @@ need-kde() {
RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
fi
else
- # Things outside kde-base only need a minimum version
+ # Things outside kde-base need a minimum version,
+ # but kde-base/kdelibs:kde-4 mustn't satisfy it.
min-kde-ver ${KDEVER}
- DEPEND="${DEPEND} >=kde-base/kdelibs-${selected_version}"
- RDEPEND="${x_DEPEND} >=kde-base/kdelibs-${selected_version}"
+ DEPEND="${DEPEND}
+ >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
+ RDEPEND="${x_DEPEND}
+ >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
fi
qtver-from-kdever ${KDEVER}