/[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.20 Revision 1.76
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.20 2005/11/11 05:29:41 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.76 2006/10/11 02:31:47 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 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-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 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
53fi 159fi
54 160
55DEPEND="${DEPEND} 161DEPEND="${DEPEND}
56 >=dev-util/pkgconfig-0.18 162 >=dev-util/pkgconfig-0.18"
163
164if [[ "${PN/util-macros}" = "${PN}" ]]; then
165 DEPEND="${DEPEND}
57 >=x11-misc/util-macros-0.99.0_p20051007" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
168fi
58 169
59RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
60 !<x11-base/xorg-x11-7.0.0_rc0" 172 !<=x11-base/xorg-x11-6.9"
61# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
62# 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}
63 209
64x-modular_unpack_source() { 210x-modular_unpack_source() {
65 unpack ${A} 211 unpack ${A}
66 cd ${S} 212 cd ${S}
67 213
68 # Joshua Baergen - October 23, 2005 214 if [[ -n ${FONT_OPTIONS} ]]; then
69 # Fix shared lib issues on MIPS, FBSD, etc etc 215 einfo "Detected font directory: ${FONT_DIR}"
70 elibtoolize 216 fi
71} 217}
72 218
73x-modular_patch_source() { 219x-modular_patch_source() {
74 # Use standardized names and locations with bulk patching 220 # Use standardized names and locations with bulk patching
75 # Patch directory is ${WORKDIR}/patch 221 # Patch directory is ${WORKDIR}/patch
76 # See epatch() in eutils.eclass for more documentation 222 # See epatch() in eutils.eclass for more documentation
77 if [ -z "${EPATCH_SUFFIX}" ] ; then 223 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
78 EPATCH_SUFFIX="patch" 224 EPATCH_SUFFIX="patch"
79 fi 225 fi
80 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
81 # For specific list of patches 235 # For specific list of patches
82 if [ -n "${PATCHES}" ] ; then 236 if [[ -n "${PATCHES}" ]] ; then
83 for PATCH in ${PATCHES} 237 for PATCH in ${PATCHES}
84 do 238 do
85 epatch ${PATCH} 239 epatch ${PATCH}
86 done 240 done
87 # For non-default directory bulk patching 241 # For non-default directory bulk patching
88 elif [ -n "${PATCH_LOC}" ] ; then 242 elif [[ -n "${PATCH_LOC}" ]] ; then
89 epatch ${PATCH_LOC} 243 epatch ${PATCH_LOC}
90 # For standard bulk patching 244 # For standard bulk patching
91 elif [ -d "${EPATCH_SOURCE}" ] ; then 245 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
92 epatch 246 epatch
93 fi 247 fi
94} 248}
95 249
96x-modular_reconf_source() { 250x-modular_reconf_source() {
97 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
98 if [ "${SNAPSHOT}" = "yes" ] 252 if [[ "${SNAPSHOT}" = "yes" ]]
99 then 253 then
100 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
101 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
102 then 256 then
103 einfo "Running autoreconf..." 257 eautoreconf
104 autoreconf -v --force --install
105 fi
106 fi 258 fi
259 fi
107 260
261 # Joshua Baergen - October 23, 2005
262 # Fix shared lib issues on MIPS, FBSD, etc etc
263 elibtoolize
108} 264}
109 265
110x-modular_src_unpack() { 266x-modular_src_unpack() {
267 x-modular_specs_check
268 x-modular_server_supports_drivers_check
269 x-modular_dri_check
111 x-modular_unpack_source 270 x-modular_unpack_source
112 x-modular_patch_source 271 x-modular_patch_source
113 x-modular_reconf_source 272 x-modular_reconf_source
114} 273}
115 274
275x-modular_font_configure() {
276 if [[ -n "${FONT}" ]]; then
277 # Might be worth adding an option to configure your desired font
278 # and exclude all others. Also, should this USE be nls or minimal?
279 if ! use nls; then
280 FONT_OPTIONS="${FONT_OPTIONS}
281 --disable-iso8859-2
282 --disable-iso8859-3
283 --disable-iso8859-4
284 --disable-iso8859-5
285 --disable-iso8859-6
286 --disable-iso8859-7
287 --disable-iso8859-8
288 --disable-iso8859-9
289 --disable-iso8859-10
290 --disable-iso8859-11
291 --disable-iso8859-12
292 --disable-iso8859-13
293 --disable-iso8859-14
294 --disable-iso8859-15
295 --disable-iso8859-16
296 --disable-jisx0201
297 --disable-koi8-r"
298 fi
299 fi
300}
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
116x-modular_src_configure() { 311x-modular_src_configure() {
312 x-modular_font_configure
313 x-modular_debug_setup
314
117 # If prefix isn't set here, .pc files cause problems 315 # If prefix isn't set here, .pc files cause problems
118 if [ -x ./configure ]; then 316 if [[ -x ./configure ]]; then
119 econf --prefix=${XDIR} \ 317 econf --prefix=${XDIR} \
120 --datadir=${XDIR}/share \ 318 --datadir=${XDIR}/share \
319 ${FONT_OPTIONS} \
121 ${DRIVER_OPTIONS} \ 320 ${DRIVER_OPTIONS} \
122 ${CONFIGURE_OPTIONS} 321 ${CONFIGURE_OPTIONS}
123 fi 322 fi
124} 323}
125 324
140# Shouldn't be necessary in XDIR=/usr 339# Shouldn't be necessary in XDIR=/usr
141# einstall forces datadir, so we need to re-force it 340# einstall forces datadir, so we need to re-force it
142# datadir=${XDIR}/share \ 341# datadir=${XDIR}/share \
143# mandir=${XDIR}/share/man \ 342# mandir=${XDIR}/share/man \
144 343
344 if [[ -e ${S}/ChangeLog ]]; then
345 dodoc ${S}/ChangeLog
346 fi
347
348 # Make sure docs get compressed
349 prepalldocs
350
145 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
146 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
147 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
148 | 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
361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
149 fi 365 fi
150} 366}
151 367
152x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
153 if [[ -n "${FONT}" ]]; then 369 if [[ -n "${FONT}" ]]; then
159 if [[ -n "${FONT}" ]]; then 375 if [[ -n "${FONT}" ]]; then
160 setup_fonts 376 setup_fonts
161 fi 377 fi
162} 378}
163 379
380x-modular_pkg_postrm() {
381 if [[ -n "${FONT}" ]]; then
382 cleanup_fonts
383 fi
384}
385
386cleanup_fonts() {
387 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
388 for DIR in ${FONT_DIR}; do
389 unset KEEP_FONTDIR
390 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
391
392 ebegin "Checking ${REAL_DIR} for useless files"
393 pushd ${REAL_DIR} &> /dev/null
394 for FILE in *; do
395 unset MATCH
396 for ALLOWED_FILE in ${ALLOWED_FILES}; do
397 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
398 # If it's allowed, then move on to the next file
399 MATCH="yes"
400 break
401 fi
402 done
403 # If we found a match in allowed files, move on to the next file
404 if [[ -n ${MATCH} ]]; then
405 continue
406 fi
407 # If we get this far, there wasn't a match in the allowed files
408 KEEP_FONTDIR="yes"
409 # We don't need to check more files if we're already keeping it
410 break
411 done
412 popd &> /dev/null
413 # If there are no files worth keeping, then get rid of the dir
414 if [[ -z "${KEEP_FONTDIR}" ]]; then
415 rm -rf ${REAL_DIR}
416 fi
417 eend 0
418 done
419}
420
164setup_fonts() { 421setup_fonts() {
165 if [[ ! -n "${FONT_DIRS}" ]]; then 422 if [[ ! -n "${FONT_DIRS}" ]]; then
166 msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts." 423 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
167 eerror ${msg} 424 eerror "${msg}"
168 die ${msg} 425 die "${msg}"
169 fi 426 fi
170 427
171 create_fonts_scale 428 create_fonts_scale
172 create_fonts_dir 429 create_fonts_dir
173 fix_font_permissions 430 fix_font_permissions
174 create_font_cache 431 create_font_cache
432}
433
434remove_font_metadata() {
435 local DIR
436 for DIR in ${FONT_DIR}; do
437 if [[ "${DIR}" != "Speedo" ]] && \
438 [[ "${DIR}" != "CID" ]] ; then
439 # Delete font metadata files
440 # fonts.scale, fonts.dir, fonts.cache-1
441 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
442 fi
443 done
444}
445
446# Installs device-to-driver mappings for system-config-display
447# and anything else that uses hwdata
448install_driver_hwdata() {
449 insinto /usr/share/hwdata/videoaliases
450 for i in "${FILESDIR}"/*.xinf; do
451 # We need this for the case when none exist,
452 # so *.xinf doesn't expand
453 if [[ -e $i ]]; then
454 doins $i
455 fi
456 done
175} 457}
176 458
177discover_font_dirs() { 459discover_font_dirs() {
178 pushd ${IMAGE}/usr/share/fonts 460 pushd ${IMAGE}/usr/share/fonts
179 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 461 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
184create_fonts_scale() { 466create_fonts_scale() {
185 ebegin "Creating fonts.scale files" 467 ebegin "Creating fonts.scale files"
186 local x 468 local x
187 for FONT_DIR in ${FONT_DIRS}; do 469 for FONT_DIR in ${FONT_DIRS}; do
188 x=${ROOT}/usr/share/fonts/${FONT_DIR} 470 x=${ROOT}/usr/share/fonts/${FONT_DIR}
189 [ -z "$(ls ${x}/)" ] && continue 471 [[ -z "$(ls ${x}/)" ]] && continue
190 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 472 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
191 473
192 # Only generate .scale files if truetype, opentype or type1 474 # Only generate .scale files if truetype, opentype or type1
193 # fonts are present ... 475 # fonts are present ...
194 476
195 # First truetype (ttf,ttc) 477 # First truetype (ttf,ttc)
196 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 478 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
197 # Also, there is no way to regenerate Speedo/CID fonts.scale 479 # Also, there is no way to regenerate Speedo/CID fonts.scale
198 # <spyderous@gentoo.org> 2 August 2004 480 # <spyderous@gentoo.org> 2 August 2004
199 if [ "${x/encodings}" = "${x}" -a \ 481 if [[ "${x/encodings}" = "${x}" ]] \
200 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 482 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
201 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 483 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
202 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
203 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 485 ${ROOT}/usr/bin/ttmkfdir -x 2 \
204 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 486 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
205 -o ${x}/fonts.scale -d ${x} 487 -o ${x}/fonts.scale -d ${x}
206 # ttmkfdir fails on some stuff, so try mkfontscale if it does 488 # ttmkfdir fails on some stuff, so try mkfontscale if it does
207 local ttmkfdir_return=$? 489 local ttmkfdir_return=$?
208 else 490 else
209 # We didn't use ttmkfdir at all 491 # We didn't use ttmkfdir at all
210 local ttmkfdir_return=2 492 local ttmkfdir_return=2
211 fi 493 fi
212 if [ ${ttmkfdir_return} -ne 0 ]; then 494 if [[ ${ttmkfdir_return} -ne 0 ]]; then
213 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 495 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
214 ${ROOT}/usr/bin/mkfontscale \ 496 ${ROOT}/usr/bin/mkfontscale \
215 -a /usr/share/fonts/encodings/encodings.dir \ 497 -a /usr/share/fonts/encodings/encodings.dir \
216 -- ${x} 498 -- ${x}
217 fi 499 fi
218 # Next type1 and opentype (pfa,pfb,otf,otc) 500 # Next type1 and opentype (pfa,pfb,otf,otc)
219 elif [ "${x/encodings}" = "${x}" -a \ 501 elif [[ "${x/encodings}" = "${x}" ]] \
220 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 502 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
221 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
222 ${ROOT}/usr/bin/mkfontscale \ 504 ${ROOT}/usr/bin/mkfontscale \
223 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 505 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
224 -- ${x} 506 -- ${x}
225 fi 507 fi
229 511
230create_fonts_dir() { 512create_fonts_dir() {
231 ebegin "Generating fonts.dir files" 513 ebegin "Generating fonts.dir files"
232 for FONT_DIR in ${FONT_DIRS}; do 514 for FONT_DIR in ${FONT_DIRS}; do
233 x=${ROOT}/usr/share/fonts/${FONT_DIR} 515 x=${ROOT}/usr/share/fonts/${FONT_DIR}
234 [ -z "$(ls ${x}/)" ] && continue 516 [[ -z "$(ls ${x}/)" ]] && continue
235 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 517 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
236 518
237 if [ "${x/encodings}" = "${x}" ]; then 519 if [[ "${x/encodings}" = "${x}" ]]; then
238 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 520 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
239 ${ROOT}/usr/bin/mkfontdir \ 521 ${ROOT}/usr/bin/mkfontdir \
240 -e ${ROOT}/usr/share/fonts/encodings \ 522 -e ${ROOT}/usr/share/fonts/encodings \
241 -e ${ROOT}/usr/share/fonts/encodings/large \ 523 -e ${ROOT}/usr/share/fonts/encodings/large \
242 -- ${x} 524 -- ${x}
256 538
257create_font_cache() { 539create_font_cache() {
258 # danarmak found out that fc-cache should be run AFTER all the above 540 # danarmak found out that fc-cache should be run AFTER all the above
259 # stuff, as otherwise the cache is invalid, and has to be run again 541 # stuff, as otherwise the cache is invalid, and has to be run again
260 # as root anyway 542 # as root anyway
261 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 543 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
262 ebegin "Creating FC font cache" 544 ebegin "Creating FC font cache"
263 HOME="/root" ${ROOT}/usr/bin/fc-cache 545 HOME="/root" ${ROOT}/usr/bin/fc-cache
264 eend 0 546 eend 0
265 fi 547 fi
266} 548}

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.76

  ViewVC Help
Powered by ViewVC 1.1.20