Gentoo Archives: gentoo-commits

From: Jonathan Callen <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdebindings-meta/, kde-base/kdesdk-meta/, kde-base/kdebase-meta/, ...
Date: Mon, 04 Apr 2011 22:47:21
Message-Id: 17c16f1ef063883b6641f961c7d454544e1135a8.abcd@gentoo
1 commit: 17c16f1ef063883b6641f961c7d454544e1135a8
2 Author: abcd <abcd <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 4 22:40:32 2011 +0000
4 Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 4 22:46:53 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=17c16f1e
7
8 [kde-base] Use new kde4-meta-pkg.eclass for meta packages
9
10 ---
11 kde-base/kde-meta/kde-meta-4.6.2.ebuild | 9 ++-------
12 kde-base/kde-meta/kde-meta-4.6.9999.ebuild | 9 ++-------
13 kde-base/kde-meta/kde-meta-9999.ebuild | 9 ++-------
14 .../kdeaccessibility-meta-4.6.2.ebuild | 9 ++-------
15 .../kdeaccessibility-meta-4.6.9999.ebuild | 9 ++-------
16 .../kdeaccessibility-meta-9999.ebuild | 9 ++-------
17 kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild | 9 ++-------
18 .../kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild | 9 ++-------
19 kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild | 9 ++-------
20 .../kdeartwork-meta/kdeartwork-meta-4.6.2.ebuild | 9 ++-------
21 .../kdeartwork-meta-4.6.9999.ebuild | 9 ++-------
22 .../kdeartwork-meta/kdeartwork-meta-9999.ebuild | 9 ++-------
23 kde-base/kdebase-meta/kdebase-meta-4.6.2.ebuild | 9 ++-------
24 kde-base/kdebase-meta/kdebase-meta-4.6.9999.ebuild | 9 ++-------
25 kde-base/kdebase-meta/kdebase-meta-9999.ebuild | 9 ++-------
26 .../kdebase-runtime-meta-4.6.2.ebuild | 9 ++-------
27 .../kdebase-runtime-meta-4.6.9999.ebuild | 9 ++-------
28 .../kdebase-runtime-meta-9999.ebuild | 9 ++-------
29 .../kdebindings-meta/kdebindings-meta-4.6.2.ebuild | 9 ++-------
30 .../kdebindings-meta-4.6.9999.ebuild | 9 ++-------
31 .../kdebindings-meta/kdebindings-meta-9999.ebuild | 9 ++-------
32 kde-base/kdeedu-meta/kdeedu-meta-4.6.2.ebuild | 9 ++-------
33 kde-base/kdeedu-meta/kdeedu-meta-4.6.9999.ebuild | 9 ++-------
34 kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild | 9 ++-------
35 kde-base/kdegames-meta/kdegames-meta-4.6.2.ebuild | 9 ++-------
36 .../kdegames-meta/kdegames-meta-4.6.9999.ebuild | 9 ++-------
37 kde-base/kdegames-meta/kdegames-meta-9999.ebuild | 9 ++-------
38 .../kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild | 9 ++-------
39 .../kdegraphics-meta-4.6.9999.ebuild | 9 ++-------
40 .../kdegraphics-meta/kdegraphics-meta-9999.ebuild | 9 ++-------
41 .../kdemultimedia-meta-4.6.2.ebuild | 9 ++-------
42 .../kdemultimedia-meta-4.6.9999.ebuild | 9 ++-------
43 .../kdemultimedia-meta-9999.ebuild | 9 ++-------
44 .../kdenetwork-meta/kdenetwork-meta-4.6.2.ebuild | 9 ++-------
45 .../kdenetwork-meta-4.6.9999.ebuild | 9 ++-------
46 .../kdenetwork-meta/kdenetwork-meta-9999.ebuild | 9 ++-------
47 kde-base/kdepim-meta/kdepim-meta-4.5.94.1.ebuild | 9 ++-------
48 kde-base/kdepim-meta/kdepim-meta-4.6.9999.ebuild | 9 ++-------
49 kde-base/kdepim-meta/kdepim-meta-9999.ebuild | 9 ++-------
50 kde-base/kdesdk-meta/kdesdk-meta-4.6.2.ebuild | 9 ++-------
51 kde-base/kdesdk-meta/kdesdk-meta-4.6.9999.ebuild | 9 ++-------
52 kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild | 9 ++-------
53 kde-base/kdetoys-meta/kdetoys-meta-4.6.2.ebuild | 9 ++-------
54 kde-base/kdetoys-meta/kdetoys-meta-4.6.9999.ebuild | 9 ++-------
55 kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild | 9 ++-------
56 kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild | 9 ++-------
57 .../kdeutils-meta/kdeutils-meta-4.6.9999.ebuild | 9 ++-------
58 kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild | 9 ++-------
59 .../kdewebdev-meta/kdewebdev-meta-4.6.2.ebuild | 9 ++-------
60 .../kdewebdev-meta/kdewebdev-meta-4.6.9999.ebuild | 9 ++-------
61 kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild | 9 ++-------
62 51 files changed, 102 insertions(+), 357 deletions(-)
63
64 diff --git a/kde-base/kde-meta/kde-meta-4.6.2.ebuild b/kde-base/kde-meta/kde-meta-4.6.2.ebuild
65 index e2c1f99..2d1d4a6 100644
66 --- a/kde-base/kde-meta/kde-meta-4.6.2.ebuild
67 +++ b/kde-base/kde-meta/kde-meta-4.6.2.ebuild
68 @@ -3,15 +3,11 @@
69 # $Header: $
70
71 EAPI=3
72 -inherit kde4-functions
73 +inherit kde4-meta-pkg
74
75 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
76 -HOMEPAGE="http://www.kde.org/"
77 -
78 -LICENSE="GPL-2"
79 -SLOT="4.6"
80 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
81 -IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
82 +IUSE="accessibility nls sdk semantic-desktop"
83
84 RDEPEND="
85 $(add_kdebase_dep kate)
86 @@ -34,5 +30,4 @@ RDEPEND="
87 $(add_kdebase_dep kdewebdev-meta)
88 )
89 semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
90 - $(block_other_slots)
91 "
92
93 diff --git a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
94 index 38da9fa..7d5dc08 100644
95 --- a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
96 +++ b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
97 @@ -3,15 +3,11 @@
98 # $Header: $
99
100 EAPI=3
101 -inherit kde4-functions
102 +inherit kde4-meta-pkg
103
104 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
105 -HOMEPAGE="http://www.kde.org/"
106 -
107 -LICENSE="GPL-2"
108 -SLOT="4.6"
109 KEYWORDS=""
110 -IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
111 +IUSE="accessibility nls sdk semantic-desktop"
112
113 RDEPEND="
114 $(add_kdebase_dep kate)
115 @@ -34,5 +30,4 @@ RDEPEND="
116 $(add_kdebase_dep kdewebdev-meta)
117 )
118 semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
119 - $(block_other_slots)
120 "
121
122 diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild
123 index e713346..433f02b 100644
124 --- a/kde-base/kde-meta/kde-meta-9999.ebuild
125 +++ b/kde-base/kde-meta/kde-meta-9999.ebuild
126 @@ -3,15 +3,11 @@
127 # $Header: $
128
129 EAPI=3
130 -inherit kde4-functions
131 +inherit kde4-meta-pkg
132
133 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
134 -HOMEPAGE="http://www.kde.org/"
135 -
136 -LICENSE="GPL-2"
137 -SLOT="live"
138 KEYWORDS=""
139 -IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
140 +IUSE="accessibility nls sdk semantic-desktop"
141
142 RDEPEND="
143 $(add_kdebase_dep kate)
144 @@ -34,5 +30,4 @@ RDEPEND="
145 $(add_kdebase_dep kdewebdev-meta)
146 )
147 semantic-desktop? ( $(add_kdebase_dep kdepim-meta) )
148 - $(block_other_slots)
149 "
150
151 diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
152 index 56822a5..f3f4d41 100644
153 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
154 +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
155 @@ -3,15 +3,11 @@
156 # $Header: $
157
158 EAPI=3
159 -inherit kde4-functions
160 +inherit kde4-meta-pkg
161
162 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
163 -HOMEPAGE="http://www.kde.org/"
164 -
165 -LICENSE="GPL-2"
166 -SLOT="4.6"
167 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
168 -IUSE="aqua kdeprefix"
169 +IUSE=""
170
171 RDEPEND="
172 $(add_kdebase_dep jovie)
173 @@ -21,5 +17,4 @@ RDEPEND="
174 $(add_kdebase_dep kmag)
175 $(add_kdebase_dep kmousetool)
176 $(add_kdebase_dep kmouth)
177 - $(block_other_slots)
178 "
179
180 diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
181 index de9f0ec..3ea2a87 100644
182 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
183 +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
184 @@ -3,15 +3,11 @@
185 # $Header: $
186
187 EAPI=3
188 -inherit kde4-functions
189 +inherit kde4-meta-pkg
190
191 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
192 -HOMEPAGE="http://www.kde.org/"
193 -
194 -LICENSE="GPL-2"
195 -SLOT="4.6"
196 KEYWORDS=""
197 -IUSE="aqua kdeprefix"
198 +IUSE=""
199
200 RDEPEND="
201 $(add_kdebase_dep jovie)
202 @@ -21,5 +17,4 @@ RDEPEND="
203 $(add_kdebase_dep kmag)
204 $(add_kdebase_dep kmousetool)
205 $(add_kdebase_dep kmouth)
206 - $(block_other_slots)
207 "
208
209 diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
210 index 834c186..3ea2a87 100644
211 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
212 +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
213 @@ -3,15 +3,11 @@
214 # $Header: $
215
216 EAPI=3
217 -inherit kde4-functions
218 +inherit kde4-meta-pkg
219
220 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
221 -HOMEPAGE="http://www.kde.org/"
222 -
223 -LICENSE="GPL-2"
224 -SLOT="live"
225 KEYWORDS=""
226 -IUSE="aqua kdeprefix"
227 +IUSE=""
228
229 RDEPEND="
230 $(add_kdebase_dep jovie)
231 @@ -21,5 +17,4 @@ RDEPEND="
232 $(add_kdebase_dep kmag)
233 $(add_kdebase_dep kmousetool)
234 $(add_kdebase_dep kmouth)
235 - $(block_other_slots)
236 "
237
238 diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
239 index 5f19948..6c237af 100644
240 --- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
241 +++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
242 @@ -3,20 +3,15 @@
243 # $Header: $
244
245 EAPI=3
246 -inherit kde4-functions
247 +inherit kde4-meta-pkg
248
249 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
250 -HOMEPAGE="http://www.kde.org/"
251 -
252 -LICENSE="GPL-2"
253 -SLOT="4.6"
254 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
255 -IUSE="aqua cups kdeprefix"
256 +IUSE="cups"
257
258 RDEPEND="
259 $(add_kdebase_dep kcron)
260 $(add_kdebase_dep ksystemlog)
261 $(add_kdebase_dep kuser)
262 cups? ( $(add_kdebase_dep system-config-printer-kde) )
263 - $(block_other_slots)
264 "
265
266 diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
267 index 671e3a3..0cea067 100644
268 --- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
269 +++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
270 @@ -3,20 +3,15 @@
271 # $Header: $
272
273 EAPI=3
274 -inherit kde4-functions
275 +inherit kde4-meta-pkg
276
277 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
278 -HOMEPAGE="http://www.kde.org/"
279 -
280 -LICENSE="GPL-2"
281 -SLOT="4.6"
282 KEYWORDS=""
283 -IUSE="aqua cups kdeprefix"
284 +IUSE="cups"
285
286 RDEPEND="
287 $(add_kdebase_dep kcron)
288 $(add_kdebase_dep ksystemlog)
289 $(add_kdebase_dep kuser)
290 cups? ( $(add_kdebase_dep system-config-printer-kde) )
291 - $(block_other_slots)
292 "
293
294 diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
295 index a1cd4bb..0cea067 100644
296 --- a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
297 +++ b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
298 @@ -3,20 +3,15 @@
299 # $Header: $
300
301 EAPI=3
302 -inherit kde4-functions
303 +inherit kde4-meta-pkg
304
305 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
306 -HOMEPAGE="http://www.kde.org/"
307 -
308 -LICENSE="GPL-2"
309 -SLOT="live"
310 KEYWORDS=""
311 -IUSE="aqua cups kdeprefix"
312 +IUSE="cups"
313
314 RDEPEND="
315 $(add_kdebase_dep kcron)
316 $(add_kdebase_dep ksystemlog)
317 $(add_kdebase_dep kuser)
318 cups? ( $(add_kdebase_dep system-config-printer-kde) )
319 - $(block_other_slots)
320 "
321
322 diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.2.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.2.ebuild
323 index 0b9a17f..889d95f 100644
324 --- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.2.ebuild
325 +++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.2.ebuild
326 @@ -3,15 +3,11 @@
327 # $Header: $
328
329 EAPI=3
330 -inherit kde4-functions
331 +inherit kde4-meta-pkg
332
333 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
334 -HOMEPAGE="http://www.kde.org/"
335 -
336 -LICENSE="GPL-2"
337 -SLOT="4.6"
338 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
339 -IUSE="aqua kdeprefix"
340 +IUSE=""
341
342 RDEPEND="
343 $(add_kdebase_dep kdeartwork-colorschemes)
344 @@ -23,5 +19,4 @@ RDEPEND="
345 $(add_kdebase_dep kdeartwork-styles)
346 $(add_kdebase_dep kdeartwork-wallpapers)
347 $(add_kdebase_dep kdeartwork-weatherwallpapers)
348 - $(block_other_slots)
349 "
350
351 diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.9999.ebuild
352 index cbe1c3c..8b1db6b 100644
353 --- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.9999.ebuild
354 +++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.6.9999.ebuild
355 @@ -3,15 +3,11 @@
356 # $Header: $
357
358 EAPI=3
359 -inherit kde4-functions
360 +inherit kde4-meta-pkg
361
362 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
363 -HOMEPAGE="http://www.kde.org/"
364 -
365 -LICENSE="GPL-2"
366 -SLOT="4.6"
367 KEYWORDS=""
368 -IUSE="aqua kdeprefix"
369 +IUSE=""
370
371 RDEPEND="
372 $(add_kdebase_dep kdeartwork-colorschemes)
373 @@ -23,5 +19,4 @@ RDEPEND="
374 $(add_kdebase_dep kdeartwork-styles)
375 $(add_kdebase_dep kdeartwork-wallpapers)
376 $(add_kdebase_dep kdeartwork-weatherwallpapers)
377 - $(block_other_slots)
378 "
379
380 diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
381 index eb683e9..8b1db6b 100644
382 --- a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
383 +++ b/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
384 @@ -3,15 +3,11 @@
385 # $Header: $
386
387 EAPI=3
388 -inherit kde4-functions
389 +inherit kde4-meta-pkg
390
391 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
392 -HOMEPAGE="http://www.kde.org/"
393 -
394 -LICENSE="GPL-2"
395 -SLOT="live"
396 KEYWORDS=""
397 -IUSE="aqua kdeprefix"
398 +IUSE=""
399
400 RDEPEND="
401 $(add_kdebase_dep kdeartwork-colorschemes)
402 @@ -23,5 +19,4 @@ RDEPEND="
403 $(add_kdebase_dep kdeartwork-styles)
404 $(add_kdebase_dep kdeartwork-wallpapers)
405 $(add_kdebase_dep kdeartwork-weatherwallpapers)
406 - $(block_other_slots)
407 "
408
409 diff --git a/kde-base/kdebase-meta/kdebase-meta-4.6.2.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.6.2.ebuild
410 index 548e619..3bd500d 100644
411 --- a/kde-base/kdebase-meta/kdebase-meta-4.6.2.ebuild
412 +++ b/kde-base/kdebase-meta/kdebase-meta-4.6.2.ebuild
413 @@ -3,15 +3,11 @@
414 # $Header: $
415
416 EAPI=3
417 -inherit kde4-functions
418 +inherit kde4-meta-pkg
419
420 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
421 -HOMEPAGE="http://www.kde.org/"
422 -
423 -LICENSE="GPL-2"
424 -SLOT="4.6"
425 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
426 -IUSE="aqua kdeprefix"
427 +IUSE=""
428
429 RDEPEND="
430 $(add_kdebase_dep dolphin)
431 @@ -59,5 +55,4 @@ RDEPEND="
432 $(add_kdebase_dep solid)
433 $(add_kdebase_dep systemsettings)
434 !prefix? ( $(add_kdebase_dep kdm) )
435 - $(block_other_slots)
436 "
437
438 diff --git a/kde-base/kdebase-meta/kdebase-meta-4.6.9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.6.9999.ebuild
439 index 8ead901..ea2b2bc 100644
440 --- a/kde-base/kdebase-meta/kdebase-meta-4.6.9999.ebuild
441 +++ b/kde-base/kdebase-meta/kdebase-meta-4.6.9999.ebuild
442 @@ -3,15 +3,11 @@
443 # $Header: $
444
445 EAPI=3
446 -inherit kde4-functions
447 +inherit kde4-meta-pkg
448
449 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
450 -HOMEPAGE="http://www.kde.org/"
451 -
452 -LICENSE="GPL-2"
453 -SLOT="4.6"
454 KEYWORDS=""
455 -IUSE="aqua kdeprefix"
456 +IUSE=""
457
458 RDEPEND="
459 $(add_kdebase_dep dolphin)
460 @@ -59,5 +55,4 @@ RDEPEND="
461 $(add_kdebase_dep solid)
462 $(add_kdebase_dep systemsettings)
463 !prefix? ( $(add_kdebase_dep kdm) )
464 - $(block_other_slots)
465 "
466
467 diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
468 index a29ca6d..419ec77 100644
469 --- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
470 +++ b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
471 @@ -3,15 +3,11 @@
472 # $Header: $
473
474 EAPI=3
475 -inherit kde4-functions
476 +inherit kde4-meta-pkg
477
478 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
479 -HOMEPAGE="http://www.kde.org/"
480 -
481 -LICENSE="GPL-2"
482 -SLOT="live"
483 KEYWORDS=""
484 -IUSE="aqua kdeprefix"
485 +IUSE=""
486
487 RDEPEND="
488 $(add_kdebase_dep dolphin)
489 @@ -59,5 +55,4 @@ RDEPEND="
490 $(add_kdebase_dep solid)
491 $(add_kdebase_dep systemsettings)
492 !prefix? ( $(add_kdebase_dep kdm) )
493 - $(block_other_slots)
494 "
495
496 diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild
497 index 4cf8f3b..39cf24e 100644
498 --- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild
499 +++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild
500 @@ -3,15 +3,11 @@
501 # $Header: $
502
503 EAPI=3
504 -inherit kde4-functions
505 +inherit kde4-meta-pkg
506
507 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
508 -HOMEPAGE="http://www.kde.org/"
509 -
510 -LICENSE="GPL-2"
511 -SLOT="4.6"
512 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
513 -IUSE="aqua +handbook kdeprefix semantic-desktop"
514 +IUSE="+handbook semantic-desktop"
515
516 RDEPEND="
517 $(add_kdebase_dep activitymanager)
518 @@ -49,5 +45,4 @@ RDEPEND="
519 $(add_kdebase_dep solid-runtime)
520 handbook? ( $(add_kdebase_dep khelpcenter) )
521 semantic-desktop? ( $(add_kdebase_dep nepomuk) )
522 - $(block_other_slots)
523 "
524
525 diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.9999.ebuild
526 index 619db14..056ce6b 100644
527 --- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.9999.ebuild
528 +++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.9999.ebuild
529 @@ -3,15 +3,11 @@
530 # $Header: $
531
532 EAPI=3
533 -inherit kde4-functions
534 +inherit kde4-meta-pkg
535
536 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
537 -HOMEPAGE="http://www.kde.org/"
538 -
539 -LICENSE="GPL-2"
540 -SLOT="4.6"
541 KEYWORDS=""
542 -IUSE="aqua +handbook kdeprefix semantic-desktop"
543 +IUSE="+handbook semantic-desktop"
544
545 RDEPEND="
546 $(add_kdebase_dep activitymanager)
547 @@ -49,5 +45,4 @@ RDEPEND="
548 $(add_kdebase_dep solid-runtime)
549 handbook? ( $(add_kdebase_dep khelpcenter) )
550 semantic-desktop? ( $(add_kdebase_dep nepomuk) )
551 - $(block_other_slots)
552 "
553
554 diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
555 index 92c79e1..056ce6b 100644
556 --- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
557 +++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
558 @@ -3,15 +3,11 @@
559 # $Header: $
560
561 EAPI=3
562 -inherit kde4-functions
563 +inherit kde4-meta-pkg
564
565 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
566 -HOMEPAGE="http://www.kde.org/"
567 -
568 -LICENSE="GPL-2"
569 -SLOT="live"
570 KEYWORDS=""
571 -IUSE="aqua +handbook kdeprefix semantic-desktop"
572 +IUSE="+handbook semantic-desktop"
573
574 RDEPEND="
575 $(add_kdebase_dep activitymanager)
576 @@ -49,5 +45,4 @@ RDEPEND="
577 $(add_kdebase_dep solid-runtime)
578 handbook? ( $(add_kdebase_dep khelpcenter) )
579 semantic-desktop? ( $(add_kdebase_dep nepomuk) )
580 - $(block_other_slots)
581 "
582
583 diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.6.2.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.6.2.ebuild
584 index 26a56a9..f6c9557 100644
585 --- a/kde-base/kdebindings-meta/kdebindings-meta-4.6.2.ebuild
586 +++ b/kde-base/kdebindings-meta/kdebindings-meta-4.6.2.ebuild
587 @@ -3,15 +3,11 @@
588 # $Header: $
589
590 EAPI=3
591 -inherit kde4-functions
592 +inherit kde4-meta-pkg
593
594 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
595 -HOMEPAGE="http://www.kde.org/"
596 -
597 -LICENSE="GPL-2"
598 -SLOT="4.6"
599 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
600 -IUSE="aqua csharp java kdeprefix perl python ruby"
601 +IUSE="csharp java perl python ruby"
602
603 RDEPEND="
604 $(add_kdebase_dep smoke)
605 @@ -23,5 +19,4 @@ RDEPEND="
606 $(add_kdebase_dep pykde4)
607 )
608 ruby? ( $(add_kdebase_dep kdebindings-ruby) )
609 - $(block_other_slots)
610 "
611
612 diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.6.9999.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.6.9999.ebuild
613 index 538d477..69fb474 100644
614 --- a/kde-base/kdebindings-meta/kdebindings-meta-4.6.9999.ebuild
615 +++ b/kde-base/kdebindings-meta/kdebindings-meta-4.6.9999.ebuild
616 @@ -3,15 +3,11 @@
617 # $Header: $
618
619 EAPI=3
620 -inherit kde4-functions
621 +inherit kde4-meta-pkg
622
623 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
624 -HOMEPAGE="http://www.kde.org/"
625 -
626 -LICENSE="GPL-2"
627 -SLOT="4.6"
628 KEYWORDS=""
629 -IUSE="aqua csharp java kdeprefix perl python ruby"
630 +IUSE="csharp java perl python ruby"
631
632 RDEPEND="
633 $(add_kdebase_dep smoke)
634 @@ -23,5 +19,4 @@ RDEPEND="
635 $(add_kdebase_dep pykde4)
636 )
637 ruby? ( $(add_kdebase_dep kdebindings-ruby) )
638 - $(block_other_slots)
639 "
640
641 diff --git a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
642 index 9ff8bf9..69fb474 100644
643 --- a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
644 +++ b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
645 @@ -3,15 +3,11 @@
646 # $Header: $
647
648 EAPI=3
649 -inherit kde4-functions
650 +inherit kde4-meta-pkg
651
652 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
653 -HOMEPAGE="http://www.kde.org/"
654 -
655 -LICENSE="GPL-2"
656 -SLOT="live"
657 KEYWORDS=""
658 -IUSE="aqua csharp java kdeprefix perl python ruby"
659 +IUSE="csharp java perl python ruby"
660
661 RDEPEND="
662 $(add_kdebase_dep smoke)
663 @@ -23,5 +19,4 @@ RDEPEND="
664 $(add_kdebase_dep pykde4)
665 )
666 ruby? ( $(add_kdebase_dep kdebindings-ruby) )
667 - $(block_other_slots)
668 "
669
670 diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.6.2.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.6.2.ebuild
671 index 81f7898..621913e 100644
672 --- a/kde-base/kdeedu-meta/kdeedu-meta-4.6.2.ebuild
673 +++ b/kde-base/kdeedu-meta/kdeedu-meta-4.6.2.ebuild
674 @@ -3,15 +3,11 @@
675 # $Header: $
676
677 EAPI=3
678 -inherit kde4-functions
679 +inherit kde4-meta-pkg
680
681 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
682 -HOMEPAGE="http://www.kde.org/"
683 -
684 -LICENSE="GPL-2"
685 -SLOT="4.6"
686 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
687 -IUSE="aqua kdeprefix"
688 +IUSE=""
689
690 RDEPEND="
691 $(add_kdebase_dep blinken)
692 @@ -36,5 +32,4 @@ RDEPEND="
693 $(add_kdebase_dep parley)
694 $(add_kdebase_dep rocs)
695 $(add_kdebase_dep step)
696 - $(block_other_slots)
697 "
698
699 diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.6.9999.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.6.9999.ebuild
700 index 4d80d34..111e1d0 100644
701 --- a/kde-base/kdeedu-meta/kdeedu-meta-4.6.9999.ebuild
702 +++ b/kde-base/kdeedu-meta/kdeedu-meta-4.6.9999.ebuild
703 @@ -3,15 +3,11 @@
704 # $Header: $
705
706 EAPI=3
707 -inherit kde4-functions
708 +inherit kde4-meta-pkg
709
710 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
711 -HOMEPAGE="http://www.kde.org/"
712 -
713 -LICENSE="GPL-2"
714 -SLOT="4.6"
715 KEYWORDS=""
716 -IUSE="aqua kdeprefix"
717 +IUSE=""
718
719 RDEPEND="
720 $(add_kdebase_dep blinken)
721 @@ -36,5 +32,4 @@ RDEPEND="
722 $(add_kdebase_dep parley)
723 $(add_kdebase_dep rocs)
724 $(add_kdebase_dep step)
725 - $(block_other_slots)
726 "
727
728 diff --git a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
729 index 21295a7..111e1d0 100644
730 --- a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
731 +++ b/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
732 @@ -3,15 +3,11 @@
733 # $Header: $
734
735 EAPI=3
736 -inherit kde4-functions
737 +inherit kde4-meta-pkg
738
739 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
740 -HOMEPAGE="http://www.kde.org/"
741 -
742 -LICENSE="GPL-2"
743 -SLOT="live"
744 KEYWORDS=""
745 -IUSE="aqua kdeprefix"
746 +IUSE=""
747
748 RDEPEND="
749 $(add_kdebase_dep blinken)
750 @@ -36,5 +32,4 @@ RDEPEND="
751 $(add_kdebase_dep parley)
752 $(add_kdebase_dep rocs)
753 $(add_kdebase_dep step)
754 - $(block_other_slots)
755 "
756
757 diff --git a/kde-base/kdegames-meta/kdegames-meta-4.6.2.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.6.2.ebuild
758 index 1870034..62e8820 100644
759 --- a/kde-base/kdegames-meta/kdegames-meta-4.6.2.ebuild
760 +++ b/kde-base/kdegames-meta/kdegames-meta-4.6.2.ebuild
761 @@ -3,15 +3,11 @@
762 # $Header: $
763
764 EAPI=3
765 -inherit kde4-functions
766 +inherit kde4-meta-pkg
767
768 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
769 -HOMEPAGE="http://www.kde.org/"
770 -
771 -LICENSE="GPL-2"
772 -SLOT="4.6"
773 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
774 -IUSE="aqua kdeprefix opengl python"
775 +IUSE="opengl python"
776
777 RDEPEND="
778 $(add_kdebase_dep bomber)
779 @@ -54,5 +50,4 @@ RDEPEND="
780 $(add_kdebase_dep palapeli)
781 opengl? ( $(add_kdebase_dep ksudoku) )
782 python? ( $(add_kdebase_dep kajongg) )
783 - $(block_other_slots)
784 "
785
786 diff --git a/kde-base/kdegames-meta/kdegames-meta-4.6.9999.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.6.9999.ebuild
787 index 4ba5cd8..5e0b4a8 100644
788 --- a/kde-base/kdegames-meta/kdegames-meta-4.6.9999.ebuild
789 +++ b/kde-base/kdegames-meta/kdegames-meta-4.6.9999.ebuild
790 @@ -3,15 +3,11 @@
791 # $Header: $
792
793 EAPI=3
794 -inherit kde4-functions
795 +inherit kde4-meta-pkg
796
797 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
798 -HOMEPAGE="http://www.kde.org/"
799 -
800 -LICENSE="GPL-2"
801 -SLOT="4.6"
802 KEYWORDS=""
803 -IUSE="aqua kdeprefix opengl python"
804 +IUSE="opengl python"
805
806 RDEPEND="
807 $(add_kdebase_dep bomber)
808 @@ -54,5 +50,4 @@ RDEPEND="
809 $(add_kdebase_dep palapeli)
810 opengl? ( $(add_kdebase_dep ksudoku) )
811 python? ( $(add_kdebase_dep kajongg) )
812 - $(block_other_slots)
813 "
814
815 diff --git a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild b/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
816 index 826d74a..5e0b4a8 100644
817 --- a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
818 +++ b/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
819 @@ -3,15 +3,11 @@
820 # $Header: $
821
822 EAPI=3
823 -inherit kde4-functions
824 +inherit kde4-meta-pkg
825
826 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
827 -HOMEPAGE="http://www.kde.org/"
828 -
829 -LICENSE="GPL-2"
830 -SLOT="live"
831 KEYWORDS=""
832 -IUSE="aqua kdeprefix opengl python"
833 +IUSE="opengl python"
834
835 RDEPEND="
836 $(add_kdebase_dep bomber)
837 @@ -54,5 +50,4 @@ RDEPEND="
838 $(add_kdebase_dep palapeli)
839 opengl? ( $(add_kdebase_dep ksudoku) )
840 python? ( $(add_kdebase_dep kajongg) )
841 - $(block_other_slots)
842 "
843
844 diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild
845 index 93abb0a..e5557cb 100644
846 --- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild
847 +++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild
848 @@ -3,15 +3,11 @@
849 # $Header: $
850
851 EAPI=3
852 -inherit kde4-functions
853 +inherit kde4-meta-pkg
854
855 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
856 -HOMEPAGE="http://www.kde.org/"
857 -
858 -LICENSE="GPL-2"
859 -SLOT="4.6"
860 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
861 -IUSE="aqua kdeprefix scanner"
862 +IUSE="scanner"
863
864 RDEPEND="
865 $(add_kdebase_dep gwenview)
866 @@ -32,5 +28,4 @@ RDEPEND="
867 $(add_kdebase_dep ksaneplugin)
868 $(add_kdebase_dep libksane)
869 )
870 - $(block_other_slots)
871 "
872
873 diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.9999.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.9999.ebuild
874 index d2443fa..7a7e255 100644
875 --- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.9999.ebuild
876 +++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.9999.ebuild
877 @@ -3,15 +3,11 @@
878 # $Header: $
879
880 EAPI=3
881 -inherit kde4-functions
882 +inherit kde4-meta-pkg
883
884 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
885 -HOMEPAGE="http://www.kde.org/"
886 -
887 -LICENSE="GPL-2"
888 -SLOT="4.6"
889 KEYWORDS=""
890 -IUSE="aqua kdeprefix scanner"
891 +IUSE="scanner"
892
893 RDEPEND="
894 $(add_kdebase_dep gwenview)
895 @@ -32,5 +28,4 @@ RDEPEND="
896 $(add_kdebase_dep ksaneplugin)
897 $(add_kdebase_dep libksane)
898 )
899 - $(block_other_slots)
900 "
901
902 diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
903 index 7d45278..7a7e255 100644
904 --- a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
905 +++ b/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
906 @@ -3,15 +3,11 @@
907 # $Header: $
908
909 EAPI=3
910 -inherit kde4-functions
911 +inherit kde4-meta-pkg
912
913 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
914 -HOMEPAGE="http://www.kde.org/"
915 -
916 -LICENSE="GPL-2"
917 -SLOT="live"
918 KEYWORDS=""
919 -IUSE="aqua kdeprefix scanner"
920 +IUSE="scanner"
921
922 RDEPEND="
923 $(add_kdebase_dep gwenview)
924 @@ -32,5 +28,4 @@ RDEPEND="
925 $(add_kdebase_dep ksaneplugin)
926 $(add_kdebase_dep libksane)
927 )
928 - $(block_other_slots)
929 "
930
931 diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild
932 index 6f6d708..e463853 100644
933 --- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild
934 +++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild
935 @@ -3,15 +3,11 @@
936 # $Header: $
937
938 EAPI=3
939 -inherit kde4-functions
940 +inherit kde4-meta-pkg
941
942 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
943 -HOMEPAGE="http://www.kde.org/"
944 -
945 -LICENSE="GPL-2"
946 -SLOT="4.6"
947 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
948 -IUSE="aqua ffmpeg kdeprefix"
949 +IUSE="ffmpeg"
950
951 RDEPEND="
952 $(add_kdebase_dep dragonplayer)
953 @@ -23,5 +19,4 @@ RDEPEND="
954 $(add_kdebase_dep libkcompactdisc)
955 $(add_kdebase_dep mplayerthumbs)
956 ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
957 - $(block_other_slots)
958 "
959
960 diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.9999.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.9999.ebuild
961 index c1add4a..2cb686b 100644
962 --- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.9999.ebuild
963 +++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.9999.ebuild
964 @@ -3,15 +3,11 @@
965 # $Header: $
966
967 EAPI=3
968 -inherit kde4-functions
969 +inherit kde4-meta-pkg
970
971 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
972 -HOMEPAGE="http://www.kde.org/"
973 -
974 -LICENSE="GPL-2"
975 -SLOT="4.6"
976 KEYWORDS=""
977 -IUSE="aqua ffmpeg kdeprefix"
978 +IUSE="ffmpeg"
979
980 RDEPEND="
981 $(add_kdebase_dep dragonplayer)
982 @@ -23,5 +19,4 @@ RDEPEND="
983 $(add_kdebase_dep libkcompactdisc)
984 $(add_kdebase_dep mplayerthumbs)
985 ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
986 - $(block_other_slots)
987 "
988
989 diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
990 index 9d5b554..2cb686b 100644
991 --- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
992 +++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
993 @@ -3,15 +3,11 @@
994 # $Header: $
995
996 EAPI=3
997 -inherit kde4-functions
998 +inherit kde4-meta-pkg
999
1000 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
1001 -HOMEPAGE="http://www.kde.org/"
1002 -
1003 -LICENSE="GPL-2"
1004 -SLOT="live"
1005 KEYWORDS=""
1006 -IUSE="aqua ffmpeg kdeprefix"
1007 +IUSE="ffmpeg"
1008
1009 RDEPEND="
1010 $(add_kdebase_dep dragonplayer)
1011 @@ -23,5 +19,4 @@ RDEPEND="
1012 $(add_kdebase_dep libkcompactdisc)
1013 $(add_kdebase_dep mplayerthumbs)
1014 ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
1015 - $(block_other_slots)
1016 "
1017
1018 diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.2.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.2.ebuild
1019 index 1c512a4..b4cb20c 100644
1020 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.2.ebuild
1021 +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.2.ebuild
1022 @@ -3,15 +3,11 @@
1023 # $Header: $
1024
1025 EAPI=3
1026 -inherit kde4-functions
1027 +inherit kde4-meta-pkg
1028
1029 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
1030 -HOMEPAGE="http://www.kde.org/"
1031 -
1032 -LICENSE="GPL-2"
1033 -SLOT="4.6"
1034 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
1035 -IUSE="aqua kdeprefix ppp"
1036 +IUSE="ppp"
1037
1038 RDEPEND="
1039 $(add_kdebase_dep kdenetwork-filesharing)
1040 @@ -21,5 +17,4 @@ RDEPEND="
1041 $(add_kdebase_dep krdc)
1042 $(add_kdebase_dep krfb)
1043 ppp? ( $(add_kdebase_dep kppp) )
1044 - $(block_other_slots)
1045 "
1046
1047 diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.9999.ebuild
1048 index bdbbe68..3918db1 100644
1049 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.9999.ebuild
1050 +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.6.9999.ebuild
1051 @@ -3,15 +3,11 @@
1052 # $Header: $
1053
1054 EAPI=3
1055 -inherit kde4-functions
1056 +inherit kde4-meta-pkg
1057
1058 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
1059 -HOMEPAGE="http://www.kde.org/"
1060 -
1061 -LICENSE="GPL-2"
1062 -SLOT="4.6"
1063 KEYWORDS=""
1064 -IUSE="aqua kdeprefix ppp"
1065 +IUSE="ppp"
1066
1067 RDEPEND="
1068 $(add_kdebase_dep kdenetwork-filesharing)
1069 @@ -21,5 +17,4 @@ RDEPEND="
1070 $(add_kdebase_dep krdc)
1071 $(add_kdebase_dep krfb)
1072 ppp? ( $(add_kdebase_dep kppp) )
1073 - $(block_other_slots)
1074 "
1075
1076 diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
1077 index fd16e78..3918db1 100644
1078 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
1079 +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
1080 @@ -3,15 +3,11 @@
1081 # $Header: $
1082
1083 EAPI=3
1084 -inherit kde4-functions
1085 +inherit kde4-meta-pkg
1086
1087 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
1088 -HOMEPAGE="http://www.kde.org/"
1089 -
1090 -LICENSE="GPL-2"
1091 -SLOT="live"
1092 KEYWORDS=""
1093 -IUSE="aqua kdeprefix ppp"
1094 +IUSE="ppp"
1095
1096 RDEPEND="
1097 $(add_kdebase_dep kdenetwork-filesharing)
1098 @@ -21,5 +17,4 @@ RDEPEND="
1099 $(add_kdebase_dep krdc)
1100 $(add_kdebase_dep krfb)
1101 ppp? ( $(add_kdebase_dep kppp) )
1102 - $(block_other_slots)
1103 "
1104
1105 diff --git a/kde-base/kdepim-meta/kdepim-meta-4.5.94.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.5.94.1.ebuild
1106 index 4778267..717f59a 100644
1107 --- a/kde-base/kdepim-meta/kdepim-meta-4.5.94.1.ebuild
1108 +++ b/kde-base/kdepim-meta/kdepim-meta-4.5.94.1.ebuild
1109 @@ -3,15 +3,11 @@
1110 # $Header: $
1111
1112 EAPI=3
1113 -inherit kde4-functions
1114 +inherit kde4-meta-pkg
1115
1116 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
1117 -HOMEPAGE="http://www.kde.org/"
1118 -
1119 -LICENSE="GPL-2"
1120 -SLOT="4.6"
1121 KEYWORDS="~amd64 ~x86"
1122 -IUSE="aqua kdeprefix"
1123 +IUSE=""
1124
1125 RDEPEND="
1126 $(add_kdebase_dep akonadiconsole)
1127 @@ -34,5 +30,4 @@ RDEPEND="
1128 $(add_kdebase_dep kontact)
1129 $(add_kdebase_dep korganizer)
1130 $(add_kdebase_dep ktimetracker)
1131 - $(block_other_slots)
1132 "
1133
1134 diff --git a/kde-base/kdepim-meta/kdepim-meta-4.6.9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.6.9999.ebuild
1135 index 1c7d39c..905d379 100644
1136 --- a/kde-base/kdepim-meta/kdepim-meta-4.6.9999.ebuild
1137 +++ b/kde-base/kdepim-meta/kdepim-meta-4.6.9999.ebuild
1138 @@ -3,15 +3,11 @@
1139 # $Header: $
1140
1141 EAPI=3
1142 -inherit kde4-functions
1143 +inherit kde4-meta-pkg
1144
1145 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
1146 -HOMEPAGE="http://www.kde.org/"
1147 -
1148 -LICENSE="GPL-2"
1149 -SLOT="4.6"
1150 KEYWORDS=""
1151 -IUSE="aqua kdeprefix"
1152 +IUSE=""
1153
1154 RDEPEND="
1155 $(add_kdebase_dep akonadiconsole)
1156 @@ -34,5 +30,4 @@ RDEPEND="
1157 $(add_kdebase_dep kontact)
1158 $(add_kdebase_dep korganizer)
1159 $(add_kdebase_dep ktimetracker)
1160 - $(block_other_slots)
1161 "
1162
1163 diff --git a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
1164 index db5c3b8..905d379 100644
1165 --- a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
1166 +++ b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
1167 @@ -3,15 +3,11 @@
1168 # $Header: $
1169
1170 EAPI=3
1171 -inherit kde4-functions
1172 +inherit kde4-meta-pkg
1173
1174 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
1175 -HOMEPAGE="http://www.kde.org/"
1176 -
1177 -LICENSE="GPL-2"
1178 -SLOT="live"
1179 KEYWORDS=""
1180 -IUSE="aqua kdeprefix"
1181 +IUSE=""
1182
1183 RDEPEND="
1184 $(add_kdebase_dep akonadiconsole)
1185 @@ -34,5 +30,4 @@ RDEPEND="
1186 $(add_kdebase_dep kontact)
1187 $(add_kdebase_dep korganizer)
1188 $(add_kdebase_dep ktimetracker)
1189 - $(block_other_slots)
1190 "
1191
1192 diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.6.2.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.6.2.ebuild
1193 index ed21b1c..5dd56ba 100644
1194 --- a/kde-base/kdesdk-meta/kdesdk-meta-4.6.2.ebuild
1195 +++ b/kde-base/kdesdk-meta/kdesdk-meta-4.6.2.ebuild
1196 @@ -3,15 +3,11 @@
1197 # $Header: $
1198
1199 EAPI=3
1200 -inherit kde4-functions
1201 +inherit kde4-meta-pkg
1202
1203 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
1204 -HOMEPAGE="http://www.kde.org/"
1205 -
1206 -LICENSE="GPL-2"
1207 -SLOT="4.6"
1208 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
1209 -IUSE="aqua cvs kdeprefix"
1210 +IUSE="cvs"
1211
1212 RDEPEND="
1213 cvs? ( $(add_kdebase_dep cervisia) )
1214 @@ -30,5 +26,4 @@ RDEPEND="
1215 $(add_kdebase_dep lokalize)
1216 $(add_kdebase_dep okteta)
1217 $(add_kdebase_dep umbrello)
1218 - $(block_other_slots)
1219 "
1220
1221 diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.6.9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.6.9999.ebuild
1222 index 6ffde31..739e2fe 100644
1223 --- a/kde-base/kdesdk-meta/kdesdk-meta-4.6.9999.ebuild
1224 +++ b/kde-base/kdesdk-meta/kdesdk-meta-4.6.9999.ebuild
1225 @@ -3,15 +3,11 @@
1226 # $Header: $
1227
1228 EAPI=3
1229 -inherit kde4-functions
1230 +inherit kde4-meta-pkg
1231
1232 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
1233 -HOMEPAGE="http://www.kde.org/"
1234 -
1235 -LICENSE="GPL-2"
1236 -SLOT="4.6"
1237 KEYWORDS=""
1238 -IUSE="aqua cvs kdeprefix"
1239 +IUSE="cvs"
1240
1241 RDEPEND="
1242 cvs? ( $(add_kdebase_dep cervisia) )
1243 @@ -30,5 +26,4 @@ RDEPEND="
1244 $(add_kdebase_dep lokalize)
1245 $(add_kdebase_dep okteta)
1246 $(add_kdebase_dep umbrello)
1247 - $(block_other_slots)
1248 "
1249
1250 diff --git a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
1251 index 38ef268..739e2fe 100644
1252 --- a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
1253 +++ b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
1254 @@ -3,15 +3,11 @@
1255 # $Header: $
1256
1257 EAPI=3
1258 -inherit kde4-functions
1259 +inherit kde4-meta-pkg
1260
1261 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
1262 -HOMEPAGE="http://www.kde.org/"
1263 -
1264 -LICENSE="GPL-2"
1265 -SLOT="live"
1266 KEYWORDS=""
1267 -IUSE="aqua cvs kdeprefix"
1268 +IUSE="cvs"
1269
1270 RDEPEND="
1271 cvs? ( $(add_kdebase_dep cervisia) )
1272 @@ -30,5 +26,4 @@ RDEPEND="
1273 $(add_kdebase_dep lokalize)
1274 $(add_kdebase_dep okteta)
1275 $(add_kdebase_dep umbrello)
1276 - $(block_other_slots)
1277 "
1278
1279 diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.6.2.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.6.2.ebuild
1280 index f55eb03..0c489c2 100644
1281 --- a/kde-base/kdetoys-meta/kdetoys-meta-4.6.2.ebuild
1282 +++ b/kde-base/kdetoys-meta/kdetoys-meta-4.6.2.ebuild
1283 @@ -3,19 +3,14 @@
1284 # $Header: $
1285
1286 EAPI=3
1287 -inherit kde4-functions
1288 +inherit kde4-meta-pkg
1289
1290 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
1291 -HOMEPAGE="http://www.kde.org/"
1292 -
1293 -LICENSE="GPL-2"
1294 -SLOT="4.6"
1295 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
1296 -IUSE="aqua kdeprefix"
1297 +IUSE=""
1298
1299 RDEPEND="
1300 $(add_kdebase_dep amor)
1301 $(add_kdebase_dep kteatime)
1302 $(add_kdebase_dep ktux)
1303 - $(block_other_slots)
1304 "
1305
1306 diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.6.9999.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.6.9999.ebuild
1307 index 5c07426..5b3bd48 100644
1308 --- a/kde-base/kdetoys-meta/kdetoys-meta-4.6.9999.ebuild
1309 +++ b/kde-base/kdetoys-meta/kdetoys-meta-4.6.9999.ebuild
1310 @@ -3,19 +3,14 @@
1311 # $Header: $
1312
1313 EAPI=3
1314 -inherit kde4-functions
1315 +inherit kde4-meta-pkg
1316
1317 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
1318 -HOMEPAGE="http://www.kde.org/"
1319 -
1320 -LICENSE="GPL-2"
1321 -SLOT="4.6"
1322 KEYWORDS=""
1323 -IUSE="aqua kdeprefix"
1324 +IUSE=""
1325
1326 RDEPEND="
1327 $(add_kdebase_dep amor)
1328 $(add_kdebase_dep kteatime)
1329 $(add_kdebase_dep ktux)
1330 - $(block_other_slots)
1331 "
1332
1333 diff --git a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
1334 index 68e675c..5b3bd48 100644
1335 --- a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
1336 +++ b/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
1337 @@ -3,19 +3,14 @@
1338 # $Header: $
1339
1340 EAPI=3
1341 -inherit kde4-functions
1342 +inherit kde4-meta-pkg
1343
1344 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
1345 -HOMEPAGE="http://www.kde.org/"
1346 -
1347 -LICENSE="GPL-2"
1348 -SLOT="live"
1349 KEYWORDS=""
1350 -IUSE="aqua kdeprefix"
1351 +IUSE=""
1352
1353 RDEPEND="
1354 $(add_kdebase_dep amor)
1355 $(add_kdebase_dep kteatime)
1356 $(add_kdebase_dep ktux)
1357 - $(block_other_slots)
1358 "
1359
1360 diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild
1361 index 2672102..dbc2556 100644
1362 --- a/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild
1363 +++ b/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild
1364 @@ -3,15 +3,11 @@
1365 # $Header: $
1366
1367 EAPI=3
1368 -inherit kde4-functions
1369 +inherit kde4-meta-pkg
1370
1371 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
1372 -HOMEPAGE="http://www.kde.org/"
1373 -
1374 -LICENSE="GPL-2"
1375 -SLOT="4.6"
1376 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
1377 -IUSE="aqua cups floppy kdeprefix"
1378 +IUSE="cups floppy"
1379
1380 RDEPEND="
1381 $(add_kdebase_dep ark)
1382 @@ -27,5 +23,4 @@ RDEPEND="
1383 $(add_kdebase_dep sweeper)
1384 cups? ( $(add_kdebase_dep printer-applet) )
1385 floppy? ( $(add_kdebase_dep kfloppy) )
1386 - $(block_other_slots)
1387 "
1388
1389 diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.6.9999.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.6.9999.ebuild
1390 index 4ab555a..031810c 100644
1391 --- a/kde-base/kdeutils-meta/kdeutils-meta-4.6.9999.ebuild
1392 +++ b/kde-base/kdeutils-meta/kdeutils-meta-4.6.9999.ebuild
1393 @@ -3,15 +3,11 @@
1394 # $Header: $
1395
1396 EAPI=3
1397 -inherit kde4-functions
1398 +inherit kde4-meta-pkg
1399
1400 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
1401 -HOMEPAGE="http://www.kde.org/"
1402 -
1403 -LICENSE="GPL-2"
1404 -SLOT="4.6"
1405 KEYWORDS=""
1406 -IUSE="aqua cups floppy kdeprefix"
1407 +IUSE="cups floppy"
1408
1409 RDEPEND="
1410 $(add_kdebase_dep ark)
1411 @@ -27,5 +23,4 @@ RDEPEND="
1412 $(add_kdebase_dep sweeper)
1413 cups? ( $(add_kdebase_dep printer-applet) )
1414 floppy? ( $(add_kdebase_dep kfloppy) )
1415 - $(block_other_slots)
1416 "
1417
1418 diff --git a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
1419 index 64277c7..031810c 100644
1420 --- a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
1421 +++ b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
1422 @@ -3,15 +3,11 @@
1423 # $Header: $
1424
1425 EAPI=3
1426 -inherit kde4-functions
1427 +inherit kde4-meta-pkg
1428
1429 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
1430 -HOMEPAGE="http://www.kde.org/"
1431 -
1432 -LICENSE="GPL-2"
1433 -SLOT="live"
1434 KEYWORDS=""
1435 -IUSE="aqua cups floppy kdeprefix"
1436 +IUSE="cups floppy"
1437
1438 RDEPEND="
1439 $(add_kdebase_dep ark)
1440 @@ -27,5 +23,4 @@ RDEPEND="
1441 $(add_kdebase_dep sweeper)
1442 cups? ( $(add_kdebase_dep printer-applet) )
1443 floppy? ( $(add_kdebase_dep kfloppy) )
1444 - $(block_other_slots)
1445 "
1446
1447 diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.2.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.2.ebuild
1448 index b13b5c8..9f89e22 100644
1449 --- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.2.ebuild
1450 +++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.2.ebuild
1451 @@ -3,20 +3,15 @@
1452 # $Header: $
1453
1454 EAPI=3
1455 -inherit kde4-functions
1456 +inherit kde4-meta-pkg
1457
1458 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
1459 -HOMEPAGE="http://www.kde.org/"
1460 -
1461 -LICENSE="GPL-2"
1462 -SLOT="4.6"
1463 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
1464 -IUSE="aqua kdeprefix"
1465 +IUSE=""
1466
1467 RDEPEND="
1468 $(add_kdebase_dep kfilereplace)
1469 $(add_kdebase_dep kimagemapeditor)
1470 $(add_kdebase_dep klinkstatus)
1471 $(add_kdebase_dep kommander)
1472 - $(block_other_slots)
1473 "
1474
1475 diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.9999.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.9999.ebuild
1476 index e61d4a1..7bcaa90 100644
1477 --- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.9999.ebuild
1478 +++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.6.9999.ebuild
1479 @@ -3,20 +3,15 @@
1480 # $Header: $
1481
1482 EAPI=3
1483 -inherit kde4-functions
1484 +inherit kde4-meta-pkg
1485
1486 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
1487 -HOMEPAGE="http://www.kde.org/"
1488 -
1489 -LICENSE="GPL-2"
1490 -SLOT="4.6"
1491 KEYWORDS=""
1492 -IUSE="aqua kdeprefix"
1493 +IUSE=""
1494
1495 RDEPEND="
1496 $(add_kdebase_dep kfilereplace)
1497 $(add_kdebase_dep kimagemapeditor)
1498 $(add_kdebase_dep klinkstatus)
1499 $(add_kdebase_dep kommander)
1500 - $(block_other_slots)
1501 "
1502
1503 diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
1504 index e6a697a..7bcaa90 100644
1505 --- a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
1506 +++ b/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
1507 @@ -3,20 +3,15 @@
1508 # $Header: $
1509
1510 EAPI=3
1511 -inherit kde4-functions
1512 +inherit kde4-meta-pkg
1513
1514 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
1515 -HOMEPAGE="http://www.kde.org/"
1516 -
1517 -LICENSE="GPL-2"
1518 -SLOT="live"
1519 KEYWORDS=""
1520 -IUSE="aqua kdeprefix"
1521 +IUSE=""
1522
1523 RDEPEND="
1524 $(add_kdebase_dep kfilereplace)
1525 $(add_kdebase_dep kimagemapeditor)
1526 $(add_kdebase_dep klinkstatus)
1527 $(add_kdebase_dep kommander)
1528 - $(block_other_slots)
1529 "