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

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

  ViewVC Help
Powered by ViewVC 1.1.20