/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

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

Revision 1.24 Revision 1.45
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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/x-modular.eclass,v 1.24 2005/12/06 02:22:16 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.45 2006/02/15 21:33:15 spyderous Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
9# 9#
10# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 10# Using this eclass:
11# the subdirectories within /usr/share/fonts to which it installs fonts. 11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25#
26# Pretty much everything else should be automatic.
12 27
13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
14 29
15inherit eutils libtool 30inherit eutils libtool toolchain-funcs flag-o-matic
16 31
17# Directory prefix to use for everything 32# Directory prefix to use for everything
18XDIR="/usr" 33XDIR="/usr"
19 34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40
20IUSE="" 41IUSE=""
21HOMEPAGE="http://xorg.freedesktop.org/" 42HOMEPAGE="http://xorg.freedesktop.org/"
22SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 43
23 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 44# Set up SRC_URI for individual modular releases
24 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then
47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI}
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
57elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI}
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI}
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi
73
74# SRC_URI for full releases
75SRC_URI="${SRC_URI}
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2"
26LICENSE="X11" 77
27SLOT="0" 78SLOT="0"
28 79
80# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit.
82LICENSE=${PN}
83
29# Set up shared dependencies 84# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 85if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 86# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 87 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 88 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 89 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 90 >=sys-devel/libtool-1.5
36 >=sys-devel/m4-1.4" 91 >=sys-devel/m4-1.4"
37fi 92fi
38 93
39# If we're a font package, but not the font.alias one 94# If we're a font package, but not the font.alias one
40if [[ "${PN/#font-}" != "${PN}" ]] && [[ "${PN}" != "font-alias" ]]; then 95if [[ "${PN/#font-}" != "${PN}" ]] \
96 && [[ "${PN}" != "font-alias" ]] \
97 && [[ "${PN}" != "font-util" ]]; then
41 # Activate font code in the rest of the eclass 98 # Activate font code in the rest of the eclass
42 FONT="yes" 99 FONT="yes"
43 100
44 RDEPEND="${RDEPEND} 101 RDEPEND="${RDEPEND}
45 media-fonts/encodings" 102 media-fonts/encodings
103 x11-apps/mkfontscale
104 x11-apps/mkfontdir"
46 PDEPEND="${PDEPEND} 105 PDEPEND="${PDEPEND}
47 media-fonts/font-alias" 106 media-fonts/font-alias"
107
108 # Starting with 7.0RC3, we can specify the font directory
109 # But oddly, we can't do the same for encodings or font-alias
110
111 # Wrap in `if` so ebuilds can set it too
112 if [[ -z ${FONT_DIR} ]]; then
113 FONT_DIR=${PN##*-}
114
115 fi
116
117 # Fix case of font directories
118 FONT_DIR=${FONT_DIR/ttf/TTF}
119 FONT_DIR=${FONT_DIR/otf/OTF}
120 FONT_DIR=${FONT_DIR/type1/Type1}
121 FONT_DIR=${FONT_DIR/speedo/Speedo}
122
123 # Set up configure option
124 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
125
126 if [[ -n "${FONT}" ]]; then
127 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then
128 IUSE="${IUSE} nls"
129 fi
130 fi
48fi 131fi
49 132
50# If we're a driver package 133# If we're a driver package
51if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 134if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
52 # Don't build static driver modules 135 # Enable driver code in the rest of the eclass
53 DRIVER_OPTIONS="--disable-static" 136 DRIVER="yes"
137
138 # Add driver patchset to SRC_URI
139 SRC_URI="${SRC_URI}
140 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
141fi
142
143# Debugging -- ignore packages that can't be built with debugging
144if [[ -z "${FONT}" ]] \
145 || [[ "${PN/app-doc}" != "${PN}" ]] \
146 || [[ "${PN/x11-proto}" != "${PN}" ]] \
147 || [[ "${PN/util-macros}" != "${PN}" ]] \
148 || [[ "${PN/xbitmaps}" != "${PN}" ]] \
149 || [[ "${PN/xkbdata}" != "${PN}" ]] \
150 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
151 || [[ "${PN/xcursor}" != "${PN}" ]] \
152 ; then
153 DEBUGGABLE="yes"
154 IUSE="${IUSE} debug"
155 if use debug; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
54fi 158fi
55 159
56DEPEND="${DEPEND} 160DEPEND="${DEPEND}
57 >=dev-util/pkgconfig-0.18 161 >=dev-util/pkgconfig-0.18"
162
163if [[ "${PN/util-macros}" = "${PN}" ]]; then
164 DEPEND="${DEPEND}
58 >=x11-misc/util-macros-0.99.2" 165 >=x11-misc/util-macros-0.99.2"
166fi
59 167
60# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories 168# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
61RDEPEND="${RDEPEND} 169RDEPEND="${RDEPEND}
62 !<=x11-base/xorg-x11-6.9 170 !<=x11-base/xorg-x11-6.9
63 >=sys-apps/man-1.6b-r2" 171 >=sys-apps/man-1.6b-r2"
… …
66 174
67x-modular_unpack_source() { 175x-modular_unpack_source() {
68 unpack ${A} 176 unpack ${A}
69 cd ${S} 177 cd ${S}
70 178
71 # Joshua Baergen - October 23, 2005 179 if [[ -n ${FONT_OPTIONS} ]]; then
72 # Fix shared lib issues on MIPS, FBSD, etc etc 180 einfo "Detected font directory: ${FONT_DIR}"
73 elibtoolize 181 fi
74} 182}
75 183
76x-modular_patch_source() { 184x-modular_patch_source() {
77 # Use standardized names and locations with bulk patching 185 # Use standardized names and locations with bulk patching
78 # Patch directory is ${WORKDIR}/patch 186 # Patch directory is ${WORKDIR}/patch
79 # See epatch() in eutils.eclass for more documentation 187 # See epatch() in eutils.eclass for more documentation
80 if [ -z "${EPATCH_SUFFIX}" ] ; then 188 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
81 EPATCH_SUFFIX="patch" 189 EPATCH_SUFFIX="patch"
82 fi 190 fi
83 191
192 # If this is a driver package we need to fix man page install location.
193 # Running autoreconf will use the patched util-macros to make the
194 # change for us, so we only need to patch if it is not going to run.
195 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
196 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
197 fi
198
84 # For specific list of patches 199 # For specific list of patches
85 if [ -n "${PATCHES}" ] ; then 200 if [[ -n "${PATCHES}" ]] ; then
86 for PATCH in ${PATCHES} 201 for PATCH in ${PATCHES}
87 do 202 do
88 epatch ${PATCH} 203 epatch ${PATCH}
89 done 204 done
90 # For non-default directory bulk patching 205 # For non-default directory bulk patching
91 elif [ -n "${PATCH_LOC}" ] ; then 206 elif [[ -n "${PATCH_LOC}" ]] ; then
92 epatch ${PATCH_LOC} 207 epatch ${PATCH_LOC}
93 # For standard bulk patching 208 # For standard bulk patching
94 elif [ -d "${EPATCH_SOURCE}" ] ; then 209 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
95 epatch 210 epatch
96 fi 211 fi
97} 212}
98 213
99x-modular_reconf_source() { 214x-modular_reconf_source() {
100 # Run autoreconf for CVS snapshots only 215 # Run autoreconf for CVS snapshots only
101 if [ "${SNAPSHOT}" = "yes" ] 216 if [[ "${SNAPSHOT}" = "yes" ]]
102 then 217 then
103 # If possible, generate configure if it doesn't exist 218 # If possible, generate configure if it doesn't exist
104 if [ -f "${S}/configure.ac" ] 219 if [ -f "${S}/configure.ac" ]
105 then 220 then
106 einfo "Running autoreconf..." 221 einfo "Running autoreconf..."
… …
109 fi 224 fi
110 225
111} 226}
112 227
113x-modular_src_unpack() { 228x-modular_src_unpack() {
229 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
230 if gcc-specs-now; then
231 msg="Do not emerge ${PN} without vanilla gcc!"
232 eerror "$msg"
233 die "$msg"
234 fi
235 fi
236
114 x-modular_unpack_source 237 x-modular_unpack_source
115 x-modular_patch_source 238 x-modular_patch_source
116 x-modular_reconf_source 239 x-modular_reconf_source
240
241 # Joshua Baergen - October 23, 2005
242 # Fix shared lib issues on MIPS, FBSD, etc etc
243 elibtoolize
244}
245
246x-modular_font_configure() {
247 if [[ -n "${FONT}" ]]; then
248 # Might be worth adding an option to configure your desired font
249 # and exclude all others. Also, should this USE be nls or minimal?
250 if ! use nls; then
251 FONT_OPTIONS="${FONT_OPTIONS}
252 --disable-iso8859-2
253 --disable-iso8859-3
254 --disable-iso8859-4
255 --disable-iso8859-5
256 --disable-iso8859-6
257 --disable-iso8859-7
258 --disable-iso8859-8
259 --disable-iso8859-9
260 --disable-iso8859-10
261 --disable-iso8859-11
262 --disable-iso8859-12
263 --disable-iso8859-13
264 --disable-iso8859-14
265 --disable-iso8859-15
266 --disable-iso8859-16
267 --disable-jisx0201
268 --disable-koi8-r"
269 fi
270 fi
271}
272
273x-modular_debug_setup() {
274 if [[ -n "${DEBUGGABLE}" ]]; then
275 if use debug; then
276 strip-flags
277 append-flags -g
278 fi
279 fi
117} 280}
118 281
119x-modular_src_configure() { 282x-modular_src_configure() {
283 x-modular_font_configure
284 x-modular_debug_setup
285
120 # If prefix isn't set here, .pc files cause problems 286 # If prefix isn't set here, .pc files cause problems
121 if [ -x ./configure ]; then 287 if [[ -x ./configure ]]; then
122 econf --prefix=${XDIR} \ 288 econf --prefix=${XDIR} \
123 --datadir=${XDIR}/share \ 289 --datadir=${XDIR}/share \
290 ${FONT_OPTIONS} \
124 ${DRIVER_OPTIONS} \ 291 ${DRIVER_OPTIONS} \
125 ${CONFIGURE_OPTIONS} 292 ${CONFIGURE_OPTIONS}
126 fi 293 fi
127} 294}
128 295
… …
162 if [[ -n "${FONT}" ]]; then 329 if [[ -n "${FONT}" ]]; then
163 setup_fonts 330 setup_fonts
164 fi 331 fi
165} 332}
166 333
334x-modular_pkg_postrm() {
335 if [[ -n "${FONT}" ]]; then
336 cleanup_fonts
337 fi
338}
339
340cleanup_fonts() {
341 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
342 for DIR in ${FONT_DIR}; do
343 unset KEEP_FONTDIR
344 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
345
346 ebegin "Checking ${REAL_DIR} for useless files"
347 pushd ${REAL_DIR} &> /dev/null
348 for FILE in *; do
349 unset MATCH
350 for ALLOWED_FILE in ${ALLOWED_FILES}; do
351 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
352 # If it's allowed, then move on to the next file
353 MATCH="yes"
354 break
355 fi
356 done
357 # If we found a match in allowed files, move on to the next file
358 if [[ -n ${MATCH} ]]; then
359 continue
360 fi
361 # If we get this far, there wasn't a match in the allowed files
362 KEEP_FONTDIR="yes"
363 # We don't need to check more files if we're already keeping it
364 break
365 done
366 popd &> /dev/null
367 # If there are no files worth keeping, then get rid of the dir
368 if [[ -z "${KEEP_FONTDIR}" ]]; then
369 rm -rf ${REAL_DIR}
370 fi
371 eend 0
372 done
373}
374
167setup_fonts() { 375setup_fonts() {
168 if [[ ! -n "${FONT_DIRS}" ]]; then 376 if [[ ! -n "${FONT_DIRS}" ]]; then
169 msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts." 377 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
170 eerror ${msg} 378 eerror "${msg}"
171 die ${msg} 379 die "${msg}"
172 fi 380 fi
173 381
174 create_fonts_scale 382 create_fonts_scale
175 create_fonts_dir 383 create_fonts_dir
176 fix_font_permissions 384 fix_font_permissions
… …
187create_fonts_scale() { 395create_fonts_scale() {
188 ebegin "Creating fonts.scale files" 396 ebegin "Creating fonts.scale files"
189 local x 397 local x
190 for FONT_DIR in ${FONT_DIRS}; do 398 for FONT_DIR in ${FONT_DIRS}; do
191 x=${ROOT}/usr/share/fonts/${FONT_DIR} 399 x=${ROOT}/usr/share/fonts/${FONT_DIR}
192 [ -z "$(ls ${x}/)" ] && continue 400 [[ -z "$(ls ${x}/)" ]] && continue
193 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 401 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
194 402
195 # Only generate .scale files if truetype, opentype or type1 403 # Only generate .scale files if truetype, opentype or type1
196 # fonts are present ... 404 # fonts are present ...
197 405
198 # First truetype (ttf,ttc) 406 # First truetype (ttf,ttc)
199 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 407 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
200 # Also, there is no way to regenerate Speedo/CID fonts.scale 408 # Also, there is no way to regenerate Speedo/CID fonts.scale
201 # <spyderous@gentoo.org> 2 August 2004 409 # <spyderous@gentoo.org> 2 August 2004
202 if [ "${x/encodings}" = "${x}" -a \ 410 if [[ "${x/encodings}" = "${x}" ]] \
203 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 411 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
204 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 412 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
205 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 413 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
206 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 414 ${ROOT}/usr/bin/ttmkfdir -x 2 \
207 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 415 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
208 -o ${x}/fonts.scale -d ${x} 416 -o ${x}/fonts.scale -d ${x}
209 # ttmkfdir fails on some stuff, so try mkfontscale if it does 417 # ttmkfdir fails on some stuff, so try mkfontscale if it does
210 local ttmkfdir_return=$? 418 local ttmkfdir_return=$?
211 else 419 else
212 # We didn't use ttmkfdir at all 420 # We didn't use ttmkfdir at all
213 local ttmkfdir_return=2 421 local ttmkfdir_return=2
214 fi 422 fi
215 if [ ${ttmkfdir_return} -ne 0 ]; then 423 if [[ ${ttmkfdir_return} -ne 0 ]]; then
216 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 424 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
217 ${ROOT}/usr/bin/mkfontscale \ 425 ${ROOT}/usr/bin/mkfontscale \
218 -a /usr/share/fonts/encodings/encodings.dir \ 426 -a /usr/share/fonts/encodings/encodings.dir \
219 -- ${x} 427 -- ${x}
220 fi 428 fi
221 # Next type1 and opentype (pfa,pfb,otf,otc) 429 # Next type1 and opentype (pfa,pfb,otf,otc)
222 elif [ "${x/encodings}" = "${x}" -a \ 430 elif [[ "${x/encodings}" = "${x}" ]] \
223 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 431 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
224 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 432 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
225 ${ROOT}/usr/bin/mkfontscale \ 433 ${ROOT}/usr/bin/mkfontscale \
226 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 434 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
227 -- ${x} 435 -- ${x}
228 fi 436 fi
… …
232 440
233create_fonts_dir() { 441create_fonts_dir() {
234 ebegin "Generating fonts.dir files" 442 ebegin "Generating fonts.dir files"
235 for FONT_DIR in ${FONT_DIRS}; do 443 for FONT_DIR in ${FONT_DIRS}; do
236 x=${ROOT}/usr/share/fonts/${FONT_DIR} 444 x=${ROOT}/usr/share/fonts/${FONT_DIR}
237 [ -z "$(ls ${x}/)" ] && continue 445 [[ -z "$(ls ${x}/)" ]] && continue
238 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 446 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
239 447
240 if [ "${x/encodings}" = "${x}" ]; then 448 if [[ "${x/encodings}" = "${x}" ]]; then
241 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 449 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
242 ${ROOT}/usr/bin/mkfontdir \ 450 ${ROOT}/usr/bin/mkfontdir \
243 -e ${ROOT}/usr/share/fonts/encodings \ 451 -e ${ROOT}/usr/share/fonts/encodings \
244 -e ${ROOT}/usr/share/fonts/encodings/large \ 452 -e ${ROOT}/usr/share/fonts/encodings/large \
245 -- ${x} 453 -- ${x}
… …
259 467
260create_font_cache() { 468create_font_cache() {
261 # danarmak found out that fc-cache should be run AFTER all the above 469 # danarmak found out that fc-cache should be run AFTER all the above
262 # stuff, as otherwise the cache is invalid, and has to be run again 470 # stuff, as otherwise the cache is invalid, and has to be run again
263 # as root anyway 471 # as root anyway
264 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 472 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
265 ebegin "Creating FC font cache" 473 ebegin "Creating FC font cache"
266 HOME="/root" ${ROOT}/usr/bin/fc-cache 474 HOME="/root" ${ROOT}/usr/bin/fc-cache
267 eend 0 475 eend 0
268 fi 476 fi
269} 477}
Legend:
Removed from v.1.24  
changed lines
  Added in v.1.45
  ViewVC Help
Powered by ViewVC 1.1.13