1 |
alexxy 09/10/06 18:02:13 |
2 |
|
3 |
Modified: kde4-base.eclass kde4-functions.eclass |
4 |
kde4-meta.eclass |
5 |
Log: |
6 |
[eclass] Update kde4 eclasses |
7 |
|
8 |
Revision Changes Path |
9 |
1.46 eclass/kde4-base.eclass |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.46&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.46&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.45&r2=1.46 |
14 |
|
15 |
Index: kde4-base.eclass |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
18 |
retrieving revision 1.45 |
19 |
retrieving revision 1.46 |
20 |
diff -u -r1.45 -r1.46 |
21 |
--- kde4-base.eclass 1 Sep 2009 09:32:08 -0000 1.45 |
22 |
+++ kde4-base.eclass 6 Oct 2009 18:02:12 -0000 1.46 |
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.45 2009/09/01 09:32:08 scarabeus Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.46 2009/10/06 18:02:12 alexxy Exp $ |
28 |
|
29 |
# @ECLASS: kde4-base.eclass |
30 |
# @MAINTAINER: |
31 |
@@ -92,7 +92,7 @@ |
32 |
# One may override this variable to raise version requirements. |
33 |
# For possible values look at KDE_SLOTS and KDE_LIVE_SLOTS variables. |
34 |
# Note that it is fixed to ${SLOT} for kde-base packages. |
35 |
-KDE_MINIMAL="${KDE_MINIMAL:-4.2}" |
36 |
+KDE_MINIMAL="${KDE_MINIMAL:-4.3}" |
37 |
|
38 |
# Fallback behaviour (for now) |
39 |
# TODO Remove when tree is clean |
40 |
@@ -187,12 +187,20 @@ |
41 |
# Determine SLOT from PVs |
42 |
case ${PV} in |
43 |
*.9999*) SLOT="${PV/.9999*/}" ;; # stable live |
44 |
- 4.4* | 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) SLOT="4.4" ;; |
45 |
- 4.3* | 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) SLOT="4.3" ;; |
46 |
- 4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;; |
47 |
+ 4.4* | 4.3.[6-9]*) SLOT="4.4" ;; |
48 |
+ 4.3*) SLOT="4.3" ;; |
49 |
+ 4.2*) SLOT="4.2" ;; |
50 |
9999*) SLOT="live" ;; # regular live |
51 |
*) die "Unsupported ${PV}" ;; |
52 |
esac |
53 |
+ # This code is to prevent portage from searching GENTOO_MIRRORS for |
54 |
+ # packages that will never be mirrored. (As they only will ever be in |
55 |
+ # the overlay). |
56 |
+ case ${PV} in |
57 |
+ *9999* | 4.?.[6-9]?) |
58 |
+ RESTRICT+=" mirror" |
59 |
+ ;; |
60 |
+ esac |
61 |
KDE_MINIMAL="${SLOT}" |
62 |
_kdedir="${SLOT}" |
63 |
_pv="-${PV}:${SLOT}" |
64 |
@@ -230,8 +238,9 @@ |
65 |
) |
66 |
" |
67 |
if [[ ${PN} != kdelibs ]]; then |
68 |
- [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${KDE_MINIMAL} && local libknotificationitem_required=1 |
69 |
if [[ ${KDEBASE} = kde-base ]]; then |
70 |
+ # libknotificationitem only when SLOT is 4.3 |
71 |
+ [[ ${PN} != libknotificationitem ]] && [[ ${SLOT} = 4.3 ]] && local libknotificationitem_required=1 |
72 |
kdecommondepend+=" |
73 |
kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] ) |
74 |
!kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] ) |
75 |
@@ -245,10 +254,6 @@ |
76 |
kdecommondepend+=" |
77 |
>=kde-base/kdelibs${_pv} |
78 |
" |
79 |
- [[ -n ${libknotificationitem_required} ]] && \ |
80 |
- kdecommondepend+=" |
81 |
- >=kde-base/libknotificationitem${_pv} |
82 |
- " |
83 |
fi |
84 |
fi |
85 |
unset _pv _pvn |
86 |
@@ -372,29 +377,19 @@ |
87 |
case ${KDEBASE} in |
88 |
kde-base) |
89 |
case ${PV} in |
90 |
- 4.3.85 | 4.3.90 | 4.3.95 | 4.3.96) |
91 |
- # block for normally packed unstable releases |
92 |
- SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
93 |
- 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) |
94 |
- SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/${_kmname_pv}.tar.lzma" ;; |
95 |
- 4.2.85 | 4.2.90 | 4.2.95 | 4.2.96 | 4.2.98) |
96 |
+ 4.3.85 | 4.3.9[0568]) |
97 |
# block for normally packed unstable releases |
98 |
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
99 |
- 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) |
100 |
+ 4.3.[6-9]*) |
101 |
SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/${_kmname_pv}.tar.lzma" ;; |
102 |
- 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* | 4.0.9* | 4.0.8*) |
103 |
- SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
104 |
*) SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
105 |
esac |
106 |
;; |
107 |
koffice) |
108 |
case ${PV} in |
109 |
- 1.9*) |
110 |
- SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" |
111 |
- ;; |
112 |
+ 2.0.[6-9]*) SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" ;; |
113 |
*) SRC_URI="mirror://kde/stable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" ;; |
114 |
esac |
115 |
- ;; |
116 |
esac |
117 |
fi |
118 |
unset _kmname _kmname_pv |
119 |
@@ -636,8 +631,9 @@ |
120 |
if [[ -n ${KDEBASE} ]] && [[ -d "${D}${EROOT}usr/share/doc/${PF}" ]]; then |
121 |
# work around bug #97196 |
122 |
dodir /usr/share/doc/KDE4 && \ |
123 |
- mv -f "${D}${EROOT}usr/share/doc/${PF}" "${D}${EROOT}usr/share/doc/KDE4/" || \ |
124 |
+ cp -r "${D}${EROOT}usr/share/doc/${PF}" "${D}${EROOT}usr/share/doc/KDE4/" || \ |
125 |
die "Failed to move docs to KDE4/." |
126 |
+ rm -rf "${D}${EROOT}usr/share/doc/${PF}" |
127 |
fi |
128 |
} |
129 |
|
130 |
|
131 |
|
132 |
|
133 |
1.25 eclass/kde4-functions.eclass |
134 |
|
135 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.25&view=markup |
136 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.25&content-type=text/plain |
137 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.24&r2=1.25 |
138 |
|
139 |
Index: kde4-functions.eclass |
140 |
=================================================================== |
141 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
142 |
retrieving revision 1.24 |
143 |
retrieving revision 1.25 |
144 |
diff -u -r1.24 -r1.25 |
145 |
--- kde4-functions.eclass 1 Sep 2009 09:32:08 -0000 1.24 |
146 |
+++ kde4-functions.eclass 6 Oct 2009 18:02:12 -0000 1.25 |
147 |
@@ -1,6 +1,8 @@ |
148 |
# Copyright 1999-2008 Gentoo Foundation |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.24 2009/09/01 09:32:08 scarabeus Exp $ |
151 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.25 2009/10/06 18:02:12 alexxy Exp $ |
152 |
+ |
153 |
+inherit versionator |
154 |
|
155 |
# Prefix compat: |
156 |
: ${EROOT:=${ROOT}} |
157 |
@@ -82,26 +84,7 @@ |
158 |
eend $? |
159 |
fi |
160 |
|
161 |
- if [[ -z ${EROOT%%/} && -x "${KDEDIR}"/bin/kbuildsycoca4 ]]; then |
162 |
- # Make sure tha cache file exists, writable by root and readable by |
163 |
- # others. Otherwise kbuildsycoca4 will fail. |
164 |
- touch "${KDEDIR}/share/kde4/services/ksycoca4" |
165 |
- chmod 644 "${KDEDIR}/share/kde4/services/ksycoca4" |
166 |
- |
167 |
- # We have to unset DISPLAY and DBUS_SESSION_BUS_ADDRESS, the ones |
168 |
- # in the user's environment (through su [without '-']) may cause |
169 |
- # kbuildsycoca4 to hang. |
170 |
- |
171 |
- ebegin "Running kbuildsycoca4 to build global database" |
172 |
- # This is needed because we support multiple kde versions installed together. |
173 |
- # Lookup in order - local, KDEDIR, /usr, do not duplicate entries btw. |
174 |
- local KDEDIRS="${EROOT}usr/share" |
175 |
- [[ ${KDEDIR} != "${EROOT}usr" ]] && KDEDIRS="${KDEDIR}/share:${KDEDIRS}" |
176 |
- XDG_DATA_DIRS="${EROOT}usr/local/share:${KDEDIRS}" \ |
177 |
- DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \ |
178 |
- "${KDEDIR}"/bin/kbuildsycoca4 --global --noincremental &> /dev/null |
179 |
- eend $? |
180 |
- fi |
181 |
+ # We no longer need to run kbuildsycoca4, as kded does that automatically, as needed |
182 |
|
183 |
# fix permission for some directories |
184 |
for x in share/{config,kde4}; do |
185 |
@@ -372,30 +355,171 @@ |
186 |
block_other_slots() { |
187 |
debug-print-function ${FUNCNAME} "$@" |
188 |
|
189 |
- local slot |
190 |
- for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do |
191 |
- # Block non kdeprefix ${PN} on other slots |
192 |
- if [[ ${SLOT} != ${slot} ]]; then |
193 |
- echo "!kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" |
194 |
- fi |
195 |
- done |
196 |
+ _do_blocker ${PN} 0:${SLOT} |
197 |
} |
198 |
|
199 |
# @FUNCTION: add_blocker |
200 |
# @DESCRIPTION: |
201 |
# Create correct RDEPEND value for blocking correct package. |
202 |
-# Usefull for file-collision blocks. |
203 |
-# Parameters are package and version to block. |
204 |
-# add_blocker kde-base/kdelibs 4.2.4 |
205 |
+# Useful for file-collision blocks. |
206 |
+# Parameters are package and version(s) to block. |
207 |
+# add_blocker kdelibs 4.2.4 |
208 |
+# If no version is specified, then all versions will be blocked |
209 |
+# If any arguments (from 2 on) contain a ":", then different versions |
210 |
+# are blocked in different slots. (Unlisted slots get the version without |
211 |
+# a ":", if none, then all versions are blocked). The parameter is then of |
212 |
+# the form VERSION:SLOT. Any VERSION of 0 means that no blocker will be |
213 |
+# added for that slot (or, if no slot, then for any unlisted slot). |
214 |
+# A parameter of the form :SLOT means to block all versions from that slot. |
215 |
+# If VERSION begins with "<", then "!<foo" will be used instead of "!<=foo". |
216 |
+# As a special case, if a parameter with slot "3.5" is passed, then that slot |
217 |
+# may also be blocked. |
218 |
+# |
219 |
+# Versions that match "4.x.50" are equivalent to all slots up to (and including) |
220 |
+# "4.x", but nothing following slot "4.x" |
221 |
+# |
222 |
+# As an example, if SLOT=live, then |
223 |
+# add_blocker kdelibs 0 :4.3 '<4.3.96:4.4' 9999:live |
224 |
+# will add the following to RDEPEND: |
225 |
+# !kdeprefix? ( !kde-base/kdelibs:4.3[-kdeprefix] ) |
226 |
+# !kdeprefix? ( !<kde-base/kdelibs-4.3.96:4.4[-kdeprefix] ) |
227 |
+# !kdeprefix? ( !<=kde-base/kdelibs-9999:live[-kdeprefix] ) |
228 |
+# kdeprefix? ( !<=kde-base/kdelibs-9999:live[kdeprefix] ) |
229 |
add_blocker() { |
230 |
debug-print-function ${FUNCNAME} "$@" |
231 |
|
232 |
- [[ ${1} = "" || ${2} = "" ]] && die "Missing parameter" |
233 |
- local slot |
234 |
+ RDEPEND+=" $(_do_blocker "$@")" |
235 |
+} |
236 |
+ |
237 |
+# _greater_max_in_slot ver slot |
238 |
+# slot must be 4.x or live |
239 |
+# returns true if ver is >= the maximum possibile version in slot |
240 |
+_greater_max_in_slot() { |
241 |
+ local ver=$1 |
242 |
+ local slot=$2 |
243 |
+ # If slot is live, then return false |
244 |
+ # (nothing is greater than the maximum live version) |
245 |
+ [[ $slot == live ]] && return 1 |
246 |
+ # Otherwise, for slot X.Y, test against X.Y.50 |
247 |
+ local test=${slot}.50 |
248 |
+ version_compare $1 ${test} |
249 |
+ # 1 = '<', 2 = '=', 3 = '>' |
250 |
+ [[ $? -ne 1 ]] |
251 |
+} |
252 |
+ |
253 |
+# _less_min_in_slot ver slot |
254 |
+# slot must be 4.x or live |
255 |
+# returns true if ver is <= the minimum possibile version in slot |
256 |
+_less_min_in_slot() { |
257 |
+ local ver=$1 |
258 |
+ local slot=$2 |
259 |
+ # If slot == live, then test with "9999_pre", so that 9999 tests false |
260 |
+ local test=9999_pre |
261 |
+ # If slot == X.Y, then test with X.(Y-1).50 |
262 |
+ [[ $slot == live ]] || test=${slot%.*}.$((${slot#*.} - 1)).50 |
263 |
+ version_compare $1 ${test} |
264 |
+ # 1 = '<', 2 = '=', 3 = '>' |
265 |
+ [[ $? -ne 3 ]] |
266 |
+} |
267 |
+ |
268 |
+# Internal function used for add_blocker and block_other_slots |
269 |
+# This takes the same parameters as add_blocker, but echos to |
270 |
+# stdout instead of updating a variable. |
271 |
+_do_blocker() { |
272 |
+ debug-print-function ${FUNCNAME} "$@" |
273 |
+ |
274 |
+ [[ -z ${1} ]] && die "Missing parameter" |
275 |
+ local pkg=kde-base/$1 |
276 |
+ shift |
277 |
+ local param slot def="unset" var atom |
278 |
+ # The following variables will hold parameters that contain ":" |
279 |
+ # - block_3_5 |
280 |
+ # - block_4_1 |
281 |
+ # - block_4_2 |
282 |
+ # - block_4_3 |
283 |
+ # - block_4_4 |
284 |
+ # - block_live |
285 |
+ for slot in 3.5 ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do |
286 |
+ local block_${slot//./_}="unset" |
287 |
+ done |
288 |
+ |
289 |
+ # This construct goes through each parameter passed, and sets |
290 |
+ # either def or block_* to the version passed |
291 |
+ for param; do |
292 |
+ # If the parameter does not have a ":" in it... |
293 |
+ if [[ ${param/:} == ${param} ]]; then |
294 |
+ def=${param} |
295 |
+ else # the parameter *does* have a ":" in it |
296 |
+ # so everythin after the : is the slot... |
297 |
+ slot=${param#*:} |
298 |
+ # ...and everything before the : is the version |
299 |
+ local block_${slot//./_}=${param%:*} |
300 |
+ fi |
301 |
+ done |
302 |
+ |
303 |
for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do |
304 |
+ # ${var} contains the name of the variable we care about for this slot |
305 |
+ # ${!var} is it's value |
306 |
+ var=block_${slot//./_} |
307 |
+ # if we didn't pass *:${slot}, then use the unsloted value |
308 |
+ [[ ${!var} == "unset" ]] && var=def |
309 |
+ |
310 |
+ # If the no version was passed, or the version is greater than the |
311 |
+ # maximum possible version in this slot, block all versions in this |
312 |
+ # slot |
313 |
+ if [[ ${!var} == "unset" ]] || _greater_max_in_slot ${!var#<} ${slot}; then |
314 |
+ atom=${pkg} |
315 |
+ # If the version is "0" or less than the minimum possible version in |
316 |
+ # this slot, do nothing |
317 |
+ elif [[ ${!var} == "0" ]] || _less_min_in_slot ${!var#<} ${slot}; then |
318 |
+ continue |
319 |
+ # If the version passed begins with a "<", then use "<" instead of "<=" |
320 |
+ elif [[ ${!var:0:1} == "<" ]]; then |
321 |
+ # this also removes the first character of the version, which is a "<" |
322 |
+ atom="<${pkg}-${!var:1}" |
323 |
+ else |
324 |
+ atom="<=${pkg}-${!var}" |
325 |
+ fi |
326 |
# on -kdeprefix we block every slot |
327 |
- RDEPEND+=" !kdeprefix? ( !<=${1}-${2}:${slot}[-kdeprefix] )" |
328 |
+ echo " !kdeprefix? ( !${atom}:${slot}[-kdeprefix] )" |
329 |
+ # on kdeprefix we block only our slot |
330 |
+ if [[ ${SLOT} == ${slot} ]]; then |
331 |
+ echo " kdeprefix? ( !${atom}:${SLOT}[kdeprefix] )" |
332 |
+ fi |
333 |
done |
334 |
- # on kdeprefix we block only our slot |
335 |
- RDEPEND+=" kdeprefix? ( !<=${1}-${2}:${SLOT}[kdeprefix] )" |
336 |
+ |
337 |
+ # This is a special case block for :3.5; it does not use the |
338 |
+ # default version passed, and no blocker is output *unless* a version |
339 |
+ # is passed, or ":3.5" is passed to explicitly request a block on all |
340 |
+ # 3.5 versions. |
341 |
+ if [[ ${block_3_5} != "unset" && ${block_3_5} != "0" ]]; then |
342 |
+ if [[ -z ${block_3_5} ]]; then |
343 |
+ atom=${pkg} |
344 |
+ elif [[ ${block_3_5:0:1} == "<" ]]; then |
345 |
+ atom="<${pkg}-${block_3_5:1}" |
346 |
+ else |
347 |
+ atom="<=${pkg}-${block_3_5}" |
348 |
+ fi |
349 |
+ echo " !${atom}:3.5" |
350 |
+ fi |
351 |
+} |
352 |
+ |
353 |
+# @FUNCTION: add_kdebase_dep |
354 |
+# @DESCRIPTION: |
355 |
+# Create proper dependency for kde-base/ dependencies, |
356 |
+# adding SLOT when needed (and *only* when needed). |
357 |
+# This takes 1 or 2 arguments. The first being the package |
358 |
+# name, the optional second, is additional USE flags to append. |
359 |
+# The output of this should be added directly to DEPEND/RDEPEND, and |
360 |
+# may be wrapped in a USE conditional (but not an || conditional |
361 |
+# without an extra set of parentheses. |
362 |
+add_kdebase_dep() { |
363 |
+ debug-print-function ${FUNCNAME} "$@" |
364 |
+ |
365 |
+ [[ -z ${1} ]] && die "Missing parameter" |
366 |
+ |
367 |
+ local use=${2:+,${2}} |
368 |
+ |
369 |
+ echo "!kdeprefix? ( >=kde-base/${1}-${PV}[-kdeprefix${use}] )" |
370 |
+ echo "kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[kdeprefix${use}] )" |
371 |
} |
372 |
|
373 |
|
374 |
|
375 |
1.26 eclass/kde4-meta.eclass |
376 |
|
377 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.26&view=markup |
378 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.26&content-type=text/plain |
379 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.25&r2=1.26 |
380 |
|
381 |
Index: kde4-meta.eclass |
382 |
=================================================================== |
383 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
384 |
retrieving revision 1.25 |
385 |
retrieving revision 1.26 |
386 |
diff -u -r1.25 -r1.26 |
387 |
--- kde4-meta.eclass 20 Aug 2009 09:18:01 -0000 1.25 |
388 |
+++ kde4-meta.eclass 6 Oct 2009 18:02:12 -0000 1.26 |
389 |
@@ -1,6 +1,6 @@ |
390 |
# Copyright 1999-2009 Gentoo Foundation |
391 |
# Distributed under the terms of the GNU General Public License v2 |
392 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.25 2009/08/20 09:18:01 scarabeus Exp $ |
393 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.26 2009/10/06 18:02:12 alexxy Exp $ |
394 |
# |
395 |
# @ECLASS: kde4-meta.eclass |
396 |
# @MAINTAINER: |
397 |
@@ -41,7 +41,9 @@ |
398 |
case ${PN} in |
399 |
akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) |
400 |
IUSE+=" +kontact" |
401 |
- RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )" |
402 |
+ if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then |
403 |
+ RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )" |
404 |
+ fi |
405 |
;; |
406 |
esac |
407 |
;; |
408 |
@@ -217,12 +219,12 @@ |
409 |
else |
410 |
local abort tarball tarfile f extractlist moduleprefix postfix |
411 |
case ${PV} in |
412 |
- 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) |
413 |
+ 4.3.85 | 4.3.9[0568]) |
414 |
# block for normally packed upstream unstable snapshots |
415 |
KMTARPARAMS+=" --bzip2" # bz2 |
416 |
postfix="bz2" |
417 |
;; |
418 |
- 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6* | 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*) |
419 |
+ 4.3.[6-9]*) |
420 |
KMTARPARAMS+=" --lzma" # lzma |
421 |
postfix="lzma" |
422 |
;; |
423 |
@@ -358,8 +360,10 @@ |
424 |
if has kontact ${IUSE//+} && use kontact; then |
425 |
KMEXTRA+=" |
426 |
kontact/plugins/${PLUGINNAME:-${PN}}/" |
427 |
- KMEXTRACTONLY+=" |
428 |
- kontactinterfaces/" |
429 |
+ if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then |
430 |
+ KMEXTRACTONLY+=" |
431 |
+ kontactinterfaces/" |
432 |
+ fi |
433 |
fi |
434 |
;; |
435 |
kdeutils) |
436 |
@@ -392,11 +396,10 @@ |
437 |
# No need for unpack since 4.2.86 |
438 |
# Remove when 4.2 is wiped out from the tree |
439 |
case ${PV} in |
440 |
- 4.1*|4.2.0|4.2.1|4.2.2|4.2.3|4.2.4|4.2.85) |
441 |
+ 4.2.[0-4]) |
442 |
KMCOMPILEONLY+=" |
443 |
cmake/modules/" |
444 |
;; |
445 |
- *) ;; |
446 |
esac |
447 |
;; |
448 |
kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) |
449 |
@@ -608,18 +611,9 @@ |
450 |
sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \ |
451 |
"${S}"/cmake/modules/CMakeLists.txt || \ |
452 |
die "${LINENO}: sed died in collision prevention section" |
453 |
- case ${PV} in |
454 |
- 2.0.*) |
455 |
- sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ |
456 |
- "${S}"/CMakeLists.txt || \ |
457 |
- die "${LINENO}: sed died in collision prevention section" |
458 |
- ;; |
459 |
- *) |
460 |
- sed -i -e '/install(.\+config-openexr\.h.\+)/d' \ |
461 |
- "${S}"//CMakeLists.txt || \ |
462 |
- die "${LINENO}: sed died in collision prevention section" |
463 |
- ;; |
464 |
- esac |
465 |
+ sed -i -e '/install(.\+config-openexr\.h.\+)/d' \ |
466 |
+ "${S}"//CMakeLists.txt || \ |
467 |
+ die "${LINENO}: sed died in collision prevention section" |
468 |
fi |
469 |
esac |