/[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.18 Revision 1.27
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.18 2010/11/01 12:37:58 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.27 2011/03/08 11:31:42 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.
36 # Activate font code in the rest of the eclass 36 # Activate font code in the rest of the eclass
37 FONT="yes" 37 FONT="yes"
38 FONT_ECLASS="font" 38 FONT_ECLASS="font"
39fi 39fi
40 40
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit autotools-utils eutils 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 *) die "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}
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" ;;
77 x11-base) MODULE="xserver" ;; 75 x11-base) MODULE=xserver/ ;;
76 x11-drivers) MODULE=driver/ ;;
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 might 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}
90 96
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.11.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"
160 IUSE+=" static-libs" 172 IUSE+=" static-libs"
161fi 173fi
162 174
163DEPEND+=" >=dev-util/pkgconfig-0.23" 175DEPEND+=" >=dev-util/pkgconfig-0.23"
164 176
165# Check deps on xorg-server 177# Check deps on drivers
166has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 178if has dri ${IUSE//+}; then
167[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 179 COMMON_DEPEND+=" dri? (
180 x11-base/xorg-server[-minimal]
181 x11-libs/libdrm
182 )"
183 DEPEND+=" dri? (
184 x11-proto/xf86driproto
185 x11-proto/glproto
186 x11-proto/dri2proto
187 )"
188fi
189if [[ -n "${DRIVER}" ]]; then
190 COMMON_DEPEND+="
191 x11-base/xorg-server[xorg]
192 "
193fi
194if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
195 COMMON_DEPEND+="
196 x11-libs/libpciaccess
197 "
198 # we also needs some protos and libs in all cases
199 DEPEND+="
200 x11-proto/fontsproto
201 x11-proto/randrproto
202 x11-proto/renderproto
203 x11-proto/videoproto
204 x11-proto/xextproto
205 x11-proto/xineramaproto
206 x11-proto/xproto
207 "
208fi
209
210# Add deps on documentation
211# Most docbooks use dtd version 4.2 and 4.3 add more when found
212if has doc ${IUSE//+}; then
213 DEPEND+="
214 doc? (
215 app-text/xmlto
216 app-doc/doxygen
217 app-text/docbook-xml-dtd:4.1
218 app-text/docbook-xml-dtd:4.2
219 app-text/docbook-xml-dtd:4.3
220 )
221 "
222fi
223
224DEPEND+=" ${COMMON_DEPEND}"
225RDEPEND+=" ${COMMON_DEPEND}"
226unset COMMON_DEPEND
227
228debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
229debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
168 230
169# @FUNCTION: xorg-2_pkg_setup 231# @FUNCTION: xorg-2_pkg_setup
170# @DESCRIPTION: 232# @DESCRIPTION:
171# Setup prefix compat 233# Setup prefix compat
172xorg-2_pkg_setup() { 234xorg-2_pkg_setup() {
235 debug-print-function ${FUNCNAME} "$@"
236
173 [[ ${FONT} == yes ]] && font_pkg_setup 237 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
174} 238}
175 239
176# @FUNCTION: xorg-2_src_unpack 240# @FUNCTION: xorg-2_src_unpack
177# @DESCRIPTION: 241# @DESCRIPTION:
178# Simply unpack source code. 242# Simply unpack source code.
179xorg-2_src_unpack() { 243xorg-2_src_unpack() {
244 debug-print-function ${FUNCNAME} "$@"
245
180 if [[ -n ${GIT_ECLASS} ]]; then 246 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 247 git_src_unpack
182 else 248 else
183 unpack ${A} 249 unpack ${A}
184 fi 250 fi
188 254
189# @FUNCTION: xorg-2_patch_source 255# @FUNCTION: xorg-2_patch_source
190# @DESCRIPTION: 256# @DESCRIPTION:
191# Apply all patches 257# Apply all patches
192xorg-2_patch_source() { 258xorg-2_patch_source() {
259 debug-print-function ${FUNCNAME} "$@"
260
193 # Use standardized names and locations with bulk patching 261 # Use standardized names and locations with bulk patching
194 # Patch directory is ${WORKDIR}/patch 262 # Patch directory is ${WORKDIR}/patch
195 # See epatch() in eutils.eclass for more documentation 263 # See epatch() in eutils.eclass for more documentation
196 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 264 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
197 265
198 [[ -d "${EPATCH_SOURCE}" ]] && epatch 266 [[ -d "${EPATCH_SOURCE}" ]] && epatch
199 base_src_prepare 267 autotools-utils_src_prepare "$@"
200} 268}
201 269
202# @FUNCTION: xorg-2_reconf_source 270# @FUNCTION: xorg-2_reconf_source
203# @DESCRIPTION: 271# @DESCRIPTION:
204# Run eautoreconf if necessary, and run elibtoolize. 272# Run eautoreconf if necessary, and run elibtoolize.
205xorg-2_reconf_source() { 273xorg-2_reconf_source() {
274 debug-print-function ${FUNCNAME} "$@"
275
206 case ${CHOST} in 276 case ${CHOST} in
207 *-interix* | *-aix* | *-winnt*) 277 *-interix* | *-aix* | *-winnt*)
208 # some hosts need full eautoreconf 278 # some hosts need full eautoreconf
209 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 279 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
210 ;; 280 ;;
217 287
218# @FUNCTION: xorg-2_src_prepare 288# @FUNCTION: xorg-2_src_prepare
219# @DESCRIPTION: 289# @DESCRIPTION:
220# Prepare a package after unpacking, performing all X-related tasks. 290# Prepare a package after unpacking, performing all X-related tasks.
221xorg-2_src_prepare() { 291xorg-2_src_prepare() {
292 debug-print-function ${FUNCNAME} "$@"
293
222 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 294 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
223 xorg-2_patch_source 295 xorg-2_patch_source
224 xorg-2_reconf_source 296 xorg-2_reconf_source
225} 297}
226 298
227# @FUNCTION: xorg-2_font_configure 299# @FUNCTION: xorg-2_font_configure
228# @DESCRIPTION: 300# @DESCRIPTION:
229# If a font package, perform any necessary configuration steps 301# If a font package, perform any necessary configuration steps
230xorg-2_font_configure() { 302xorg-2_font_configure() {
303 debug-print-function ${FUNCNAME} "$@"
304
231 if has nls ${IUSE//+} && ! use nls; then 305 if has nls ${IUSE//+} && ! use nls; then
306 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
232 FONT_OPTIONS+=" 307 FONT_OPTIONS+="
308 --disable-all-encodings"
309 else
310 FONT_OPTIONS+="
233 --disable-iso8859-2 311 --disable-iso8859-2
234 --disable-iso8859-3 312 --disable-iso8859-3
235 --disable-iso8859-4 313 --disable-iso8859-4
236 --disable-iso8859-5 314 --disable-iso8859-5
237 --disable-iso8859-6 315 --disable-iso8859-6
238 --disable-iso8859-7 316 --disable-iso8859-7
239 --disable-iso8859-8 317 --disable-iso8859-8
240 --disable-iso8859-9 318 --disable-iso8859-9
241 --disable-iso8859-10 319 --disable-iso8859-10
242 --disable-iso8859-11 320 --disable-iso8859-11
243 --disable-iso8859-12 321 --disable-iso8859-12
244 --disable-iso8859-13 322 --disable-iso8859-13
245 --disable-iso8859-14 323 --disable-iso8859-14
246 --disable-iso8859-15 324 --disable-iso8859-15
247 --disable-iso8859-16 325 --disable-iso8859-16
248 --disable-jisx0201 326 --disable-jisx0201
249 --disable-koi8-r" 327 --disable-koi8-r"
328 fi
250 fi 329 fi
251} 330}
252 331
253# @FUNCTION: xorg-2_flags_setup 332# @FUNCTION: xorg-2_flags_setup
254# @DESCRIPTION: 333# @DESCRIPTION:
255# Set up CFLAGS for a debug build 334# Set up CFLAGS for a debug build
256xorg-2_flags_setup() { 335xorg-2_flags_setup() {
336 debug-print-function ${FUNCNAME} "$@"
337
257 # Win32 require special define 338 # Win32 require special define
258 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 339 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
259 # hardened ldflags 340 # hardened ldflags
260 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 341 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
261 342
269 350
270# @FUNCTION: xorg-2_src_configure 351# @FUNCTION: xorg-2_src_configure
271# @DESCRIPTION: 352# @DESCRIPTION:
272# Perform any necessary pre-configuration steps, then run configure 353# Perform any necessary pre-configuration steps, then run configure
273xorg-2_src_configure() { 354xorg-2_src_configure() {
274 local myopts="" 355 debug-print-function ${FUNCNAME} "$@"
275 356
276 xorg-2_flags_setup 357 xorg-2_flags_setup
277 [[ -n "${FONT}" ]] && xorg-2_font_configure
278 358
279 # @VARIABLE: CONFIGURE_OPTIONS 359 # @VARIABLE: CONFIGURE_OPTIONS
280 # @DESCRIPTION: 360 # @DESCRIPTION:
281 # Any options to pass to configure 361 # Any options to pass to configure
282 # @DEFAULT_UNSET 362 # @DEFAULT_UNSET
283 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 363 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
284 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 364
285 if has static-libs ${IUSE//+}; then 365 [[ -n "${FONT}" ]] && xorg-2_font_configure
286 myopts+=" $(use_enable static-libs static)" 366 local myeconfargs=(
287 fi 367 --disable-dependency-tracking
288 econf \
289 ${FONT_OPTIONS} \
290 ${CONFIGURE_OPTIONS} \ 368 ${CONFIGURE_OPTIONS}
291 ${myopts} 369 ${FONT_OPTIONS}
292 fi 370 )
371
372 autotools-utils_src_configure "$@"
293} 373}
294 374
295# @FUNCTION: xorg-2_src_compile 375# @FUNCTION: xorg-2_src_compile
296# @DESCRIPTION: 376# @DESCRIPTION:
297# Compile a package, performing all X-related tasks. 377# Compile a package, performing all X-related tasks.
298xorg-2_src_compile() { 378xorg-2_src_compile() {
299 base_src_compile 379 debug-print-function ${FUNCNAME} "$@"
380
381 autotools-utils_src_compile "$@"
300} 382}
301 383
302# @FUNCTION: xorg-2_src_install 384# @FUNCTION: xorg-2_src_install
303# @DESCRIPTION: 385# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 386# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 387# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 388xorg-2_src_install() {
389 debug-print-function ${FUNCNAME} "$@"
390
307 if [[ ${CATEGORY} == x11-proto ]]; then 391 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 392 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 393 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 docdir=${EPREFIX}/usr/share/doc/${PF} \ 394 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 DESTDIR="${D}" \
312 install || die "emake install failed"
313 else 395 else
314 emake \ 396 autotools-utils_src_install \
315 docdir=${EPREFIX}/usr/share/doc/${PF} \ 397 docdir="${EPREFIX}/usr/share/doc/${PF}"
316 DESTDIR="${D}" \
317 install || die "emake install failed"
318 fi 398 fi
319 399
320 if [[ -n ${GIT_ECLASS} ]]; then 400 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 401 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 402 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 403 popd > /dev/null
324 fi 404 fi
325 405
326 if [[ -e "${S}"/ChangeLog ]]; then 406 if [[ -e "${S}"/ChangeLog ]]; then
327 dodoc "${S}"/ChangeLog
328 fi
329 # @VARIABLE: DOCS
330 # @DESCRIPTION:
331 # Any documentation to install
332 # @DEFAULT_UNSET
333 if [[ -n ${DOCS} ]]; then
334 dodoc ${DOCS} || die "dodoc failed" 407 dodoc "${S}"/ChangeLog || die "dodoc failed"
335 fi 408 fi
336 409
337 # Don't install libtool archives for server modules 410 # Don't install libtool archives (even with static-libs)
338 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 411 remove_libtool_files all
339 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
340 -exec rm -f {} ';'
341 fi
342 412
343 [[ -n ${FONT} ]] && remove_font_metadata 413 [[ -n ${FONT} ]] && remove_font_metadata
344} 414}
345 415
346# @FUNCTION: xorg-2_pkg_postinst 416# @FUNCTION: xorg-2_pkg_postinst
347# @DESCRIPTION: 417# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 418# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 419# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 420xorg-2_pkg_postinst() {
421 debug-print-function ${FUNCNAME} "$@"
422
351 [[ -n ${FONT} ]] && setup_fonts 423 [[ -n ${FONT} ]] && setup_fonts "$@"
352} 424}
353 425
354# @FUNCTION: xorg-2_pkg_postrm 426# @FUNCTION: xorg-2_pkg_postrm
355# @DESCRIPTION: 427# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 428# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 429# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 430xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 431 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 432
361 fi 433 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 434}
363 435
364# @FUNCTION: setup_fonts 436# @FUNCTION: setup_fonts
365# @DESCRIPTION: 437# @DESCRIPTION:
366# Generates needed files for fonts and fixes font permissions 438# Generates needed files for fonts and fixes font permissions
367setup_fonts() { 439setup_fonts() {
440 debug-print-function ${FUNCNAME} "$@"
441
368 create_fonts_scale 442 create_fonts_scale
369 create_fonts_dir 443 create_fonts_dir
370 font_pkg_postinst 444 font_pkg_postinst
371} 445}
372 446
373# @FUNCTION: remove_font_metadata 447# @FUNCTION: remove_font_metadata
374# @DESCRIPTION: 448# @DESCRIPTION:
375# Don't let the package install generated font files that may overlap 449# Don't let the package install generated font files that may overlap
376# with other packages. Instead, they're generated in pkg_postinst(). 450# with other packages. Instead, they're generated in pkg_postinst().
377remove_font_metadata() { 451remove_font_metadata() {
452 debug-print-function ${FUNCNAME} "$@"
453
378 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 454 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
379 einfo "Removing font metadata" 455 einfo "Removing font metadata"
380 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 456 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
381 fi 457 fi
382} 458}
383 459
384# @FUNCTION: create_fonts_scale 460# @FUNCTION: create_fonts_scale
385# @DESCRIPTION: 461# @DESCRIPTION:
386# Create fonts.scale file, used by the old server-side fonts subsystem. 462# Create fonts.scale file, used by the old server-side fonts subsystem.
387create_fonts_scale() { 463create_fonts_scale() {
464 debug-print-function ${FUNCNAME} "$@"
465
388 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 466 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
389 ebegin "Generating font.scale" 467 ebegin "Generating font.scale"
390 mkfontscale \ 468 mkfontscale \
391 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 469 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
392 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 470 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
396 474
397# @FUNCTION: create_fonts_dir 475# @FUNCTION: create_fonts_dir
398# @DESCRIPTION: 476# @DESCRIPTION:
399# Create fonts.dir file, used by the old server-side fonts subsystem. 477# Create fonts.dir file, used by the old server-side fonts subsystem.
400create_fonts_dir() { 478create_fonts_dir() {
479 debug-print-function ${FUNCNAME} "$@"
480
401 ebegin "Generating fonts.dir" 481 ebegin "Generating fonts.dir"
402 mkfontdir \ 482 mkfontdir \
403 -e "${EROOT}"/usr/share/fonts/encodings \ 483 -e "${EROOT}"/usr/share/fonts/encodings \
404 -e "${EROOT}"/usr/share/fonts/encodings/large \ 484 -e "${EROOT}"/usr/share/fonts/encodings/large \
405 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 485 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

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

  ViewVC Help
Powered by ViewVC 1.1.20