/[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.12 Revision 1.52
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.12 2005/09/05 22:24:20 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.52 2006/04/03 23:49:32 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}" ]]; then 135if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
49 # Don't build static driver modules 136 # Enable driver code in the rest of the eclass
50 DRIVER_OPTIONS="--disable-static" 137 DRIVER="yes"
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
51fi 161fi
52 162
53DEPEND="${DEPEND} 163DEPEND="${DEPEND}
54 >=dev-util/pkgconfig-0.18 164 >=dev-util/pkgconfig-0.18"
165
166if [[ "${PN/util-macros}" = "${PN}" ]]; then
167 DEPEND="${DEPEND}
55 x11-misc/util-macros" 168 >=x11-misc/util-macros-0.99.2"
169fi
56 170
171# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
57RDEPEND="${RDEPEND}" 172RDEPEND="${RDEPEND}
58# 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
59# x11-base/x11-env" 176# x11-base/x11-env"
60# FIXME: Uncomment once it's in portage
61# !x11-base/xorg-x11"
62 177
63x-modular_unpack_source() { 178x-modular_unpack_source() {
64 unpack ${A} 179 unpack ${A}
65 cd ${S} 180 cd ${S}
181
182 if [[ -n ${FONT_OPTIONS} ]]; then
183 einfo "Detected font directory: ${FONT_DIR}"
184 fi
66} 185}
67 186
68x-modular_patch_source() { 187x-modular_patch_source() {
69 # Use standardized names and locations with bulk patching 188 # Use standardized names and locations with bulk patching
70 # Patch directory is ${WORKDIR}/patch 189 # Patch directory is ${WORKDIR}/patch
71 # See epatch() in eutils.eclass for more documentation 190 # See epatch() in eutils.eclass for more documentation
72 if [ -z "${EPATCH_SUFFIX}" ] ; then 191 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
73 EPATCH_SUFFIX="patch" 192 EPATCH_SUFFIX="patch"
74 fi 193 fi
75 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
76 # For specific list of patches 202 # For specific list of patches
77 if [ -n "${PATCHES}" ] ; then 203 if [[ -n "${PATCHES}" ]] ; then
78 for PATCH in ${PATCHES} 204 for PATCH in ${PATCHES}
79 do 205 do
80 epatch ${PATCH} 206 epatch ${PATCH}
81 done 207 done
82 # For non-default directory bulk patching 208 # For non-default directory bulk patching
83 elif [ -n "${PATCH_LOC}" ] ; then 209 elif [[ -n "${PATCH_LOC}" ]] ; then
84 epatch ${PATCH_LOC} 210 epatch ${PATCH_LOC}
85 # For standard bulk patching 211 # For standard bulk patching
86 elif [ -d "${EPATCH_SOURCE}" ] ; then 212 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
87 epatch 213 epatch
88 fi 214 fi
89} 215}
90 216
91x-modular_reconf_source() { 217x-modular_reconf_source() {
92 # Run autoreconf for CVS snapshots only 218 # Run autoreconf for CVS snapshots only
93 if [ "${SNAPSHOT}" = "yes" ] 219 if [[ "${SNAPSHOT}" = "yes" ]]
94 then 220 then
95 # If possible, generate configure if it doesn't exist 221 # If possible, generate configure if it doesn't exist
96 if [ -f "${S}/configure.ac" ] 222 if [ -f "${S}/configure.ac" ]
97 then 223 then
98 einfo "Running autoreconf..." 224 eautoreconf
99 autoreconf -v --force --install
100 fi 225 fi
101 fi 226 fi
102 227
103} 228}
104 229
105x-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
106 x-modular_unpack_source 239 x-modular_unpack_source
107 x-modular_patch_source 240 x-modular_patch_source
108 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
109} 282}
110 283
111x-modular_src_configure() { 284x-modular_src_configure() {
285 x-modular_font_configure
286 x-modular_debug_setup
287
112 # If prefix isn't set here, .pc files cause problems 288 # If prefix isn't set here, .pc files cause problems
113 if [ -x ./configure ]; then 289 if [[ -x ./configure ]]; then
114 econf --prefix=${XDIR} \ 290 econf --prefix=${XDIR} \
115 --datadir=${XDIR}/share \ 291 --datadir=${XDIR}/share \
292 ${FONT_OPTIONS} \
116 ${DRIVER_OPTIONS} \ 293 ${DRIVER_OPTIONS} \
117 ${CONFIGURE_OPTIONS} 294 ${CONFIGURE_OPTIONS}
118 fi 295 fi
119} 296}
120 297
… …
135# Shouldn't be necessary in XDIR=/usr 312# Shouldn't be necessary in XDIR=/usr
136# einstall forces datadir, so we need to re-force it 313# einstall forces datadir, so we need to re-force it
137# datadir=${XDIR}/share \ 314# datadir=${XDIR}/share \
138# mandir=${XDIR}/share/man \ 315# mandir=${XDIR}/share/man \
139 316
317 # Make sure docs get compressed
318 prepalldocs
319
140 # Don't install libtool archives for server modules 320 # Don't install libtool archives for server modules
141 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 321 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
142 find ${D}/usr/lib/xorg/modules -name '*.la' \ 322 find ${D}/usr/lib/xorg/modules -name '*.la' \
143 | xargs rm -f 323 | xargs rm -f
144 fi 324 fi
325
326 # Don't install overlapping fonts.* files
327 # Generate them instead when possible
328 if [[ -n "${FONT}" ]]; then
329 remove_font_metadata
330 fi
145} 331}
146 332
147x-modular_pkg_preinst() { 333x-modular_pkg_preinst() {
148 if [[ -n "${FONT}" ]]; then 334 if [[ -n "${FONT}" ]]; then
149 discover_font_dirs 335 discover_font_dirs
… …
154 if [[ -n "${FONT}" ]]; then 340 if [[ -n "${FONT}" ]]; then
155 setup_fonts 341 setup_fonts
156 fi 342 fi
157} 343}
158 344
345x-modular_pkg_postrm() {
346 if [[ -n "${FONT}" ]]; then
347 cleanup_fonts
348 fi
349}
350
351cleanup_fonts() {
352 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
353 for DIR in ${FONT_DIR}; do
354 unset KEEP_FONTDIR
355 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
356
357 ebegin "Checking ${REAL_DIR} for useless files"
358 pushd ${REAL_DIR} &> /dev/null
359 for FILE in *; do
360 unset MATCH
361 for ALLOWED_FILE in ${ALLOWED_FILES}; do
362 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
363 # If it's allowed, then move on to the next file
364 MATCH="yes"
365 break
366 fi
367 done
368 # If we found a match in allowed files, move on to the next file
369 if [[ -n ${MATCH} ]]; then
370 continue
371 fi
372 # If we get this far, there wasn't a match in the allowed files
373 KEEP_FONTDIR="yes"
374 # We don't need to check more files if we're already keeping it
375 break
376 done
377 popd &> /dev/null
378 # If there are no files worth keeping, then get rid of the dir
379 if [[ -z "${KEEP_FONTDIR}" ]]; then
380 rm -rf ${REAL_DIR}
381 fi
382 eend 0
383 done
384}
385
159setup_fonts() { 386setup_fonts() {
160 if [[ ! -n "${FONT_DIRS}" ]]; then 387 if [[ ! -n "${FONT_DIRS}" ]]; then
161 msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts." 388 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
162 eerror ${msg} 389 eerror "${msg}"
163 die ${msg} 390 die "${msg}"
164 fi 391 fi
165 392
166 create_fonts_scale 393 create_fonts_scale
167 create_fonts_dir 394 create_fonts_dir
168 fix_font_permissions 395 fix_font_permissions
169 create_font_cache 396 create_font_cache
397}
398
399remove_font_metadata() {
400 local DIR
401 for DIR in ${FONT_DIR}; do
402 if [[ "${DIR}" != "Speedo" ]] && \
403 [[ "${DIR}" != "CID" ]] ; then
404 # Delete font metadata files
405 # fonts.scale, fonts.dir, fonts.cache-1
406 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
407 fi
408 done
170} 409}
171 410
172discover_font_dirs() { 411discover_font_dirs() {
173 pushd ${IMAGE}/usr/share/fonts 412 pushd ${IMAGE}/usr/share/fonts
174 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 413 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
… …
179create_fonts_scale() { 418create_fonts_scale() {
180 ebegin "Creating fonts.scale files" 419 ebegin "Creating fonts.scale files"
181 local x 420 local x
182 for FONT_DIR in ${FONT_DIRS}; do 421 for FONT_DIR in ${FONT_DIRS}; do
183 x=${ROOT}/usr/share/fonts/${FONT_DIR} 422 x=${ROOT}/usr/share/fonts/${FONT_DIR}
184 [ -z "$(ls ${x}/)" ] && continue 423 [[ -z "$(ls ${x}/)" ]] && continue
185 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 424 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
186 425
187 # Only generate .scale files if truetype, opentype or type1 426 # Only generate .scale files if truetype, opentype or type1
188 # fonts are present ... 427 # fonts are present ...
189 428
190 # First truetype (ttf,ttc) 429 # First truetype (ttf,ttc)
191 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 430 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
192 # Also, there is no way to regenerate Speedo/CID fonts.scale 431 # Also, there is no way to regenerate Speedo/CID fonts.scale
193 # <spyderous@gentoo.org> 2 August 2004 432 # <spyderous@gentoo.org> 2 August 2004
194 if [ "${x/encodings}" = "${x}" -a \ 433 if [[ "${x/encodings}" = "${x}" ]] \
195 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 434 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
196 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 435 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
197 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 436 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
198 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 437 ${ROOT}/usr/bin/ttmkfdir -x 2 \
199 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 438 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
200 -o ${x}/fonts.scale -d ${x} 439 -o ${x}/fonts.scale -d ${x}
201 # ttmkfdir fails on some stuff, so try mkfontscale if it does 440 # ttmkfdir fails on some stuff, so try mkfontscale if it does
202 local ttmkfdir_return=$? 441 local ttmkfdir_return=$?
203 else 442 else
204 # We didn't use ttmkfdir at all 443 # We didn't use ttmkfdir at all
205 local ttmkfdir_return=2 444 local ttmkfdir_return=2
206 fi 445 fi
207 if [ ${ttmkfdir_return} -ne 0 ]; then 446 if [[ ${ttmkfdir_return} -ne 0 ]]; then
208 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 447 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
209 ${ROOT}/usr/bin/mkfontscale \ 448 ${ROOT}/usr/bin/mkfontscale \
210 -a /usr/share/fonts/encodings/encodings.dir \ 449 -a /usr/share/fonts/encodings/encodings.dir \
211 -- ${x} 450 -- ${x}
212 fi 451 fi
213 # Next type1 and opentype (pfa,pfb,otf,otc) 452 # Next type1 and opentype (pfa,pfb,otf,otc)
214 elif [ "${x/encodings}" = "${x}" -a \ 453 elif [[ "${x/encodings}" = "${x}" ]] \
215 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 454 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
216 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 455 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
217 ${ROOT}/usr/bin/mkfontscale \ 456 ${ROOT}/usr/bin/mkfontscale \
218 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 457 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
219 -- ${x} 458 -- ${x}
220 fi 459 fi
… …
224 463
225create_fonts_dir() { 464create_fonts_dir() {
226 ebegin "Generating fonts.dir files" 465 ebegin "Generating fonts.dir files"
227 for FONT_DIR in ${FONT_DIRS}; do 466 for FONT_DIR in ${FONT_DIRS}; do
228 x=${ROOT}/usr/share/fonts/${FONT_DIR} 467 x=${ROOT}/usr/share/fonts/${FONT_DIR}
229 [ -z "$(ls ${x}/)" ] && continue 468 [[ -z "$(ls ${x}/)" ]] && continue
230 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 469 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
231 470
232 if [ "${x/encodings}" = "${x}" ]; then 471 if [[ "${x/encodings}" = "${x}" ]]; then
233 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 472 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
234 ${ROOT}/usr/bin/mkfontdir \ 473 ${ROOT}/usr/bin/mkfontdir \
235 -e ${ROOT}/usr/share/fonts/encodings \ 474 -e ${ROOT}/usr/share/fonts/encodings \
236 -e ${ROOT}/usr/share/fonts/encodings/large \ 475 -e ${ROOT}/usr/share/fonts/encodings/large \
237 -- ${x} 476 -- ${x}
… …
251 490
252create_font_cache() { 491create_font_cache() {
253 # danarmak found out that fc-cache should be run AFTER all the above 492 # danarmak found out that fc-cache should be run AFTER all the above
254 # stuff, as otherwise the cache is invalid, and has to be run again 493 # stuff, as otherwise the cache is invalid, and has to be run again
255 # as root anyway 494 # as root anyway
256 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 495 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
257 ebegin "Creating FC font cache" 496 ebegin "Creating FC font cache"
258 HOME="/root" ${ROOT}/usr/bin/fc-cache 497 HOME="/root" ${ROOT}/usr/bin/fc-cache
259 eend 0 498 eend 0
260 fi 499 fi
261} 500}
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.52
  ViewVC Help
Powered by ViewVC 1.1.13