Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepimlibs/, kde-apps/kdepim/, ...
Date: Sat, 26 Sep 2015 15:45:22
Message-Id: 1443282308.c8589142937aee7a9d9f96bd11796624239c91d4.kensington@gentoo
1 commit: c8589142937aee7a9d9f96bd11796624239c91d4
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 25 22:57:28 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 15:45:08 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8589142
7
8 kde-apps: Relax blockers on kde-base (limit to slot 4)
9
10 Package-Manager: portage-2.2.20.1
11
12 kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild | 2 +-
13 .../kdepim-runtime/kdepim-runtime-15.08.1.ebuild | 2 +-
14 .../kdepim-runtime-15.08.49.9999.ebuild | 2 +-
15 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 2 +-
16 kde-apps/kdepim/kdepim-15.08.1.ebuild | 46 +++++++++++-----------
17 kde-apps/kdepim/kdepim-15.08.49.9999.ebuild | 46 +++++++++++-----------
18 kde-apps/kdepim/kdepim-9999.ebuild | 46 +++++++++++-----------
19 kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild | 2 +-
20 .../kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 2 +-
21 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 2 +-
22 10 files changed, 76 insertions(+), 76 deletions(-)
23
24 diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
25 index 04bfd75..9d75d3d 100644
26 --- a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
27 +++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
28 @@ -18,7 +18,7 @@ DEPEND="
29 RDEPEND="
30 !<kde-apps/kde-l10n-15.08.0-r1
31 !<kde-apps/kde4-l10n-4.14.3-r1
32 - !kde-base/kdepim-l10n
33 + !kde-base/kdepim-l10n:4
34 "
35
36 KEYWORDS="~amd64 ~x86"
37
38 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
39 index 0e204f9..a33fb24 100644
40 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
41 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
42 @@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
43 google? ( net-libs/libkgapi:5 )
44 "
45 RDEPEND="${CDEPEND}
46 - !kde-base/kdepim-runtime
47 + !kde-base/kdepim-runtime:4
48 "
49
50 PATCHES=( "${FILESDIR}/${PN}-15.08.0-GID-based-merge.patch" )
51
52 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
53 index ce5c065..dd6037f 100644
54 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
55 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
56 @@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
57 google? ( net-libs/libkgapi:5 )
58 "
59 RDEPEND="${CDEPEND}
60 - !kde-base/kdepim-runtime
61 + !kde-base/kdepim-runtime:4
62 "
63
64 src_configure() {
65
66 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
67 index 6a5c040..7bf0f34 100644
68 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
69 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
70 @@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
71 google? ( net-libs/libkgapi:5 )
72 "
73 RDEPEND="${CDEPEND}
74 - !kde-base/kdepim-runtime
75 + !kde-base/kdepim-runtime:4
76 "
77
78 src_configure() {
79
80 diff --git a/kde-apps/kdepim/kdepim-15.08.1.ebuild b/kde-apps/kdepim/kdepim-15.08.1.ebuild
81 index a73a25e..9ed11a3 100644
82 --- a/kde-apps/kdepim/kdepim-15.08.1.ebuild
83 +++ b/kde-apps/kdepim/kdepim-15.08.1.ebuild
84 @@ -95,29 +95,29 @@ DEPEND="
85 )
86 "
87 RDEPEND="${DEPEND}
88 - !kde-base/akonadiconsole
89 - !kde-base/akregator
90 - !kde-base/blogilo
91 - !kde-base/calendarjanitor
92 - !kde-base/kabcclient
93 - !kde-base/kaddressbook
94 - !kde-base/kalarm
95 - !kde-base/kdepim-common-libs
96 - !kde-base/kdepim-icons
97 - !kde-base/kdepim-kresources
98 - !kde-base/kdepim-l10n
99 - !kde-base/kdepim-meta
100 - !kde-base/kdepim-runtime
101 - !kde-base/kjots
102 - !kde-base/kleopatra
103 - !kde-base/kmail
104 - !kde-base/knode
105 - !kde-base/knotes
106 - !kde-base/konsolekalendar
107 - !kde-base/kontact
108 - !kde-base/korganizer
109 - !kde-base/ktimetracker
110 - !kde-base/ktnef
111 + !kde-base/akonadiconsole:4
112 + !kde-base/akregator:4
113 + !kde-base/blogilo:4
114 + !kde-base/calendarjanitor:4
115 + !kde-base/kabcclient:4
116 + !kde-base/kaddressbook:4
117 + !kde-base/kalarm:4
118 + !kde-base/kdepim-common-libs:4
119 + !kde-base/kdepim-icons:4
120 + !kde-base/kdepim-kresources:4
121 + !kde-base/kdepim-l10n:4
122 + !kde-base/kdepim-meta:4
123 + !kde-base/kdepim-runtime:4
124 + !kde-base/kjots:4
125 + !kde-base/kleopatra:4
126 + !kde-base/kmail:4
127 + !kde-base/knode:4
128 + !kde-base/knotes:4
129 + !kde-base/konsolekalendar:4
130 + !kde-base/kontact:4
131 + !kde-base/korganizer:4
132 + !kde-base/ktimetracker:4
133 + !kde-base/ktnef:4
134 $(add_kdeapps_dep kdepim-runtime)
135 kdepim_features_kleopatra? ( app-crypt/gnupg )
136 "
137
138 diff --git a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
139 index c1d3dfb..e631641 100644
140 --- a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
141 +++ b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
142 @@ -95,29 +95,29 @@ DEPEND="
143 )
144 "
145 RDEPEND="${DEPEND}
146 - !kde-base/akonadiconsole
147 - !kde-base/akregator
148 - !kde-base/blogilo
149 - !kde-base/calendarjanitor
150 - !kde-base/kabcclient
151 - !kde-base/kaddressbook
152 - !kde-base/kalarm
153 - !kde-base/kdepim-common-libs
154 - !kde-base/kdepim-icons
155 - !kde-base/kdepim-kresources
156 - !kde-base/kdepim-l10n
157 - !kde-base/kdepim-meta
158 - !kde-base/kdepim-runtime
159 - !kde-base/kjots
160 - !kde-base/kleopatra
161 - !kde-base/kmail
162 - !kde-base/knode
163 - !kde-base/knotes
164 - !kde-base/konsolekalendar
165 - !kde-base/kontact
166 - !kde-base/korganizer
167 - !kde-base/ktimetracker
168 - !kde-base/ktnef
169 + !kde-base/akonadiconsole:4
170 + !kde-base/akregator:4
171 + !kde-base/blogilo:4
172 + !kde-base/calendarjanitor:4
173 + !kde-base/kabcclient:4
174 + !kde-base/kaddressbook:4
175 + !kde-base/kalarm:4
176 + !kde-base/kdepim-common-libs:4
177 + !kde-base/kdepim-icons:4
178 + !kde-base/kdepim-kresources:4
179 + !kde-base/kdepim-l10n:4
180 + !kde-base/kdepim-meta:4
181 + !kde-base/kdepim-runtime:4
182 + !kde-base/kjots:4
183 + !kde-base/kleopatra:4
184 + !kde-base/kmail:4
185 + !kde-base/knode:4
186 + !kde-base/knotes:4
187 + !kde-base/konsolekalendar:4
188 + !kde-base/kontact:4
189 + !kde-base/korganizer:4
190 + !kde-base/ktimetracker:4
191 + !kde-base/ktnef:4
192 $(add_kdeapps_dep kdepim-runtime)
193 kdepim_features_kleopatra? ( app-crypt/gnupg )
194 "
195
196 diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
197 index e6c5b98..d5f20c1 100644
198 --- a/kde-apps/kdepim/kdepim-9999.ebuild
199 +++ b/kde-apps/kdepim/kdepim-9999.ebuild
200 @@ -93,29 +93,29 @@ DEPEND="
201 )
202 "
203 RDEPEND="${DEPEND}
204 - !kde-base/akonadiconsole
205 - !kde-base/akregator
206 - !kde-base/blogilo
207 - !kde-base/calendarjanitor
208 - !kde-base/kabcclient
209 - !kde-base/kaddressbook
210 - !kde-base/kalarm
211 - !kde-base/kdepim-common-libs
212 - !kde-base/kdepim-icons
213 - !kde-base/kdepim-kresources
214 - !kde-base/kdepim-l10n
215 - !kde-base/kdepim-meta
216 - !kde-base/kdepim-runtime
217 - !kde-base/kjots
218 - !kde-base/kleopatra
219 - !kde-base/kmail
220 - !kde-base/knode
221 - !kde-base/knotes
222 - !kde-base/konsolekalendar
223 - !kde-base/kontact
224 - !kde-base/korganizer
225 - !kde-base/ktimetracker
226 - !kde-base/ktnef
227 + !kde-base/akonadiconsole:4
228 + !kde-base/akregator:4
229 + !kde-base/blogilo:4
230 + !kde-base/calendarjanitor:4
231 + !kde-base/kabcclient:4
232 + !kde-base/kaddressbook:4
233 + !kde-base/kalarm:4
234 + !kde-base/kdepim-common-libs:4
235 + !kde-base/kdepim-icons:4
236 + !kde-base/kdepim-kresources:4
237 + !kde-base/kdepim-l10n:4
238 + !kde-base/kdepim-meta:4
239 + !kde-base/kdepim-runtime:4
240 + !kde-base/kjots:4
241 + !kde-base/kleopatra:4
242 + !kde-base/kmail:4
243 + !kde-base/knode:4
244 + !kde-base/knotes:4
245 + !kde-base/konsolekalendar:4
246 + !kde-base/kontact:4
247 + !kde-base/korganizer:4
248 + !kde-base/ktimetracker:4
249 + !kde-base/ktnef:4
250 $(add_kdeapps_dep kdepim-runtime)
251 kdepim_features_kleopatra? ( app-crypt/gnupg )
252 "
253
254 diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
255 index b2f7d46..8f05846 100644
256 --- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
257 +++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
258 @@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
259 dev-libs/boost
260 "
261 RDEPEND="${COMMON_DEPEND}
262 - !kde-base/kdepimlibs
263 + !kde-base/kdepimlibs:4
264 "
265
266 src_prepare() {
267
268 diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
269 index e661cb9..1aeb6f1 100644
270 --- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
271 +++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
272 @@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
273 dev-libs/boost
274 "
275 RDEPEND="${COMMON_DEPEND}
276 - !kde-base/kdepimlibs
277 + !kde-base/kdepimlibs:4
278 "
279
280 src_prepare() {
281
282 diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
283 index e661cb9..1aeb6f1 100644
284 --- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
285 +++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
286 @@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
287 dev-libs/boost
288 "
289 RDEPEND="${COMMON_DEPEND}
290 - !kde-base/kdepimlibs
291 + !kde-base/kdepimlibs:4
292 "
293
294 src_prepare() {