/[gentoo-x86]/eclass/kde4-meta.eclass
Gentoo

Diff of /eclass/kde4-meta.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.10 Revision 1.23
1# Copyright 1999-2008 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.10 2009/01/12 19:40:34 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.23 2009/08/03 21:59:53 wired Exp $
4# 4#
5# @ECLASS: kde4-meta.eclass 5# @ECLASS: kde4-meta.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# kde@gentoo.org 7# kde@gentoo.org
8# @BLURB: Eclass for writing "split" KDE packages. 8# @BLURB: Eclass for writing "split" KDE packages.
10# This eclass provides all necessary functions for writing split KDE ebuilds. 10# This eclass provides all necessary functions for writing split KDE ebuilds.
11# 11#
12# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. 12# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
13# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. 13# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
14 14
15# we want opengl optional in each koffice package
16if [[ $KMNAME = koffice ]]; then
17 case ${PN} in
18 koffice-data)
19 ;;
20 *)
21 OPENGL_REQUIRED=optional
22 ;;
23 esac
24fi
25
26inherit kde4-base versionator 15inherit kde4-base versionator
27 16
28EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm 17EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
29 18
30if [[ -z ${KMNAME} ]]; then 19if [[ -z ${KMNAME} ]]; then
40 HOMEPAGE="http://www.koffice.org/" 29 HOMEPAGE="http://www.koffice.org/"
41 LICENSE="GPL-2" 30 LICENSE="GPL-2"
42 ;; 31 ;;
43esac 32esac
44 33
34# Add khelpcenter dependency when installing handbooks
35if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
36 RDEPEND+=" handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )"
37fi
38
45# Add dependencies that all packages in a certain module share. 39# Add dependencies that all packages in a certain module share.
46case ${KMNAME} in 40case ${KMNAME} in
47 kdebase|kdebase-workspace|kdebase-runtime) 41 kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
48 DEPEND="${DEPEND} >=kde-base/qimageblitz-0.0.4" 42 COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4"
49 RDEPEND="${RDEPEND} >=kde-base/qimageblitz-0.0.4"
50 ;; 43 ;;
51 kdepim) 44 kdenetwork)
52 DEPEND="${DEPEND} dev-libs/boost app-office/akonadi-server" 45 COMMONDEPEND+=" >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]"
53 RDEPEND="${RDEPEND} dev-libs/boost" 46 ;;
54 if [[ $PN != kode ]]; then 47 kdepim|kdepim-runtime)
55 DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}" 48 COMMONDEPEND+="
56 RDEPEND="${RDEPEND} >=kde-base/kode-${PV}:${SLOT}" 49 dev-libs/boost
57 fi 50 >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
51 "
58 case ${PN} in 52 case ${PN} in
59 akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker) 53 akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
60 IUSE="+kontact" 54 IUSE+=" +kontact"
61 DEPEND="${DEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )"
62 RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )" 55 RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
63 ;; 56 ;;
64 esac 57 esac
65 ;; 58 ;;
66 kdegames) 59 kdegames)
67 if [[ $PN != libkdegames ]]; then 60 if [[ ${PN} != libkdegames ]]; then
68 DEPEND="${DEPEND} >=kde-base/libkdegames-${PV}:${SLOT}" 61 COMMONDEPEND+=" >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] "
69 RDEPEND="${RDEPEND} >=kde-base/libkdegames-${PV}:${SLOT}"
70 fi 62 fi
71 ;; 63 ;;
72 koffice) 64 koffice)
73 case ${PV} in 65 [[ ${PN} != koffice-data ]] && IUSE+=" debug"
74 9999*) DEPEND="${DEPEND} !app-office/${PN}:2" ;; 66 RDEPEND+="
75 1.9*|2*) DEPEND="${DEPEND} !app-office/${PN}:live" ;;
76 esac
77 DEPEND="${DEPEND}
78 !app-office/${PN}:0 67 !app-office/${PN}:0
79 !app-office/koffice:0 68 !app-office/koffice:0
80 !app-office/koffice-meta:0" 69 !app-office/koffice-meta:0
81 case ${PN} in 70 "
82 koffice-data) 71 if has openexr ${IUSE//+}; then
83 DEPEND="${DEPEND} media-libs/lcms" 72 COMMONDEPEND+=" media-gfx/imagemagick[openexr?]"
84 RDEPEND="${RDEPEND} media-libs/lcms" 73 else
85 ;; 74 COMMONDEPEND+=" media-gfx/imagemagick"
86 *) 75 fi
87 IUSE="+crypt" 76
88 DEPEND="${DEPEND} crypt? ( >=app-crypt/qca-2 )" 77 COMMONDEPEND+="
89 RDEPEND="${RDEPEND} crypt? ( >=app-crypt/qca-2 )" 78 dev-cpp/eigen:2
90 if [[ $PN != koffice-libs ]]; then 79 media-libs/fontconfig
80 media-libs/freetype:2
81 "
82 if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
91 DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}" 83 COMMONDEPEND+=" >=app-office/koffice-libs-${PV}:${SLOT}"
92 RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
93 fi 84 fi
94 ;;
95 esac
96 ;; 85 ;;
97esac 86esac
87
88DEPEND+=" ${COMMONDEPEND}"
89RDEPEND+=" ${COMMONDEPEND}"
90unset COMMONDEPEND
98 91
99debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies" 92debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
100debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies" 93debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
94
95# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
96case ${BUILD_TYPE} in
97 live)
98 case ${KMNAME} in
99 extragear*|playground*)
100 ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
101 ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
102 ;;
103 esac
104 ;;
105esac
101 106
102# @ECLASS-VARIABLE: KMNAME 107# @ECLASS-VARIABLE: KMNAME
103# @DESCRIPTION: 108# @DESCRIPTION:
104# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it 109# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it
105# _before_ inheriting this eclass, (unlike the other parameters), since it's 110# _before_ inheriting this eclass, (unlike the other parameters), since it's
118# If set to "true", $KMMODULE doesn't have to be defined. 123# If set to "true", $KMMODULE doesn't have to be defined.
119# 124#
120# Example usage: If you're installing subdirectories of a package, like plugins, 125# Example usage: If you're installing subdirectories of a package, like plugins,
121# you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and 126# you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and
122# set KMNOMODULE="true". 127# set KMNOMODULE="true".
123if [[ -z $KMMODULE && $KMNOMODULE != true ]]; then 128if [[ -z ${KMMODULE} && ${KMNOMODULE} != true ]]; then
124 KMMODULE=$PN 129 KMMODULE=${PN}
125fi 130fi
126 131
127# @ECLASS-VARIABLE: KMEXTRA 132# @ECLASS-VARIABLE: KMEXTRA
128# @DESCRIPTION: 133# @DESCRIPTION:
129# All subdirectories listed here will be extracted, compiled & installed. 134# All subdirectories listed here will be extracted, compiled & installed.
130# $KMMODULE is always added to $KMEXTRA. 135# $KMMODULE is always added to $KMEXTRA.
131# If the htmlhandbook USE-flag is set, and if this directory exists, 136# If the handbook USE-flag is set, and if this directory exists,
132# then "doc/$KMMODULE" is added to $KMEXTRA. In other cases, this should be 137# then "doc/$KMMODULE" is added to $KMEXTRA. In other cases, this should be
133# handled in the ebuild. 138# handled in the ebuild.
134# If the documentation is in a different subdirectory, you should add it to KMEXTRA. 139# If the documentation is in a different subdirectory, you should add it to KMEXTRA.
135 140
136# @ECLASS-VARIABLE: KMCOMPILEONLY 141# @ECLASS-VARIABLE: KMCOMPILEONLY
151# @FUNCTION: kde4-meta_pkg_setup 156# @FUNCTION: kde4-meta_pkg_setup
152# @DESCRIPTION: 157# @DESCRIPTION:
153# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in 158# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in
154# split ebuilds. 159# split ebuilds.
155kde4-meta_pkg_setup() { 160kde4-meta_pkg_setup() {
161 debug-print-function ${FUNCNAME} "$@"
162
156 kde4-base_pkg_setup 163 kde4-base_pkg_setup
157} 164}
158 165
159# @FUNCTION: kde4-meta_src_unpack 166# @FUNCTION: kde4-meta_src_unpack
160# @DESCRIPTION: 167# @DESCRIPTION:
161# This function unpacks the source for split ebuilds. See also 168# This function unpacks the source for split ebuilds. See also
162# kde4-meta-src_extract. 169# kde4-meta-src_extract.
163kde4-meta_src_unpack() { 170kde4-meta_src_unpack() {
164 debug-print-function ${FUNCNAME} "$@" 171 debug-print-function ${FUNCNAME} "$@"
172
165 if [[ $BUILD_TYPE = live ]]; then 173 if [[ ${BUILD_TYPE} = live ]]; then
166 migrate_store_dir 174 migrate_store_dir
167 S="${WORKDIR}/${PN}-${PV}" 175 S="${WORKDIR}/${P}"
168 mkdir -p "${S}" 176 mkdir -p "${S}"
169 ESVN_RESTRICT="export" subversion_src_unpack 177 ESVN_RESTRICT="export" subversion_src_unpack
170 subversion_wc_info 178 subversion_wc_info
171 subversion_bootstrap 179 subversion_bootstrap
172 kde4-meta_src_extract 180 kde4-meta_src_extract
181# @DESCRIPTION: 189# @DESCRIPTION:
182# A function to unpack the source for a split KDE ebuild. 190# A function to unpack the source for a split KDE ebuild.
183# Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and 191# Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and
184# KMTARPARAMS. 192# KMTARPARAMS.
185kde4-meta_src_extract() { 193kde4-meta_src_extract() {
194 debug-print-function ${FUNCNAME} "$@"
195
186 if [[ $BUILD_TYPE = live ]]; then 196 if [[ ${BUILD_TYPE} = live ]]; then
187 local rsync_options subdir kmnamedir targetdir 197 local rsync_options subdir kmnamedir targetdir
188 # Export working copy to ${S} 198 # Export working copy to ${S}
189 einfo "Exporting parts of working copy to ${S}" 199 einfo "Exporting parts of working copy to ${S}"
190 kde4-meta_create_extractlists 200 kde4-meta_create_extractlists
191 201
199 rsync --recursive ${rsync_options} "${ESVN_WC_PATH}/${kmnamedir}cmake" "${S}" \ 209 rsync --recursive ${rsync_options} "${ESVN_WC_PATH}/${kmnamedir}cmake" "${S}" \
200 || die "${ESVN}: can't export cmake files to '${S}'." 210 || die "${ESVN}: can't export cmake files to '${S}'."
201 fi 211 fi
202 # Copy all subdirectories 212 # Copy all subdirectories
203 for subdir in $(__list_needed_subdirectories); do 213 for subdir in $(__list_needed_subdirectories); do
204 targetdir="" 214 targetdir=""
205 if [[ $subdir = doc/* && ! -e "$ESVN_WC_PATH/$kmnamedir$subdir" ]]; then 215 if [[ $subdir = doc/* && ! -e "$ESVN_WC_PATH/$kmnamedir$subdir" ]]; then
206 continue 216 continue
207 fi 217 fi
208 218
209 [[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}" 219 [[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}"
210 rsync --recursive ${rsync_options} "${ESVN_WC_PATH}/${kmnamedir}${subdir%/}" "${S}/${targetdir}" \ 220 rsync --recursive ${rsync_options} "${ESVN_WC_PATH}/${kmnamedir}${subdir%/}" "${S}/${targetdir}" \
211 || die "${ESVN}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'." 221 || die "${ESVN}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'."
212 done 222 done
213 223
214 if [[ $KMNAME = kdebase-runtime && $PN != kdebase-data ]]; then 224 if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then
215 sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \ 225 sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
216 "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed" 226 "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
217 fi 227 fi
218 else 228 else
219 local abort tarball tarfile f extractlist 229 local abort tarball tarfile f extractlist moduleprefix postfix
230 case ${PV} in
231 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)
232 # block for normally packed upstream unstable snapshots
233 KMTARPARAMS+=" --bzip2" # bz2
234 postfix="bz2"
235 ;;
236 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6* | 4.3.9* | 4.3.8* | 4.3.7* | 4.3.6*)
237 KMTARPARAMS+=" --lzma" # lzma
238 postfix="lzma"
239 ;;
240 *)
241 KMTARPARAMS+=" --bzip2" # bz2
242 postfix="bz2"
243 ;;
244 esac
220 case $KMNAME in 245 case ${KMNAME} in
221 kdebase-apps) 246 kdebase-apps)
222 tarball="${KMNAME#-apps}-${PV}.tar.bz2" 247 # kdebase/apps -> kdebase-apps
248 tarball="kdebase-${PV}.tar.${postfix}"
249 # Go one level deeper for kdebase-apps in tarballs
250 moduleprefix=apps/
251 KMTARPARAMS+=" --transform=s|apps/||"
223 ;; 252 ;;
224 *) 253 *)
254 # Create tarball name from module name (this is the default)
225 tarball="${KMNAME}-${PV}.tar.bz2" 255 tarball="${KMNAME}-${PV}.tar.${postfix}"
226 ;; 256 ;;
227 esac 257 esac
258
259 # Full path to source tarball
228 tarfile="${DISTDIR}"/${tarball} 260 tarfile="${DISTDIR}/${tarball}"
261
262 # Detect real toplevel dir from tarball name - it will be used upon extraction
263 # and in __list_needed_subdirectories
264 topdir="${tarball%.tar.*}/"
229 265
230 ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" 266 ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
231 267
232 kde4-meta_create_extractlists 268 kde4-meta_create_extractlists
233 269
234 for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \ 270 for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \
235 AUTHORS COPYING INSTALL README NEWS ChangeLog 271 AUTHORS COPYING INSTALL README NEWS ChangeLog
236 do 272 do
237 extractlist="${extractlist} ${KMNAME}-${PV}/${f}" 273 extractlist+=" ${topdir}${moduleprefix}${f}"
238 done 274 done
239 extractlist="${extractlist} $(__list_needed_subdirectories)" 275 extractlist+=" $(__list_needed_subdirectories)"
240 KMTARPARAMS="${KMTARPARAMS} -j"
241 276
242 pushd "${WORKDIR}" > /dev/null 277 pushd "${WORKDIR}" > /dev/null
243 [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf $tarfile $KMTARPARAMS $extractlist >&2 278 [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2
244 tar -xpf $tarfile $KMTARPARAMS $extractlist 2> /dev/null 279 tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null
245 280
246 # Default $S is based on $P; rename the extracted directory to match $S 281 # Default $S is based on $P; rename the extracted directory to match $S if necessary
247 mv ${KMNAME}-${PV} ${P} || die "Died while moving \"${KMNAME}-${PV}\" to \"${P}\"" 282 mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
248 283
249 popd > /dev/null 284 popd > /dev/null
250 285
251 eend $? 286 eend $?
287
288 # We need to clear it here to make verification below work
289 unset moduleprefix
252 290
253 if [[ -n ${KDE4_STRICTER} ]]; then 291 if [[ -n ${KDE4_STRICTER} ]]; then
254 for f in $(__list_needed_subdirectories fatal); do 292 for f in $(__list_needed_subdirectories fatal); do
255 if [[ ! -e ${S}/${f#*/} ]]; then 293 if [[ ! -e "${S}/${f#*/}" ]]; then
256 eerror "'${f#*/}' is missing" 294 eerror "'${f#*/}' is missing"
257 abort=true 295 abort=true
258 fi 296 fi
259 done 297 done
260 [[ -n ${abort} ]] && die "There were missing files." 298 [[ -n ${abort} ]] && die "There were missing files."
261 fi 299 fi
262 kde4-base_src_unpack 300
263 fi 301 # We don't need it anymore
264 # fix koffice linking 302 unset topdir
265 if [[ $KMNAME = koffice ]]; then
266 koffice_fix_libraries
267 fi 303 fi
268} 304}
269 305
270# @FUNCTION: kde4-meta_create_extractlists 306# @FUNCTION: kde4-meta_create_extractlists
271# @DESCRIPTION: 307# @DESCRIPTION:
273# Also see descriptions of KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, 309# Also see descriptions of KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY,
274# KMEXTRACTONLY and KMTARPARAMS. 310# KMEXTRACTONLY and KMTARPARAMS.
275kde4-meta_create_extractlists() { 311kde4-meta_create_extractlists() {
276 debug-print-function ${FUNCNAME} "$@" 312 debug-print-function ${FUNCNAME} "$@"
277 313
314 # TODO change to KMEXTRA for more strict check
278 if has htmlhandbook ${IUSE//+} && use htmlhandbook; then 315 if has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then
279 # We use the basename of $KMMODULE because $KMMODULE can contain 316 # We use the basename of $KMMODULE because $KMMODULE can contain
280 # the path to the module subdirectory. 317 # the path to the module subdirectory.
281 KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}" 318 KMEXTRA_NONFATAL+="
319 doc/${KMMODULE##*/}"
282 fi 320 fi
283 321
284 # Add some CMake-files to KMEXTRACTONLY. 322 # Add some CMake-files to KMEXTRACTONLY.
285 # Note that this actually doesn't include KMEXTRA handling. 323 # Note that this actually doesn't include KMEXTRA handling.
286 # In those cases you should care to add the relevant files to KMEXTRACTONLY 324 # In those cases you should care to add the relevant files to KMEXTRACTONLY
287 case ${KMNAME} in 325 case ${KMNAME} in
288 kdebase) 326 kdebase)
289 KMEXTRACTONLY="${KMEXTRACTONLY} 327 KMEXTRACTONLY+="
290 apps/config-apps.h.cmake 328 apps/config-apps.h.cmake
291 apps/ConfigureChecks.cmake" 329 apps/ConfigureChecks.cmake"
292 ;; 330 ;;
293 kdebase-apps) 331 kdebase-apps)
294 KMEXTRACTONLY="${KMEXTRACTONLY} 332 KMEXTRACTONLY+="
295 config-apps.h.cmake 333 config-apps.h.cmake
296 ConfigureChecks.cmake" 334 ConfigureChecks.cmake"
297 ;; 335 ;;
298 kdebase-runtime) 336 kdebase-runtime)
299 KMEXTRACTONLY="${KMEXTRACTONLY} 337 KMEXTRACTONLY+="
300 config-runtime.h.cmake" 338 config-runtime.h.cmake"
301 ;; 339 ;;
302 kdebase-workspace) 340 kdebase-workspace)
303 KMEXTRACTONLY="${KMEXTRACTONLY} 341 KMEXTRACTONLY+="
304 config-unix.h.cmake 342 config-unix.h.cmake
305 ConfigureChecks.cmake 343 ConfigureChecks.cmake
306 config-workspace.h.cmake 344 config-workspace.h.cmake
307 config-X11.h.cmake 345 config-X11.h.cmake
308 startkde.cmake" 346 startkde.cmake
347 KDE4WorkspaceConfig.cmake.in"
348 ;;
349 kdegames)
350 if [[ ${PN} != libkdegames ]]; then
351 KMEXTRACTONLY+="
352 libkdegames/"
353 fi
354 ;;
355 kdepim)
356 if [[ ${PN} != libkdepim ]]; then
357 KMEXTRACTONLY+="
358 libkdepim/"
359 fi
309 case ${SLOT} in 360 case ${SLOT} in
310 4.2) 361 4.3|4.4|live)
311 KMEXTRACTONLY="${KMEXTRACTONLY} 362 KMEXTRACTONLY+="
312 KDE4WorkspaceConfig.cmake.in" 363 kdepim-version.h
364 config-enterprise.h.cmake"
313 ;; 365 ;;
314 *) : ;;
315 esac 366 esac
316 ;; 367 KMEXTRACTONLY+="
317 kdegames) 368 kleopatra/ConfigureChecks.cmake"
318 if [[ ${PN} != "libkdegames" ]]; then 369 if has kontact ${IUSE//+} && use kontact; then
319 KMEXTRACTONLY="${KMEXTRACTONLY} 370 KMEXTRA+="
320 libkdegames" 371 kontact/plugins/${PLUGINNAME:-${PN}}/"
372 KMEXTRACTONLY+="
373 kontactinterfaces/"
321 fi 374 fi
322 ;; 375 ;;
323 kdepim) 376 kdeutils)
324 KMEXTRACTONLY="${KMEXTRACTONLY} 377 case ${SLOT} in
325 kleopatra/ConfigureChecks.cmake 378 4.3|4.4|live)
326 libkdepim/kdepim_export.h" 379 KMEXTRACTONLY+="
327 if has kontact ${IUSE//+} && use kontact; then 380 kdeutils-version.h"
328 KMEXTRA="${KMEXTRA} kontact/plugins/${PLUGINNAME:-${PN}}" 381 ;;
329 KMEXTRACTONLY="${KMEXTRACTONLY} kontactinterfaces/" 382 esac
330 fi
331 ;; 383 ;;
332 koffice) 384 koffice)
333 KMEXTRACTONLY="${KMEXTRACTONLY} 385 KMEXTRACTONLY+="
334 config-endian.h.cmake 386 config-endian.h.cmake
335 filters/config-filters.h.cmake 387 filters/config-filters.h.cmake
336 config-openctl.h.cmake
337 config-openexr.h.cmake 388 config-openexr.h.cmake
338 config-opengl.h.cmake 389 config-opengl.h.cmake
339 config-prefix.h.cmake" 390 config-prefix.h.cmake
391 "
340 case ${PN} in 392 case ${PV} in
341 koffice-libs|koffice-data) 393 2.0.*)
394 KMEXTRACTONLY+="
395 config-openctl.h.cmake"
342 ;; 396 ;;
343 *)
344 # add basic extract for all packages
345 KMEXTRACTONLY="${KMEXTRACTONLY}
346 filters/
347 libs/
348 plugins/"
349 if [[ ${PN} != "kplato" ]]; then
350 KMEXTRA="${KMEXTRA} filters/${PN}"
351 fi
352 ;;
353 esac 397 esac
354 ;; 398 ;;
355 esac 399 esac
356 # Don't install cmake modules for split ebuilds, to avoid collisions. 400 # Don't install cmake modules for split ebuilds, to avoid collisions.
357 case ${KMNAME} in 401 case ${KMNAME} in
402 kdepim)
403 # No need for unpack since 4.2.86
404 # Remove when 4.2 is wiped out from the tree
405 case ${PV} in
406 4.1*|4.2.0|4.2.1|4.2.2|4.2.3|4.2.4|4.2.85)
407 KMCOMPILEONLY+="
408 cmake/modules/"
409 ;;
410 *) ;;
411 esac
412 ;;
358 kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics|kdepim) 413 kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
359 case ${PN} in 414 case ${PN} in
360 libkdegames|libkdeedu|marble|libkworkspace) 415 libkdegames|libkdeedu|libkworkspace)
361 KMEXTRA="${KMEXTRA} 416 KMEXTRA+="
362 cmake/modules/" 417 cmake/modules/"
363 ;; 418 ;;
364 *) 419 *)
365 KMCOMPILEONLY="${KMCOMPILEONLY} 420 KMCOMPILEONLY+="
366 cmake/modules/" 421 cmake/modules/"
367 ;; 422 ;;
368 esac 423 esac
369 ;; 424 ;;
370 esac 425 esac
371 426
372 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}" 427 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
373} 428}
374 429
375__list_needed_subdirectories() { 430__list_needed_subdirectories() {
376 local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist topdir 431 local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist
377 432
378 # We expand KMEXTRA by adding CMakeLists.txt files 433 # We expand KMEXTRA by adding CMakeLists.txt files
379 kmextra="${KMEXTRA}" 434 kmextra="${KMEXTRA}"
380 [[ ${1} != fatal ]] && kmextra="${kmextra} ${KMEXTRA_NONFATAL}" 435 [[ ${1} != fatal ]] && kmextra+=" ${KMEXTRA_NONFATAL}"
381 for i in ${kmextra}; do 436 for i in ${kmextra}; do
382 kmextra_expanded="${kmextra_expanded} ${i}" 437 kmextra_expanded+=" ${i}"
383 j=$(dirname ${i}) 438 j=$(dirname ${i})
384 while [[ ${j} != "." ]]; do 439 while [[ ${j} != "." ]]; do
385 kmextra_expanded="${kmextra_expanded} ${j}/CMakeLists.txt"; 440 kmextra_expanded+=" ${j}/CMakeLists.txt";
386 j=$(dirname ${j}) 441 j=$(dirname ${j})
387 done 442 done
388 done 443 done
389 444
390 # Expand KMMODULE 445 # Expand KMMODULE
391 if [[ -n $KMMODULE ]]; then 446 if [[ -n ${KMMODULE} ]]; then
392 kmmodule_expanded="${KMMODULE}" 447 kmmodule_expanded="${KMMODULE}"
393 j=$(dirname ${KMMODULE}) 448 j=$(dirname ${KMMODULE})
394 while [[ ${j} != "." ]]; do 449 while [[ ${j} != "." ]]; do
395 kmmodule_expanded="${kmmodule_expanded} $j/CMakeLists.txt"; 450 kmmodule_expanded+=" ${j}/CMakeLists.txt";
396 j=$(dirname $j) 451 j=$(dirname ${j})
397 done 452 done
398 fi 453 fi
399 454
400 # Expand KMCOMPILEONLY 455 # Expand KMCOMPILEONLY
401 for i in ${KMCOMPILEONLY}; do 456 for i in ${KMCOMPILEONLY}; do
402 kmcompileonly_expanded="${kmcompileonly_expanded} ${i}" 457 kmcompileonly_expanded+=" ${i}"
403 j=$(dirname ${i}) 458 j=$(dirname ${i})
404 while [[ ${j} != "." ]]; do 459 while [[ ${j} != "." ]]; do
405 kmcompileonly_expanded="${kmcompileonly_expanded} ${j}/CMakeLists.txt"; 460 kmcompileonly_expanded+=" ${j}/CMakeLists.txt";
406 j=$(dirname ${j}) 461 j=$(dirname ${j})
407 done 462 done
408 done 463 done
409 464
410 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmextra_expanded: ${kmextra_expanded}" 465 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmextra_expanded: ${kmextra_expanded}"
411 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded: ${kmmodule_expanded}" 466 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded: ${kmmodule_expanded}"
412 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}" 467 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}"
413 468
414
415 case ${PV} in
416 scm|9999*) : ;;
417 *) topdir="${KMNAME}-${PV}/" ;;
418 esac
419
420 # Create final list of stuff to extract 469 # Create final list of stuff to extract
470 # We append topdir only when specified (usually for tarballs)
421 for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \ 471 for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \
422 ${KMEXTRACTONLY} 472 ${KMEXTRACTONLY}
423 do 473 do
424 extractlist="${extractlist} ${topdir}${i}" 474 extractlist+=" ${topdir}${moduleprefix}${i}"
425 done 475 done
426 476
427 echo ${extractlist} 477 echo ${extractlist}
428} 478}
429 479
434 debug-print-function ${FUNCNAME} "$@" 484 debug-print-function ${FUNCNAME} "$@"
435 485
436 kde4-meta_change_cmakelists 486 kde4-meta_change_cmakelists
437 kde4-base_src_prepare 487 kde4-base_src_prepare
438} 488}
439
440 489
441# FIXME: no comment here? 490# FIXME: no comment here?
442_change_cmakelists_parent_dirs() { 491_change_cmakelists_parent_dirs() {
443 debug-print-function ${FUNCNAME} "$@" 492 debug-print-function ${FUNCNAME} "$@"
444 493
458 507
459# FIXME: add description 508# FIXME: add description
460# @FUNCTION: kde4-meta_change_cmakelists 509# @FUNCTION: kde4-meta_change_cmakelists
461# @DESCRIPTION: 510# @DESCRIPTION:
462kde4-meta_change_cmakelists() { 511kde4-meta_change_cmakelists() {
463 debug-print-function ${FUNCNAME} "$@" 512 debug-print-function ${FUNCNAME} "$@"
464 513
465 pushd "${S}" > /dev/null 514 pushd "${S}" > /dev/null
466 515
467 comment_all_add_subdirectory ./ 516 comment_all_add_subdirectory ./
468 517
478 find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \ 527 find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
479 die "${LINENO}: died in KMMODULE section" 528 die "${LINENO}: died in KMMODULE section"
480 _change_cmakelists_parent_dirs ${KMMODULE} 529 _change_cmakelists_parent_dirs ${KMMODULE}
481 fi 530 fi
482 531
532 local i
533
534 # KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
535 for i in ${KMEXTRACTONLY}; do
536 if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then
537 sed -i -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \
538 die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
539 fi
540 done
541
483 # KMCOMPILEONLY 542 # KMCOMPILEONLY
484 local i
485 for i in ${KMCOMPILEONLY}; do 543 for i in ${KMCOMPILEONLY}; do
486 debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}" 544 debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}"
487 # Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions. 545 # Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions.
488 find "${S}"/${i} -name CMakeLists.txt -print0 | \ 546 find "${S}"/${i} -name CMakeLists.txt -print0 | \
489 xargs -0 sed -i \ 547 xargs -0 sed -i \
511 die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}" 569 die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
512 _change_cmakelists_parent_dirs ${i} 570 _change_cmakelists_parent_dirs ${i}
513 fi 571 fi
514 done 572 done
515 573
516 # KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
517 for i in ${KMEXTRACTONLY}; do
518 if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then
519 sed -i -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \
520 die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
521 fi
522 done
523
524 case ${KMNAME} in 574 case ${KMNAME} in
525 kdebase-workspace) 575 kdebase-workspace)
526 # COLLISION PROTECT section 576 # COLLISION PROTECT section
527 # Install the startkde script just once, as a part of kde-base/kdebase-startkde, 577 # Install the startkde script just once, as a part of kde-base/kdebase-startkde,
528 # not as a part of every package. 578 # not as a part of every package.
529 if [[ ${PN} != "kdebase-startkde" && -f "${S}"/CMakeLists.txt ]]; then 579 if [[ ${PN} != kdebase-startkde && -f "${S}"/CMakeLists.txt ]]; then
530 # The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0. 580 # The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
531 sed -i -e '/startkde/s/^/#DONOTINSTALL /' "${S}"/CMakeLists.txt || \ 581 sed -i -e '/startkde/s/^/#DONOTINSTALL /' "${S}"/CMakeLists.txt || \
532 die "${LINENO}: sed died in the kdebase-startkde collision prevention section" 582 die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
533 fi 583 fi
534 # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 584 # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
535 if [[ ${SLOT} == 4.2 ]] || [[ ${PV} == 9999 ]]; then
536 if [[ ${PN} != libkworkspace ]]; then 585 if [[ ${PN} != libkworkspace ]]; then
586 sed -i \
537 sed -i -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ 587 -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
538 CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip EXPORT section" 588 CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section"
539 fi
540 fi 589 fi
541 ;; 590 ;;
542 kdebase-runtime) 591 kdebase-runtime)
543 # COLLISION PROTECT section 592 # COLLISION PROTECT section
544 # Only install the kde4 script as part of kde-base/kdebase-data 593 # Only install the kde4 script as part of kde-base/kdebase-data
545 if [[ ${PN} != "kdebase-data" && -f "${S}"/CMakeLists.txt ]]; then 594 if [[ ${PN} != kdebase-data && -f "${S}"/CMakeLists.txt ]]; then
546 sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \ 595 sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
547 "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed" 596 "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
548 fi 597 fi
549 ;; 598 ;;
550 kdepim) 599 kdepim)
554 -e '/add_custom_target(kmail_xml /,/)/p' "${S}"/kmail/CMakeLists.txt || die "uncommenting xml failed" 603 -e '/add_custom_target(kmail_xml /,/)/p' "${S}"/kmail/CMakeLists.txt || die "uncommenting xml failed"
555 _change_cmakelists_parent_dirs kmail 604 _change_cmakelists_parent_dirs kmail
556 ;; 605 ;;
557 esac 606 esac
558 ;; 607 ;;
608 kdewebdev)
609 # Disable hardcoded kdepimlibs check
610 sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
611 -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2)/' \
612 -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt)/' \
613 -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \
614 -i CMakeLists.txt || die "failed to disable hardcoded checks"
615 ;;
616 koffice)
617 # prevent collisions
618 if [[ ${PN} != koffice-data ]]; then
619 sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
620 "${S}"/cmake/modules/CMakeLists.txt || \
621 die "${LINENO}: sed died in collision prevention section"
622 case ${PV} in
623 2.0.*)
624 sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \
625 "${S}"/CMakeLists.txt || \
626 die "${LINENO}: sed died in collision prevention section"
627 ;;
628 *)
629 sed -i -e '/install(.\+config-openexr\.h.\+)/d' \
630 "${S}"//CMakeLists.txt || \
631 die "${LINENO}: sed died in collision prevention section"
632 ;;
633 esac
634 fi
559 esac 635 esac
560 636
561 popd > /dev/null 637 popd > /dev/null
562} 638}
563 639
564# @FUNCTION: kde4-meta_src_configure 640# @FUNCTION: kde4-meta_src_configure
565# @DESCRIPTION: 641# @DESCRIPTION:
566# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in split 642# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in split
567# ebuilds. 643# ebuilds.
568kde4-meta_src_configure() { 644kde4-meta_src_configure() {
569 debug-print-function ${FUNCNAME} "$@" 645 debug-print-function ${FUNCNAME} "$@"
646
647 # Set some cmake default values here (usually workarounds for automagic deps)
648 case ${KMNAME} in
649 kdewebdev)
650 mycmakeargs="
651 -DWITH_KdepimLibs=OFF
652 -DWITH_LibXml2=OFF
653 -DWITH_LibXslt=OFF
654 -DWITH_Boost=OFF
655 -DWITH_LibTidy=OFF
656 ${mycmakeargs}"
657 ;;
658 esac
570 659
571 kde4-base_src_configure 660 kde4-base_src_configure
572} 661}
573 662
574# @FUNCTION: kde4-meta_src_compile 663# @FUNCTION: kde4-meta_src_compile
575# @DESCRIPTION: 664# @DESCRIPTION:
576# General function for compiling split KDE4 applications. 665# General function for compiling split KDE4 applications.
577# Overrides kde4-base_src_compile. 666# Overrides kde4-base_src_compile.
578kde4-meta_src_compile() { 667kde4-meta_src_compile() {
579 debug-print-function ${FUNCNAME} "$@" 668 debug-print-function ${FUNCNAME} "$@"
580 669
581 kde4-base_src_make 670 kde4-base_src_compile "$@"
582} 671}
583 672
584# @FUNCTION: kde4-meta_src_test 673# @FUNCTION: kde4-meta_src_test
585# @DESCRIPTION: 674# @DESCRIPTION:
586# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split 675# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
595# @DESCRIPTION: 684# @DESCRIPTION:
596# Function for installing KDE4 split applications. 685# Function for installing KDE4 split applications.
597kde4-meta_src_install() { 686kde4-meta_src_install() {
598 debug-print-function $FUNCNAME "$@" 687 debug-print-function $FUNCNAME "$@"
599 688
600 kde4-meta_src_make_doc 689 kde4-base_src_install
601 cmake-utils_src_install
602
603 if [[ -n ${KMSAVELIBS} ]]; then
604 install_library_dependencies
605 fi
606
607 # remove unvanted koffice stuff
608 if [[ $KMNAME = koffice && $PN != koffice-data ]]; then
609 rm "$D/$KDEDIR/include/config-openexr.h"
610 rm "$D/$KDEDIR/share/apps/cmake/modules/FindKOfficeLibs.cmake"
611 fi
612} 690}
613 691
614# @FUNCTION: kde4-meta_src_make_doc 692# @FUNCTION: kde4-meta_src_make_doc
615# @DESCRIPTION: 693# @DESCRIPTION:
616# This function searches in ${S}/${KMMODULE}, 694# This function searches in ${S}/${KMMODULE},
617# and tries to install "AUTHORS ChangeLog* README* NEWS todo" if these files exist. 695# and tries to install "AUTHORS ChangeLog* README* NEWS TODO" if these files exist.
618kde4-meta_src_make_doc() { 696kde4-meta_src_make_doc() {
619 debug-print-function $FUNCNAME "$@" 697 debug-print-function ${FUNCNAME} "$@"
620 698
621 local doc 699 local doc
622 for doc in AUTHORS ChangeLog* README* NEWS TODO; do 700 for doc in AUTHORS ChangeLog* README* NEWS TODO; do
623 [[ -s ${KMMODULE}/$doc ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}" 701 [[ -s ${KMMODULE}/${doc} ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}"
624 done 702 done
625 703
626 kde4-base_src_make_doc 704 kde4-base_src_make_doc
627} 705}
628 706
629# @FUNCTION: kde4-meta_pkg_postinst 707# @FUNCTION: kde4-meta_pkg_postinst
630# @DESCRIPTION: 708# @DESCRIPTION:
631# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split 709# Display information about application handbook and invoke kbuildsycoca4.
632# ebuilds.
633kde4-meta_pkg_postinst() { 710kde4-meta_pkg_postinst() {
711 debug-print-function ${FUNCNAME} "$@"
712
713 if has handbook ${IUSE//+} && ! use handbook; then
714 echo
715 einfo "Application handbook for ${PN} has not been installed."
716 einfo "To install handbook, reemerge =${CATEGORY}/${PF} with 'handbook' USE flag."
717 echo
718 fi
719
634 kde4-base_pkg_postinst 720 kde4-base_pkg_postinst
635} 721}
636 722
637# @FUNCTION: kde4-meta_pkg_postrm 723# @FUNCTION: kde4-meta_pkg_postrm
638# @DESCRIPTION: 724# @DESCRIPTION:
639# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split 725# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
640# ebuilds. 726# ebuilds.
641kde4-meta_pkg_postrm() { 727kde4-meta_pkg_postrm() {
728 debug-print-function ${FUNCNAME} "$@"
729
642 kde4-base_pkg_postrm 730 kde4-base_pkg_postrm
643} 731}
644

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.23

  ViewVC Help
Powered by ViewVC 1.1.20