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

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.63

  ViewVC Help
Powered by ViewVC 1.1.20