/[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.6 Revision 1.21
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.6 2010/07/14 08:34:27 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.21 2011/01/06 11:01:59 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# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \
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|4) 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
65# @DESCRIPTION: 65# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 66# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 67# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 68# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 69if [[ -z ${MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 70 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 71 app-doc) MODULE="doc" ;;
73 media-fonts) MODULE="font" ;; 72 media-fonts) MODULE="font" ;;
74 x11-apps|x11-wm) MODULE="app" ;; 73 x11-apps|x11-wm) MODULE="app" ;;
75 x11-misc|x11-themes) MODULE="util" ;; 74 x11-misc|x11-themes) MODULE="util" ;;
76 x11-drivers) MODULE="driver" ;; 75 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 76 x11-base) MODULE="xserver" ;;
78 x11-proto) MODULE="proto" ;; 77 x11-proto) MODULE="proto" ;;
79 x11-libs) MODULE="lib" ;; 78 x11-libs) MODULE="lib" ;;
79 *) MODULE="" ;;
80 esac 80 esac
81fi 81fi
82 82
83# @ECLASS-VARIABLE: PACKAGE_NAME
84# @DESCRIPTION:
85# For git checkout the git repository migth differ from package name.
86# This variable can be used for proper directory specification
87: ${PACKAGE_NAME:=${PN}}
88
83if [[ -n ${GIT_ECLASS} ]]; then 89if [[ -n ${GIT_ECLASS} ]]; then
84 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 90 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}"
85else 91else
86 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 92 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
87fi 93fi
88 94
89: ${SLOT:=0} 95: ${SLOT:=0}
91# Set the license for the package. This can be overridden by setting 97# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 98# 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) 99# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE:=MIT} 100: ${LICENSE:=MIT}
95 101
96# Set up shared dependencies 102# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 103# Remember that all versions here MUST be stable
98 DEPEND+=" 104XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
105EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 106 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 107 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 108if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.8.0" 109 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
104 # Required even by xorg-server 110 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 111 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 112fi
107 WANT_AUTOCONF="latest" 113WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 114WANT_AUTOMAKE="latest"
109fi 115for arch in ${XORG_EAUTORECONF_ARCHES}; do
116 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
117done
118DEPEND+=" ${EAUTORECONF_DEPENDS}"
119[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
120unset EAUTORECONF_DEPENDS
121unset EAUTORECONF_DEPEND
110 122
111if [[ ${FONT} == yes ]]; then 123if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 124 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 125 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 126 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 127 PDEPEND+=" media-fonts/font-alias"
128 DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
116 129
117 # @ECLASS-VARIABLE: FONT_DIR 130 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 131 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 132 # 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 133 # the subdirectory of /usr/share/fonts/ it should install into, set
146 159
147# Add static-libs useflag where usefull. 160# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 161if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 162 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 163 && ${CATEGORY} != app-doc \
164 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 165 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 166 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 167 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 168 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 169 && ${PN} != xbitmaps \
163# Check deps on xorg-server 177# Check deps on xorg-server
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 179[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
166 180
167# @FUNCTION: xorg-2_pkg_setup 181# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 182# @DESCRIPTION:
170# Setup prefix compat 183# Setup prefix compat
171xorg-2_pkg_setup() { 184xorg-2_pkg_setup() {
185 debug-print-function ${FUNCNAME} "$@"
186
172 [[ ${FONT} == yes ]] && font_pkg_setup 187 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
173} 188}
174 189
175# @FUNCTION: xorg-2_src_unpack 190# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 191# @DESCRIPTION:
178# Simply unpack source code. 192# Simply unpack source code.
179xorg-2_src_unpack() { 193xorg-2_src_unpack() {
194 debug-print-function ${FUNCNAME} "$@"
195
180 if [[ -n ${GIT_ECLASS} ]]; then 196 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 197 git_src_unpack
182 else 198 else
183 unpack ${A} 199 unpack ${A}
184 fi 200 fi
185 201
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 202 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 203}
188 204
189# @FUNCTION: xorg-2_patch_source 205# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 206# @DESCRIPTION:
192# Apply all patches 207# Apply all patches
193xorg-2_patch_source() { 208xorg-2_patch_source() {
209 debug-print-function ${FUNCNAME} "$@"
210
194 # Use standardized names and locations with bulk patching 211 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 212 # Patch directory is ${WORKDIR}/patch
196 # See epatch() in eutils.eclass for more documentation 213 # See epatch() in eutils.eclass for more documentation
197 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 214 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
198 215
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 216 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 217 base_src_prepare "$@"
201} 218}
202 219
203# @FUNCTION: xorg-2_reconf_source 220# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 221# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 222# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 223xorg-2_reconf_source() {
224 debug-print-function ${FUNCNAME} "$@"
225
208 case ${CHOST} in 226 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 227 *-interix* | *-aix* | *-winnt*)
210 # some hosts need full eautoreconf 228 # some hosts need full eautoreconf
211 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 229 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
212 ;; 230 ;;
213 *) 231 *)
214 # elibtoolize required for BSD 232 # elibtoolize required for BSD
215 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 233 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
216 ;; 234 ;;
217 esac 235 esac
218} 236}
219 237
220# @FUNCTION: xorg-2_src_prepare 238# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 239# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 240# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 241xorg-2_src_prepare() {
242 debug-print-function ${FUNCNAME} "$@"
243
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 244 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 245 xorg-2_patch_source
227 xorg-2_reconf_source 246 xorg-2_reconf_source
228} 247}
229 248
230# @FUNCTION: xorg-2_font_configure 249# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 250# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 251# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 252xorg-2_font_configure() {
253 debug-print-function ${FUNCNAME} "$@"
254
235 if has nls ${IUSE//+} && ! use nls; then 255 if has nls ${IUSE//+} && ! use nls; then
236 FONT_OPTIONS+=" 256 FONT_OPTIONS+="
237 --disable-iso8859-2 257 --disable-iso8859-2
238 --disable-iso8859-3 258 --disable-iso8859-3
239 --disable-iso8859-4 259 --disable-iso8859-4
252 --disable-jisx0201 272 --disable-jisx0201
253 --disable-koi8-r" 273 --disable-koi8-r"
254 fi 274 fi
255} 275}
256 276
257# @FUNCTION: x-modular_flags_setup 277# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 278# @DESCRIPTION:
260# Set up CFLAGS for a debug build 279# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 280xorg-2_flags_setup() {
281 debug-print-function ${FUNCNAME} "$@"
282
262 # Win32 require special define 283 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 284 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 285 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 286 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
287
288 # Quite few libraries fail on runtime without these:
289 if has static-libs ${IUSE//+}; then
290 filter-flags -Wl,-Bdirect
291 filter-ldflags -Bdirect
292 filter-ldflags -Wl,-Bdirect
293 fi
266} 294}
267 295
268# @FUNCTION: xorg-2_src_configure 296# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 297# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 298# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 299xorg-2_src_configure() {
300 debug-print-function ${FUNCNAME} "$@"
273 local myopts="" 301 local myopts=""
274 302
275 xorg-2_flags_setup 303 xorg-2_flags_setup
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 304 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 305
278# @VARIABLE: CONFIGURE_OPTIONS 306 # @VARIABLE: CONFIGURE_OPTIONS
279# @DESCRIPTION: 307 # @DESCRIPTION:
280# Any options to pass to configure 308 # Any options to pass to configure
309 # @DEFAULT_UNSET
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 310 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 311 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then 312 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)" 313 myopts+=" $(use_enable static-libs static)"
285 fi 314 fi
289 ${myopts} 318 ${myopts}
290 fi 319 fi
291} 320}
292 321
293# @FUNCTION: xorg-2_src_compile 322# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 323# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 324# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 325xorg-2_src_compile() {
326 debug-print-function ${FUNCNAME} "$@"
327
298 base_src_compile 328 base_src_compile "$@"
299} 329}
300 330
301# @FUNCTION: xorg-2_src_install 331# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 332# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 333# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 334# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 335xorg-2_src_install() {
336 debug-print-function ${FUNCNAME} "$@"
337
307 if [[ ${CATEGORY} == x11-proto ]]; then 338 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 339 emake \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 340 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
341 docdir=${EPREFIX}/usr/share/doc/${PF} \
310 DESTDIR="${D}" \ 342 DESTDIR="${D}" \
311 install || die "emake install failed" 343 install || die "emake install failed"
312 else 344 else
313 emake \ 345 emake \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 346 docdir=${EPREFIX}/usr/share/doc/${PF} \
316 install || die "emake install failed" 348 install || die "emake install failed"
317 fi 349 fi
318 350
319 if [[ -n ${GIT_ECLASS} ]]; then 351 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 352 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 353 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 354 popd > /dev/null
323 fi 355 fi
324 356
325 if [[ -e "${S}"/ChangeLog ]]; then 357 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog 358 dodoc "${S}"/ChangeLog || die "dodoc failed"
327 fi 359 fi
328# @VARIABLE: DOCS 360 # @VARIABLE: DOCS
329# @DESCRIPTION: 361 # @DESCRIPTION:
330# Any documentation to install 362 # Any documentation to install
363 # @DEFAULT_UNSET
331 if [[ -n ${DOCS} ]]; then 364 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 365 dodoc ${DOCS} || die "dodoc failed"
333 fi 366 fi
334 367
335 # Don't install libtool archives for server modules 368 # Don't install libtool archives for server modules
340 373
341 [[ -n ${FONT} ]] && remove_font_metadata 374 [[ -n ${FONT} ]] && remove_font_metadata
342} 375}
343 376
344# @FUNCTION: xorg-2_pkg_postinst 377# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 378# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 379# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 380# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 381xorg-2_pkg_postinst() {
382 debug-print-function ${FUNCNAME} "$@"
383
350 [[ -n ${FONT} ]] && setup_fonts 384 [[ -n ${FONT} ]] && setup_fonts "$@"
351} 385}
352 386
353# @FUNCTION: xorg-2_pkg_postrm 387# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 388# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 389# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 390# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 391xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 392 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 393
361 fi 394 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 395}
363 396
364# @FUNCTION: setup_fonts 397# @FUNCTION: setup_fonts
365# @USAGE:
366# @DESCRIPTION: 398# @DESCRIPTION:
367# Generates needed files for fonts and fixes font permissions 399# Generates needed files for fonts and fixes font permissions
368setup_fonts() { 400setup_fonts() {
401 debug-print-function ${FUNCNAME} "$@"
402
369 create_fonts_scale 403 create_fonts_scale
370 create_fonts_dir 404 create_fonts_dir
371 font_pkg_postinst 405 font_pkg_postinst
372} 406}
373 407
374# @FUNCTION: remove_font_metadata 408# @FUNCTION: remove_font_metadata
375# @USAGE:
376# @DESCRIPTION: 409# @DESCRIPTION:
377# Don't let the package install generated font files that may overlap 410# Don't let the package install generated font files that may overlap
378# with other packages. Instead, they're generated in pkg_postinst(). 411# with other packages. Instead, they're generated in pkg_postinst().
379remove_font_metadata() { 412remove_font_metadata() {
413 debug-print-function ${FUNCNAME} "$@"
414
380 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 415 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
381 einfo "Removing font metadata" 416 einfo "Removing font metadata"
382 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 417 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
383 fi 418 fi
384} 419}
385 420
386# @FUNCTION: create_fonts_scale 421# @FUNCTION: create_fonts_scale
387# @USAGE:
388# @DESCRIPTION: 422# @DESCRIPTION:
389# Create fonts.scale file, used by the old server-side fonts subsystem. 423# Create fonts.scale file, used by the old server-side fonts subsystem.
390create_fonts_scale() { 424create_fonts_scale() {
425 debug-print-function ${FUNCNAME} "$@"
426
391 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 427 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
392 ebegin "Generating font.scale" 428 ebegin "Generating font.scale"
393 mkfontscale \ 429 mkfontscale \
394 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 430 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
395 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 431 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
396 eend $? 432 eend $?
397 fi 433 fi
398} 434}
399 435
400# @FUNCTION: create_fonts_dir 436# @FUNCTION: create_fonts_dir
401# @USAGE:
402# @DESCRIPTION: 437# @DESCRIPTION:
403# Create fonts.dir file, used by the old server-side fonts subsystem. 438# Create fonts.dir file, used by the old server-side fonts subsystem.
404create_fonts_dir() { 439create_fonts_dir() {
440 debug-print-function ${FUNCNAME} "$@"
441
405 ebegin "Generating fonts.dir" 442 ebegin "Generating fonts.dir"
406 mkfontdir \ 443 mkfontdir \
407 -e "${EROOT}"/usr/share/fonts/encodings \ 444 -e "${EROOT}"/usr/share/fonts/encodings \
408 -e "${EROOT}"/usr/share/fonts/encodings/large \ 445 -e "${EROOT}"/usr/share/fonts/encodings/large \
409 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 446 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.21

  ViewVC Help
Powered by ViewVC 1.1.20