Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass
Date: Wed, 01 Aug 2012 19:39:02
Message-Id: 20120801193852.475332004B@flycatcher.gentoo.org
1 johu 12/08/01 19:38:52
2
3 Modified: ChangeLog kde4-base.eclass kde4-functions.eclass
4 kde4-meta.eclass
5 Log:
6 Make .xz compression as default for SRC_URI calculation. Add KDE prefix to BUILD_TYPE. No #DONOTCOMPILE if add_subdirectory has a variable parameter ("${...").
7
8 Revision Changes Path
9 1.362 eclass/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.362&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.362&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.361&r2=1.362
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
18 retrieving revision 1.361
19 retrieving revision 1.362
20 diff -u -r1.361 -r1.362
21 --- ChangeLog 29 Jul 2012 05:54:17 -0000 1.361
22 +++ ChangeLog 1 Aug 2012 19:38:52 -0000 1.362
23 @@ -1,6 +1,12 @@
24 # ChangeLog for eclass directory
25 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.361 2012/07/29 05:54:17 hattya Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.362 2012/08/01 19:38:52 johu Exp $
28 +
29 + 01 Aug 2012; Johannes Huber <johu@g.o> kde4-base.eclass,
30 + kde4-functions.eclass, kde4-meta.eclass:
31 + Make .xz compression as default for SRC_URI calculation. Add KDE prefix to
32 + BUILD_TYPE. No #DONOTCOMPILE if add_subdirectory has a variable parameter
33 + ("${...").
34
35 29 Jul 2012; Akinori Hattori <hattya@g.o> subversion.eclass:
36 add support for file:// URI scheme wrt bug #416649
37
38
39
40 1.120 eclass/kde4-base.eclass
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.120&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.120&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.119&r2=1.120
45
46 Index: kde4-base.eclass
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
49 retrieving revision 1.119
50 retrieving revision 1.120
51 diff -u -r1.119 -r1.120
52 --- kde4-base.eclass 22 Jun 2012 09:19:46 -0000 1.119
53 +++ kde4-base.eclass 1 Aug 2012 19:38:52 -0000 1.120
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2012 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.119 2012/06/22 09:19:46 kensington Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.120 2012/08/01 19:38:52 johu Exp $
59
60 # @ECLASS: kde4-base.eclass
61 # @MAINTAINER:
62 @@ -33,7 +33,7 @@
63
64 inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils base virtualx versionator eutils multilib
65
66 -if [[ ${BUILD_TYPE} = live ]]; then
67 +if [[ ${KDE_BUILD_TYPE} = live ]]; then
68 case ${KDE_SCM} in
69 svn) inherit subversion ;;
70 git) inherit git-2 ;;
71 @@ -70,7 +70,7 @@
72 SLOT="2"
73 ;;
74 kdevelop)
75 - if [[ ${BUILD_TYPE} = live ]]; then
76 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
77 # @ECLASS-VARIABLE: KDEVELOP_VERSION
78 # @DESCRIPTION:
79 # Specifies KDevelop version. Default is 4.0.0 for tagged packages and 9999 for live packages.
80 @@ -159,7 +159,7 @@
81 # Set this varible if you want your live package to manage its
82 # translations. (Mostly all kde ebuilds does not ship documentation
83 # and translations in live ebuilds)
84 -if [[ ${BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
85 +if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
86 # Kdebase actualy provides the handbooks even for live stuff
87 [[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
88 KDE_LINGUAS=""
89 @@ -170,7 +170,7 @@
90 kde-base)
91 HOMEPAGE="http://www.kde.org/"
92 LICENSE="GPL-2"
93 - if [[ ${BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
94 + if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
95 # Disable tests for live ebuilds by default
96 RESTRICT+=" test"
97 fi
98 @@ -450,18 +450,18 @@
99 # KDEPIM 4.4, special case
100 # TODO: Remove this part when KDEPIM 4.4 gets out of the tree
101 SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
102 - 4.[4567].8[05] | 4.[4567].9[0235678])
103 + 4.[89].8[05] | 4.[89].9[0235678])
104 # Unstable KDE SC releases
105 - SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
106 - 4.8.[12345])
107 - # Stable KDE SC releases with .xz support
108 - SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
109 + SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
110 + 4.[1234567].[12345])
111 + # Stable KDE SC with old .bz2 support
112 + SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
113 4.[89].8[05] | 4.[89].9[0235678])
114 # Unstable KDE SC releases
115 SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
116 *)
117 # Stable KDE SC releases
118 - SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
119 + SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
120 esac
121 ;;
122 koffice)
123 @@ -590,7 +590,7 @@
124 esac
125 }
126
127 -case ${BUILD_TYPE} in
128 +case ${KDE_BUILD_TYPE} in
129 live) _calculate_live_repo ;;
130 *) _calculate_src_uri ;;
131 esac
132 @@ -662,7 +662,7 @@
133 kde4-base_src_unpack() {
134 debug-print-function ${FUNCNAME} "$@"
135
136 - if [[ ${BUILD_TYPE} = live ]]; then
137 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
138 case ${KDE_SCM} in
139 svn)
140 migrate_store_dir
141 @@ -716,7 +716,7 @@
142 fi
143
144 # SCM bootstrap
145 - if [[ ${BUILD_TYPE} = live ]]; then
146 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
147 case ${KDE_SCM} in
148 svn) subversion_src_prepare ;;
149 esac
150 @@ -755,7 +755,7 @@
151
152 if use_if_iuse debug; then
153 # Set "real" debug mode
154 - CMAKE_BUILD_TYPE="Debugfull"
155 + CMAKE_KDE_BUILD_TYPE="Debugfull"
156 else
157 # Handle common release builds
158 append-cppflags -DQT_NO_DEBUG
159 @@ -892,7 +892,7 @@
160 debug-print-function ${FUNCNAME} "$@"
161
162 gnome2_icon_savelist
163 - if [[ ${BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
164 + if [[ ${KDE_BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
165 subversion_pkg_preinst
166 fi
167 }
168 @@ -909,7 +909,7 @@
169 buildsycoca
170
171 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
172 - if [[ ${BUILD_TYPE} = live ]]; then
173 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
174 echo
175 einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}"
176 einfo "Use it at your own risk."
177
178
179
180 1.60 eclass/kde4-functions.eclass
181
182 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.60&view=markup
183 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.60&content-type=text/plain
184 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.59&r2=1.60
185
186 Index: kde4-functions.eclass
187 ===================================================================
188 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
189 retrieving revision 1.59
190 retrieving revision 1.60
191 diff -u -r1.59 -r1.60
192 --- kde4-functions.eclass 8 May 2012 22:00:49 -0000 1.59
193 +++ kde4-functions.eclass 1 Aug 2012 19:38:52 -0000 1.60
194 @@ -1,6 +1,6 @@
195 # Copyright 1999-2012 Gentoo Foundation
196 # Distributed under the terms of the GNU General Public License v2
197 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.59 2012/05/08 22:00:49 dilfridge Exp $
198 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.60 2012/08/01 19:38:52 johu Exp $
199
200 inherit versionator
201
202 @@ -46,15 +46,15 @@
203
204 # determine the build type
205 if [[ ${PV} = *9999* ]]; then
206 - BUILD_TYPE="live"
207 + KDE_BUILD_TYPE="live"
208 else
209 - BUILD_TYPE="release"
210 + KDE_BUILD_TYPE="release"
211 fi
212 -export BUILD_TYPE
213 +export KDE_BUILD_TYPE
214
215 -# Set reponame and SCM for moduleses that have fully migrated to git
216 +# Set reponame and SCM for modules that have fully migrated to git
217 # (hack - it's here because it needs to be before SCM inherits from kde4-base)
218 -if [[ ${BUILD_TYPE} == live ]]; then
219 +if [[ ${KDE_BUILD_TYPE} == live ]]; then
220 case "${KMNAME}" in
221 kdebase-workspace)
222 KDE_SCM="git"
223 @@ -93,7 +93,7 @@
224 # this for you.
225 #
226 # Example: KDE_LINGUAS="en_GB de nl"
227 -if [[ ${BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
228 +if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
229 for _lingua in ${KDE_LINGUAS}; do
230 IUSE="${IUSE} linguas_${_lingua}"
231 done
232
233
234
235 1.65 eclass/kde4-meta.eclass
236
237 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.65&view=markup
238 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.65&content-type=text/plain
239 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.64&r2=1.65
240
241 Index: kde4-meta.eclass
242 ===================================================================
243 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
244 retrieving revision 1.64
245 retrieving revision 1.65
246 diff -u -r1.64 -r1.65
247 --- kde4-meta.eclass 8 May 2012 22:00:49 -0000 1.64
248 +++ kde4-meta.eclass 1 Aug 2012 19:38:52 -0000 1.65
249 @@ -1,6 +1,6 @@
250 # Copyright 1999-2012 Gentoo Foundation
251 # Distributed under the terms of the GNU General Public License v2
252 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.64 2012/05/08 22:00:49 dilfridge Exp $
253 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.65 2012/08/01 19:38:52 johu Exp $
254 #
255 # @ECLASS: kde4-meta.eclass
256 # @MAINTAINER:
257 @@ -69,7 +69,7 @@
258 debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
259
260 # Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
261 -case ${BUILD_TYPE} in
262 +case ${KDE_BUILD_TYPE} in
263 live)
264 if [[ ${KDE_SCM} == svn ]]; then
265 case ${KMNAME} in
266 @@ -147,7 +147,7 @@
267 kde4-meta_src_unpack() {
268 debug-print-function ${FUNCNAME} "$@"
269
270 - if [[ ${BUILD_TYPE} = live ]]; then
271 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
272 case "${KDE_SCM}" in
273 svn)
274 migrate_store_dir
275 @@ -173,7 +173,7 @@
276 kde4-meta_src_extract() {
277 debug-print-function ${FUNCNAME} "$@"
278
279 - if [[ ${BUILD_TYPE} = live ]]; then
280 + if [[ ${KDE_BUILD_TYPE} = live ]]; then
281 # Export working copy to ${S}
282 einfo "Exporting parts of working copy to ${S}"
283 kde4-meta_create_extractlists
284 @@ -210,12 +210,12 @@
285 else
286 local abort tarball tarfile f extractlist postfix
287
288 - if [[ ${PV} =~ 4.8.[12345] ]]; then
289 - postfix="xz"
290 - KMTARPARAMS+=" --xz"
291 - else
292 + if [[ ${PV} =~ 4.7.[12345] ]]; then
293 postfix="bz2"
294 KMTARPARAMS+=" --bzip2"
295 + else
296 + postfix="xz"
297 + KMTARPARAMS+=" --xz"
298 fi
299
300 case ${KMNAME} in
301 @@ -312,6 +312,7 @@
302 ;;
303 kdebase-runtime | kde-runtime)
304 KMEXTRACTONLY+="
305 + CTestConfig.cmake
306 config-runtime.h.cmake"
307 ;;
308 kdebase-workspace | kde-workspace)
309 @@ -380,16 +381,8 @@
310 && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]]; then
311 case ${KMNAME} in
312 kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
313 - case ${PN} in
314 - libkdegames|libkdeedu|libkworkspace)
315 - KMEXTRA+="
316 - cmake/modules/"
317 - ;;
318 - *)
319 - KMCOMPILEONLY+="
320 - cmake/modules/"
321 - ;;
322 - esac
323 + KMEXTRACTONLY+="
324 + cmake/modules/"
325 ;;
326 esac
327 fi
328 @@ -495,6 +488,13 @@
329 -i CMakeLists.txt || die "${LINENO}: cmake sed died"
330 fi
331
332 + # Restore "add_subdirectory( ${ ..." (this is done in kdesdk)
333 + if [[ -f CMakeLists.txt ]]; then
334 + sed -e '/add_subdirectory[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
335 + -e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
336 + -i CMakeLists.txt || die "${LINENO}: cmake sed died"
337 + fi
338 +
339 if [[ -z ${KMNOMODULE} ]]; then
340 # Restore "add_subdirectory" in $KMMODULE subdirectories
341 find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \