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