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

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.55

  ViewVC Help
Powered by ViewVC 1.1.20