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

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

  ViewVC Help
Powered by ViewVC 1.1.20