Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass
Date: Sun, 24 Oct 2010 15:56:07
Message-Id: 20101024155603.BAF5520051@flycatcher.gentoo.org
1 tampakrap 10/10/24 15:56:03
2
3 Modified: kde4-base.eclass kde4-functions.eclass
4 Log:
5 Add KDEPIM 4.4.7 support
6
7 Revision Changes Path
8 1.75 eclass/kde4-base.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.75&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.75&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.74&r2=1.75
13
14 Index: kde4-base.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
17 retrieving revision 1.74
18 retrieving revision 1.75
19 diff -u -r1.74 -r1.75
20 --- kde4-base.eclass 14 Sep 2010 12:39:51 -0000 1.74
21 +++ kde4-base.eclass 24 Oct 2010 15:56:03 -0000 1.75
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2010 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.74 2010/09/14 12:39:51 reavertm Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.75 2010/10/24 15:56:03 tampakrap Exp $
27
28 # @ECLASS: kde4-base.eclass
29 # @MAINTAINER:
30 @@ -479,7 +479,7 @@
31 # Unstable KDE SC releases
32 SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
33 ;;
34 - 4.4.6)
35 + 4.4.6 | 4.4.7)
36 # Only kdepim here
37 SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
38 ;;
39
40
41
42 1.36 eclass/kde4-functions.eclass
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.36&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.36&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.35&r2=1.36
47
48 Index: kde4-functions.eclass
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
51 retrieving revision 1.35
52 retrieving revision 1.36
53 diff -u -r1.35 -r1.36
54 --- kde4-functions.eclass 11 Sep 2010 04:25:23 -0000 1.35
55 +++ kde4-functions.eclass 24 Oct 2010 15:56:03 -0000 1.36
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2010 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.35 2010/09/11 04:25:23 reavertm Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.36 2010/10/24 15:56:03 tampakrap Exp $
61
62 inherit versionator
63
64 @@ -518,9 +518,9 @@
65 local use=${2:+,${2}}
66
67 if [[ ${KDEBASE} = kde-base ]]; then
68 - # FIXME remove hack when kdepim-4.4.6 is gone
69 + # FIXME remove hack when kdepim-4.4.{6,7} is gone
70 local FIXME_PV
71 - if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
72 + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
73 FIXME_PV=4.4.5
74 else
75 FIXME_PV=${PV}