/[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.18 Revision 1.60
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.18 2005/11/02 05:51:38 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.60 2006/05/23 17:50:30 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-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-0.99.0_p20051007" 164 >=x11-misc/util-macros-0.99.2"
165fi
57 166
58RDEPEND="${RDEPEND} 167RDEPEND="${RDEPEND}
59 !<x11-base/xorg-x11-7.0.0_rc0" 168 !<=x11-base/xorg-x11-6.9"
60# Provides virtual/x11 for temporary use until packages are ported 169# Provides virtual/x11 for temporary use until packages are ported
61# x11-base/x11-env" 170# x11-base/x11-env"
62 171
63x-modular_pkg_setup() { 172x-modular_specs_check() {
64 # Collision protect will scream bloody murder if we install over old versions 173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
65 if $(has_version "<x11-base/xorg-x11-7.0.0_rc0"); then 174 if gcc-specs-now; then
66 if has collision-protect ${FEATURES}; then 175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
67 eerror "Having collision-protect in FEATURES will disrupt upgrades" 176 eerror "$msg"
68 eerror "from non-modular versions of xorg-x11." 177 die "$msg"
69 eerror "Please remove collision-protect from FEATURES while upgrading." 178 fi
70 die "" 179
180 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now
182 fi
183}
184
185x-modular_dri_check() {
186 # (#120057) Enabling DRI in drivers requires that the server was built with
187 # support for it
188 if [[ -n "${DRIVER}" ]]; then
189 if has dri ${IUSE} && use dri; then
190 einfo "Checking for direct rendering capabilities ..."
191 if ! built_with_use x11-base/xorg-server dri; then
192 die "You must build x11-base/xorg-server with USE=dri."
193 fi
71 fi 194 fi
72 fi 195 fi
73} 196}
74 197
75x-modular_unpack_source() { 198x-modular_unpack_source() {
76 unpack ${A} 199 unpack ${A}
77 cd ${S} 200 cd ${S}
78 201
79 # Joshua Baergen - October 23, 2005 202 if [[ -n ${FONT_OPTIONS} ]]; then
80 # Fix shared lib issues on MIPS, FBSD, etc etc 203 einfo "Detected font directory: ${FONT_DIR}"
81 elibtoolize 204 fi
82} 205}
83 206
84x-modular_patch_source() { 207x-modular_patch_source() {
85 # Use standardized names and locations with bulk patching 208 # Use standardized names and locations with bulk patching
86 # Patch directory is ${WORKDIR}/patch 209 # Patch directory is ${WORKDIR}/patch
87 # See epatch() in eutils.eclass for more documentation 210 # See epatch() in eutils.eclass for more documentation
88 if [ -z "${EPATCH_SUFFIX}" ] ; then 211 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
89 EPATCH_SUFFIX="patch" 212 EPATCH_SUFFIX="patch"
90 fi 213 fi
91 214
215 # If this is a driver package we need to fix man page install location.
216 # Running autoreconf will use the patched util-macros to make the
217 # change for us, so we only need to patch if it is not going to run.
218 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
219 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220 fi
221
92 # For specific list of patches 222 # For specific list of patches
93 if [ -n "${PATCHES}" ] ; then 223 if [[ -n "${PATCHES}" ]] ; then
94 for PATCH in ${PATCHES} 224 for PATCH in ${PATCHES}
95 do 225 do
96 epatch ${PATCH} 226 epatch ${PATCH}
97 done 227 done
98 # For non-default directory bulk patching 228 # For non-default directory bulk patching
99 elif [ -n "${PATCH_LOC}" ] ; then 229 elif [[ -n "${PATCH_LOC}" ]] ; then
100 epatch ${PATCH_LOC} 230 epatch ${PATCH_LOC}
101 # For standard bulk patching 231 # For standard bulk patching
102 elif [ -d "${EPATCH_SOURCE}" ] ; then 232 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
103 epatch 233 epatch
104 fi 234 fi
105} 235}
106 236
107x-modular_reconf_source() { 237x-modular_reconf_source() {
108 # Run autoreconf for CVS snapshots only 238 # Run autoreconf for CVS snapshots only
109 if [ "${SNAPSHOT}" = "yes" ] 239 if [[ "${SNAPSHOT}" = "yes" ]]
110 then 240 then
111 # If possible, generate configure if it doesn't exist 241 # If possible, generate configure if it doesn't exist
112 if [ -f "${S}/configure.ac" ] 242 if [ -f "${S}/configure.ac" ]
113 then 243 then
114 einfo "Running autoreconf..." 244 eautoreconf
115 autoreconf -v --force --install
116 fi
117 fi 245 fi
246 fi
118 247
248 # Joshua Baergen - October 23, 2005
249 # Fix shared lib issues on MIPS, FBSD, etc etc
250 elibtoolize
119} 251}
120 252
121x-modular_src_unpack() { 253x-modular_src_unpack() {
254 x-modular_specs_check
255 x-modular_dri_check
122 x-modular_unpack_source 256 x-modular_unpack_source
123 x-modular_patch_source 257 x-modular_patch_source
124 x-modular_reconf_source 258 x-modular_reconf_source
125} 259}
126 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
127x-modular_src_configure() { 297x-modular_src_configure() {
298 x-modular_font_configure
299 x-modular_debug_setup
300
128 # If prefix isn't set here, .pc files cause problems 301 # If prefix isn't set here, .pc files cause problems
129 if [ -x ./configure ]; then 302 if [[ -x ./configure ]]; then
130 econf --prefix=${XDIR} \ 303 econf --prefix=${XDIR} \
131 --datadir=${XDIR}/share \ 304 --datadir=${XDIR}/share \
305 ${FONT_OPTIONS} \
132 ${DRIVER_OPTIONS} \ 306 ${DRIVER_OPTIONS} \
133 ${CONFIGURE_OPTIONS} 307 ${CONFIGURE_OPTIONS}
134 fi 308 fi
135} 309}
136 310
151# Shouldn't be necessary in XDIR=/usr 325# Shouldn't be necessary in XDIR=/usr
152# einstall forces datadir, so we need to re-force it 326# einstall forces datadir, so we need to re-force it
153# datadir=${XDIR}/share \ 327# datadir=${XDIR}/share \
154# mandir=${XDIR}/share/man \ 328# mandir=${XDIR}/share/man \
155 329
330 if [[ -e ${S}/ChangeLog ]]; then
331 dodoc ${S}/ChangeLog
332 fi
333
334 # Make sure docs get compressed
335 prepalldocs
336
156 # Don't install libtool archives for server modules 337 # Don't install libtool archives for server modules
157 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 338 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
158 find ${D}/usr/lib/xorg/modules -name '*.la' \ 339 find ${D}/usr/lib/xorg/modules -name '*.la' \
159 | xargs rm -f 340 | xargs rm -f
160 fi 341 fi
342
343 # Don't install overlapping fonts.* files
344 # Generate them instead when possible
345 if [[ -n "${FONT}" ]]; then
346 remove_font_metadata
347 fi
161} 348}
162 349
163x-modular_pkg_preinst() { 350x-modular_pkg_preinst() {
164 if [[ -n "${FONT}" ]]; then 351 if [[ -n "${FONT}" ]]; then
165 discover_font_dirs 352 discover_font_dirs
170 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
171 setup_fonts 358 setup_fonts
172 fi 359 fi
173} 360}
174 361
362x-modular_pkg_postrm() {
363 if [[ -n "${FONT}" ]]; then
364 cleanup_fonts
365 fi
366}
367
368cleanup_fonts() {
369 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
370 for DIR in ${FONT_DIR}; do
371 unset KEEP_FONTDIR
372 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
373
374 ebegin "Checking ${REAL_DIR} for useless files"
375 pushd ${REAL_DIR} &> /dev/null
376 for FILE in *; do
377 unset MATCH
378 for ALLOWED_FILE in ${ALLOWED_FILES}; do
379 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
380 # If it's allowed, then move on to the next file
381 MATCH="yes"
382 break
383 fi
384 done
385 # If we found a match in allowed files, move on to the next file
386 if [[ -n ${MATCH} ]]; then
387 continue
388 fi
389 # If we get this far, there wasn't a match in the allowed files
390 KEEP_FONTDIR="yes"
391 # We don't need to check more files if we're already keeping it
392 break
393 done
394 popd &> /dev/null
395 # If there are no files worth keeping, then get rid of the dir
396 if [[ -z "${KEEP_FONTDIR}" ]]; then
397 rm -rf ${REAL_DIR}
398 fi
399 eend 0
400 done
401}
402
175setup_fonts() { 403setup_fonts() {
176 if [[ ! -n "${FONT_DIRS}" ]]; then 404 if [[ ! -n "${FONT_DIRS}" ]]; then
177 msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts." 405 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
178 eerror ${msg} 406 eerror "${msg}"
179 die ${msg} 407 die "${msg}"
180 fi 408 fi
181 409
182 create_fonts_scale 410 create_fonts_scale
183 create_fonts_dir 411 create_fonts_dir
184 fix_font_permissions 412 fix_font_permissions
185 create_font_cache 413 create_font_cache
414}
415
416remove_font_metadata() {
417 local DIR
418 for DIR in ${FONT_DIR}; do
419 if [[ "${DIR}" != "Speedo" ]] && \
420 [[ "${DIR}" != "CID" ]] ; then
421 # Delete font metadata files
422 # fonts.scale, fonts.dir, fonts.cache-1
423 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
424 fi
425 done
186} 426}
187 427
188discover_font_dirs() { 428discover_font_dirs() {
189 pushd ${IMAGE}/usr/share/fonts 429 pushd ${IMAGE}/usr/share/fonts
190 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 430 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
195create_fonts_scale() { 435create_fonts_scale() {
196 ebegin "Creating fonts.scale files" 436 ebegin "Creating fonts.scale files"
197 local x 437 local x
198 for FONT_DIR in ${FONT_DIRS}; do 438 for FONT_DIR in ${FONT_DIRS}; do
199 x=${ROOT}/usr/share/fonts/${FONT_DIR} 439 x=${ROOT}/usr/share/fonts/${FONT_DIR}
200 [ -z "$(ls ${x}/)" ] && continue 440 [[ -z "$(ls ${x}/)" ]] && continue
201 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 441 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
202 442
203 # Only generate .scale files if truetype, opentype or type1 443 # Only generate .scale files if truetype, opentype or type1
204 # fonts are present ... 444 # fonts are present ...
205 445
206 # First truetype (ttf,ttc) 446 # First truetype (ttf,ttc)
207 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 447 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
208 # Also, there is no way to regenerate Speedo/CID fonts.scale 448 # Also, there is no way to regenerate Speedo/CID fonts.scale
209 # <spyderous@gentoo.org> 2 August 2004 449 # <spyderous@gentoo.org> 2 August 2004
210 if [ "${x/encodings}" = "${x}" -a \ 450 if [[ "${x/encodings}" = "${x}" ]] \
211 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 451 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
212 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 452 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
213 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 453 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
214 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 454 ${ROOT}/usr/bin/ttmkfdir -x 2 \
215 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 455 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
216 -o ${x}/fonts.scale -d ${x} 456 -o ${x}/fonts.scale -d ${x}
217 # ttmkfdir fails on some stuff, so try mkfontscale if it does 457 # ttmkfdir fails on some stuff, so try mkfontscale if it does
218 local ttmkfdir_return=$? 458 local ttmkfdir_return=$?
219 else 459 else
220 # We didn't use ttmkfdir at all 460 # We didn't use ttmkfdir at all
221 local ttmkfdir_return=2 461 local ttmkfdir_return=2
222 fi 462 fi
223 if [ ${ttmkfdir_return} -ne 0 ]; then 463 if [[ ${ttmkfdir_return} -ne 0 ]]; then
224 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 464 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
225 ${ROOT}/usr/bin/mkfontscale \ 465 ${ROOT}/usr/bin/mkfontscale \
226 -a /usr/share/fonts/encodings/encodings.dir \ 466 -a /usr/share/fonts/encodings/encodings.dir \
227 -- ${x} 467 -- ${x}
228 fi 468 fi
229 # Next type1 and opentype (pfa,pfb,otf,otc) 469 # Next type1 and opentype (pfa,pfb,otf,otc)
230 elif [ "${x/encodings}" = "${x}" -a \ 470 elif [[ "${x/encodings}" = "${x}" ]] \
231 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 471 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
232 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 472 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
233 ${ROOT}/usr/bin/mkfontscale \ 473 ${ROOT}/usr/bin/mkfontscale \
234 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 474 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
235 -- ${x} 475 -- ${x}
236 fi 476 fi
240 480
241create_fonts_dir() { 481create_fonts_dir() {
242 ebegin "Generating fonts.dir files" 482 ebegin "Generating fonts.dir files"
243 for FONT_DIR in ${FONT_DIRS}; do 483 for FONT_DIR in ${FONT_DIRS}; do
244 x=${ROOT}/usr/share/fonts/${FONT_DIR} 484 x=${ROOT}/usr/share/fonts/${FONT_DIR}
245 [ -z "$(ls ${x}/)" ] && continue 485 [[ -z "$(ls ${x}/)" ]] && continue
246 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 486 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
247 487
248 if [ "${x/encodings}" = "${x}" ]; then 488 if [[ "${x/encodings}" = "${x}" ]]; then
249 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
250 ${ROOT}/usr/bin/mkfontdir \ 490 ${ROOT}/usr/bin/mkfontdir \
251 -e ${ROOT}/usr/share/fonts/encodings \ 491 -e ${ROOT}/usr/share/fonts/encodings \
252 -e ${ROOT}/usr/share/fonts/encodings/large \ 492 -e ${ROOT}/usr/share/fonts/encodings/large \
253 -- ${x} 493 -- ${x}
267 507
268create_font_cache() { 508create_font_cache() {
269 # danarmak found out that fc-cache should be run AFTER all the above 509 # danarmak found out that fc-cache should be run AFTER all the above
270 # stuff, as otherwise the cache is invalid, and has to be run again 510 # stuff, as otherwise the cache is invalid, and has to be run again
271 # as root anyway 511 # as root anyway
272 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 512 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
273 ebegin "Creating FC font cache" 513 ebegin "Creating FC font cache"
274 HOME="/root" ${ROOT}/usr/bin/fc-cache 514 HOME="/root" ${ROOT}/usr/bin/fc-cache
275 eend 0 515 eend 0
276 fi 516 fi
277} 517}

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.60

  ViewVC Help
Powered by ViewVC 1.1.20