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

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.64

  ViewVC Help
Powered by ViewVC 1.1.20