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/kdebase-meta/
Date: Sat, 29 Nov 2014 17:26:57
Message-Id: 1417282016.25da2233af7acd6e2a743d4d04dd0acbcec88413.kensington@gentoo
1 commit: 25da2233af7acd6e2a743d4d04dd0acbcec88413
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 29 17:26:56 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 29 17:26:56 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25da2233
7
8 [kde-apps/kdebase-meta] Update for KDE Applications.
9
10 Package-Manager: portage-2.2.14
11
12 ---
13 kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild | 43 ++--------------------
14 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild | 43 ++--------------------
15 kde-apps/kdebase-meta/metadata.xml | 2 -
16 3 files changed, 8 insertions(+), 80 deletions(-)
17
18 diff --git a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
19 index 55fa00f..3ff04ac 100644
20 --- a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
21 +++ b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
22 @@ -3,61 +3,26 @@
23 # $Header: $
24
25 EAPI=5
26 -inherit kde4-meta-pkg
27 +
28 +inherit kde5-meta-pkg
29
30 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
31 KEYWORDS=""
32 -IUSE="+display-manager minimal +wallpapers"
33 +IUSE="+wallpapers"
34
35 RDEPEND="
36 $(add_kdeapps_dep dolphin)
37 - $(add_kdeapps_dep kcheckpass '' 4.11)
38 - wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
39 - $(add_kdeapps_dep kde-base-artwork)
40 $(add_kdeapps_dep kdebase-runtime-meta)
41 $(add_kdeapps_dep kdialog)
42 $(add_kdeapps_dep keditbookmarks)
43 - $(add_kdeapps_dep kephal '' 4.11)
44 $(add_kdeapps_dep kfind)
45 $(add_kdeapps_dep kfmclient)
46 $(add_kdeapps_dep konq-plugins)
47 $(add_kdeapps_dep konqueror)
48 $(add_kdeapps_dep konsole)
49 - $(add_kdeapps_dep kscreensaver '' 4.11)
50 - $(add_kdeapps_dep kstartupconfig '' 4.11)
51 - $(add_kdeapps_dep kstyles '' 4.11)
52 - $(add_kdeapps_dep ksystraycmd '' 4.11)
53 $(add_kdeapps_dep kwrite)
54 $(add_kdeapps_dep libkonq)
55 - $(add_kdeapps_dep liboxygenstyle '' 4.11)
56 - $(add_kdeapps_dep libplasmaclock '' 4.11)
57 $(add_kdeapps_dep nsplugins)
58 - $(add_kdeapps_dep phonon-kde)
59 $(add_kdeapps_dep plasma-apps)
60 - $(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
61 - !minimal? (
62 - $(add_kdeapps_dep freespacenotifier '' 4.11)
63 - $(add_kdeapps_dep kcminit '' 4.11)
64 - $(add_kdeapps_dep kdebase-cursors '' 4.11)
65 - $(add_kdeapps_dep kdebase-startkde '' 4.11)
66 - $(add_kdeapps_dep kdepasswd)
67 - $(add_kdeapps_dep khotkeys '' 4.11)
68 - $(add_kdeapps_dep kinfocenter '' 4.11)
69 - $(add_kdeapps_dep klipper '' 4.11)
70 - $(add_kdeapps_dep kmenuedit '' 4.11)
71 - $(add_kdeapps_dep krunner '' 4.11)
72 - $(add_kdeapps_dep ksmserver '' 4.11)
73 - $(add_kdeapps_dep ksplash '' 4.11)
74 - $(add_kdeapps_dep ksysguard '' 4.11)
75 - $(add_kdeapps_dep kwin '' 4.11)
76 - $(add_kdeapps_dep kwrited '' 4.11)
77 - $(add_kdebase_dep libkworkspace '' 4.11)
78 - $(add_kdeapps_dep libplasmagenericshell '' 4.11)
79 - $(add_kdeapps_dep libtaskmanager '' 4.11)
80 - $(add_kdeapps_dep plasma-workspace '' 4.11)
81 - $(add_kdeapps_dep powerdevil '' 4.11)
82 - $(add_kdeapps_dep solid-actions-kcm '' 4.11)
83 - $(add_kdeapps_dep systemsettings '' 4.11)
84 - !prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
85 - )
86 + wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
87 "
88
89 diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
90 index 55fa00f..3ff04ac 100644
91 --- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
92 +++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
93 @@ -3,61 +3,26 @@
94 # $Header: $
95
96 EAPI=5
97 -inherit kde4-meta-pkg
98 +
99 +inherit kde5-meta-pkg
100
101 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
102 KEYWORDS=""
103 -IUSE="+display-manager minimal +wallpapers"
104 +IUSE="+wallpapers"
105
106 RDEPEND="
107 $(add_kdeapps_dep dolphin)
108 - $(add_kdeapps_dep kcheckpass '' 4.11)
109 - wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
110 - $(add_kdeapps_dep kde-base-artwork)
111 $(add_kdeapps_dep kdebase-runtime-meta)
112 $(add_kdeapps_dep kdialog)
113 $(add_kdeapps_dep keditbookmarks)
114 - $(add_kdeapps_dep kephal '' 4.11)
115 $(add_kdeapps_dep kfind)
116 $(add_kdeapps_dep kfmclient)
117 $(add_kdeapps_dep konq-plugins)
118 $(add_kdeapps_dep konqueror)
119 $(add_kdeapps_dep konsole)
120 - $(add_kdeapps_dep kscreensaver '' 4.11)
121 - $(add_kdeapps_dep kstartupconfig '' 4.11)
122 - $(add_kdeapps_dep kstyles '' 4.11)
123 - $(add_kdeapps_dep ksystraycmd '' 4.11)
124 $(add_kdeapps_dep kwrite)
125 $(add_kdeapps_dep libkonq)
126 - $(add_kdeapps_dep liboxygenstyle '' 4.11)
127 - $(add_kdeapps_dep libplasmaclock '' 4.11)
128 $(add_kdeapps_dep nsplugins)
129 - $(add_kdeapps_dep phonon-kde)
130 $(add_kdeapps_dep plasma-apps)
131 - $(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
132 - !minimal? (
133 - $(add_kdeapps_dep freespacenotifier '' 4.11)
134 - $(add_kdeapps_dep kcminit '' 4.11)
135 - $(add_kdeapps_dep kdebase-cursors '' 4.11)
136 - $(add_kdeapps_dep kdebase-startkde '' 4.11)
137 - $(add_kdeapps_dep kdepasswd)
138 - $(add_kdeapps_dep khotkeys '' 4.11)
139 - $(add_kdeapps_dep kinfocenter '' 4.11)
140 - $(add_kdeapps_dep klipper '' 4.11)
141 - $(add_kdeapps_dep kmenuedit '' 4.11)
142 - $(add_kdeapps_dep krunner '' 4.11)
143 - $(add_kdeapps_dep ksmserver '' 4.11)
144 - $(add_kdeapps_dep ksplash '' 4.11)
145 - $(add_kdeapps_dep ksysguard '' 4.11)
146 - $(add_kdeapps_dep kwin '' 4.11)
147 - $(add_kdeapps_dep kwrited '' 4.11)
148 - $(add_kdebase_dep libkworkspace '' 4.11)
149 - $(add_kdeapps_dep libplasmagenericshell '' 4.11)
150 - $(add_kdeapps_dep libtaskmanager '' 4.11)
151 - $(add_kdeapps_dep plasma-workspace '' 4.11)
152 - $(add_kdeapps_dep powerdevil '' 4.11)
153 - $(add_kdeapps_dep solid-actions-kcm '' 4.11)
154 - $(add_kdeapps_dep systemsettings '' 4.11)
155 - !prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
156 - )
157 + wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
158 "
159
160 diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
161 index a88b9cb..783e379 100644
162 --- a/kde-apps/kdebase-meta/metadata.xml
163 +++ b/kde-apps/kdebase-meta/metadata.xml
164 @@ -3,8 +3,6 @@
165 <pkgmetadata>
166 <herd>kde</herd>
167 <use>
168 - <flag name="display-manager">Pull in a graphical display manager</flag>
169 - <flag name="minimal">Install a Plasma 5 compatible subset of the package</flag>
170 <flag name="wallpapers">Install the KDE wallpapers</flag>
171 </use>
172 </pkgmetadata>