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

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.53

  ViewVC Help
Powered by ViewVC 1.1.20