/[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.8 Revision 1.59
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.8 2005/09/03 20:59:54 cardoe Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.59 2006/05/16 06:23:43 exg 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/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
45fi 128fi
46 129
47# If we're a driver package 130# If we're a driver package
48if [[ "${PN/#xf86-video}" != "${PN}" ]] | [[ "${PN}" != "xf86-input" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
49 # Don't build static driver modules 132 # Enable driver code in the rest of the eclass
50 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
51fi 157fi
52 158
53DEPEND="${DEPEND} 159DEPEND="${DEPEND}
54 dev-util/pkgconfig 160 >=dev-util/pkgconfig-0.18"
161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND}
55 x11-misc/util-macros" 164 >=x11-misc/util-macros-0.99.2"
165fi
56 166
57RDEPEND="${RDEPEND}" 167RDEPEND="${RDEPEND}
58# Shouldn't be necessary once we're in a standard location 168 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported
59# x11-base/x11-env" 170# x11-base/x11-env"
60# FIXME: Uncomment once it's in portage 171
61# !x11-base/xorg-x11" 172x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then
175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
176 eerror "$msg"
177 die "$msg"
178 fi
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
194 fi
195 fi
196}
62 197
63x-modular_unpack_source() { 198x-modular_unpack_source() {
64 unpack ${A} 199 unpack ${A}
65 cd ${S} 200 cd ${S}
201
202 if [[ -n ${FONT_OPTIONS} ]]; then
203 einfo "Detected font directory: ${FONT_DIR}"
204 fi
66} 205}
67 206
68x-modular_patch_source() { 207x-modular_patch_source() {
69 # Use standardized names and locations with bulk patching 208 # Use standardized names and locations with bulk patching
70 # Patch directory is ${WORKDIR}/patch 209 # Patch directory is ${WORKDIR}/patch
71 # See epatch() in eutils.eclass for more documentation 210 # See epatch() in eutils.eclass for more documentation
72 if [ -z "${EPATCH_SUFFIX}" ] ; then 211 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
73 EPATCH_SUFFIX="patch" 212 EPATCH_SUFFIX="patch"
74 fi 213 fi
75 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
76 # For specific list of patches 222 # For specific list of patches
77 if [ -n "${PATCHES}" ] ; then 223 if [[ -n "${PATCHES}" ]] ; then
78 for PATCH in ${PATCHES} 224 for PATCH in ${PATCHES}
79 do 225 do
80 epatch ${PATCH} 226 epatch ${PATCH}
81 done 227 done
82 # For non-default directory bulk patching 228 # For non-default directory bulk patching
83 elif [ -n "${PATCH_LOC}" ] ; then 229 elif [[ -n "${PATCH_LOC}" ]] ; then
84 epatch ${PATCH_LOC} 230 epatch ${PATCH_LOC}
85 # For standard bulk patching 231 # For standard bulk patching
86 elif [ -d "${EPATCH_SOURCE}" ] ; then 232 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
87 epatch 233 epatch
88 fi 234 fi
89} 235}
90 236
91x-modular_reconf_source() { 237x-modular_reconf_source() {
92 # Run autoreconf for CVS snapshots only 238 # Run autoreconf for CVS snapshots only
93 if [ "${SNAPSHOT}" = "yes" ] 239 if [[ "${SNAPSHOT}" = "yes" ]]
94 then 240 then
95 # If possible, generate configure if it doesn't exist 241 # If possible, generate configure if it doesn't exist
96 if [ -f "${S}/configure.ac" ] 242 if [ -f "${S}/configure.ac" ]
97 then 243 then
98 einfo "Running autoreconf..." 244 eautoreconf
99 autoreconf -v --force --install
100 fi
101 fi 245 fi
246 fi
102 247
248 # Joshua Baergen - October 23, 2005
249 # Fix shared lib issues on MIPS, FBSD, etc etc
250 elibtoolize
103} 251}
104 252
105x-modular_src_unpack() { 253x-modular_src_unpack() {
254 x-modular_specs_check
255 x-modular_dri_check
106 x-modular_unpack_source 256 x-modular_unpack_source
107 x-modular_patch_source 257 x-modular_patch_source
108 x-modular_reconf_source 258 x-modular_reconf_source
109} 259}
110 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
111x-modular_src_configure() { 297x-modular_src_configure() {
298 x-modular_font_configure
299 x-modular_debug_setup
300
112 # If prefix isn't set here, .pc files cause problems 301 # If prefix isn't set here, .pc files cause problems
113 if [ -x ./configure ]; then 302 if [[ -x ./configure ]]; then
114 econf --prefix=${XDIR} \ 303 econf --prefix=${XDIR} \
115 --datadir=${XDIR}/share \ 304 --datadir=${XDIR}/share \
305 ${FONT_OPTIONS} \
116 ${DRIVER_OPTIONS} \ 306 ${DRIVER_OPTIONS} \
117 ${CONFIGURE_OPTIONS} 307 ${CONFIGURE_OPTIONS}
118 fi 308 fi
119} 309}
120 310
135# Shouldn't be necessary in XDIR=/usr 325# Shouldn't be necessary in XDIR=/usr
136# einstall forces datadir, so we need to re-force it 326# einstall forces datadir, so we need to re-force it
137# datadir=${XDIR}/share \ 327# datadir=${XDIR}/share \
138# mandir=${XDIR}/share/man \ 328# mandir=${XDIR}/share/man \
139 329
330 # Make sure docs get compressed
331 prepalldocs
332
140 # Don't install libtool archives for server modules 333 # Don't install libtool archives for server modules
141 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 334 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
142 find ${D}/usr/lib/xorg/modules -name '*.la' \ 335 find ${D}/usr/lib/xorg/modules -name '*.la' \
143 | xargs rm -f 336 | xargs rm -f
144 fi 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
145} 344}
146 345
147x-modular_pkg_preinst() { 346x-modular_pkg_preinst() {
148 if [[ -n "${FONT}" ]]; then 347 if [[ -n "${FONT}" ]]; then
149 discover_font_dirs 348 discover_font_dirs
154 if [[ -n "${FONT}" ]]; then 353 if [[ -n "${FONT}" ]]; then
155 setup_fonts 354 setup_fonts
156 fi 355 fi
157} 356}
158 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
159setup_fonts() { 399setup_fonts() {
160 if [[ ! -n "${FONT_DIRS}" ]]; then 400 if [[ ! -n "${FONT_DIRS}" ]]; then
161 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."
162 eerror ${msg} 402 eerror "${msg}"
163 die ${msg} 403 die "${msg}"
164 fi 404 fi
165 405
166 create_fonts_scale 406 create_fonts_scale
167 create_fonts_dir 407 create_fonts_dir
168 fix_font_permissions 408 fix_font_permissions
169 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
170} 422}
171 423
172discover_font_dirs() { 424discover_font_dirs() {
173 pushd ${IMAGE}/usr/share/fonts 425 pushd ${IMAGE}/usr/share/fonts
174 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 426 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
179create_fonts_scale() { 431create_fonts_scale() {
180 ebegin "Creating fonts.scale files" 432 ebegin "Creating fonts.scale files"
181 local x 433 local x
182 for FONT_DIR in ${FONT_DIRS}; do 434 for FONT_DIR in ${FONT_DIRS}; do
183 x=${ROOT}/usr/share/fonts/${FONT_DIR} 435 x=${ROOT}/usr/share/fonts/${FONT_DIR}
184 [ -z "$(ls ${x}/)" ] && continue 436 [[ -z "$(ls ${x}/)" ]] && continue
185 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 437 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
186 438
187 # Only generate .scale files if truetype, opentype or type1 439 # Only generate .scale files if truetype, opentype or type1
188 # fonts are present ... 440 # fonts are present ...
189 441
190 # First truetype (ttf,ttc) 442 # First truetype (ttf,ttc)
191 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 443 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
192 # Also, there is no way to regenerate Speedo/CID fonts.scale 444 # Also, there is no way to regenerate Speedo/CID fonts.scale
193 # <spyderous@gentoo.org> 2 August 2004 445 # <spyderous@gentoo.org> 2 August 2004
194 if [ "${x/encodings}" = "${x}" -a \ 446 if [[ "${x/encodings}" = "${x}" ]] \
195 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 447 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
196 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 448 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
197 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 449 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
198 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 450 ${ROOT}/usr/bin/ttmkfdir -x 2 \
199 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 451 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
200 -o ${x}/fonts.scale -d ${x} 452 -o ${x}/fonts.scale -d ${x}
201 # ttmkfdir fails on some stuff, so try mkfontscale if it does 453 # ttmkfdir fails on some stuff, so try mkfontscale if it does
202 local ttmkfdir_return=$? 454 local ttmkfdir_return=$?
203 else 455 else
204 # We didn't use ttmkfdir at all 456 # We didn't use ttmkfdir at all
205 local ttmkfdir_return=2 457 local ttmkfdir_return=2
206 fi 458 fi
207 if [ ${ttmkfdir_return} -ne 0 ]; then 459 if [[ ${ttmkfdir_return} -ne 0 ]]; then
208 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 460 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
209 ${ROOT}/usr/bin/mkfontscale \ 461 ${ROOT}/usr/bin/mkfontscale \
210 -a /usr/share/fonts/encodings/encodings.dir \ 462 -a /usr/share/fonts/encodings/encodings.dir \
211 -- ${x} 463 -- ${x}
212 fi 464 fi
213 # Next type1 and opentype (pfa,pfb,otf,otc) 465 # Next type1 and opentype (pfa,pfb,otf,otc)
214 elif [ "${x/encodings}" = "${x}" -a \ 466 elif [[ "${x/encodings}" = "${x}" ]] \
215 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 467 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
216 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 468 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
217 ${ROOT}/usr/bin/mkfontscale \ 469 ${ROOT}/usr/bin/mkfontscale \
218 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 470 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
219 -- ${x} 471 -- ${x}
220 fi 472 fi
224 476
225create_fonts_dir() { 477create_fonts_dir() {
226 ebegin "Generating fonts.dir files" 478 ebegin "Generating fonts.dir files"
227 for FONT_DIR in ${FONT_DIRS}; do 479 for FONT_DIR in ${FONT_DIRS}; do
228 x=${ROOT}/usr/share/fonts/${FONT_DIR} 480 x=${ROOT}/usr/share/fonts/${FONT_DIR}
229 [ -z "$(ls ${x}/)" ] && continue 481 [[ -z "$(ls ${x}/)" ]] && continue
230 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 482 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
231 483
232 if [ "${x/encodings}" = "${x}" ]; then 484 if [[ "${x/encodings}" = "${x}" ]]; then
233 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 485 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
234 ${ROOT}/usr/bin/mkfontdir \ 486 ${ROOT}/usr/bin/mkfontdir \
235 -e ${ROOT}/usr/share/fonts/encodings \ 487 -e ${ROOT}/usr/share/fonts/encodings \
236 -e ${ROOT}/usr/share/fonts/encodings/large \ 488 -e ${ROOT}/usr/share/fonts/encodings/large \
237 -- ${x} 489 -- ${x}
251 503
252create_font_cache() { 504create_font_cache() {
253 # 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
254 # 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
255 # as root anyway 507 # as root anyway
256 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 508 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
257 ebegin "Creating FC font cache" 509 ebegin "Creating FC font cache"
258 HOME="/root" ${ROOT}/usr/bin/fc-cache 510 HOME="/root" ${ROOT}/usr/bin/fc-cache
259 eend 0 511 eend 0
260 fi 512 fi
261} 513}

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.59

  ViewVC Help
Powered by ViewVC 1.1.20