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