1 |
commit: 590f914e42ae092e1a5ef628c0092a16a1a1393d |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 31 14:17:37 2013 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 31 14:17:37 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=590f914e |
7 |
|
8 |
[kde-base/kdelibs] UDisks2 support is now integrated. |
9 |
|
10 |
Package-Manager: portage-2.1.11.50 |
11 |
|
12 |
--- |
13 |
kde-base/kdelibs/kdelibs-4.10.0.ebuild | 15 +++------------ |
14 |
kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild | 17 +++-------------- |
15 |
kde-base/kdelibs/kdelibs-4.9.98.ebuild | 15 +++------------ |
16 |
kde-base/kdelibs/kdelibs-9999.ebuild | 15 +++------------ |
17 |
4 files changed, 12 insertions(+), 50 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 9439e85..2790679 100644 |
21 |
--- a/kde-base/kdelibs/kdelibs-4.10.0.ebuild |
22 |
+++ b/kde-base/kdelibs/kdelibs-4.10.0.ebuild |
23 |
@@ -15,17 +15,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
24 |
EGIT_BRANCH="KDE/4.10" |
25 |
|
26 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
27 |
-SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" |
28 |
|
29 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
30 |
LICENSE="LGPL-2.1" |
31 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
32 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
33 |
-udisks2 +upower upnp zeroconf" |
34 |
++upower upnp zeroconf" |
35 |
|
36 |
REQUIRED_USE=" |
37 |
udisks? ( udev ) |
38 |
- udisks2? ( udisks ) |
39 |
upower? ( udev ) |
40 |
" |
41 |
|
42 |
@@ -106,10 +104,7 @@ RDEPEND="${COMMONDEPEND} |
43 |
x11-apps/iceauth |
44 |
x11-apps/rgb |
45 |
>=x11-misc/xdg-utils-1.0.2-r3 |
46 |
- udisks? ( |
47 |
- udisks2? ( sys-fs/udisks:2 ) |
48 |
- !udisks2? ( sys-fs/udisks:0 ) |
49 |
- ) |
50 |
+ udisks? ( sys-fs/udisks:2 ) |
51 |
upower? ( sys-power/upower ) |
52 |
) |
53 |
udev? ( app-misc/media-player-info ) |
54 |
@@ -159,11 +154,6 @@ src_prepare() { |
55 |
kde4-base_src_prepare |
56 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
57 |
|
58 |
- if use udisks2; then |
59 |
- epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" |
60 |
- epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
61 |
- fi |
62 |
- |
63 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
64 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
65 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
66 |
@@ -229,6 +219,7 @@ src_configure() { |
67 |
$(cmake-utils_use_with spell ENCHANT) |
68 |
$(cmake-utils_use_with ssl OpenSSL) |
69 |
$(cmake-utils_use_with udev UDev) |
70 |
+ $(cmake-utils_use_with udisks SOLID_UDISKS2) |
71 |
$(cmake-utils_use_with upnp HUpnp) |
72 |
$(cmake-utils_use_with zeroconf Avahi) |
73 |
) |
74 |
|
75 |
diff --git a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
76 |
index 05d9717..7b71d77 100644 |
77 |
--- a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
78 |
+++ b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild |
79 |
@@ -10,22 +10,18 @@ OPENGL_REQUIRED="optional" |
80 |
KDE_HANDBOOK="optional" |
81 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
82 |
|
83 |
-# The "master" branch is out of date, so use KDE/4.10 per upstream's |
84 |
-# recommendation. |
85 |
EGIT_BRANCH="KDE/4.10" |
86 |
|
87 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
88 |
-SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" |
89 |
|
90 |
KEYWORDS="" |
91 |
LICENSE="LGPL-2.1" |
92 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
93 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
94 |
-udisks2 +upower upnp zeroconf" |
95 |
++upower upnp zeroconf" |
96 |
|
97 |
REQUIRED_USE=" |
98 |
udisks? ( udev ) |
99 |
- udisks2? ( udisks ) |
100 |
upower? ( udev ) |
101 |
" |
102 |
|
103 |
@@ -106,10 +102,7 @@ RDEPEND="${COMMONDEPEND} |
104 |
x11-apps/iceauth |
105 |
x11-apps/rgb |
106 |
>=x11-misc/xdg-utils-1.0.2-r3 |
107 |
- udisks? ( |
108 |
- udisks2? ( sys-fs/udisks:2 ) |
109 |
- !udisks2? ( sys-fs/udisks:0 ) |
110 |
- ) |
111 |
+ udisks? ( sys-fs/udisks:2 ) |
112 |
upower? ( sys-power/upower ) |
113 |
) |
114 |
udev? ( app-misc/media-player-info ) |
115 |
@@ -159,11 +152,6 @@ src_prepare() { |
116 |
kde4-base_src_prepare |
117 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
118 |
|
119 |
- if use udisks2; then |
120 |
- epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" |
121 |
- epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
122 |
- fi |
123 |
- |
124 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
125 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
126 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
127 |
@@ -229,6 +217,7 @@ src_configure() { |
128 |
$(cmake-utils_use_with spell ENCHANT) |
129 |
$(cmake-utils_use_with ssl OpenSSL) |
130 |
$(cmake-utils_use_with udev UDev) |
131 |
+ $(cmake-utils_use_with udisks SOLID_UDISKS2) |
132 |
$(cmake-utils_use_with upnp HUpnp) |
133 |
$(cmake-utils_use_with zeroconf Avahi) |
134 |
) |
135 |
|
136 |
diff --git a/kde-base/kdelibs/kdelibs-4.9.98.ebuild b/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
137 |
index 9439e85..2790679 100644 |
138 |
--- a/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
139 |
+++ b/kde-base/kdelibs/kdelibs-4.9.98.ebuild |
140 |
@@ -15,17 +15,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
141 |
EGIT_BRANCH="KDE/4.10" |
142 |
|
143 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
144 |
-SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" |
145 |
|
146 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
147 |
LICENSE="LGPL-2.1" |
148 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
149 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
150 |
-udisks2 +upower upnp zeroconf" |
151 |
++upower upnp zeroconf" |
152 |
|
153 |
REQUIRED_USE=" |
154 |
udisks? ( udev ) |
155 |
- udisks2? ( udisks ) |
156 |
upower? ( udev ) |
157 |
" |
158 |
|
159 |
@@ -106,10 +104,7 @@ RDEPEND="${COMMONDEPEND} |
160 |
x11-apps/iceauth |
161 |
x11-apps/rgb |
162 |
>=x11-misc/xdg-utils-1.0.2-r3 |
163 |
- udisks? ( |
164 |
- udisks2? ( sys-fs/udisks:2 ) |
165 |
- !udisks2? ( sys-fs/udisks:0 ) |
166 |
- ) |
167 |
+ udisks? ( sys-fs/udisks:2 ) |
168 |
upower? ( sys-power/upower ) |
169 |
) |
170 |
udev? ( app-misc/media-player-info ) |
171 |
@@ -159,11 +154,6 @@ src_prepare() { |
172 |
kde4-base_src_prepare |
173 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
174 |
|
175 |
- if use udisks2; then |
176 |
- epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" |
177 |
- epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
178 |
- fi |
179 |
- |
180 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
181 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
182 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
183 |
@@ -229,6 +219,7 @@ src_configure() { |
184 |
$(cmake-utils_use_with spell ENCHANT) |
185 |
$(cmake-utils_use_with ssl OpenSSL) |
186 |
$(cmake-utils_use_with udev UDev) |
187 |
+ $(cmake-utils_use_with udisks SOLID_UDISKS2) |
188 |
$(cmake-utils_use_with upnp HUpnp) |
189 |
$(cmake-utils_use_with zeroconf Avahi) |
190 |
) |
191 |
|
192 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
193 |
index cfcb8a2..965898e 100644 |
194 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
195 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
196 |
@@ -13,17 +13,15 @@ inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
197 |
EGIT_BRANCH="master" |
198 |
|
199 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
200 |
-SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" |
201 |
|
202 |
KEYWORDS="" |
203 |
LICENSE="LGPL-2.1" |
204 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
205 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
206 |
-udisks2 +upower upnp zeroconf" |
207 |
++upower upnp zeroconf" |
208 |
|
209 |
REQUIRED_USE=" |
210 |
udisks? ( udev ) |
211 |
- udisks2? ( udisks ) |
212 |
upower? ( udev ) |
213 |
" |
214 |
|
215 |
@@ -104,10 +102,7 @@ RDEPEND="${COMMONDEPEND} |
216 |
x11-apps/iceauth |
217 |
x11-apps/rgb |
218 |
>=x11-misc/xdg-utils-1.0.2-r3 |
219 |
- udisks? ( |
220 |
- udisks2? ( sys-fs/udisks:2 ) |
221 |
- !udisks2? ( sys-fs/udisks:0 ) |
222 |
- ) |
223 |
+ udisks? ( sys-fs/udisks:2 ) |
224 |
upower? ( sys-power/upower ) |
225 |
) |
226 |
udev? ( app-misc/media-player-info ) |
227 |
@@ -157,11 +152,6 @@ src_prepare() { |
228 |
kde4-base_src_prepare |
229 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
230 |
|
231 |
- if use udisks2; then |
232 |
- epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" |
233 |
- epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
234 |
- fi |
235 |
- |
236 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
237 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
238 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
239 |
@@ -227,6 +217,7 @@ src_configure() { |
240 |
$(cmake-utils_use_with spell ENCHANT) |
241 |
$(cmake-utils_use_with ssl OpenSSL) |
242 |
$(cmake-utils_use_with udev UDev) |
243 |
+ $(cmake-utils_use_with udisks SOLID_UDISKS2) |
244 |
$(cmake-utils_use_with upnp HUpnp) |
245 |
$(cmake-utils_use_with zeroconf Avahi) |
246 |
) |