/[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.25 Revision 1.70
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.25 2005/12/07 11:19:47 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.70 2006/07/01 20:41:12 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 pkg_postrm 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
14 29
15inherit eutils libtool 30inherit eutils libtool multilib 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/"
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"
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
26LICENSE="X11" 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
27SLOT="0" 74SLOT="0"
28 75
76# Set the license for the package. This can be overridden by setting
77# LICENSE after the inherit.
78LICENSE=${PN}
79
29# Set up shared dependencies 80# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 81if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 82# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 83 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 84 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 85 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 86 >=sys-devel/libtool-1.5
36 >=sys-devel/m4-1.4" 87 >=sys-devel/m4-1.4"
37fi 88fi
38 89
39# If we're a font package, but not the font.alias one 90# If we're a font package, but not the font.alias one
40if [[ "${PN/#font-}" != "${PN}" ]] \ 91if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \
41 && [[ "${PN}" != "font-alias" ]] \ 93 && [[ "${PN}" != "font-alias" ]] \
42 && [[ "${PN}" != "font-util" ]]; then 94 && [[ "${PN}" != "font-util" ]]; then
43 # Activate font code in the rest of the eclass 95 # Activate font code in the rest of the eclass
44 FONT="yes" 96 FONT="yes"
45 97
46 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 99 media-fonts/encodings
100 x11-apps/mkfontscale
101 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 102 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 103 media-fonts/font-alias"
50 104
51 # Starting with 7.0RC3, we can specify the font directory 105 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 106 # But oddly, we can't do the same for encodings or font-alias
73 fi 127 fi
74fi 128fi
75 129
76# If we're a driver package 130# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 132 # Enable driver code in the rest of the eclass
79 DRIVER_OPTIONS="--disable-static" 133 DRIVER="yes"
134
135 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
138fi
139
140# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \
143 || [[ "${PN/x11-proto}" != "${PN}" ]] \
144 || [[ "${PN/util-macros}" != "${PN}" ]] \
145 || [[ "${PN/xbitmaps}" != "${PN}" ]] \
146 || [[ "${PN/xkbdata}" != "${PN}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \
149 ; then
150 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
80fi 157fi
81 158
82DEPEND="${DEPEND} 159DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 160 >=dev-util/pkgconfig-0.18"
161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 !alpha? ( >=sys-devel/binutils-2.16.1-r3 )"
166fi
85 167
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 169 !<=x11-base/xorg-x11-6.9"
89 >=sys-apps/man-1.6b-r2"
90# Provides virtual/x11 for temporary use until packages are ported 170# Provides virtual/x11 for temporary use until packages are ported
91# x11-base/x11-env" 171# x11-base/x11-env"
172
173x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading
177 filter-ldflags -Wl,-z,now
178 fi
179}
180
181x-modular_dri_check() {
182 # (#120057) Enabling DRI in drivers requires that the server was built with
183 # support for it
184 if [[ -n "${DRIVER}" ]]; then
185 if has dri ${IUSE} && use dri; then
186 einfo "Checking for direct rendering capabilities ..."
187 if ! built_with_use x11-base/xorg-server dri; then
188 die "You must build x11-base/xorg-server with USE=dri."
189 fi
190 fi
191 fi
192}
193
194x-modular_server_supports_drivers_check() {
195 # (#135873) Only certain servers will actually use or be capable of
196 # building external drivers, including binary drivers.
197 if [[ -n "${DRIVER}" ]]; then
198 if has_version '>=x11-base/xorg-server-1.1'; then
199 if ! built_with_use x11-base/xorg-server xorg; then
200 eerror "x11-base/xorg-server is not built with support for external drivers."
201 die "You must build x11-base/xorg-server with USE=xorg."
202 fi
203 fi
204 fi
205}
92 206
93x-modular_unpack_source() { 207x-modular_unpack_source() {
94 unpack ${A} 208 unpack ${A}
95 cd ${S} 209 cd ${S}
96
97 # Joshua Baergen - October 23, 2005
98 # Fix shared lib issues on MIPS, FBSD, etc etc
99 elibtoolize
100 210
101 if [[ -n ${FONT_OPTIONS} ]]; then 211 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 212 einfo "Detected font directory: ${FONT_DIR}"
103 fi 213 fi
104} 214}
105 215
106x-modular_patch_source() { 216x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 217 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 218 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 219 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 220 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 221 EPATCH_SUFFIX="patch"
112 fi 222 fi
113 223
224 # If this is a driver package we need to fix man page install location.
225 # Running autoreconf will use the patched util-macros to make the
226 # change for us, so we only need to patch if it is not going to run.
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
229 fi
230
114 # For specific list of patches 231 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 232 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 233 for PATCH in ${PATCHES}
117 do 234 do
118 epatch ${PATCH} 235 epatch ${PATCH}
119 done 236 done
120 # For non-default directory bulk patching 237 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 238 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 239 epatch ${PATCH_LOC}
123 # For standard bulk patching 240 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 241 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 242 epatch
126 fi 243 fi
127} 244}
128 245
129x-modular_reconf_source() { 246x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 247 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 248 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 249 then
133 # If possible, generate configure if it doesn't exist 250 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 251 if [ -f "${S}/configure.ac" ]
135 then 252 then
136 einfo "Running autoreconf..." 253 eautoreconf
137 autoreconf -v --force --install
138 fi
139 fi 254 fi
255 fi
140 256
257 # Joshua Baergen - October 23, 2005
258 # Fix shared lib issues on MIPS, FBSD, etc etc
259 elibtoolize
141} 260}
142 261
143x-modular_src_unpack() { 262x-modular_src_unpack() {
263 x-modular_specs_check
264 x-modular_server_supports_drivers_check
265 x-modular_dri_check
144 x-modular_unpack_source 266 x-modular_unpack_source
145 x-modular_patch_source 267 x-modular_patch_source
146 x-modular_reconf_source 268 x-modular_reconf_source
147} 269}
148 270
171 --disable-koi8-r" 293 --disable-koi8-r"
172 fi 294 fi
173 fi 295 fi
174} 296}
175 297
298x-modular_debug_setup() {
299 if [[ -n "${DEBUGGABLE}" ]]; then
300 if use debug; then
301 strip-flags
302 append-flags -g
303 fi
304 fi
305}
306
176x-modular_src_configure() { 307x-modular_src_configure() {
177 x-modular_font_configure 308 x-modular_font_configure
309 x-modular_debug_setup
178 310
179 # If prefix isn't set here, .pc files cause problems 311 # If prefix isn't set here, .pc files cause problems
180 if [ -x ./configure ]; then 312 if [[ -x ./configure ]]; then
181 econf --prefix=${XDIR} \ 313 econf --prefix=${XDIR} \
182 --datadir=${XDIR}/share \ 314 --datadir=${XDIR}/share \
183 ${FONT_OPTIONS} \ 315 ${FONT_OPTIONS} \
184 ${DRIVER_OPTIONS} \ 316 ${DRIVER_OPTIONS} \
185 ${CONFIGURE_OPTIONS} 317 ${CONFIGURE_OPTIONS}
203# Shouldn't be necessary in XDIR=/usr 335# Shouldn't be necessary in XDIR=/usr
204# einstall forces datadir, so we need to re-force it 336# einstall forces datadir, so we need to re-force it
205# datadir=${XDIR}/share \ 337# datadir=${XDIR}/share \
206# mandir=${XDIR}/share/man \ 338# mandir=${XDIR}/share/man \
207 339
340 if [[ -e ${S}/ChangeLog ]]; then
341 dodoc ${S}/ChangeLog
342 fi
343
344 # Make sure docs get compressed
345 prepalldocs
346
208 # Don't install libtool archives for server modules 347 # Don't install libtool archives for server modules
209 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 348 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
210 find ${D}/usr/lib/xorg/modules -name '*.la' \ 349 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
211 | xargs rm -f 350 | xargs rm -f
351 fi
352
353 # Don't install overlapping fonts.* files
354 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata
212 fi 357 fi
213} 358}
214 359
215x-modular_pkg_preinst() { 360x-modular_pkg_preinst() {
216 if [[ -n "${FONT}" ]]; then 361 if [[ -n "${FONT}" ]]; then
276 create_fonts_dir 421 create_fonts_dir
277 fix_font_permissions 422 fix_font_permissions
278 create_font_cache 423 create_font_cache
279} 424}
280 425
426remove_font_metadata() {
427 local DIR
428 for DIR in ${FONT_DIR}; do
429 if [[ "${DIR}" != "Speedo" ]] && \
430 [[ "${DIR}" != "CID" ]] ; then
431 # Delete font metadata files
432 # fonts.scale, fonts.dir, fonts.cache-1
433 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
434 fi
435 done
436}
437
281discover_font_dirs() { 438discover_font_dirs() {
282 pushd ${IMAGE}/usr/share/fonts 439 pushd ${IMAGE}/usr/share/fonts
283 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 440 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
284 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')" 441 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
285 popd 442 popd
288create_fonts_scale() { 445create_fonts_scale() {
289 ebegin "Creating fonts.scale files" 446 ebegin "Creating fonts.scale files"
290 local x 447 local x
291 for FONT_DIR in ${FONT_DIRS}; do 448 for FONT_DIR in ${FONT_DIRS}; do
292 x=${ROOT}/usr/share/fonts/${FONT_DIR} 449 x=${ROOT}/usr/share/fonts/${FONT_DIR}
293 [ -z "$(ls ${x}/)" ] && continue 450 [[ -z "$(ls ${x}/)" ]] && continue
294 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
295 452
296 # Only generate .scale files if truetype, opentype or type1 453 # Only generate .scale files if truetype, opentype or type1
297 # fonts are present ... 454 # fonts are present ...
298 455
299 # First truetype (ttf,ttc) 456 # First truetype (ttf,ttc)
300 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 457 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
301 # Also, there is no way to regenerate Speedo/CID fonts.scale 458 # Also, there is no way to regenerate Speedo/CID fonts.scale
302 # <spyderous@gentoo.org> 2 August 2004 459 # <spyderous@gentoo.org> 2 August 2004
303 if [ "${x/encodings}" = "${x}" -a \ 460 if [[ "${x/encodings}" = "${x}" ]] \
304 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 461 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
305 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 462 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
306 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 463 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
307 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 464 ${ROOT}/usr/bin/ttmkfdir -x 2 \
308 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 465 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
309 -o ${x}/fonts.scale -d ${x} 466 -o ${x}/fonts.scale -d ${x}
310 # ttmkfdir fails on some stuff, so try mkfontscale if it does 467 # ttmkfdir fails on some stuff, so try mkfontscale if it does
311 local ttmkfdir_return=$? 468 local ttmkfdir_return=$?
312 else 469 else
313 # We didn't use ttmkfdir at all 470 # We didn't use ttmkfdir at all
314 local ttmkfdir_return=2 471 local ttmkfdir_return=2
315 fi 472 fi
316 if [ ${ttmkfdir_return} -ne 0 ]; then 473 if [[ ${ttmkfdir_return} -ne 0 ]]; then
317 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 474 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
318 ${ROOT}/usr/bin/mkfontscale \ 475 ${ROOT}/usr/bin/mkfontscale \
319 -a /usr/share/fonts/encodings/encodings.dir \ 476 -a /usr/share/fonts/encodings/encodings.dir \
320 -- ${x} 477 -- ${x}
321 fi 478 fi
322 # Next type1 and opentype (pfa,pfb,otf,otc) 479 # Next type1 and opentype (pfa,pfb,otf,otc)
323 elif [ "${x/encodings}" = "${x}" -a \ 480 elif [[ "${x/encodings}" = "${x}" ]] \
324 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 481 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 482 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 483 ${ROOT}/usr/bin/mkfontscale \
327 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 484 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 485 -- ${x}
329 fi 486 fi
333 490
334create_fonts_dir() { 491create_fonts_dir() {
335 ebegin "Generating fonts.dir files" 492 ebegin "Generating fonts.dir files"
336 for FONT_DIR in ${FONT_DIRS}; do 493 for FONT_DIR in ${FONT_DIRS}; do
337 x=${ROOT}/usr/share/fonts/${FONT_DIR} 494 x=${ROOT}/usr/share/fonts/${FONT_DIR}
338 [ -z "$(ls ${x}/)" ] && continue 495 [[ -z "$(ls ${x}/)" ]] && continue
339 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
340 497
341 if [ "${x/encodings}" = "${x}" ]; then 498 if [[ "${x/encodings}" = "${x}" ]]; then
342 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
343 ${ROOT}/usr/bin/mkfontdir \ 500 ${ROOT}/usr/bin/mkfontdir \
344 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
345 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
346 -- ${x} 503 -- ${x}
360 517
361create_font_cache() { 518create_font_cache() {
362 # danarmak found out that fc-cache should be run AFTER all the above 519 # danarmak found out that fc-cache should be run AFTER all the above
363 # stuff, as otherwise the cache is invalid, and has to be run again 520 # stuff, as otherwise the cache is invalid, and has to be run again
364 # as root anyway 521 # as root anyway
365 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 522 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
366 ebegin "Creating FC font cache" 523 ebegin "Creating FC font cache"
367 HOME="/root" ${ROOT}/usr/bin/fc-cache 524 HOME="/root" ${ROOT}/usr/bin/fc-cache
368 eend 0 525 eend 0
369 fi 526 fi
370} 527}

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.70

  ViewVC Help
Powered by ViewVC 1.1.20