1 |
commit: 876b246b4080571d8a4223df2cd84be0daccc965 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 31 16:07:31 2013 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 31 16:07:31 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=876b246b |
7 |
|
8 |
[kde-base/kdelibs] UDisk support is actually mandatory. |
9 |
|
10 |
Package-Manager: portage-2.1.11.50 |
11 |
|
12 |
--- |
13 |
kde-base/kdelibs/kdelibs-4.10.0.ebuild | 9 +++------ |
14 |
kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild | 9 ++++----- |
15 |
kde-base/kdelibs/kdelibs-4.9.98.ebuild | 9 +++------ |
16 |
kde-base/kdelibs/kdelibs-9999.ebuild | 7 +++---- |
17 |
4 files changed, 13 insertions(+), 21 deletions(-) |
18 |
|
19 |
diff --git a/kde-base/kdelibs/kdelibs-4.10.0.ebuild b/kde-base/kdelibs/kdelibs-4.10.0.ebuild |
20 |
index 2790679..5610609 100644 |
21 |
--- a/kde-base/kdelibs/kdelibs-4.10.0.ebuild |
22 |
+++ b/kde-base/kdelibs/kdelibs-4.10.0.ebuild |
23 |
@@ -10,8 +10,6 @@ OPENGL_REQUIRED="optional" |
24 |
KDE_HANDBOOK="optional" |
25 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
26 |
|
27 |
-# The "master" branch is out of date, so use KDE/4.10 per upstream's |
28 |
-# recommendation. |
29 |
EGIT_BRANCH="KDE/4.10" |
30 |
|
31 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
32 |
@@ -19,11 +17,10 @@ DESCRIPTION="KDE libraries needed by all KDE programs." |
33 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
34 |
LICENSE="LGPL-2.1" |
35 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
36 |
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
37 |
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
38 |
+upower upnp zeroconf" |
39 |
|
40 |
REQUIRED_USE=" |
41 |
- udisks? ( udev ) |
42 |
upower? ( udev ) |
43 |
" |
44 |
|
45 |
@@ -101,10 +98,10 @@ RDEPEND="${COMMONDEPEND} |
46 |
$(add_kdebase_dep kde-env) |
47 |
sys-apps/dbus[X] |
48 |
!aqua? ( |
49 |
+ sys-fs/udisks:2 |
50 |
x11-apps/iceauth |
51 |
x11-apps/rgb |
52 |
>=x11-misc/xdg-utils-1.0.2-r3 |
53 |
- udisks? ( sys-fs/udisks:2 ) |
54 |
upower? ( sys-power/upower ) |
55 |
) |
56 |
udev? ( app-misc/media-player-info ) |
57 |
@@ -194,6 +191,7 @@ src_configure() { |
58 |
-DWITH_HSPELL=OFF |
59 |
-DWITH_ASPELL=OFF |
60 |
-DWITH_DNSSD=OFF |
61 |
+ -DWITH_SOLID_UDISKS2=ON |
62 |
-DKDE_DEFAULT_HOME=.kde4 |
63 |
-DKAUTH_BACKEND=POLKITQT-1 |
64 |
-DBUILD_libkactivities=OFF |
65 |
@@ -219,7 +217,6 @@ src_configure() { |
66 |
$(cmake-utils_use_with spell ENCHANT) |
67 |
$(cmake-utils_use_with ssl OpenSSL) |
68 |
$(cmake-utils_use_with udev UDev) |
69 |
- $(cmake-utils_use_with udisks SOLID_UDISKS2) |
70 |
$(cmake-utils_use_with upnp HUpnp) |
71 |
$(cmake-utils_use_with zeroconf Avahi) |
72 |
) |
73 |
|
74 |
diff --git a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
75 |
index 7b71d77..ca8a960 100644 |
76 |
--- a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
77 |
+++ b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
78 |
@@ -10,18 +10,17 @@ OPENGL_REQUIRED="optional" |
79 |
KDE_HANDBOOK="optional" |
80 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
81 |
|
82 |
-EGIT_BRANCH="KDE/4.10" |
83 |
+EGIT_BRANCH="master" |
84 |
|
85 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
86 |
|
87 |
KEYWORDS="" |
88 |
LICENSE="LGPL-2.1" |
89 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
90 |
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
91 |
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
92 |
+upower upnp zeroconf" |
93 |
|
94 |
REQUIRED_USE=" |
95 |
- udisks? ( udev ) |
96 |
upower? ( udev ) |
97 |
" |
98 |
|
99 |
@@ -99,10 +98,10 @@ RDEPEND="${COMMONDEPEND} |
100 |
$(add_kdebase_dep kde-env) |
101 |
sys-apps/dbus[X] |
102 |
!aqua? ( |
103 |
+ sys-fs/udisks:2 |
104 |
x11-apps/iceauth |
105 |
x11-apps/rgb |
106 |
>=x11-misc/xdg-utils-1.0.2-r3 |
107 |
- udisks? ( sys-fs/udisks:2 ) |
108 |
upower? ( sys-power/upower ) |
109 |
) |
110 |
udev? ( app-misc/media-player-info ) |
111 |
@@ -192,6 +191,7 @@ src_configure() { |
112 |
-DWITH_HSPELL=OFF |
113 |
-DWITH_ASPELL=OFF |
114 |
-DWITH_DNSSD=OFF |
115 |
+ -DWITH_SOLID_UDISKS2=ON |
116 |
-DKDE_DEFAULT_HOME=.kde4 |
117 |
-DKAUTH_BACKEND=POLKITQT-1 |
118 |
-DBUILD_libkactivities=OFF |
119 |
@@ -217,7 +217,6 @@ src_configure() { |
120 |
$(cmake-utils_use_with spell ENCHANT) |
121 |
$(cmake-utils_use_with ssl OpenSSL) |
122 |
$(cmake-utils_use_with udev UDev) |
123 |
- $(cmake-utils_use_with udisks SOLID_UDISKS2) |
124 |
$(cmake-utils_use_with upnp HUpnp) |
125 |
$(cmake-utils_use_with zeroconf Avahi) |
126 |
) |
127 |
|
128 |
diff --git a/kde-base/kdelibs/kdelibs-4.9.98.ebuild b/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
129 |
index 2790679..5610609 100644 |
130 |
--- a/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
131 |
+++ b/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
132 |
@@ -10,8 +10,6 @@ OPENGL_REQUIRED="optional" |
133 |
KDE_HANDBOOK="optional" |
134 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
135 |
|
136 |
-# The "master" branch is out of date, so use KDE/4.10 per upstream's |
137 |
-# recommendation. |
138 |
EGIT_BRANCH="KDE/4.10" |
139 |
|
140 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
141 |
@@ -19,11 +17,10 @@ DESCRIPTION="KDE libraries needed by all KDE programs." |
142 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
143 |
LICENSE="LGPL-2.1" |
144 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
145 |
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
146 |
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
147 |
+upower upnp zeroconf" |
148 |
|
149 |
REQUIRED_USE=" |
150 |
- udisks? ( udev ) |
151 |
upower? ( udev ) |
152 |
" |
153 |
|
154 |
@@ -101,10 +98,10 @@ RDEPEND="${COMMONDEPEND} |
155 |
$(add_kdebase_dep kde-env) |
156 |
sys-apps/dbus[X] |
157 |
!aqua? ( |
158 |
+ sys-fs/udisks:2 |
159 |
x11-apps/iceauth |
160 |
x11-apps/rgb |
161 |
>=x11-misc/xdg-utils-1.0.2-r3 |
162 |
- udisks? ( sys-fs/udisks:2 ) |
163 |
upower? ( sys-power/upower ) |
164 |
) |
165 |
udev? ( app-misc/media-player-info ) |
166 |
@@ -194,6 +191,7 @@ src_configure() { |
167 |
-DWITH_HSPELL=OFF |
168 |
-DWITH_ASPELL=OFF |
169 |
-DWITH_DNSSD=OFF |
170 |
+ -DWITH_SOLID_UDISKS2=ON |
171 |
-DKDE_DEFAULT_HOME=.kde4 |
172 |
-DKAUTH_BACKEND=POLKITQT-1 |
173 |
-DBUILD_libkactivities=OFF |
174 |
@@ -219,7 +217,6 @@ src_configure() { |
175 |
$(cmake-utils_use_with spell ENCHANT) |
176 |
$(cmake-utils_use_with ssl OpenSSL) |
177 |
$(cmake-utils_use_with udev UDev) |
178 |
- $(cmake-utils_use_with udisks SOLID_UDISKS2) |
179 |
$(cmake-utils_use_with upnp HUpnp) |
180 |
$(cmake-utils_use_with zeroconf Avahi) |
181 |
) |
182 |
|
183 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
184 |
index 965898e..ca8a960 100644 |
185 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
186 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
187 |
@@ -17,11 +17,10 @@ DESCRIPTION="KDE libraries needed by all KDE programs." |
188 |
KEYWORDS="" |
189 |
LICENSE="LGPL-2.1" |
190 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
191 |
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
192 |
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
193 |
+upower upnp zeroconf" |
194 |
|
195 |
REQUIRED_USE=" |
196 |
- udisks? ( udev ) |
197 |
upower? ( udev ) |
198 |
" |
199 |
|
200 |
@@ -99,10 +98,10 @@ RDEPEND="${COMMONDEPEND} |
201 |
$(add_kdebase_dep kde-env) |
202 |
sys-apps/dbus[X] |
203 |
!aqua? ( |
204 |
+ sys-fs/udisks:2 |
205 |
x11-apps/iceauth |
206 |
x11-apps/rgb |
207 |
>=x11-misc/xdg-utils-1.0.2-r3 |
208 |
- udisks? ( sys-fs/udisks:2 ) |
209 |
upower? ( sys-power/upower ) |
210 |
) |
211 |
udev? ( app-misc/media-player-info ) |
212 |
@@ -192,6 +191,7 @@ src_configure() { |
213 |
-DWITH_HSPELL=OFF |
214 |
-DWITH_ASPELL=OFF |
215 |
-DWITH_DNSSD=OFF |
216 |
+ -DWITH_SOLID_UDISKS2=ON |
217 |
-DKDE_DEFAULT_HOME=.kde4 |
218 |
-DKAUTH_BACKEND=POLKITQT-1 |
219 |
-DBUILD_libkactivities=OFF |
220 |
@@ -217,7 +217,6 @@ src_configure() { |
221 |
$(cmake-utils_use_with spell ENCHANT) |
222 |
$(cmake-utils_use_with ssl OpenSSL) |
223 |
$(cmake-utils_use_with udev UDev) |
224 |
- $(cmake-utils_use_with udisks SOLID_UDISKS2) |
225 |
$(cmake-utils_use_with upnp HUpnp) |
226 |
$(cmake-utils_use_with zeroconf Avahi) |
227 |
) |