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

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.56

  ViewVC Help
Powered by ViewVC 1.1.20