/[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.77
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.77 2006/10/30 05:44:33 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 libtool 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/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 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
52fi 159fi
53 160
54DEPEND="${DEPEND} 161DEPEND="${DEPEND}
55 >=dev-util/pkgconfig-0.18 162 >=dev-util/pkgconfig-0.18"
163
164if [[ "${PN/util-macros}" = "${PN}" ]]; then
165 DEPEND="${DEPEND}
56 >=x11-misc/util-macros-0.99.0_p20051007" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
168fi
57 169
58RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
59 !<x11-base/xorg-x11-7.0.0_rc0" 172 !<=x11-base/xorg-x11-6.9"
60# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
61# x11-base/x11-env" 174# x11-base/x11-env"
62 175
63x-modular_pkg_setup() { 176x-modular_specs_check() {
64 # Collision protect will scream bloody murder if we install over old versions 177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
65 if $(has_version "<x11-base/xorg-x11-7.0.0_rc0"); then 178 append-ldflags -Wl,-z,lazy
66 if has collision-protect ${FEATURES}; then 179 # (#116698) breaks loading
67 eerror "Having collision-protect in FEATURES will disrupt upgrades" 180 filter-ldflags -Wl,-z,now
68 eerror "from non-modular versions of xorg-x11." 181 fi
69 eerror "Please remove collision-protect from FEATURES while upgrading." 182}
70 die "" 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
71 fi 206 fi
72 fi 207 fi
73} 208}
74 209
75x-modular_unpack_source() { 210x-modular_unpack_source() {
76 unpack ${A} 211 unpack ${A}
77 cd ${S} 212 cd ${S}
78 213
79 # Joshua Baergen - October 23, 2005 214 if [[ -n ${FONT_OPTIONS} ]]; then
80 # Fix shared lib issues on MIPS, FBSD, etc etc 215 einfo "Detected font directory: ${FONT_DIR}"
81 elibtoolize 216 fi
82} 217}
83 218
84x-modular_patch_source() { 219x-modular_patch_source() {
85 # Use standardized names and locations with bulk patching 220 # Use standardized names and locations with bulk patching
86 # Patch directory is ${WORKDIR}/patch 221 # Patch directory is ${WORKDIR}/patch
87 # See epatch() in eutils.eclass for more documentation 222 # See epatch() in eutils.eclass for more documentation
88 if [ -z "${EPATCH_SUFFIX}" ] ; then 223 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
89 EPATCH_SUFFIX="patch" 224 EPATCH_SUFFIX="patch"
90 fi 225 fi
91 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
92 # For specific list of patches 235 # For specific list of patches
93 if [ -n "${PATCHES}" ] ; then 236 if [[ -n "${PATCHES}" ]] ; then
94 for PATCH in ${PATCHES} 237 for PATCH in ${PATCHES}
95 do 238 do
96 epatch ${PATCH} 239 epatch ${PATCH}
97 done 240 done
98 # For non-default directory bulk patching 241 # For non-default directory bulk patching
99 elif [ -n "${PATCH_LOC}" ] ; then 242 elif [[ -n "${PATCH_LOC}" ]] ; then
100 epatch ${PATCH_LOC} 243 epatch ${PATCH_LOC}
101 # For standard bulk patching 244 # For standard bulk patching
102 elif [ -d "${EPATCH_SOURCE}" ] ; then 245 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
103 epatch 246 epatch
104 fi 247 fi
105} 248}
106 249
107x-modular_reconf_source() { 250x-modular_reconf_source() {
108 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
109 if [ "${SNAPSHOT}" = "yes" ] 252 if [[ "${SNAPSHOT}" = "yes" ]]
110 then 253 then
111 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
112 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
113 then 256 then
114 einfo "Running autoreconf..." 257 eautoreconf
115 autoreconf -v --force --install
116 fi
117 fi 258 fi
259 fi
118 260
261 # Joshua Baergen - October 23, 2005
262 # Fix shared lib issues on MIPS, FBSD, etc etc
263 elibtoolize
119} 264}
120 265
121x-modular_src_unpack() { 266x-modular_src_unpack() {
267 x-modular_specs_check
268 x-modular_server_supports_drivers_check
269 x-modular_dri_check
122 x-modular_unpack_source 270 x-modular_unpack_source
123 x-modular_patch_source 271 x-modular_patch_source
124 x-modular_reconf_source 272 x-modular_reconf_source
125} 273}
126 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
127x-modular_src_configure() { 311x-modular_src_configure() {
312 x-modular_font_configure
313 x-modular_debug_setup
314
128 # If prefix isn't set here, .pc files cause problems 315 # If prefix isn't set here, .pc files cause problems
129 if [ -x ./configure ]; then 316 if [[ -x ./configure ]]; then
130 econf --prefix=${XDIR} \ 317 econf --prefix=${XDIR} \
131 --datadir=${XDIR}/share \ 318 --datadir=${XDIR}/share \
319 ${FONT_OPTIONS} \
132 ${DRIVER_OPTIONS} \ 320 ${DRIVER_OPTIONS} \
133 ${CONFIGURE_OPTIONS} 321 ${CONFIGURE_OPTIONS}
134 fi 322 fi
135} 323}
136 324
151# Shouldn't be necessary in XDIR=/usr 339# Shouldn't be necessary in XDIR=/usr
152# einstall forces datadir, so we need to re-force it 340# einstall forces datadir, so we need to re-force it
153# datadir=${XDIR}/share \ 341# datadir=${XDIR}/share \
154# mandir=${XDIR}/share/man \ 342# mandir=${XDIR}/share/man \
155 343
344 if [[ -e ${S}/ChangeLog ]]; then
345 dodoc ${S}/ChangeLog
346 fi
347
348 # Make sure docs get compressed
349 prepalldocs
350
156 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
157 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
158 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
159 | xargs rm -f 354 | xargs rm -f
160 fi 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
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
365 fi
161} 366}
162 367
163x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
164 if [[ -n "${FONT}" ]]; then 369 # We no longer do anything here, but we can't remove it from the API
165 discover_font_dirs 370 :
166 fi
167} 371}
168 372
169x-modular_pkg_postinst() { 373x-modular_pkg_postinst() {
170 if [[ -n "${FONT}" ]]; then 374 if [[ -n "${FONT}" ]]; then
171 setup_fonts 375 setup_fonts
172 fi 376 fi
173} 377}
174 378
379x-modular_pkg_postrm() {
380 if [[ -n "${FONT}" ]]; then
381 cleanup_fonts
382 fi
383}
384
385cleanup_fonts() {
386 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
387 for DIR in ${FONT_DIR}; do
388 unset KEEP_FONTDIR
389 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
390
391 ebegin "Checking ${REAL_DIR} for useless files"
392 pushd ${REAL_DIR} &> /dev/null
393 for FILE in *; do
394 unset MATCH
395 for ALLOWED_FILE in ${ALLOWED_FILES}; do
396 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
397 # If it's allowed, then move on to the next file
398 MATCH="yes"
399 break
400 fi
401 done
402 # If we found a match in allowed files, move on to the next file
403 if [[ -n ${MATCH} ]]; then
404 continue
405 fi
406 # If we get this far, there wasn't a match in the allowed files
407 KEEP_FONTDIR="yes"
408 # We don't need to check more files if we're already keeping it
409 break
410 done
411 popd &> /dev/null
412 # If there are no files worth keeping, then get rid of the dir
413 if [[ -z "${KEEP_FONTDIR}" ]]; then
414 rm -rf ${REAL_DIR}
415 fi
416 eend 0
417 done
418}
419
175setup_fonts() { 420setup_fonts() {
176 if [[ ! -n "${FONT_DIRS}" ]]; then 421 if [[ ! -n "${FONT_DIR}" ]]; then
177 msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts." 422 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
178 eerror ${msg} 423 eerror "${msg}"
179 die ${msg} 424 die "${msg}"
180 fi 425 fi
181 426
182 create_fonts_scale 427 create_fonts_scale
183 create_fonts_dir 428 create_fonts_dir
184 fix_font_permissions 429 fix_font_permissions
185 create_font_cache 430 create_font_cache
186} 431}
187 432
433remove_font_metadata() {
434 local DIR
435 for DIR in ${FONT_DIR}; do
436 if [[ "${DIR}" != "Speedo" ]] && \
437 [[ "${DIR}" != "CID" ]] ; then
438 # Delete font metadata files
439 # fonts.scale, fonts.dir, fonts.cache-1
440 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
441 fi
442 done
443}
444
445# Installs device-to-driver mappings for system-config-display
446# and anything else that uses hwdata
447install_driver_hwdata() {
448 insinto /usr/share/hwdata/videoaliases
449 for i in "${FILESDIR}"/*.xinf; do
450 # We need this for the case when none exist,
451 # so *.xinf doesn't expand
452 if [[ -e $i ]]; then
453 doins $i
454 fi
455 done
456}
457
188discover_font_dirs() { 458discover_font_dirs() {
189 pushd ${IMAGE}/usr/share/fonts 459 FONT_DIRS="${FONT_DIR}"
190 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
191 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
192 popd
193} 460}
194 461
195create_fonts_scale() { 462create_fonts_scale() {
196 ebegin "Creating fonts.scale files" 463 ebegin "Creating fonts.scale files"
197 local x 464 local x
198 for FONT_DIR in ${FONT_DIRS}; do 465 for DIR in ${FONT_DIR}; do
199 x=${ROOT}/usr/share/fonts/${FONT_DIR} 466 x=${ROOT}/usr/share/fonts/${DIR}
200 [ -z "$(ls ${x}/)" ] && continue 467 [[ -z "$(ls ${x}/)" ]] && continue
201 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
202 469
203 # Only generate .scale files if truetype, opentype or type1 470 # Only generate .scale files if truetype, opentype or type1
204 # fonts are present ... 471 # fonts are present ...
205 472
206 # First truetype (ttf,ttc) 473 # First truetype (ttf,ttc)
207 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 474 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
208 # Also, there is no way to regenerate Speedo/CID fonts.scale 475 # Also, there is no way to regenerate Speedo/CID fonts.scale
209 # <spyderous@gentoo.org> 2 August 2004 476 # <spyderous@gentoo.org> 2 August 2004
210 if [ "${x/encodings}" = "${x}" -a \ 477 if [[ "${x/encodings}" = "${x}" ]] \
211 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 478 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
212 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 479 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
213 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
214 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 481 ${ROOT}/usr/bin/ttmkfdir -x 2 \
215 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 482 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
216 -o ${x}/fonts.scale -d ${x} 483 -o ${x}/fonts.scale -d ${x}
217 # ttmkfdir fails on some stuff, so try mkfontscale if it does 484 # ttmkfdir fails on some stuff, so try mkfontscale if it does
218 local ttmkfdir_return=$? 485 local ttmkfdir_return=$?
219 else 486 else
220 # We didn't use ttmkfdir at all 487 # We didn't use ttmkfdir at all
221 local ttmkfdir_return=2 488 local ttmkfdir_return=2
222 fi 489 fi
223 if [ ${ttmkfdir_return} -ne 0 ]; then 490 if [[ ${ttmkfdir_return} -ne 0 ]]; then
224 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 491 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
225 ${ROOT}/usr/bin/mkfontscale \ 492 ${ROOT}/usr/bin/mkfontscale \
226 -a /usr/share/fonts/encodings/encodings.dir \ 493 -a /usr/share/fonts/encodings/encodings.dir \
227 -- ${x} 494 -- ${x}
228 fi 495 fi
229 # Next type1 and opentype (pfa,pfb,otf,otc) 496 # Next type1 and opentype (pfa,pfb,otf,otc)
230 elif [ "${x/encodings}" = "${x}" -a \ 497 elif [[ "${x/encodings}" = "${x}" ]] \
231 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 498 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
232 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
233 ${ROOT}/usr/bin/mkfontscale \ 500 ${ROOT}/usr/bin/mkfontscale \
234 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 501 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
235 -- ${x} 502 -- ${x}
236 fi 503 fi
238 eend 0 505 eend 0
239} 506}
240 507
241create_fonts_dir() { 508create_fonts_dir() {
242 ebegin "Generating fonts.dir files" 509 ebegin "Generating fonts.dir files"
243 for FONT_DIR in ${FONT_DIRS}; do 510 for DIR in ${FONT_DIR}; do
244 x=${ROOT}/usr/share/fonts/${FONT_DIR} 511 x=${ROOT}/usr/share/fonts/${DIR}
245 [ -z "$(ls ${x}/)" ] && continue 512 [[ -z "$(ls ${x}/)" ]] && continue
246 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
247 514
248 if [ "${x/encodings}" = "${x}" ]; then 515 if [[ "${x/encodings}" = "${x}" ]]; then
249 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
250 ${ROOT}/usr/bin/mkfontdir \ 517 ${ROOT}/usr/bin/mkfontdir \
251 -e ${ROOT}/usr/share/fonts/encodings \ 518 -e ${ROOT}/usr/share/fonts/encodings \
252 -e ${ROOT}/usr/share/fonts/encodings/large \ 519 -e ${ROOT}/usr/share/fonts/encodings/large \
253 -- ${x} 520 -- ${x}
256 eend 0 523 eend 0
257} 524}
258 525
259fix_font_permissions() { 526fix_font_permissions() {
260 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
261 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
262 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
263 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
264 done 531 done
265 eend 0 532 eend 0
266} 533}
267 534
268create_font_cache() { 535create_font_cache() {
269 # danarmak found out that fc-cache should be run AFTER all the above 536 # 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 537 # stuff, as otherwise the cache is invalid, and has to be run again
271 # as root anyway 538 # as root anyway
272 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 539 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
273 ebegin "Creating FC font cache" 540 ebegin "Creating FC font cache"
274 HOME="/root" ${ROOT}/usr/bin/fc-cache 541 HOME="/root" ${ROOT}/usr/bin/fc-cache
275 eend 0 542 eend 0
276 fi 543 fi
277} 544}

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

  ViewVC Help
Powered by ViewVC 1.1.20