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 kde4-meta.eclass
Date: Wed, 29 Dec 2010 17:07:01
Message-Id: 20101229170651.EF9E020054@flycatcher.gentoo.org
1 tampakrap 10/12/29 17:06:51
2
3 Modified: kde4-base.eclass kde4-functions.eclass
4 kde4-meta.eclass
5 Log:
6 Add eclass support for kdepim 4.6beta3
7 This commit is useless for in tree eclasses, as this kdepim version will stay in overlay
8 I'm just syncing tree and overlay eclasses
9
10 Revision Changes Path
11 1.81 eclass/kde4-base.eclass
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.81&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.81&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.80&r2=1.81
16
17 Index: kde4-base.eclass
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
20 retrieving revision 1.80
21 retrieving revision 1.81
22 diff -u -r1.80 -r1.81
23 --- kde4-base.eclass 29 Dec 2010 16:45:19 -0000 1.80
24 +++ kde4-base.eclass 29 Dec 2010 17:06:51 -0000 1.81
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.80 2010/12/29 16:45:19 tampakrap Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.81 2010/12/29 17:06:51 tampakrap Exp $
30
31 # @ECLASS: kde4-base.eclass
32 # @MAINTAINER:
33 @@ -533,6 +533,10 @@
34 case ${KDEBASE} in
35 kde-base)
36 case ${PV} in
37 + 4.5.93)
38 + # Only kdepim and kdepim-runtime 4.6beta here
39 + SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname}-4.6beta3.tar.bz2"
40 + ;;
41 4.[456].8[05] | 4.[456].9[023568])
42 # Unstable KDE SC releases
43 SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
44
45
46
47 1.40 eclass/kde4-functions.eclass
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.40&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.40&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.39&r2=1.40
52
53 Index: kde4-functions.eclass
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
56 retrieving revision 1.39
57 retrieving revision 1.40
58 diff -u -r1.39 -r1.40
59 --- kde4-functions.eclass 29 Dec 2010 16:45:19 -0000 1.39
60 +++ kde4-functions.eclass 29 Dec 2010 17:06:51 -0000 1.40
61 @@ -1,6 +1,6 @@
62 # Copyright 1999-2010 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.39 2010/12/29 16:45:19 tampakrap Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.40 2010/12/29 17:06:51 tampakrap Exp $
66
67 inherit versionator
68
69 @@ -381,6 +381,12 @@
70 else
71 FIXME_PV=${PV}
72 fi
73 + # FIXME remove hack when kdepim-4.6beta is gone
74 + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
75 + FIXME_PV=4.5.90
76 + else
77 + FIXME_PV=${PV}
78 + fi
79
80 # if building stable-live version depend just on slot
81 # to allow merging packages against more stable basic stuff
82
83
84
85 1.46 eclass/kde4-meta.eclass
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.46&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.46&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.45&r2=1.46
90
91 Index: kde4-meta.eclass
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
94 retrieving revision 1.45
95 retrieving revision 1.46
96 diff -u -r1.45 -r1.46
97 --- kde4-meta.eclass 29 Dec 2010 16:38:50 -0000 1.45
98 +++ kde4-meta.eclass 29 Dec 2010 17:06:51 -0000 1.46
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2010 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.45 2010/12/29 16:38:50 tampakrap Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.46 2010/12/29 17:06:51 tampakrap Exp $
104 #
105 # @ECLASS: kde4-meta.eclass
106 # @MAINTAINER:
107 @@ -220,6 +220,11 @@
108 moduleprefix=apps/
109 KMTARPARAMS+=" --transform=s|apps/||"
110 ;;
111 + kdepim)
112 + if [[ ${PV} == 4.5.93 ]] ; then
113 + tarball="kdepim-4.6beta3.tar.${postfix}"
114 + fi
115 + ;;
116 *)
117 # Create tarball name from module name (this is the default)
118 tarball="${KMNAME}-${PV}.tar.${postfix}"