Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
Date: Sun, 01 Nov 2009 20:26:37
Message-Id: E1N4h0V-0007ub-73@stork.gentoo.org
1 abcd 09/11/01 20:26:35
2
3 Modified: kde-functions.eclass
4 Log:
5 Fix last instance of deprange()
6
7 Revision Changes Path
8 1.175 eclass/kde-functions.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.175&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.175&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.174&r2=1.175
13
14 Index: kde-functions.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
17 retrieving revision 1.174
18 retrieving revision 1.175
19 diff -u -r1.174 -r1.175
20 --- kde-functions.eclass 1 Nov 2009 09:43:35 -0000 1.174
21 +++ kde-functions.eclass 1 Nov 2009 20:26:34 -0000 1.175
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2008 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.174 2009/11/01 09:43:35 abcd Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.175 2009/11/01 20:26:34 abcd Exp $
27
28 # @ECLASS: kde-functions.eclass
29 # @MAINTAINER:
30 @@ -389,19 +389,10 @@
31 fi
32 if [[ -n "${KDEBASE}" ]]; then
33 # If we're a kde-base package, we need at least our own version of kdelibs.
34 - # Also, split kde-base ebuilds are not updated with every KDE release, and so
35 - # can require support of different versions of kdelibs.
36 - # KM_DEPRANGE should contain 2nd and 3rd parameter to deprange:
37 - # max and min KDE versions. E.g. KM_DEPRANGE="$PV $MAXKDEVER".
38 # Note: we only set RDEPEND if it is already set, otherwise
39 # we break packages relying on portage copying RDEPEND from DEPEND.
40 - if [[ -n "${KM_DEPRANGE}" ]]; then
41 - DEPEND="${DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
42 - RDEPEND="${x_DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
43 - else
44 - DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
45 - RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
46 - fi
47 + DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
48 + RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
49 else
50 # Things outside kde-base need a minimum version,
51 # but kde-base/kdelibs:kde-4 mustn't satisfy it.