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

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.51

  ViewVC Help
Powered by ViewVC 1.1.20