/[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.29 Revision 1.53
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2012 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.29 2011/03/15 12:32:14 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.53 2012/05/02 18:31:45 jdhore 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# @AUTHOR:
9# Author: Tomáš Chvátal <scarabeus@gentoo.org>
10# Author: Donnie Berkholz <dberkholz@gentoo.org>
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 11# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION: 12# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, 13# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions 14# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching, 15# can be accessed by setting variables instead, such as patching,
15# All you need to do in a basic ebuild is inherit this eclass and set 18# All you need to do in a basic ebuild is inherit this eclass and set
16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 19# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
17# with the other X packages, you don't need to set SRC_URI. Pretty much 20# with the other X packages, you don't need to set SRC_URI. Pretty much
18# everything else should be automatic. 21# everything else should be automatic.
19 22
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-2"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27fi 27fi
28 28
29# If we're a font package, but not the font.alias one 29# If we're a font package, but not the font.alias one
30FONT_ECLASS="" 30FONT_ECLASS=""
35 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
36 FONT="yes" 36 FONT="yes"
37 FONT_ECLASS="font" 37 FONT_ECLASS="font"
38fi 38fi
39 39
40# we need to inherit autotools first to get the deps
40inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
41 ${FONT_ECLASS} ${GIT_ECLASS} 42 flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
42 43
43EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
44case "${EAPI:-0}" in 45case "${EAPI:-0}" in
45 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 46 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
46 *) die "EAPI-UNSUPPORTED" ;; 47 *) die "EAPI=${EAPI} is not supported" ;;
47esac 48esac
48 49
49# exports must be ALWAYS after inherit 50# exports must be ALWAYS after inherit
50EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
51 52
56# @DESCRIPTION: 57# @DESCRIPTION:
57# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
58# before inheriting this eclass. 59# before inheriting this eclass.
59: ${XORG_EAUTORECONF:="no"} 60: ${XORG_EAUTORECONF:="no"}
60 61
61# @ECLASS-VARIABLE: BASE_INDIVIDUAL_URI 62# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
62# @DESCRIPTION: 63# @DESCRIPTION:
63# Set up SRC_URI for individual modular releases. If set to an empty 64# Set up SRC_URI for individual modular releases. If set to an empty
64# string, no SRC_URI will be provided by the eclass. 65# string, no SRC_URI will be provided by the eclass.
65: ${BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"} 66: ${XORG_BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
66 67
67# @ECLASS-VARIABLE: MODULE 68# @ECLASS-VARIABLE: XORG_MODULE
68# @DESCRIPTION: 69# @DESCRIPTION:
69# The subdirectory to download source from. Possible settings are app, 70# The subdirectory to download source from. Possible settings are app,
70# doc, data, util, driver, font, lib, proto, xserver. Set above the 71# doc, data, util, driver, font, lib, proto, xserver. Set above the
71# inherit to override the default autoconfigured module. 72# inherit to override the default autoconfigured module.
72if [[ -z ${MODULE} ]]; then 73if [[ -z ${XORG_MODULE} ]]; then
73 case ${CATEGORY} in 74 case ${CATEGORY} in
74 app-doc) MODULE=doc/ ;; 75 app-doc) XORG_MODULE=doc/ ;;
75 media-fonts) MODULE=font/ ;; 76 media-fonts) XORG_MODULE=font/ ;;
76 x11-apps|x11-wm) MODULE=app/ ;; 77 x11-apps|x11-wm) XORG_MODULE=app/ ;;
77 x11-misc|x11-themes) MODULE=util/ ;; 78 x11-misc|x11-themes) XORG_MODULE=util/ ;;
78 x11-base) MODULE=xserver/ ;; 79 x11-base) XORG_MODULE=xserver/ ;;
79 x11-drivers) MODULE=driver/ ;; 80 x11-drivers) XORG_MODULE=driver/ ;;
80 x11-proto) MODULE=proto/ ;; 81 x11-proto) XORG_MODULE=proto/ ;;
81 x11-libs) MODULE=lib/ ;; 82 x11-libs) XORG_MODULE=lib/ ;;
82 *) MODULE= ;; 83 *) XORG_MODULE= ;;
83 esac 84 esac
84fi 85fi
85 86
86# @ECLASS-VARIABLE: PACKAGE_NAME 87# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
87# @DESCRIPTION: 88# @DESCRIPTION:
88# For git checkout the git repository might differ from package name. 89# For git checkout the git repository might differ from package name.
89# This variable can be used for proper directory specification 90# This variable can be used for proper directory specification
90: ${PACKAGE_NAME:=${PN}} 91: ${XORG_PACKAGE_NAME:=${PN}}
91 92
92if [[ -n ${GIT_ECLASS} ]]; then 93if [[ -n ${GIT_ECLASS} ]]; then
93 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}" 94 : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME} http://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
94elif [[ -n ${BASE_INDIVIDUAL_URI} ]]; then 95elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
95 SRC_URI="${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2" 96 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
96fi 97fi
97 98
98: ${SLOT:=0} 99: ${SLOT:=0}
99 100
100# Set the license for the package. This can be overridden by setting 101# Set the license for the package. This can be overridden by setting
107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" 108XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
108EAUTORECONF_DEPEND+=" 109EAUTORECONF_DEPEND+="
109 >=sys-devel/libtool-2.2.6a 110 >=sys-devel/libtool-2.2.6a
110 sys-devel/m4" 111 sys-devel/m4"
111if [[ ${PN} != util-macros ]] ; then 112if [[ ${PN} != util-macros ]] ; then
112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0" 113 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.15.0"
113 # Required even by xorg-server 114 # Required even by xorg-server
114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 115 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
115fi 116fi
116WANT_AUTOCONF="latest" 117WANT_AUTOCONF="latest"
117WANT_AUTOMAKE="latest" 118WANT_AUTOMAKE="latest"
118for arch in ${XORG_EAUTORECONF_ARCHES}; do 119for arch in ${XORG_EAUTORECONF_ARCHES}; do
119 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" 120 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
126if [[ ${FONT} == yes ]]; then 127if [[ ${FONT} == yes ]]; then
127 RDEPEND+=" media-fonts/encodings 128 RDEPEND+=" media-fonts/encodings
128 x11-apps/mkfontscale 129 x11-apps/mkfontscale
129 x11-apps/mkfontdir" 130 x11-apps/mkfontdir"
130 PDEPEND+=" media-fonts/font-alias" 131 PDEPEND+=" media-fonts/font-alias"
131 DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 132 DEPEND+=" >=media-fonts/font-util-1.2.0"
132 133
133 # @ECLASS-VARIABLE: FONT_DIR 134 # @ECLASS-VARIABLE: FONT_DIR
134 # @DESCRIPTION: 135 # @DESCRIPTION:
135 # If you're creating a font package and the suffix of PN is not equal to 136 # If you're creating a font package and the suffix of PN is not equal to
136 # the subdirectory of /usr/share/fonts/ it should install into, set 137 # the subdirectory of /usr/share/fonts/ it should install into, set
173 && ${PN} != xorg-cf-files \ 174 && ${PN} != xorg-cf-files \
174 && ${PN/xcursor} = ${PN} ]]; then 175 && ${PN/xcursor} = ${PN} ]]; then
175 IUSE+=" static-libs" 176 IUSE+=" static-libs"
176fi 177fi
177 178
178DEPEND+=" >=dev-util/pkgconfig-0.23" 179DEPEND+=" virtual/pkgconfig"
179 180
180# Check deps on drivers 181# @ECLASS-VARIABLE: XORG_DRI
181if has dri ${IUSE//+}; then 182# @DESCRIPTION:
182 COMMON_DEPEND+=" dri? ( 183# Possible values are "always" or the value of the useflag DRI capabilities
184# are required for. Default value is "no"
185#
186# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
187: ${XORG_DRI:="no"}
188
189DRI_COMMON_DEPEND="
183 x11-base/xorg-server[-minimal] 190 x11-base/xorg-server[-minimal]
184 x11-libs/libdrm 191 x11-libs/libdrm
185 )" 192"
186 DEPEND+=" dri? ( 193DRI_DEPEND="
187 x11-proto/xf86driproto 194 x11-proto/xf86driproto
188 x11-proto/glproto 195 x11-proto/glproto
189 x11-proto/dri2proto 196 x11-proto/dri2proto
190 )" 197"
191fi 198case ${XORG_DRI} in
199 no)
200 ;;
201 always)
202 COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
203 DEPEND+=" ${DRI_DEPEND}"
204 ;;
205 *)
206 COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
207 DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
208 IUSE+=" ${XORG_DRI}"
209 ;;
210esac
211unset DRI_DEPEND
212unset DRI_COMMONDEPEND
213
192if [[ -n "${DRIVER}" ]]; then 214if [[ -n "${DRIVER}" ]]; then
193 COMMON_DEPEND+=" 215 COMMON_DEPEND+="
194 x11-base/xorg-server[xorg] 216 x11-base/xorg-server[xorg]
217 "
218fi
219if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
220 DEPEND+="
221 x11-proto/inputproto
222 x11-proto/kbproto
223 x11-proto/xproto
195 " 224 "
196fi 225fi
197if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then 226if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
198 COMMON_DEPEND+=" 227 COMMON_DEPEND+="
199 x11-libs/libpciaccess 228 x11-libs/libpciaccess
208 x11-proto/xineramaproto 237 x11-proto/xineramaproto
209 x11-proto/xproto 238 x11-proto/xproto
210 " 239 "
211fi 240fi
212 241
213# Add deps on documentation 242# @ECLASS-VARIABLE: XORG_DOC
214# Most docbooks use dtd version 4.2 and 4.3 add more when found 243# @DESCRIPTION:
215if has doc ${IUSE//+}; then 244# Possible values are "always" or the value of the useflag doc packages
216 DEPEND+=" 245# are required for. Default value is "no"
246#
247# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
248: ${XORG_DOC:="no"}
249
250DOC_DEPEND="
217 doc? ( 251 doc? (
252 app-text/asciidoc
218 app-text/xmlto 253 app-text/xmlto
219 app-doc/doxygen 254 app-doc/doxygen
220 app-text/docbook-xml-dtd:4.1 255 app-text/docbook-xml-dtd:4.1.2
221 app-text/docbook-xml-dtd:4.2 256 app-text/docbook-xml-dtd:4.2
222 app-text/docbook-xml-dtd:4.3 257 app-text/docbook-xml-dtd:4.3
223 ) 258 )
224 " 259"
225fi 260case ${XORG_DOC} in
261 no)
262 ;;
263 always)
264 DEPEND+=" ${DOC_DEPEND}"
265 ;;
266 *)
267 DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
268 IUSE+=" ${XORG_DOC}"
269 ;;
270esac
271unset DOC_DEPEND
226 272
227DEPEND+=" ${COMMON_DEPEND}" 273DEPEND+=" ${COMMON_DEPEND}"
228RDEPEND+=" ${COMMON_DEPEND}" 274RDEPEND+=" ${COMMON_DEPEND}"
229unset COMMON_DEPEND 275unset COMMON_DEPEND
230 276
231debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}" 277debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
232debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}" 278debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
279debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
233 280
234# @FUNCTION: xorg-2_pkg_setup 281# @FUNCTION: xorg-2_pkg_setup
235# @DESCRIPTION: 282# @DESCRIPTION:
236# Setup prefix compat 283# Setup prefix compat
237xorg-2_pkg_setup() { 284xorg-2_pkg_setup() {
245# Simply unpack source code. 292# Simply unpack source code.
246xorg-2_src_unpack() { 293xorg-2_src_unpack() {
247 debug-print-function ${FUNCNAME} "$@" 294 debug-print-function ${FUNCNAME} "$@"
248 295
249 if [[ -n ${GIT_ECLASS} ]]; then 296 if [[ -n ${GIT_ECLASS} ]]; then
250 git_src_unpack 297 git-2_src_unpack
251 else 298 else
252 unpack ${A} 299 unpack ${A}
253 fi 300 fi
254 301
255 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 302 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
265 # Patch directory is ${WORKDIR}/patch 312 # Patch directory is ${WORKDIR}/patch
266 # See epatch() in eutils.eclass for more documentation 313 # See epatch() in eutils.eclass for more documentation
267 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 314 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
268 315
269 [[ -d "${EPATCH_SOURCE}" ]] && epatch 316 [[ -d "${EPATCH_SOURCE}" ]] && epatch
270 autotools-utils_src_prepare "$@"
271} 317}
272 318
273# @FUNCTION: xorg-2_reconf_source 319# @FUNCTION: xorg-2_reconf_source
274# @DESCRIPTION: 320# @DESCRIPTION:
275# Run eautoreconf if necessary, and run elibtoolize. 321# Run eautoreconf if necessary, and run elibtoolize.
277 debug-print-function ${FUNCNAME} "$@" 323 debug-print-function ${FUNCNAME} "$@"
278 324
279 case ${CHOST} in 325 case ${CHOST} in
280 *-interix* | *-aix* | *-winnt*) 326 *-interix* | *-aix* | *-winnt*)
281 # some hosts need full eautoreconf 327 # some hosts need full eautoreconf
282 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 328 [[ -e "./configure.ac" || -e "./configure.in" ]] \
329 && AUTOTOOLS_AUTORECONF=1
283 ;; 330 ;;
284 *) 331 *)
285 # elibtoolize required for BSD 332 # elibtoolize required for BSD
286 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize 333 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
334 && AUTOTOOLS_AUTORECONF=1
287 ;; 335 ;;
288 esac 336 esac
289} 337}
290 338
291# @FUNCTION: xorg-2_src_prepare 339# @FUNCTION: xorg-2_src_prepare
292# @DESCRIPTION: 340# @DESCRIPTION:
293# Prepare a package after unpacking, performing all X-related tasks. 341# Prepare a package after unpacking, performing all X-related tasks.
294xorg-2_src_prepare() { 342xorg-2_src_prepare() {
295 debug-print-function ${FUNCNAME} "$@" 343 debug-print-function ${FUNCNAME} "$@"
296 344
297 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
298 xorg-2_patch_source 345 xorg-2_patch_source
299 xorg-2_reconf_source 346 xorg-2_reconf_source
347 autotools-utils_src_prepare "$@"
300} 348}
301 349
302# @FUNCTION: xorg-2_font_configure 350# @FUNCTION: xorg-2_font_configure
303# @DESCRIPTION: 351# @DESCRIPTION:
304# If a font package, perform any necessary configuration steps 352# If a font package, perform any necessary configuration steps
357xorg-2_src_configure() { 405xorg-2_src_configure() {
358 debug-print-function ${FUNCNAME} "$@" 406 debug-print-function ${FUNCNAME} "$@"
359 407
360 xorg-2_flags_setup 408 xorg-2_flags_setup
361 409
362 # @VARIABLE: CONFIGURE_OPTIONS 410 # @VARIABLE: XORG_CONFIGURE_OPTIONS
363 # @DESCRIPTION: 411 # @DESCRIPTION:
364 # Any options to pass to configure 412 # Array of an additional options to pass to configure.
365 # @DEFAULT_UNSET 413 # @DEFAULT_UNSET
366 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 414 if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
415 # fallback to CONFIGURE_OPTIONS, deprecated.
416 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
417 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
418 eqawarn "to preserve namespace."
419 fi
420
421 local xorgconfadd=(${CONFIGURE_OPTIONS})
422 else
423 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
424 fi
367 425
368 [[ -n "${FONT}" ]] && xorg-2_font_configure 426 [[ -n "${FONT}" ]] && xorg-2_font_configure
369 local myeconfargs=( 427 local myeconfargs=(
370 --disable-dependency-tracking 428 --disable-dependency-tracking
371 ${CONFIGURE_OPTIONS}
372 ${FONT_OPTIONS} 429 ${FONT_OPTIONS}
430 "${xorgconfadd[@]}"
373 ) 431 )
374 432
375 autotools-utils_src_configure "$@" 433 autotools-utils_src_configure "$@"
376} 434}
377 435
421# Run X-specific post-installation tasks on the live filesystem. The 479# Run X-specific post-installation tasks on the live filesystem. The
422# only task right now is some setup for font packages. 480# only task right now is some setup for font packages.
423xorg-2_pkg_postinst() { 481xorg-2_pkg_postinst() {
424 debug-print-function ${FUNCNAME} "$@" 482 debug-print-function ${FUNCNAME} "$@"
425 483
426 [[ -n ${FONT} ]] && setup_fonts "$@" 484 if [[ -n ${FONT} ]]; then
485 create_fonts_scale
486 create_fonts_dir
487 font_pkg_postinst "$@"
488 fi
427} 489}
428 490
429# @FUNCTION: xorg-2_pkg_postrm 491# @FUNCTION: xorg-2_pkg_postrm
430# @DESCRIPTION: 492# @DESCRIPTION:
431# Run X-specific post-removal tasks on the live filesystem. The only 493# Run X-specific post-removal tasks on the live filesystem. The only
432# task right now is some cleanup for font packages. 494# task right now is some cleanup for font packages.
433xorg-2_pkg_postrm() { 495xorg-2_pkg_postrm() {
434 debug-print-function ${FUNCNAME} "$@" 496 debug-print-function ${FUNCNAME} "$@"
435 497
436 [[ -n ${FONT} ]] && font_pkg_postrm "$@" 498 if [[ -n ${FONT} ]]; then
437} 499 # if we're doing an upgrade, postinst will do
438 500 if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
439# @FUNCTION: setup_fonts
440# @DESCRIPTION:
441# Generates needed files for fonts and fixes font permissions
442setup_fonts() {
443 debug-print-function ${FUNCNAME} "$@"
444
445 create_fonts_scale 501 create_fonts_scale
446 create_fonts_dir 502 create_fonts_dir
447 font_pkg_postinst 503 font_pkg_postrm "$@"
504 fi
505 fi
448} 506}
449 507
450# @FUNCTION: remove_font_metadata 508# @FUNCTION: remove_font_metadata
451# @DESCRIPTION: 509# @DESCRIPTION:
452# Don't let the package install generated font files that may overlap 510# Don't let the package install generated font files that may overlap
465# Create fonts.scale file, used by the old server-side fonts subsystem. 523# Create fonts.scale file, used by the old server-side fonts subsystem.
466create_fonts_scale() { 524create_fonts_scale() {
467 debug-print-function ${FUNCNAME} "$@" 525 debug-print-function ${FUNCNAME} "$@"
468 526
469 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 527 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
470 ebegin "Generating font.scale" 528 ebegin "Generating fonts.scale"
471 mkfontscale \ 529 mkfontscale \
472 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 530 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
473 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 531 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
474 eend $? 532 eend $?
475 fi 533 fi

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.53

  ViewVC Help
Powered by ViewVC 1.1.20