/[gentoo-x86]/eclass/xorg-2.eclass
Gentoo

Diff of /eclass/xorg-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.19
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 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/xorg-2.eclass,v 1.1 2010/03/14 10:27:07 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.19 2010/11/05 12:11:55 scarabeus Exp $
4# 4#
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8
9# Author: Tomáš Chvátal <scarabeus@gentoo.org>
10# Author: Donnie Berkholz <dberkholz@gentoo.org>
11# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
12# @DESCRIPTION: 9# @DESCRIPTION:
13# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, 10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
14# and more. Many things that would normally be done in various functions 11# and more. Many things that would normally be done in various functions
15# can be accessed by setting variables instead, such as patching, 12# can be accessed by setting variables instead, such as patching,
18# All you need to do in a basic ebuild is inherit this eclass and set 15# All you need to do in a basic ebuild is inherit this eclass and set
19# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
20# with the other X packages, you don't need to set SRC_URI. Pretty much 17# with the other X packages, you don't need to set SRC_URI. Pretty much
21# everything else should be automatic. 18# everything else should be automatic.
22 19
20# Author: Tomáš Chvátal <scarabeus@gentoo.org>
21# Author: Donnie Berkholz <dberkholz@gentoo.org>
22
23GIT_ECLASS="" 23GIT_ECLASS=""
24if [[ ${PV} == *9999* ]]; then 24if [[ ${PV} == *9999* ]]; then
25 GIT_ECLASS="git" 25 GIT_ECLASS="git"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27 SRC_URI="" 27 SRC_URI=""
42 ${FONT_ECLASS} ${GIT_ECLASS} 42 ${FONT_ECLASS} ${GIT_ECLASS}
43 43
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 45case "${EAPI:-0}" in
46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) DEPEND="EAPI-UNSUPPORTED" ;; 47 *) die "EAPI-UNSUPPORTED" ;;
48esac 48esac
49 49
50# exports must be ALWAYS after inherit 50# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
52 52
89: ${SLOT:=0} 89: ${SLOT:=0}
90 90
91# Set the license for the package. This can be overridden by setting 91# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
93# are under the MIT license. (This is what Red Hat does in their rpms) 93# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE=MIT} 94: ${LICENSE:=MIT}
95 95
96# Set up shared dependencies 96# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 97# Remember that all versions here MUST be stable
98 DEPEND+=" 98XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
99EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 100 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 101 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 102if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.5.0" 103 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
104 # Required even by xorg-server 104 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 105 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 106fi
107 WANT_AUTOCONF="latest" 107WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 108WANT_AUTOMAKE="latest"
109fi 109for arch in ${XORG_EAUTORECONF_ARCHES}; do
110 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
111done
112DEPEND+=" ${EAUTORECONF_DEPENDS}"
113[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
114unset EAUTORECONF_DEPENDS
115unset EAUTORECONF_DEPEND
110 116
111if [[ ${FONT} == yes ]]; then 117if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 118 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 119 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 120 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 121 PDEPEND+=" media-fonts/font-alias"
122 DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
116 123
117 # @ECLASS-VARIABLE: FONT_DIR 124 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 125 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 126 # If you're creating a font package and the suffix of PN is not equal to
120 # the subdirectory of /usr/share/fonts/ it should install into, set 127 # the subdirectory of /usr/share/fonts/ it should install into, set
135fi 142fi
136 143
137# If we're a driver package, then enable DRIVER case 144# If we're a driver package, then enable DRIVER case
138[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" 145[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes"
139 146
147# @ECLASS-VARIABLE: XORG_STATIC
148# @DESCRIPTION:
149# Enables static-libs useflag. Set to no, if your package gets:
150#
151# QA: configure: WARNING: unrecognized options: --disable-static
152: ${XORG_STATIC:="yes"}
153
140# Add static-libs useflag where usefull. 154# Add static-libs useflag where usefull.
155if [[ ${XORG_STATIC} == yes \
141if [[ ${FONT} != yes \ 156 && ${FONT} != yes \
142 && ${CATEGORY} != app-doc \ 157 && ${CATEGORY} != app-doc \
158 && ${CATEGORY} != x11-apps \
143 && ${CATEGORY} != x11-proto \ 159 && ${CATEGORY} != x11-proto \
144 && ${CATEGORY} != x11-drivers \ 160 && ${CATEGORY} != x11-drivers \
145 && ${CATEGORY} != media-fonts \ 161 && ${CATEGORY} != media-fonts \
146 && ${PN} != util-macros \ 162 && ${PN} != util-macros \
147 && ${PN} != xbitmaps \ 163 && ${PN} != xbitmaps \
155# Check deps on xorg-server 171# Check deps on xorg-server
156has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 172has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
157[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 173[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
158 174
159# @FUNCTION: xorg-2_pkg_setup 175# @FUNCTION: xorg-2_pkg_setup
160# @USAGE:
161# @DESCRIPTION: 176# @DESCRIPTION:
162# Setup prefix compat 177# Setup prefix compat
163xorg-2_pkg_setup() { 178xorg-2_pkg_setup() {
164 [[ ${FONT} == yes ]] && font_pkg_setup 179 [[ ${FONT} == yes ]] && font_pkg_setup
165} 180}
166 181
167# @FUNCTION: xorg-2_src_unpack 182# @FUNCTION: xorg-2_src_unpack
168# @USAGE:
169# @DESCRIPTION: 183# @DESCRIPTION:
170# Simply unpack source code. 184# Simply unpack source code.
171xorg-2_src_unpack() { 185xorg-2_src_unpack() {
172 if [[ -n ${GIT_ECLASS} ]]; then 186 if [[ -n ${GIT_ECLASS} ]]; then
173 git_src_unpack 187 git_src_unpack
177 191
178 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 192 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
179} 193}
180 194
181# @FUNCTION: xorg-2_patch_source 195# @FUNCTION: xorg-2_patch_source
182# @USAGE:
183# @DESCRIPTION: 196# @DESCRIPTION:
184# Apply all patches 197# Apply all patches
185xorg-2_patch_source() { 198xorg-2_patch_source() {
186 # Use standardized names and locations with bulk patching 199 # Use standardized names and locations with bulk patching
187 # Patch directory is ${WORKDIR}/patch 200 # Patch directory is ${WORKDIR}/patch
188 # See epatch() in eutils.eclass for more documentation 201 # See epatch() in eutils.eclass for more documentation
189 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 202 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
190 203
191 [[ -d "${EPATCH_SOURCE}" ]] && epatch 204 [[ -d "${EPATCH_SOURCE}" ]] && epatch
192 base_src_prepare 205 base_src_prepare
193 epatch_user
194} 206}
195 207
196# @FUNCTION: xorg-2_reconf_source 208# @FUNCTION: xorg-2_reconf_source
197# @USAGE:
198# @DESCRIPTION: 209# @DESCRIPTION:
199# Run eautoreconf if necessary, and run elibtoolize. 210# Run eautoreconf if necessary, and run elibtoolize.
200xorg-2_reconf_source() { 211xorg-2_reconf_source() {
201 case ${CHOST} in 212 case ${CHOST} in
202 *-interix* | *-aix* | *-winnt*) 213 *-interix* | *-aix* | *-winnt*)
203 # some hosts need full eautoreconf 214 # some hosts need full eautoreconf
204 [[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 215 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
205 ;; 216 ;;
206 *) 217 *)
207 # elibtoolize required for BSD 218 # elibtoolize required for BSD
208 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 219 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
209 ;; 220 ;;
210 esac 221 esac
211} 222}
212 223
213# @FUNCTION: xorg-2_src_prepare 224# @FUNCTION: xorg-2_src_prepare
214# @USAGE:
215# @DESCRIPTION: 225# @DESCRIPTION:
216# Prepare a package after unpacking, performing all X-related tasks. 226# Prepare a package after unpacking, performing all X-related tasks.
217xorg-2_src_prepare() { 227xorg-2_src_prepare() {
218 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 228 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
219 xorg-2_patch_source 229 xorg-2_patch_source
220 xorg-2_reconf_source 230 xorg-2_reconf_source
221} 231}
222 232
223# @FUNCTION: xorg-2_font_configure 233# @FUNCTION: xorg-2_font_configure
224# @USAGE:
225# @DESCRIPTION: 234# @DESCRIPTION:
226# If a font package, perform any necessary configuration steps 235# If a font package, perform any necessary configuration steps
227xorg-2_font_configure() { 236xorg-2_font_configure() {
228 if has nls ${IUSE//+} && ! use nls; then 237 if has nls ${IUSE//+} && ! use nls; then
229 FONT_OPTIONS+=" 238 FONT_OPTIONS+="
245 --disable-jisx0201 254 --disable-jisx0201
246 --disable-koi8-r" 255 --disable-koi8-r"
247 fi 256 fi
248} 257}
249 258
250# @FUNCTION: x-modular_flags_setup 259# @FUNCTION: xorg-2_flags_setup
251# @USAGE:
252# @DESCRIPTION: 260# @DESCRIPTION:
253# Set up CFLAGS for a debug build 261# Set up CFLAGS for a debug build
254xorg-2_flags_setup() { 262xorg-2_flags_setup() {
255 # Win32 require special define 263 # Win32 require special define
256 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 264 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
257 # hardened ldflags 265 # hardened ldflags
258 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 266 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
267
268 # Quite few libraries fail on runtime without these:
269 if has static-libs ${IUSE//+}; then
270 filter-flags -Wl,-Bdirect
271 filter-ldflags -Bdirect
272 filter-ldflags -Wl,-Bdirect
273 fi
259} 274}
260 275
261# @FUNCTION: xorg-2_src_configure 276# @FUNCTION: xorg-2_src_configure
262# @USAGE:
263# @DESCRIPTION: 277# @DESCRIPTION:
264# Perform any necessary pre-configuration steps, then run configure 278# Perform any necessary pre-configuration steps, then run configure
265xorg-2_src_configure() { 279xorg-2_src_configure() {
266 local myopts="" 280 local myopts=""
267 281
268 xorg-2_flags_setup 282 xorg-2_flags_setup
269 [[ -n "${FONT}" ]] && xorg-2_font_configure 283 [[ -n "${FONT}" ]] && xorg-2_font_configure
270 284
271# @VARIABLE: CONFIGURE_OPTIONS 285 # @VARIABLE: CONFIGURE_OPTIONS
272# @DESCRIPTION: 286 # @DESCRIPTION:
273# Any options to pass to configure 287 # Any options to pass to configure
288 # @DEFAULT_UNSET
274 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 289 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
275 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 290 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
276 if has static-libs ${IUSE//+}; then 291 if has static-libs ${IUSE//+}; then
277 myopts+=" $(use_enable static-libs static)" 292 myopts+=" $(use_enable static-libs static)"
278 fi 293 fi
282 ${myopts} 297 ${myopts}
283 fi 298 fi
284} 299}
285 300
286# @FUNCTION: xorg-2_src_compile 301# @FUNCTION: xorg-2_src_compile
287# @USAGE:
288# @DESCRIPTION: 302# @DESCRIPTION:
289# Compile a package, performing all X-related tasks. 303# Compile a package, performing all X-related tasks.
290xorg-2_src_compile() { 304xorg-2_src_compile() {
291 base_src_compile 305 base_src_compile
292} 306}
293 307
294# @FUNCTION: xorg-2_src_install 308# @FUNCTION: xorg-2_src_install
295# @USAGE:
296# @DESCRIPTION: 309# @DESCRIPTION:
297# Install a built package to ${D}, performing any necessary steps. 310# Install a built package to ${D}, performing any necessary steps.
298# Creates a ChangeLog from git if using live ebuilds. 311# Creates a ChangeLog from git if using live ebuilds.
299xorg-2_src_install() { 312xorg-2_src_install() {
300 if [[ ${CATEGORY} == x11-proto ]]; then 313 if [[ ${CATEGORY} == x11-proto ]]; then
301 emake \ 314 emake \
302 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 315 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
316 docdir=${EPREFIX}/usr/share/doc/${PF} \
303 DESTDIR="${D}" \ 317 DESTDIR="${D}" \
304 install || die "emake install failed" 318 install || die "emake install failed"
305 else 319 else
306 emake \ 320 emake \
307 docdir=${EPREFIX}/usr/share/doc/${PF} \ 321 docdir=${EPREFIX}/usr/share/doc/${PF} \
309 install || die "emake install failed" 323 install || die "emake install failed"
310 fi 324 fi
311 325
312 if [[ -n ${GIT_ECLASS} ]]; then 326 if [[ -n ${GIT_ECLASS} ]]; then
313 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 327 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
314 git log ${GIT_TREE} > "${S}"/ChangeLog 328 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
315 popd > /dev/null 329 popd > /dev/null
316 fi 330 fi
317 331
318 if [[ -e "${S}"/ChangeLog ]]; then 332 if [[ -e "${S}"/ChangeLog ]]; then
319 dodoc "${S}"/ChangeLog 333 dodoc "${S}"/ChangeLog
320 fi 334 fi
321# @VARIABLE: DOCS 335 # @VARIABLE: DOCS
322# @DESCRIPTION: 336 # @DESCRIPTION:
323# Any documentation to install 337 # Any documentation to install
338 # @DEFAULT_UNSET
324 if [[ -n ${DOCS} ]]; then 339 if [[ -n ${DOCS} ]]; then
325 dodoc ${DOCS} || die "dodoc failed" 340 dodoc ${DOCS} || die "dodoc failed"
326 fi 341 fi
327 342
328 # Don't install libtool archives for server modules 343 # Don't install libtool archives for server modules
333 348
334 [[ -n ${FONT} ]] && remove_font_metadata 349 [[ -n ${FONT} ]] && remove_font_metadata
335} 350}
336 351
337# @FUNCTION: xorg-2_pkg_postinst 352# @FUNCTION: xorg-2_pkg_postinst
338# @USAGE:
339# @DESCRIPTION: 353# @DESCRIPTION:
340# Run X-specific post-installation tasks on the live filesystem. The 354# Run X-specific post-installation tasks on the live filesystem. The
341# only task right now is some setup for font packages. 355# only task right now is some setup for font packages.
342xorg-2_pkg_postinst() { 356xorg-2_pkg_postinst() {
343 [[ -n ${FONT} ]] && setup_fonts 357 [[ -n ${FONT} ]] && setup_fonts
344} 358}
345 359
346# @FUNCTION: xorg-2_pkg_postrm 360# @FUNCTION: xorg-2_pkg_postrm
347# @USAGE:
348# @DESCRIPTION: 361# @DESCRIPTION:
349# Run X-specific post-removal tasks on the live filesystem. The only 362# Run X-specific post-removal tasks on the live filesystem. The only
350# task right now is some cleanup for font packages. 363# task right now is some cleanup for font packages.
351xorg-2_pkg_postrm() { 364xorg-2_pkg_postrm() {
352 if [[ -n ${FONT} ]]; then 365 if [[ -n ${FONT} ]]; then
353 cleanup_fonts
354 font_pkg_postrm 366 font_pkg_postrm
355 fi 367 fi
356} 368}
357 369
358# @FUNCTION: cleanup_fonts
359# @USAGE:
360# @DESCRIPTION:
361# Get rid of font directories that only contain generated files
362cleanup_fonts() {
363 local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
364 local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
365 local fle allowed_file
366
367 unset KEEP_FONTDIR
368
369 einfo "Checking ${real_dir} for useless files"
370 pushd ${real_dir} &> /dev/null
371 for fle in *; do
372 unset MATCH
373 for allowed_file in ${allowed_files}; do
374 if [[ ${fle} = ${allowed_file} ]]; then
375 # If it's allowed, then move on to the next file
376 MATCH="yes"
377 break
378 fi
379 done
380 # If we found a match in allowed files, move on to the next file
381 [[ -n ${MATCH} ]] && continue
382 # If we get this far, there wasn't a match in the allowed files
383 KEEP_FONTDIR="yes"
384 # We don't need to check more files if we're already keeping it
385 break
386 done
387 popd &> /dev/null
388 # If there are no files worth keeping, then get rid of the dir
389 [[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
390}
391
392# @FUNCTION: setup_fonts 370# @FUNCTION: setup_fonts
393# @USAGE:
394# @DESCRIPTION: 371# @DESCRIPTION:
395# Generates needed files for fonts and fixes font permissions 372# Generates needed files for fonts and fixes font permissions
396setup_fonts() { 373setup_fonts() {
397 create_fonts_scale 374 create_fonts_scale
398 create_fonts_dir 375 create_fonts_dir
399 font_pkg_postinst 376 font_pkg_postinst
400} 377}
401 378
402# @FUNCTION: remove_font_metadata 379# @FUNCTION: remove_font_metadata
403# @USAGE:
404# @DESCRIPTION: 380# @DESCRIPTION:
405# Don't let the package install generated font files that may overlap 381# Don't let the package install generated font files that may overlap
406# with other packages. Instead, they're generated in pkg_postinst(). 382# with other packages. Instead, they're generated in pkg_postinst().
407remove_font_metadata() { 383remove_font_metadata() {
408 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 384 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
410 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 386 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
411 fi 387 fi
412} 388}
413 389
414# @FUNCTION: create_fonts_scale 390# @FUNCTION: create_fonts_scale
415# @USAGE:
416# @DESCRIPTION: 391# @DESCRIPTION:
417# Create fonts.scale file, used by the old server-side fonts subsystem. 392# Create fonts.scale file, used by the old server-side fonts subsystem.
418create_fonts_scale() { 393create_fonts_scale() {
419 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 394 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
420 ebegin "Generating font.scale" 395 ebegin "Generating font.scale"
424 eend $? 399 eend $?
425 fi 400 fi
426} 401}
427 402
428# @FUNCTION: create_fonts_dir 403# @FUNCTION: create_fonts_dir
429# @USAGE:
430# @DESCRIPTION: 404# @DESCRIPTION:
431# Create fonts.dir file, used by the old server-side fonts subsystem. 405# Create fonts.dir file, used by the old server-side fonts subsystem.
432create_fonts_dir() { 406create_fonts_dir() {
433 ebegin "Generating fonts.dir" 407 ebegin "Generating fonts.dir"
434 mkfontdir \ 408 mkfontdir \

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.19

  ViewVC Help
Powered by ViewVC 1.1.20