1 |
wired 09/08/03 21:59:53 |
2 |
|
3 |
Modified: kde4-base.eclass kde4-functions.eclass |
4 |
kde4-meta.eclass |
5 |
Log: |
6 |
synced kde4 eclasses with new ones from kde-testing overlay |
7 |
|
8 |
Revision Changes Path |
9 |
1.42 eclass/kde4-base.eclass |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.42&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.42&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.41&r2=1.42 |
14 |
|
15 |
Index: kde4-base.eclass |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
18 |
retrieving revision 1.41 |
19 |
retrieving revision 1.42 |
20 |
diff -u -r1.41 -r1.42 |
21 |
--- kde4-base.eclass 5 Jun 2009 09:48:46 -0000 1.41 |
22 |
+++ kde4-base.eclass 3 Aug 2009 21:59:53 -0000 1.42 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 2007-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.41 2009/06/05 09:48:46 scarabeus Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.42 2009/08/03 21:59:53 wired Exp $ |
28 |
|
29 |
# @ECLASS: kde4-base.eclass |
30 |
# @MAINTAINER: |
31 |
@@ -61,11 +61,11 @@ |
32 |
|
33 |
# @ECLASS-VARIABLE: KDE_MINIMAL |
34 |
# @DESCRIPTION: |
35 |
-# This wariable is used when KDE_REQUIRED is set, to specify required KDE minimal |
36 |
+# This variable is used when KDE_REQUIRED is set, to specify required KDE minimal |
37 |
# version for apps to work. Currently defaults to 4.2 |
38 |
# One may override this variable to raise version requirements. |
39 |
# For possible values look at KDE_SLOTS and KDE_LIVE_SLOTS variables. |
40 |
-# Note that for kde-base packages is fixed to ${SLOT}. |
41 |
+# Note that it is fixed to ${SLOT} for kde-base packages. |
42 |
KDE_MINIMAL="${KDE_MINIMAL:-4.2}" |
43 |
|
44 |
# Fallback behaviour (for now) |
45 |
@@ -94,13 +94,11 @@ |
46 |
" |
47 |
case ${OPENGL_REQUIRED} in |
48 |
always) |
49 |
- COMMONDEPEND="${COMMONDEPEND} ${qtopengldepend}" |
50 |
+ COMMONDEPEND+=" ${qtopengldepend}" |
51 |
;; |
52 |
optional) |
53 |
- IUSE="${IUSE} opengl" |
54 |
- COMMONDEPEND="${COMMONDEPEND} |
55 |
- opengl? ( ${qtopengldepend} ) |
56 |
- " |
57 |
+ IUSE+=" opengl" |
58 |
+ COMMONDEPEND+=" opengl? ( ${qtopengldepend} )" |
59 |
;; |
60 |
*) ;; |
61 |
esac |
62 |
@@ -112,13 +110,11 @@ |
63 |
" |
64 |
case ${WEBKIT_REQUIRED} in |
65 |
always) |
66 |
- COMMONDEPEND="${COMMONDEPEND} ${qtwebkitdepend}" |
67 |
+ COMMONDEPEND+=" ${qtwebkitdepend}" |
68 |
;; |
69 |
optional) |
70 |
- IUSE="${IUSE} webkit" |
71 |
- COMMONDEPEND="${COMMONDEPEND} |
72 |
- webkit? ( ${qtwebkitdepend} ) |
73 |
- " |
74 |
+ IUSE+=" webkit" |
75 |
+ COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )" |
76 |
;; |
77 |
*) ;; |
78 |
esac |
79 |
@@ -130,52 +126,32 @@ |
80 |
" |
81 |
case ${CPPUNIT_REQUIRED} in |
82 |
always) |
83 |
- DEPEND="${DEPEND} ${cppuintdepend}" |
84 |
+ DEPEND+=" ${cppuintdepend}" |
85 |
;; |
86 |
optional) |
87 |
- IUSE="${IUSE} test" |
88 |
- DEPEND="${DEPEND} |
89 |
- test? ( ${cppuintdepend} ) |
90 |
- " |
91 |
+ IUSE+=" test" |
92 |
+ DEPEND+=" test? ( ${cppuintdepend} )" |
93 |
;; |
94 |
*) ;; |
95 |
esac |
96 |
unset cppuintdepend |
97 |
|
98 |
-# DEPRECATED block |
99 |
-if [[ ${NEED_KDE} != "none" ]]; then |
100 |
- # localization deps |
101 |
- # DISABLED UNTIL PMS decide correct approach :( |
102 |
- if [[ -n ${KDE_LINGUAS} ]]; then |
103 |
- LNG_DEP="" |
104 |
- for _lng in ${KDE_LINGUAS}; do |
105 |
- # there must be or due to issue if lingua is not present in kde-l10n so |
106 |
- # it wont die but pick kde-l10n as-is. |
107 |
- LNG_DEP="${LNG_DEP} |
108 |
- || ( |
109 |
- kde-base/kde-l10n[linguas_${_lng},kdeprefix=] |
110 |
- kde-base/kde-l10n[kdeprefix=] |
111 |
- ) |
112 |
- " |
113 |
- done |
114 |
- fi |
115 |
-fi # NEED_KDE != NONE block |
116 |
- |
117 |
# Setup packages inheriting this eclass |
118 |
case ${KDEBASE} in |
119 |
kde-base) |
120 |
if [[ $BUILD_TYPE = live ]]; then |
121 |
# Disable tests for live ebuilds |
122 |
- RESTRICT="${RESTRICT} test" |
123 |
+ RESTRICT+=" test" |
124 |
# Live ebuilds in kde-base default to kdeprefix by default |
125 |
- IUSE="${IUSE} +kdeprefix" |
126 |
+ IUSE+=" +kdeprefix" |
127 |
else |
128 |
# All other ebuild types default to -kdeprefix as before |
129 |
- IUSE="${IUSE} kdeprefix" |
130 |
+ IUSE+=" kdeprefix" |
131 |
fi |
132 |
# Determine SLOT from PVs |
133 |
case ${PV} in |
134 |
*.9999*) SLOT="${PV/.9999*/}" ;; # stable live |
135 |
+ 4.4* | 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) SLOT="4.4" ;; |
136 |
4.3* | 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) SLOT="4.3" ;; |
137 |
4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;; |
138 |
9999*) SLOT="live" ;; # regular live |
139 |
@@ -186,12 +162,10 @@ |
140 |
_pvn="-${PV}" |
141 |
|
142 |
# Block installation of other SLOTS unless kdeprefix |
143 |
- for slot in ${KDE_SLOTS[@]}; do |
144 |
+ for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do |
145 |
# Block non kdeprefix ${PN} on other slots |
146 |
if [[ ${SLOT} != ${slot} ]]; then |
147 |
- RDEPEND="${RDEPEND} |
148 |
- !kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] ) |
149 |
- " |
150 |
+ RDEPEND+=" !kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" |
151 |
fi |
152 |
done |
153 |
unset slot |
154 |
@@ -211,9 +185,6 @@ |
155 |
# KDE dependencies |
156 |
kdecommondepend=" |
157 |
dev-lang/perl |
158 |
- x11-libs/libXext |
159 |
- x11-libs/libXt |
160 |
- x11-libs/libXxf86vm |
161 |
>=x11-libs/qt-core-${QT_DEPEND}:4[qt3support,ssl] |
162 |
>=x11-libs/qt-gui-${QT_DEPEND}:4[accessibility,dbus] |
163 |
>=x11-libs/qt-qt3support-${QT_DEPEND}:4[accessibility] |
164 |
@@ -221,15 +192,20 @@ |
165 |
>=x11-libs/qt-sql-${QT_DEPEND}:4[qt3support] |
166 |
>=x11-libs/qt-svg-${QT_DEPEND}:4 |
167 |
>=x11-libs/qt-test-${QT_DEPEND}:4 |
168 |
+ !aqua? ( |
169 |
+ x11-libs/libXext |
170 |
+ x11-libs/libXt |
171 |
+ x11-libs/libXxf86vm |
172 |
+ ) |
173 |
" |
174 |
if [[ ${PN} != kdelibs ]]; then |
175 |
if [[ ${KDEBASE} = kde-base ]]; then |
176 |
- kdecommondepend="${kdecommondepend} |
177 |
+ kdecommondepend+=" |
178 |
kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] ) |
179 |
!kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] ) |
180 |
" |
181 |
else |
182 |
- kdecommondepend="${kdecommondepend} |
183 |
+ kdecommondepend+=" |
184 |
>=kde-base/kdelibs${_pv} |
185 |
" |
186 |
fi |
187 |
@@ -237,19 +213,17 @@ |
188 |
unset _pv _pvn |
189 |
kdedepend=" |
190 |
dev-util/pkgconfig |
191 |
- >=sys-apps/sandbox-1.3.2 |
192 |
" |
193 |
case ${KDE_REQUIRED} in |
194 |
always) |
195 |
- COMMONDEPEND="${COMMONDEPEND} ${kdecommondepend}" |
196 |
- DEPEND="${DEPEND} ${kdedepend}" |
197 |
+ IUSE+=" aqua" |
198 |
+ COMMONDEPEND+=" ${kdecommondepend}" |
199 |
+ DEPEND+=" ${kdedepend}" |
200 |
;; |
201 |
optional) |
202 |
- IUSE="${IUSE} kde" |
203 |
- COMMONDEPEND="${COMMONDEPEND} |
204 |
- kde? ( ${kdecommondepend} )" |
205 |
- DEPEND="${DEPEND} |
206 |
- kde? ( ${kdedepend} )" |
207 |
+ IUSE+=" aqua kde" |
208 |
+ COMMONDEPEND+=" kde? ( ${kdecommondepend} )" |
209 |
+ DEPEND+=" kde? ( ${kdedepend} )" |
210 |
;; |
211 |
*) ;; |
212 |
esac |
213 |
@@ -260,8 +234,9 @@ |
214 |
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND (only) is ${RDEPEND}" |
215 |
|
216 |
# Accumulate dependencies set by this eclass |
217 |
-DEPEND="${DEPEND} ${COMMONDEPEND}" |
218 |
-RDEPEND="${RDEPEND} ${COMMONDEPEND}" |
219 |
+DEPEND+=" ${COMMONDEPEND}" |
220 |
+RDEPEND+=" ${COMMONDEPEND}" |
221 |
+unset COMMONDEPEND |
222 |
|
223 |
# Fetch section - If the ebuild's category is not 'kde-base' and if it is not a |
224 |
# koffice ebuild, the URI should be set in the ebuild itself |
225 |
@@ -301,6 +276,9 @@ |
226 |
kdebase-*) |
227 |
ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/kdebase/${KMNAME#kdebase-}" |
228 |
;; |
229 |
+ kdelibs-*) |
230 |
+ ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/kdelibs/${KMNAME#kdelibs-}" |
231 |
+ ;; |
232 |
kdereview) |
233 |
ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}" |
234 |
;; |
235 |
@@ -353,7 +331,12 @@ |
236 |
case ${KDEBASE} in |
237 |
kde-base) |
238 |
case ${PV} in |
239 |
- 4.2.85|4.2.90) |
240 |
+ 4.3.85 | 4.3.90 | 4.3.95 | 4.3.96) |
241 |
+ # block for normally packed unstable releases |
242 |
+ SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
243 |
+ 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) |
244 |
+ SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/${_kmname_pv}.tar.lzma" ;; |
245 |
+ 4.2.85 | 4.2.90 | 4.2.95 | 4.2.96 | 4.2.98) |
246 |
# block for normally packed unstable releases |
247 |
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
248 |
4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) |
249 |
@@ -384,7 +367,7 @@ |
250 |
# @DESCRIPTION: |
251 |
# Set the installation PREFIX for non kde-base applications. It defaults to /usr. |
252 |
# kde-base packages go into KDE4 installation directory (KDEDIR) by default. |
253 |
-# No matter the PREFIX, package will be built agains KDE installed in KDEDIR. |
254 |
+# No matter the PREFIX, package will be built against KDE installed in KDEDIR. |
255 |
|
256 |
# @FUNCTION: kde4-base_pkg_setup |
257 |
# @DESCRIPTION: |
258 |
@@ -405,9 +388,9 @@ |
259 |
|
260 |
if [[ ${KDEBASE} = kde-base ]]; then |
261 |
if use kdeprefix; then |
262 |
- KDEDIR="${ROOT}usr/kde/${_kdedir}" |
263 |
+ KDEDIR="${EROOT}usr/kde/${_kdedir}" |
264 |
else |
265 |
- KDEDIR="${ROOT}usr" |
266 |
+ KDEDIR="${EROOT}usr" |
267 |
fi |
268 |
PREFIX="${PREFIX:-${KDEDIR}}" |
269 |
else |
270 |
@@ -418,9 +401,9 @@ |
271 |
[[ -z ${kde_minimal_met} ]] && [[ ${slot} = ${KDE_MINIMAL} ]] && kde_minimal_met=1 |
272 |
if [[ -n ${kde_minimal_met} ]] && has_version "kde-base/kdelibs:${slot}"; then |
273 |
if has_version "kde-base/kdelibs:${slot}[kdeprefix]"; then |
274 |
- KDEDIR="${ROOT}usr/kde/${slot}" |
275 |
+ KDEDIR="${EROOT}usr/kde/${slot}" |
276 |
else |
277 |
- KDEDIR="${ROOT}usr" |
278 |
+ KDEDIR="${EROOT}usr" |
279 |
fi |
280 |
break; |
281 |
fi |
282 |
@@ -431,11 +414,15 @@ |
283 |
if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then |
284 |
[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" |
285 |
else |
286 |
- [[ -z ${KDEDIR} ]] && KDEDIR="${ROOT}usr" |
287 |
+ [[ -z ${KDEDIR} ]] && KDEDIR="${EROOT}usr" |
288 |
fi |
289 |
|
290 |
- PREFIX="${PREFIX:-${ROOT}usr}" |
291 |
+ PREFIX="${PREFIX:-${EROOT}usr}" |
292 |
fi |
293 |
+ # Point pkg-config path to KDE *.pc files |
294 |
+ export PKG_CONFIG_PATH="${KDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" |
295 |
+ # Point to correct QT plugins path |
296 |
+ QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/" |
297 |
|
298 |
# Not needed anymore |
299 |
unset _kdedir |
300 |
@@ -459,7 +446,8 @@ |
301 |
# @DESCRIPTION: |
302 |
# General pre-configure and pre-compile function for KDE4 applications. |
303 |
# It also handles translations if KDE_LINGUAS is defined. See KDE_LINGUAS and |
304 |
-# enable_selected_linguas() in kde4-functions.eclass(5) for further details. |
305 |
+# enable_selected_linguas() and enable_selected_doc_linguas() |
306 |
+# in kde4-functions.eclass(5) for further details. |
307 |
kde4-base_src_prepare() { |
308 |
debug-print-function ${FUNCNAME} "$@" |
309 |
|
310 |
@@ -468,6 +456,12 @@ |
311 |
enable_selected_linguas |
312 |
fi |
313 |
|
314 |
+ # Enable/disable handbooks for kde4-base packages |
315 |
+ # kde-l10n inherits kde-base but is metpackage, so no check for doc |
316 |
+ if ! has kde4-meta ${INHERITED}; then |
317 |
+ has handbook ${IUSE//+} && [[ ${PN} != kde-l10n ]] && enable_selected_doc_linguas |
318 |
+ fi |
319 |
+ |
320 |
[[ ${BUILD_TYPE} = live ]] && subversion_src_prepare |
321 |
base_src_prepare |
322 |
|
323 |
@@ -502,38 +496,34 @@ |
324 |
fi |
325 |
|
326 |
# Set distribution name |
327 |
- [[ ${PN} = kdelibs ]] && cmakeargs="${cmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo" |
328 |
+ [[ ${PN} = kdelibs ]] && cmakeargs+=" -DKDE_DISTRIBUTION_TEXT=Gentoo" |
329 |
|
330 |
# Here we set the install prefix |
331 |
- cmakeargs="${cmakeargs} -DCMAKE_INSTALL_PREFIX=${PREFIX}" |
332 |
+ cmakeargs+=" -DCMAKE_INSTALL_PREFIX=${PREFIX}" |
333 |
|
334 |
- # Set environment |
335 |
+ # Use colors |
336 |
QTEST_COLORED=1 |
337 |
- QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/" |
338 |
- |
339 |
- # Point pkg-config path to KDE *.pc files |
340 |
- export PKG_CONFIG_PATH="${KDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" |
341 |
|
342 |
# Shadow existing /usr installations |
343 |
unset KDEDIRS |
344 |
|
345 |
- if [[ ${KDEDIR} != "${ROOT}usr" ]]; then |
346 |
+ if [[ ${KDEDIR} != "${EROOT}usr" ]]; then |
347 |
# Override some environment variables - only when kdeprefix is different, |
348 |
# to not break ccache/distcc |
349 |
PATH="${KDEDIR}/bin:${PATH}" |
350 |
LDPATH="${KDEDIR}/$(get_libdir):${LDPATH}" |
351 |
|
352 |
# Append full RPATH |
353 |
- cmakeargs="${cmakeargs} -DCMAKE_SKIP_RPATH=OFF" |
354 |
+ cmakeargs+=" -DCMAKE_SKIP_RPATH=OFF" |
355 |
fi |
356 |
|
357 |
if has kdeprefix ${IUSE//+} && use kdeprefix; then |
358 |
# Set cmake prefixes to allow buildsystem to localize valid KDE installation |
359 |
# when more are present |
360 |
- cmakeargs="${cmakeargs} -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}" |
361 |
+ cmakeargs+=" -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}" |
362 |
else |
363 |
# If prefix is /usr, sysconf needs to be /etc, not /usr/etc |
364 |
- cmakeargs="${cmakeargs} -DSYSCONF_INSTALL_DIR=${ROOT}etc" |
365 |
+ cmakeargs+=" -DSYSCONF_INSTALL_DIR=${EROOT}etc" |
366 |
fi |
367 |
|
368 |
mycmakeargs="${cmakeargs} ${mycmakeargs}" |
369 |
@@ -547,7 +537,7 @@ |
370 |
kde4-base_src_compile() { |
371 |
debug-print-function ${FUNCNAME} "$@" |
372 |
|
373 |
- cmake-utils_src_compile |
374 |
+ cmake-utils_src_compile "$@" |
375 |
} |
376 |
|
377 |
# @FUNCTION: kde4-base_src_test |
378 |
@@ -557,7 +547,7 @@ |
379 |
debug-print-function ${FUNCNAME} "$@" |
380 |
|
381 |
# Override this value, set in kde4-base_src_configure() |
382 |
- mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON" |
383 |
+ mycmakeargs+=" -DKDE4_BUILD_TESTS=ON" |
384 |
cmake-utils_src_configure |
385 |
kde4-base_src_compile |
386 |
|
387 |
@@ -599,10 +589,10 @@ |
388 |
done |
389 |
fi |
390 |
|
391 |
- if [[ -n ${KDEBASE} ]] && [[ -d "${D}${ROOT}usr/share/doc/${PF}" ]]; then |
392 |
+ if [[ -n ${KDEBASE} ]] && [[ -d "${D}${EROOT}usr/share/doc/${PF}" ]]; then |
393 |
# work around bug #97196 |
394 |
dodir /usr/share/doc/KDE4 && \ |
395 |
- mv "${D}${ROOT}usr/share/doc/${PF}" "${D}${ROOT}usr/share/doc/KDE4/" || \ |
396 |
+ mv "${D}${EROOT}usr/share/doc/${PF}" "${D}${EROOT}usr/share/doc/KDE4/" || \ |
397 |
die "Failed to move docs to KDE4/." |
398 |
fi |
399 |
} |
400 |
@@ -617,17 +607,17 @@ |
401 |
|
402 |
if [[ ${BUILD_TYPE} = live ]] && [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
403 |
echo |
404 |
- einfo "WARNING! This is an experimental live ebuild of ${KMNAME:-${PN}}" |
405 |
+ einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}" |
406 |
einfo "Use it at your own risk." |
407 |
einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!" |
408 |
echo |
409 |
elif [[ ${BUILD_TYPE} != live ]] && [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && has kdeprefix ${IUSE//+} && use kdeprefix; then |
410 |
# warning about kdeprefix for non-live users |
411 |
echo |
412 |
- ewarn "WARNING! You have kdeprefix useflag enabled." |
413 |
- ewarn "This setting is strongly discouraged and might lead to potential troubles" |
414 |
+ ewarn "WARNING! You have the kdeprefix useflag enabled." |
415 |
+ ewarn "This setting is strongly discouraged and might lead to potential trouble" |
416 |
ewarn "with KDE update strategies." |
417 |
- ewarn "You are using this setup at your own risk and kde team does not" |
418 |
+ ewarn "You are using this setup at your own risk and the kde team does not" |
419 |
ewarn "take responsibilities for dead kittens." |
420 |
echo |
421 |
fi |
422 |
|
423 |
|
424 |
|
425 |
1.22 eclass/kde4-functions.eclass |
426 |
|
427 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.22&view=markup |
428 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.22&content-type=text/plain |
429 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.21&r2=1.22 |
430 |
|
431 |
Index: kde4-functions.eclass |
432 |
=================================================================== |
433 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
434 |
retrieving revision 1.21 |
435 |
retrieving revision 1.22 |
436 |
diff -u -r1.21 -r1.22 |
437 |
--- kde4-functions.eclass 4 Jun 2009 09:29:54 -0000 1.21 |
438 |
+++ kde4-functions.eclass 3 Aug 2009 21:59:53 -0000 1.22 |
439 |
@@ -1,6 +1,9 @@ |
440 |
# Copyright 1999-2008 Gentoo Foundation |
441 |
# Distributed under the terms of the GNU General Public License v2 |
442 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.21 2009/06/04 09:29:54 scarabeus Exp $ |
443 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.22 2009/08/03 21:59:53 wired Exp $ |
444 |
+ |
445 |
+# Prefix compat: |
446 |
+: ${EROOT:=${ROOT}} |
447 |
|
448 |
# @ECLASS: kde4-functions.eclass |
449 |
# @MAINTAINER: |
450 |
@@ -12,7 +15,7 @@ |
451 |
|
452 |
# @ECLASS-VARIABLE: EAPI |
453 |
# @DESCRIPTION: |
454 |
-# By default kde4 eclasses wants eapi 2 which might be redefinable to newer |
455 |
+# By default kde4 eclasses want EAPI 2 which might be redefinable to newer |
456 |
# versions. |
457 |
case ${EAPI:-0} in |
458 |
2) : ;; |
459 |
@@ -39,7 +42,7 @@ |
460 |
# @DESCRIPTION: |
461 |
# The slots used by all KDE versions later than 4.0. The live KDE releases use |
462 |
# KDE_LIVE_SLOTS instead. Values should be ordered. |
463 |
-KDE_SLOTS=( "kde-4" "4.1" "4.2" "4.3" ) |
464 |
+KDE_SLOTS=( "kde-4" "4.1" "4.2" "4.3" "4.4" ) |
465 |
|
466 |
# @ECLASS-VARIABLE: KDE_LIVE_SLOTS |
467 |
# @DESCRIPTION: |
468 |
@@ -53,7 +56,21 @@ |
469 |
buildsycoca() { |
470 |
debug-print-function ${FUNCNAME} "$@" |
471 |
|
472 |
- if [[ -z ${ROOT%%/} && -x ${KDEDIR}/bin/kbuildsycoca4 ]]; then |
473 |
+ local KDE3DIR="${EROOT}usr/kde/3.5" |
474 |
+ if [[ -z ${EROOT%%/} && -x "${KDE3DIR}"/bin/kbuildsycoca ]]; then |
475 |
+ # Since KDE3 is aware of shortcuts in /usr, rebuild database |
476 |
+ # for KDE3 as well. |
477 |
+ touch "${KDE3DIR}"/share/services/ksycoca |
478 |
+ chmod 644 "${KDE3DIR}"/share/services/ksycoca |
479 |
+ |
480 |
+ ebegin "Running kbuildsycoca to build global database" |
481 |
+ XDG_DATA_DIRS="${EROOT}usr/local/share:${KDE3DIR}/share:${EROOT}usr/share" \ |
482 |
+ DISPLAY="" \ |
483 |
+ "${KDE3DIR}"/bin/kbuildsycoca --global --noincremental &> /dev/null |
484 |
+ eend $? |
485 |
+ fi |
486 |
+ |
487 |
+ if [[ -z ${EROOT%%/} && -x "${KDEDIR}"/bin/kbuildsycoca4 ]]; then |
488 |
# Make sure tha cache file exists, writable by root and readable by |
489 |
# others. Otherwise kbuildsycoca4 will fail. |
490 |
touch "${KDEDIR}/share/kde4/services/ksycoca4" |
491 |
@@ -66,17 +83,17 @@ |
492 |
ebegin "Running kbuildsycoca4 to build global database" |
493 |
# This is needed because we support multiple kde versions installed together. |
494 |
# Lookup in order - local, KDEDIR, /usr, do not duplicate entries btw. |
495 |
- local KDEDIRS="${ROOT}usr/share" |
496 |
- [[ ${KDEDIR} != "${ROOT}usr" ]] && KDEDIRS="${KDEDIR}/share:${KDEDIRS}" |
497 |
- XDG_DATA_DIRS="${ROOT}usr/local/share:${KDEDIRS}" \ |
498 |
+ local KDEDIRS="${EROOT}usr/share" |
499 |
+ [[ ${KDEDIR} != "${EROOT}usr" ]] && KDEDIRS="${KDEDIR}/share:${KDEDIRS}" |
500 |
+ XDG_DATA_DIRS="${EROOT}usr/local/share:${KDEDIRS}" \ |
501 |
DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \ |
502 |
- ${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null |
503 |
+ "${KDEDIR}"/bin/kbuildsycoca4 --global --noincremental &> /dev/null |
504 |
eend $? |
505 |
fi |
506 |
|
507 |
# fix permission for some directories |
508 |
- for x in share/config share/kde4; do |
509 |
- [[ ${KDEDIR} = ${ROOT}usr ]] && DIRS=${ROOT}usr || DIRS="${ROOT}usr ${KDEDIR}" |
510 |
+ for x in share/{config,kde4}; do |
511 |
+ [[ ${KDEDIR} = ${EROOT}usr ]] && DIRS=${EROOT}usr || DIRS="${EROOT}usr ${KDEDIR}" |
512 |
for y in ${DIRS}; do |
513 |
[[ -d "${y}/${x}" ]] || break # nothing to do if directory does not exist |
514 |
if [[ $(stat --format=%a "${y}/${x}") != 755 ]]; then |
515 |
@@ -97,8 +114,12 @@ |
516 |
# except those in cmake/. |
517 |
comment_all_add_subdirectory() { |
518 |
find "$@" -name CMakeLists.txt -print0 | grep -vFzZ "./cmake" | \ |
519 |
- xargs -0 sed -i -e '/add_subdirectory/s/^/#DONOTCOMPILE /' -e '/ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' || \ |
520 |
- die "${LINENO}: Initial sed died" |
521 |
+ xargs -0 sed -i \ |
522 |
+ -e '/^[[:space:]]*add_subdirectory/s/^/#DONOTCOMPILE /' \ |
523 |
+ -e '/^[[:space:]]*ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \ |
524 |
+ -e '/^[[:space:]]*macro_optional_add_subdirectory/s/^/#DONOTCOMPILE /' \ |
525 |
+ -e '/^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \ |
526 |
+ || die "${LINENO}: Initial sed died" |
527 |
} |
528 |
|
529 |
# @ECLASS-VARIABLE: KDE_LINGUAS |
530 |
@@ -120,19 +141,22 @@ |
531 |
# the package (see KDE_LINGUAS). By default, translations are found in "${S}"/po |
532 |
# but this default can be overridden by defining KDE_LINGUAS_DIR. |
533 |
enable_selected_linguas() { |
534 |
- local lingua sr_mess wp |
535 |
+ debug-print-function ${FUNCNAME} "$@" |
536 |
+ |
537 |
+ local lingua linguas sr_mess wp |
538 |
|
539 |
- ## This isn't working because it seems portage sets LINGUAS |
540 |
- ## even if you don't have it in make.conf |
541 |
- ## Im leaving the command that *should* work if LINGUAS was unset commented |
542 |
# if there is no linguas defined we enable everything |
543 |
if ! $(env | grep -q "^LINGUAS="); then |
544 |
return 0 |
545 |
fi |
546 |
- # [[ ! ${LINGUAS+set} = set ]] && LINGUAS="*" |
547 |
- # ebuild overridable linguas directory definition |
548 |
- KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:="${S}/po"} |
549 |
- cd "${KDE_LINGUAS_DIR}" || die "wrong linguas dir specified" |
550 |
+ |
551 |
+ # @ECLASS-VARIABLE: KDE_LINGUAS_DIR |
552 |
+ # @DESCRIPTION: |
553 |
+ # Specified folder where application translations are located. |
554 |
+ KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:="po"} |
555 |
+ [[ -d "${KDE_LINGUAS_DIR}" ]] || die "wrong linguas dir specified" |
556 |
+ comment_all_add_subdirectory "${KDE_LINGUAS_DIR}" |
557 |
+ pushd "${KDE_LINGUAS_DIR}" > /dev/null |
558 |
|
559 |
# fix all various crazy sr@Latn variations |
560 |
# this part is only ease for ebuilds, so there wont be any die when this |
561 |
@@ -154,21 +178,74 @@ |
562 |
mv "${lingua}.po" "${lingua}.po.old" |
563 |
fi |
564 |
done |
565 |
- comment_all_add_subdirectory "${KDE_LINGUAS_DIR}" |
566 |
+ |
567 |
for lingua in ${KDE_LINGUAS}; do |
568 |
if use linguas_${lingua} ; then |
569 |
- ebegin "Enabling LANGUAGE: ${lingua}" |
570 |
if [[ -d "${lingua}" ]]; then |
571 |
+ linguas="${linguas} ${lingua}" |
572 |
sed -e "/add_subdirectory([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \ |
573 |
-e "/ADD_SUBDIRECTORY([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \ |
574 |
-i CMakeLists.txt || die "Sed to uncomment linguas_${lingua} failed." |
575 |
fi |
576 |
if [[ -e "${lingua}.po.old" ]]; then |
577 |
+ linguas="${linguas} ${lingua}" |
578 |
mv "${lingua}.po.old" "${lingua}.po" |
579 |
fi |
580 |
- eend $? |
581 |
fi |
582 |
done |
583 |
+ [[ -n "${linguas}" ]] && einfo "Enabling languages: ${linguas}" |
584 |
+ |
585 |
+ popd > /dev/null |
586 |
+} |
587 |
+ |
588 |
+# @FUNCTION: enable_selected_doc_linguas |
589 |
+# @DESCRIPTION: |
590 |
+# Enable only selected linguas enabled doc folders. |
591 |
+enable_selected_doc_linguas() { |
592 |
+ debug-print-function ${FUNCNAME} "$@" |
593 |
+ |
594 |
+ # if there is no linguas defined we enable everything |
595 |
+ if ! $(env | grep -q "^LINGUAS="); then |
596 |
+ return 0 |
597 |
+ fi |
598 |
+ |
599 |
+ # @ECLASS-VARIABLE: KDE_DOC_DIRS |
600 |
+ # @DESCRIPTION: |
601 |
+ # Variable specifying whitespace separated patterns for documentation locations. |
602 |
+ # Default is "doc/%lingua" |
603 |
+ KDE_DOC_DIRS=${KDE_DOC_DIRS:='doc/%lingua'} |
604 |
+ local linguas |
605 |
+ for pattern in ${KDE_DOC_DIRS}; do |
606 |
+ |
607 |
+ local handbookdir=`dirname ${pattern}` |
608 |
+ local translationdir=`basename ${pattern}` |
609 |
+ # Do filename pattern supplied, treat as directory |
610 |
+ [[ "${handbookdir}" = '.' ]] && handbookdir=${translationdir} && translationdir= |
611 |
+ [[ -d "${handbookdir}" ]] || die 'wrong doc dir specified' |
612 |
+ |
613 |
+ if ! use handbook; then |
614 |
+ # Disable whole directory |
615 |
+ sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ |
616 |
+ -e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ |
617 |
+ -i CMakeLists.txt || die 'failed to comment out all handbooks' |
618 |
+ else |
619 |
+ # Disable subdirectories recursively |
620 |
+ comment_all_add_subdirectory "${handbookdir}" |
621 |
+ # Add requested translations |
622 |
+ local lingua |
623 |
+ for lingua in en ${KDE_LINGUAS}; do |
624 |
+ if [[ ${lingua} = 'en' ]] || use linguas_${lingua}; then |
625 |
+ if [[ -d "${handbookdir}/${translationdir//%lingua/${lingua}}" ]]; then |
626 |
+ sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \ |
627 |
+ -e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \ |
628 |
+ -i "${handbookdir}"/CMakeLists.txt && ! has ${lingua} ${linguas} && linguas="${linguas} ${lingua}" |
629 |
+ fi |
630 |
+ fi |
631 |
+ done |
632 |
+ fi |
633 |
+ |
634 |
+ done |
635 |
+ [[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}" |
636 |
} |
637 |
|
638 |
# @FUNCTION: get_build_type |
639 |
@@ -253,7 +330,7 @@ |
640 |
local depsfile="${T}/${PN}:${SLOT}" |
641 |
|
642 |
ebegin "Installing library dependencies as ${depsfile##*/}" |
643 |
- insinto ${ROOT}var/lib/kde |
644 |
+ insinto ${EROOT}var/lib/kde |
645 |
doins "${depsfile}" || die "Failed to install library dependencies." |
646 |
eend $? |
647 |
} |
648 |
@@ -268,7 +345,7 @@ |
649 |
i=0 |
650 |
for pn in ${KMLOADLIBS} ; do |
651 |
((i++)) |
652 |
- depsfile="${ROOT}var/lib/kde/${pn}:${SLOT}" |
653 |
+ depsfile="${EROOT}var/lib/kde/${pn}:${SLOT}" |
654 |
[[ -r "${depsfile}" ]] || die "Depsfile '${depsfile}' not accessible. You probably need to reinstall ${pn}." |
655 |
sed -i -e "${i}iINCLUDE(\"${depsfile}\")" "${S}/CMakeLists.txt" || \ |
656 |
die "Failed to include library dependencies for ${pn}" |
657 |
|
658 |
|
659 |
|
660 |
1.23 eclass/kde4-meta.eclass |
661 |
|
662 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.23&view=markup |
663 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.23&content-type=text/plain |
664 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.22&r2=1.23 |
665 |
|
666 |
Index: kde4-meta.eclass |
667 |
=================================================================== |
668 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
669 |
retrieving revision 1.22 |
670 |
retrieving revision 1.23 |
671 |
diff -u -r1.22 -r1.23 |
672 |
--- kde4-meta.eclass 4 Jun 2009 09:29:54 -0000 1.22 |
673 |
+++ kde4-meta.eclass 3 Aug 2009 21:59:53 -0000 1.23 |
674 |
@@ -1,6 +1,6 @@ |
675 |
# Copyright 1999-2009 Gentoo Foundation |
676 |
# Distributed under the terms of the GNU General Public License v2 |
677 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.22 2009/06/04 09:29:54 scarabeus Exp $ |
678 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.23 2009/08/03 21:59:53 wired Exp $ |
679 |
# |
680 |
# @ECLASS: kde4-meta.eclass |
681 |
# @MAINTAINER: |
682 |
@@ -31,96 +31,64 @@ |
683 |
;; |
684 |
esac |
685 |
|
686 |
-# remove this codeblock when 4.2.3 is dropped |
687 |
-if [[ ${PV} = "4.2.3" ]]; then |
688 |
- [[ ${PN} != khelpcenter ]] && has doc ${IUSE//+} \ |
689 |
- RDEPEND="${RDEPEND} doc? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )" |
690 |
-else |
691 |
# Add khelpcenter dependency when installing handbooks |
692 |
if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then |
693 |
- RDEPEND="${RDEPEND} |
694 |
- handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] ) |
695 |
- " |
696 |
-fi |
697 |
+ RDEPEND+=" handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )" |
698 |
fi |
699 |
+ |
700 |
# Add dependencies that all packages in a certain module share. |
701 |
case ${KMNAME} in |
702 |
kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) |
703 |
- DEPEND="${DEPEND} |
704 |
- >=kde-base/qimageblitz-0.0.4 |
705 |
- " |
706 |
- RDEPEND="${RDEPEND} |
707 |
- >=kde-base/qimageblitz-0.0.4 |
708 |
- " |
709 |
+ COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4" |
710 |
;; |
711 |
kdenetwork) |
712 |
- DEPEND="${DEPEND} |
713 |
- >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] |
714 |
- " |
715 |
- RDEPEND="${RDEPEND} |
716 |
- >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] |
717 |
- " |
718 |
+ COMMONDEPEND+=" >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]" |
719 |
;; |
720 |
- kdepim) |
721 |
- DEPEND="${DEPEND} |
722 |
- dev-libs/boost |
723 |
- >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] |
724 |
- " |
725 |
- RDEPEND="${RDEPEND} |
726 |
+ kdepim|kdepim-runtime) |
727 |
+ COMMONDEPEND+=" |
728 |
dev-libs/boost |
729 |
>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] |
730 |
" |
731 |
case ${PN} in |
732 |
akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) |
733 |
- IUSE="+kontact" |
734 |
- RDEPEND="${RDEPEND} |
735 |
- kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] ) |
736 |
- " |
737 |
+ IUSE+=" +kontact" |
738 |
+ RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )" |
739 |
;; |
740 |
esac |
741 |
;; |
742 |
kdegames) |
743 |
if [[ ${PN} != libkdegames ]]; then |
744 |
- DEPEND="${DEPEND} |
745 |
- >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] |
746 |
- " |
747 |
- RDEPEND="${RDEPEND} |
748 |
- >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] |
749 |
- " |
750 |
+ COMMONDEPEND+=" >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] " |
751 |
fi |
752 |
;; |
753 |
koffice) |
754 |
- [[ ${PN} != koffice-data ]] && IUSE="debug" |
755 |
- RDEPEND="${RDEPEND} |
756 |
+ [[ ${PN} != koffice-data ]] && IUSE+=" debug" |
757 |
+ RDEPEND+=" |
758 |
!app-office/${PN}:0 |
759 |
!app-office/koffice:0 |
760 |
!app-office/koffice-meta:0 |
761 |
" |
762 |
if has openexr ${IUSE//+}; then |
763 |
- COMMON_DEPEND="media-gfx/imagemagick[openexr?]" |
764 |
+ COMMONDEPEND+=" media-gfx/imagemagick[openexr?]" |
765 |
else |
766 |
- COMMON_DEPEND="media-gfx/imagemagick" |
767 |
+ COMMONDEPEND+=" media-gfx/imagemagick" |
768 |
fi |
769 |
|
770 |
- COMMON_DEPEND="${COMMON_DEPEND} |
771 |
+ COMMONDEPEND+=" |
772 |
dev-cpp/eigen:2 |
773 |
media-libs/fontconfig |
774 |
media-libs/freetype:2 |
775 |
" |
776 |
- DEPEND="${DEPEND} ${COMMON_DEPEND}" |
777 |
- RDEPEND="${RDEPEND} ${COMMON_DEPEND}" |
778 |
- unset COMMON_DEPEND |
779 |
if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then |
780 |
- DEPEND="${DEPEND} |
781 |
- >=app-office/koffice-libs-${PV}:${SLOT} |
782 |
- " |
783 |
- RDEPEND="${RDEPEND} |
784 |
- >=app-office/koffice-libs-${PV}:${SLOT} |
785 |
- " |
786 |
+ COMMONDEPEND+=" >=app-office/koffice-libs-${PV}:${SLOT}" |
787 |
fi |
788 |
;; |
789 |
esac |
790 |
|
791 |
+DEPEND+=" ${COMMONDEPEND}" |
792 |
+RDEPEND+=" ${COMMONDEPEND}" |
793 |
+unset COMMONDEPEND |
794 |
+ |
795 |
debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies" |
796 |
debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies" |
797 |
|
798 |
@@ -260,27 +228,27 @@ |
799 |
else |
800 |
local abort tarball tarfile f extractlist moduleprefix postfix |
801 |
case ${PV} in |
802 |
- 4.2.85|4.2.90) |
803 |
+ 4.3.85 | 4.3.90 | 4.3.95 | 4.3.96 | 4.3.98 | 4.2.85 | 4.2.90 | 4.2.95 | 4.2.96 | 4.2.98) |
804 |
# block for normally packed upstream unstable snapshots |
805 |
- KMTARPARAMS="${KMTARPARAMS} --bzip2" # bz2 |
806 |
+ KMTARPARAMS+=" --bzip2" # bz2 |
807 |
postfix="bz2" |
808 |
;; |
809 |
- 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) |
810 |
- KMTARPARAMS="${KMTARPARAMS} --lzma" # lzma |
811 |
+ 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6* | 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) |
812 |
+ KMTARPARAMS+=" --lzma" # lzma |
813 |
postfix="lzma" |
814 |
;; |
815 |
*) |
816 |
- KMTARPARAMS="${KMTARPARAMS} --bzip2" # bz2 |
817 |
+ KMTARPARAMS+=" --bzip2" # bz2 |
818 |
postfix="bz2" |
819 |
;; |
820 |
esac |
821 |
case ${KMNAME} in |
822 |
kdebase-apps) |
823 |
- # kdebase/apps -> kdebasa-apps |
824 |
+ # kdebase/apps -> kdebase-apps |
825 |
tarball="kdebase-${PV}.tar.${postfix}" |
826 |
# Go one level deeper for kdebase-apps in tarballs |
827 |
moduleprefix=apps/ |
828 |
- KMTARPARAMS="${KMTARPARAMS} --transform=s|apps/||" |
829 |
+ KMTARPARAMS+=" --transform=s|apps/||" |
830 |
;; |
831 |
*) |
832 |
# Create tarball name from module name (this is the default) |
833 |
@@ -288,7 +256,7 @@ |
834 |
;; |
835 |
esac |
836 |
|
837 |
- # Full patch to source tarball |
838 |
+ # Full path to source tarball |
839 |
tarfile="${DISTDIR}/${tarball}" |
840 |
|
841 |
# Detect real toplevel dir from tarball name - it will be used upon extraction |
842 |
@@ -302,9 +270,9 @@ |
843 |
for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \ |
844 |
AUTHORS COPYING INSTALL README NEWS ChangeLog |
845 |
do |
846 |
- extractlist="${extractlist} ${topdir}${moduleprefix}${f}" |
847 |
+ extractlist+=" ${topdir}${moduleprefix}${f}" |
848 |
done |
849 |
- extractlist="${extractlist} $(__list_needed_subdirectories)" |
850 |
+ extractlist+=" $(__list_needed_subdirectories)" |
851 |
|
852 |
pushd "${WORKDIR}" > /dev/null |
853 |
[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2 |
854 |
@@ -344,17 +312,11 @@ |
855 |
debug-print-function ${FUNCNAME} "$@" |
856 |
|
857 |
# TODO change to KMEXTRA for more strict check |
858 |
- # remvove 4.2.3 check when dropped |
859 |
- if [[ ${PV} = "4.2.3" ]]; then |
860 |
- if has doc ${IUSE//+} && use doc && [[ -n ${KMMODULE} ]]; then |
861 |
- KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}" |
862 |
- fi |
863 |
- else |
864 |
if has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then |
865 |
# We use the basename of $KMMODULE because $KMMODULE can contain |
866 |
# the path to the module subdirectory. |
867 |
- KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}" |
868 |
- fi |
869 |
+ KMEXTRA_NONFATAL+=" |
870 |
+ doc/${KMMODULE##*/}" |
871 |
fi |
872 |
|
873 |
# Add some CMake-files to KMEXTRACTONLY. |
874 |
@@ -362,21 +324,21 @@ |
875 |
# In those cases you should care to add the relevant files to KMEXTRACTONLY |
876 |
case ${KMNAME} in |
877 |
kdebase) |
878 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
879 |
+ KMEXTRACTONLY+=" |
880 |
apps/config-apps.h.cmake |
881 |
apps/ConfigureChecks.cmake" |
882 |
;; |
883 |
kdebase-apps) |
884 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
885 |
+ KMEXTRACTONLY+=" |
886 |
config-apps.h.cmake |
887 |
ConfigureChecks.cmake" |
888 |
;; |
889 |
kdebase-runtime) |
890 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
891 |
+ KMEXTRACTONLY+=" |
892 |
config-runtime.h.cmake" |
893 |
;; |
894 |
kdebase-workspace) |
895 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
896 |
+ KMEXTRACTONLY+=" |
897 |
config-unix.h.cmake |
898 |
ConfigureChecks.cmake |
899 |
config-workspace.h.cmake |
900 |
@@ -386,37 +348,53 @@ |
901 |
;; |
902 |
kdegames) |
903 |
if [[ ${PN} != libkdegames ]]; then |
904 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
905 |
- libkdegames" |
906 |
+ KMEXTRACTONLY+=" |
907 |
+ libkdegames/" |
908 |
fi |
909 |
;; |
910 |
kdepim) |
911 |
if [[ ${PN} != libkdepim ]]; then |
912 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
913 |
- libkdepim" |
914 |
+ KMEXTRACTONLY+=" |
915 |
+ libkdepim/" |
916 |
fi |
917 |
case ${SLOT} in |
918 |
- 4.3|live) |
919 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
920 |
- kdepim-version.h |
921 |
- config-enterprise.h.cmake" |
922 |
+ 4.3|4.4|live) |
923 |
+ KMEXTRACTONLY+=" |
924 |
+ kdepim-version.h |
925 |
+ config-enterprise.h.cmake" |
926 |
;; |
927 |
esac |
928 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
929 |
+ KMEXTRACTONLY+=" |
930 |
kleopatra/ConfigureChecks.cmake" |
931 |
if has kontact ${IUSE//+} && use kontact; then |
932 |
- KMEXTRA="${KMEXTRA} kontact/plugins/${PLUGINNAME:-${PN}}" |
933 |
- KMEXTRACTONLY="${KMEXTRACTONLY} kontactinterfaces/" |
934 |
+ KMEXTRA+=" |
935 |
+ kontact/plugins/${PLUGINNAME:-${PN}}/" |
936 |
+ KMEXTRACTONLY+=" |
937 |
+ kontactinterfaces/" |
938 |
fi |
939 |
;; |
940 |
+ kdeutils) |
941 |
+ case ${SLOT} in |
942 |
+ 4.3|4.4|live) |
943 |
+ KMEXTRACTONLY+=" |
944 |
+ kdeutils-version.h" |
945 |
+ ;; |
946 |
+ esac |
947 |
+ ;; |
948 |
koffice) |
949 |
- KMEXTRACTONLY="${KMEXTRACTONLY} |
950 |
+ KMEXTRACTONLY+=" |
951 |
config-endian.h.cmake |
952 |
filters/config-filters.h.cmake |
953 |
- config-openctl.h.cmake |
954 |
config-openexr.h.cmake |
955 |
config-opengl.h.cmake |
956 |
- config-prefix.h.cmake" |
957 |
+ config-prefix.h.cmake |
958 |
+ " |
959 |
+ case ${PV} in |
960 |
+ 2.0.*) |
961 |
+ KMEXTRACTONLY+=" |
962 |
+ config-openctl.h.cmake" |
963 |
+ ;; |
964 |
+ esac |
965 |
;; |
966 |
esac |
967 |
# Don't install cmake modules for split ebuilds, to avoid collisions. |
968 |
@@ -426,20 +404,20 @@ |
969 |
# Remove when 4.2 is wiped out from the tree |
970 |
case ${PV} in |
971 |
4.1*|4.2.0|4.2.1|4.2.2|4.2.3|4.2.4|4.2.85) |
972 |
- KMCOMPILEONLY="${KMCOMPILEONLY} |
973 |
+ KMCOMPILEONLY+=" |
974 |
cmake/modules/" |
975 |
- ;; |
976 |
+ ;; |
977 |
*) ;; |
978 |
esac |
979 |
;; |
980 |
kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) |
981 |
case ${PN} in |
982 |
libkdegames|libkdeedu|libkworkspace) |
983 |
- KMEXTRA="${KMEXTRA} |
984 |
+ KMEXTRA+=" |
985 |
cmake/modules/" |
986 |
;; |
987 |
*) |
988 |
- KMCOMPILEONLY="${KMCOMPILEONLY} |
989 |
+ KMCOMPILEONLY+=" |
990 |
cmake/modules/" |
991 |
;; |
992 |
esac |
993 |
@@ -454,12 +432,12 @@ |
994 |
|
995 |
# We expand KMEXTRA by adding CMakeLists.txt files |
996 |
kmextra="${KMEXTRA}" |
997 |
- [[ ${1} != fatal ]] && kmextra="${kmextra} ${KMEXTRA_NONFATAL}" |
998 |
+ [[ ${1} != fatal ]] && kmextra+=" ${KMEXTRA_NONFATAL}" |
999 |
for i in ${kmextra}; do |
1000 |
- kmextra_expanded="${kmextra_expanded} ${i}" |
1001 |
+ kmextra_expanded+=" ${i}" |
1002 |
j=$(dirname ${i}) |
1003 |
while [[ ${j} != "." ]]; do |
1004 |
- kmextra_expanded="${kmextra_expanded} ${j}/CMakeLists.txt"; |
1005 |
+ kmextra_expanded+=" ${j}/CMakeLists.txt"; |
1006 |
j=$(dirname ${j}) |
1007 |
done |
1008 |
done |
1009 |
@@ -469,17 +447,17 @@ |
1010 |
kmmodule_expanded="${KMMODULE}" |
1011 |
j=$(dirname ${KMMODULE}) |
1012 |
while [[ ${j} != "." ]]; do |
1013 |
- kmmodule_expanded="${kmmodule_expanded} ${j}/CMakeLists.txt"; |
1014 |
+ kmmodule_expanded+=" ${j}/CMakeLists.txt"; |
1015 |
j=$(dirname ${j}) |
1016 |
done |
1017 |
fi |
1018 |
|
1019 |
# Expand KMCOMPILEONLY |
1020 |
for i in ${KMCOMPILEONLY}; do |
1021 |
- kmcompileonly_expanded="${kmcompileonly_expanded} ${i}" |
1022 |
+ kmcompileonly_expanded+=" ${i}" |
1023 |
j=$(dirname ${i}) |
1024 |
while [[ ${j} != "." ]]; do |
1025 |
- kmcompileonly_expanded="${kmcompileonly_expanded} ${j}/CMakeLists.txt"; |
1026 |
+ kmcompileonly_expanded+=" ${j}/CMakeLists.txt"; |
1027 |
j=$(dirname ${j}) |
1028 |
done |
1029 |
done |
1030 |
@@ -493,7 +471,7 @@ |
1031 |
for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \ |
1032 |
${KMEXTRACTONLY} |
1033 |
do |
1034 |
- extractlist="${extractlist} ${topdir}${moduleprefix}${i}" |
1035 |
+ extractlist+=" ${topdir}${moduleprefix}${i}" |
1036 |
done |
1037 |
|
1038 |
echo ${extractlist} |
1039 |
@@ -607,7 +585,7 @@ |
1040 |
if [[ ${PN} != libkworkspace ]]; then |
1041 |
sed -i \ |
1042 |
-e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ |
1043 |
- CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" |
1044 |
+ CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" |
1045 |
fi |
1046 |
;; |
1047 |
kdebase-runtime) |
1048 |
@@ -641,9 +619,18 @@ |
1049 |
sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \ |
1050 |
"${S}"/cmake/modules/CMakeLists.txt || \ |
1051 |
die "${LINENO}: sed died in collision prevention section" |
1052 |
- sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ |
1053 |
- "${S}"/CMakeLists.txt || \ |
1054 |
- die "${LINENO}: sed died in collision prevention section" |
1055 |
+ case ${PV} in |
1056 |
+ 2.0.*) |
1057 |
+ sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ |
1058 |
+ "${S}"/CMakeLists.txt || \ |
1059 |
+ die "${LINENO}: sed died in collision prevention section" |
1060 |
+ ;; |
1061 |
+ *) |
1062 |
+ sed -i -e '/install(.\+config-openexr\.h.\+)/d' \ |
1063 |
+ "${S}"//CMakeLists.txt || \ |
1064 |
+ die "${LINENO}: sed died in collision prevention section" |
1065 |
+ ;; |
1066 |
+ esac |
1067 |
fi |
1068 |
esac |
1069 |
|
1070 |
@@ -680,7 +667,7 @@ |
1071 |
kde4-meta_src_compile() { |
1072 |
debug-print-function ${FUNCNAME} "$@" |
1073 |
|
1074 |
- kde4-base_src_compile |
1075 |
+ kde4-base_src_compile "$@" |
1076 |
} |
1077 |
|
1078 |
# @FUNCTION: kde4-meta_src_test |
1079 |
@@ -705,7 +692,7 @@ |
1080 |
# @FUNCTION: kde4-meta_src_make_doc |
1081 |
# @DESCRIPTION: |
1082 |
# This function searches in ${S}/${KMMODULE}, |
1083 |
-# and tries to install "AUTHORS ChangeLog* README* NEWS todo" if these files exist. |
1084 |
+# and tries to install "AUTHORS ChangeLog* README* NEWS TODO" if these files exist. |
1085 |
kde4-meta_src_make_doc() { |
1086 |
debug-print-function ${FUNCNAME} "$@" |
1087 |
|
1088 |
@@ -726,7 +713,7 @@ |
1089 |
if has handbook ${IUSE//+} && ! use handbook; then |
1090 |
echo |
1091 |
einfo "Application handbook for ${PN} has not been installed." |
1092 |
- einfo "To install handbook, reemerge =${CATEGORY}/${P} with 'handbook' USE flag." |
1093 |
+ einfo "To install handbook, reemerge =${CATEGORY}/${PF} with 'handbook' USE flag." |
1094 |
echo |
1095 |
fi |