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

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.20