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