/[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.29
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.29 2011/03/15 12:32:14 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.
22 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=""
28fi 27fi
29 28
30# 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
31FONT_ECLASS="" 30FONT_ECLASS=""
32if [[ ${PN} == font* \ 31if [[ ${PN} == font* \
36 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
37 FONT="yes" 36 FONT="yes"
38 FONT_ECLASS="font" 37 FONT_ECLASS="font"
39fi 38fi
40 39
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 40inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
42 ${FONT_ECLASS} ${GIT_ECLASS} 41 ${FONT_ECLASS} ${GIT_ECLASS}
43 42
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 43EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 44case "${EAPI:-0}" in
46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 45 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) die "EAPI-UNSUPPORTED" ;; 46 *) die "EAPI-UNSUPPORTED" ;;
48esac 47esac
49 48
50# exports must be ALWAYS after inherit 49# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 50EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57# @DESCRIPTION: 56# @DESCRIPTION:
58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 57# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
59# before inheriting this eclass. 58# before inheriting this eclass.
60: ${XORG_EAUTORECONF:="no"} 59: ${XORG_EAUTORECONF:="no"}
61 60
61# @ECLASS-VARIABLE: BASE_INDIVIDUAL_URI
62# @DESCRIPTION:
62# Set up SRC_URI for individual modular releases 63# Set up SRC_URI for individual modular releases. If set to an empty
64# string, no SRC_URI will be provided by the eclass.
63BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 65: ${BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
66
64# @ECLASS-VARIABLE: MODULE 67# @ECLASS-VARIABLE: MODULE
65# @DESCRIPTION: 68# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 69# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 70# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 71# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 72if [[ -z ${MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 73 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 74 app-doc) MODULE=doc/ ;;
73 media-fonts) MODULE="font" ;; 75 media-fonts) MODULE=font/ ;;
74 x11-apps|x11-wm) MODULE="app" ;; 76 x11-apps|x11-wm) MODULE=app/ ;;
75 x11-misc|x11-themes) MODULE="util" ;; 77 x11-misc|x11-themes) MODULE=util/ ;;
76 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 78 x11-base) MODULE=xserver/ ;;
79 x11-drivers) MODULE=driver/ ;;
78 x11-proto) MODULE="proto" ;; 80 x11-proto) MODULE=proto/ ;;
79 x11-libs) MODULE="lib" ;; 81 x11-libs) MODULE=lib/ ;;
82 *) MODULE= ;;
80 esac 83 esac
81fi 84fi
82 85
86# @ECLASS-VARIABLE: PACKAGE_NAME
87# @DESCRIPTION:
88# For git checkout the git repository might differ from package name.
89# This variable can be used for proper directory specification
90: ${PACKAGE_NAME:=${PN}}
91
83if [[ -n ${GIT_ECLASS} ]]; then 92if [[ -n ${GIT_ECLASS} ]]; then
84 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 93 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}"
85else 94elif [[ -n ${BASE_INDIVIDUAL_URI} ]]; then
86 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 95 SRC_URI="${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
87fi 96fi
88 97
89: ${SLOT:=0} 98: ${SLOT:=0}
90 99
91# Set the license for the package. This can be overridden by setting 100# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 101# 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) 102# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE:=MIT} 103: ${LICENSE:=MIT}
95 104
96# Set up shared dependencies 105# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 106# Remember that all versions here MUST be stable
98 DEPEND+=" 107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
108EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 109 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 110 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 111if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.11.0" 112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
104 # Required even by xorg-server 113 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 115fi
107 WANT_AUTOCONF="latest" 116WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 117WANT_AUTOMAKE="latest"
109fi 118for arch in ${XORG_EAUTORECONF_ARCHES}; do
119 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
120done
121DEPEND+=" ${EAUTORECONF_DEPENDS}"
122[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
123unset EAUTORECONF_DEPENDS
124unset EAUTORECONF_DEPEND
110 125
111if [[ ${FONT} == yes ]]; then 126if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 127 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 128 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 129 x11-apps/mkfontdir"
160 IUSE+=" static-libs" 175 IUSE+=" static-libs"
161fi 176fi
162 177
163DEPEND+=" >=dev-util/pkgconfig-0.23" 178DEPEND+=" >=dev-util/pkgconfig-0.23"
164 179
165# Check deps on xorg-server 180# Check deps on drivers
166has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 181if has dri ${IUSE//+}; then
167[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 182 COMMON_DEPEND+=" dri? (
183 x11-base/xorg-server[-minimal]
184 x11-libs/libdrm
185 )"
186 DEPEND+=" dri? (
187 x11-proto/xf86driproto
188 x11-proto/glproto
189 x11-proto/dri2proto
190 )"
191fi
192if [[ -n "${DRIVER}" ]]; then
193 COMMON_DEPEND+="
194 x11-base/xorg-server[xorg]
195 "
196fi
197if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
198 COMMON_DEPEND+="
199 x11-libs/libpciaccess
200 "
201 # we also needs some protos and libs in all cases
202 DEPEND+="
203 x11-proto/fontsproto
204 x11-proto/randrproto
205 x11-proto/renderproto
206 x11-proto/videoproto
207 x11-proto/xextproto
208 x11-proto/xineramaproto
209 x11-proto/xproto
210 "
211fi
212
213# Add deps on documentation
214# Most docbooks use dtd version 4.2 and 4.3 add more when found
215if has doc ${IUSE//+}; then
216 DEPEND+="
217 doc? (
218 app-text/xmlto
219 app-doc/doxygen
220 app-text/docbook-xml-dtd:4.1
221 app-text/docbook-xml-dtd:4.2
222 app-text/docbook-xml-dtd:4.3
223 )
224 "
225fi
226
227DEPEND+=" ${COMMON_DEPEND}"
228RDEPEND+=" ${COMMON_DEPEND}"
229unset COMMON_DEPEND
230
231debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
232debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
168 233
169# @FUNCTION: xorg-2_pkg_setup 234# @FUNCTION: xorg-2_pkg_setup
170# @DESCRIPTION: 235# @DESCRIPTION:
171# Setup prefix compat 236# Setup prefix compat
172xorg-2_pkg_setup() { 237xorg-2_pkg_setup() {
238 debug-print-function ${FUNCNAME} "$@"
239
173 [[ ${FONT} == yes ]] && font_pkg_setup 240 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
174} 241}
175 242
176# @FUNCTION: xorg-2_src_unpack 243# @FUNCTION: xorg-2_src_unpack
177# @DESCRIPTION: 244# @DESCRIPTION:
178# Simply unpack source code. 245# Simply unpack source code.
179xorg-2_src_unpack() { 246xorg-2_src_unpack() {
247 debug-print-function ${FUNCNAME} "$@"
248
180 if [[ -n ${GIT_ECLASS} ]]; then 249 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 250 git_src_unpack
182 else 251 else
183 unpack ${A} 252 unpack ${A}
184 fi 253 fi
188 257
189# @FUNCTION: xorg-2_patch_source 258# @FUNCTION: xorg-2_patch_source
190# @DESCRIPTION: 259# @DESCRIPTION:
191# Apply all patches 260# Apply all patches
192xorg-2_patch_source() { 261xorg-2_patch_source() {
262 debug-print-function ${FUNCNAME} "$@"
263
193 # Use standardized names and locations with bulk patching 264 # Use standardized names and locations with bulk patching
194 # Patch directory is ${WORKDIR}/patch 265 # Patch directory is ${WORKDIR}/patch
195 # See epatch() in eutils.eclass for more documentation 266 # See epatch() in eutils.eclass for more documentation
196 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 267 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
197 268
198 [[ -d "${EPATCH_SOURCE}" ]] && epatch 269 [[ -d "${EPATCH_SOURCE}" ]] && epatch
199 base_src_prepare 270 autotools-utils_src_prepare "$@"
200} 271}
201 272
202# @FUNCTION: xorg-2_reconf_source 273# @FUNCTION: xorg-2_reconf_source
203# @DESCRIPTION: 274# @DESCRIPTION:
204# Run eautoreconf if necessary, and run elibtoolize. 275# Run eautoreconf if necessary, and run elibtoolize.
205xorg-2_reconf_source() { 276xorg-2_reconf_source() {
277 debug-print-function ${FUNCNAME} "$@"
278
206 case ${CHOST} in 279 case ${CHOST} in
207 *-interix* | *-aix* | *-winnt*) 280 *-interix* | *-aix* | *-winnt*)
208 # some hosts need full eautoreconf 281 # some hosts need full eautoreconf
209 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 282 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
210 ;; 283 ;;
217 290
218# @FUNCTION: xorg-2_src_prepare 291# @FUNCTION: xorg-2_src_prepare
219# @DESCRIPTION: 292# @DESCRIPTION:
220# Prepare a package after unpacking, performing all X-related tasks. 293# Prepare a package after unpacking, performing all X-related tasks.
221xorg-2_src_prepare() { 294xorg-2_src_prepare() {
295 debug-print-function ${FUNCNAME} "$@"
296
222 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 297 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
223 xorg-2_patch_source 298 xorg-2_patch_source
224 xorg-2_reconf_source 299 xorg-2_reconf_source
225} 300}
226 301
227# @FUNCTION: xorg-2_font_configure 302# @FUNCTION: xorg-2_font_configure
228# @DESCRIPTION: 303# @DESCRIPTION:
229# If a font package, perform any necessary configuration steps 304# If a font package, perform any necessary configuration steps
230xorg-2_font_configure() { 305xorg-2_font_configure() {
306 debug-print-function ${FUNCNAME} "$@"
307
231 if has nls ${IUSE//+} && ! use nls; then 308 if has nls ${IUSE//+} && ! use nls; then
309 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
232 FONT_OPTIONS+=" 310 FONT_OPTIONS+="
311 --disable-all-encodings"
312 else
313 FONT_OPTIONS+="
233 --disable-iso8859-2 314 --disable-iso8859-2
234 --disable-iso8859-3 315 --disable-iso8859-3
235 --disable-iso8859-4 316 --disable-iso8859-4
236 --disable-iso8859-5 317 --disable-iso8859-5
237 --disable-iso8859-6 318 --disable-iso8859-6
238 --disable-iso8859-7 319 --disable-iso8859-7
239 --disable-iso8859-8 320 --disable-iso8859-8
240 --disable-iso8859-9 321 --disable-iso8859-9
241 --disable-iso8859-10 322 --disable-iso8859-10
242 --disable-iso8859-11 323 --disable-iso8859-11
243 --disable-iso8859-12 324 --disable-iso8859-12
244 --disable-iso8859-13 325 --disable-iso8859-13
245 --disable-iso8859-14 326 --disable-iso8859-14
246 --disable-iso8859-15 327 --disable-iso8859-15
247 --disable-iso8859-16 328 --disable-iso8859-16
248 --disable-jisx0201 329 --disable-jisx0201
249 --disable-koi8-r" 330 --disable-koi8-r"
331 fi
250 fi 332 fi
251} 333}
252 334
253# @FUNCTION: xorg-2_flags_setup 335# @FUNCTION: xorg-2_flags_setup
254# @DESCRIPTION: 336# @DESCRIPTION:
255# Set up CFLAGS for a debug build 337# Set up CFLAGS for a debug build
256xorg-2_flags_setup() { 338xorg-2_flags_setup() {
339 debug-print-function ${FUNCNAME} "$@"
340
257 # Win32 require special define 341 # Win32 require special define
258 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 342 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
259 # hardened ldflags 343 # hardened ldflags
260 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 344 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
261 345
269 353
270# @FUNCTION: xorg-2_src_configure 354# @FUNCTION: xorg-2_src_configure
271# @DESCRIPTION: 355# @DESCRIPTION:
272# Perform any necessary pre-configuration steps, then run configure 356# Perform any necessary pre-configuration steps, then run configure
273xorg-2_src_configure() { 357xorg-2_src_configure() {
274 local myopts="" 358 debug-print-function ${FUNCNAME} "$@"
275 359
276 xorg-2_flags_setup 360 xorg-2_flags_setup
277 [[ -n "${FONT}" ]] && xorg-2_font_configure
278 361
279 # @VARIABLE: CONFIGURE_OPTIONS 362 # @VARIABLE: CONFIGURE_OPTIONS
280 # @DESCRIPTION: 363 # @DESCRIPTION:
281 # Any options to pass to configure 364 # Any options to pass to configure
282 # @DEFAULT_UNSET 365 # @DEFAULT_UNSET
283 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 366 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
284 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 367
285 if has static-libs ${IUSE//+}; then 368 [[ -n "${FONT}" ]] && xorg-2_font_configure
286 myopts+=" $(use_enable static-libs static)" 369 local myeconfargs=(
287 fi 370 --disable-dependency-tracking
288 econf \
289 ${FONT_OPTIONS} \
290 ${CONFIGURE_OPTIONS} \ 371 ${CONFIGURE_OPTIONS}
291 ${myopts} 372 ${FONT_OPTIONS}
292 fi 373 )
374
375 autotools-utils_src_configure "$@"
293} 376}
294 377
295# @FUNCTION: xorg-2_src_compile 378# @FUNCTION: xorg-2_src_compile
296# @DESCRIPTION: 379# @DESCRIPTION:
297# Compile a package, performing all X-related tasks. 380# Compile a package, performing all X-related tasks.
298xorg-2_src_compile() { 381xorg-2_src_compile() {
299 base_src_compile 382 debug-print-function ${FUNCNAME} "$@"
383
384 autotools-utils_src_compile "$@"
300} 385}
301 386
302# @FUNCTION: xorg-2_src_install 387# @FUNCTION: xorg-2_src_install
303# @DESCRIPTION: 388# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 389# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 390# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 391xorg-2_src_install() {
392 debug-print-function ${FUNCNAME} "$@"
393
307 if [[ ${CATEGORY} == x11-proto ]]; then 394 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 395 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 396 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 docdir=${EPREFIX}/usr/share/doc/${PF} \ 397 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 DESTDIR="${D}" \
312 install || die "emake install failed"
313 else 398 else
314 emake \ 399 autotools-utils_src_install \
315 docdir=${EPREFIX}/usr/share/doc/${PF} \ 400 docdir="${EPREFIX}/usr/share/doc/${PF}"
316 DESTDIR="${D}" \
317 install || die "emake install failed"
318 fi 401 fi
319 402
320 if [[ -n ${GIT_ECLASS} ]]; then 403 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 404 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 405 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 406 popd > /dev/null
324 fi 407 fi
325 408
326 if [[ -e "${S}"/ChangeLog ]]; then 409 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" 410 dodoc "${S}"/ChangeLog || die "dodoc failed"
335 fi 411 fi
336 412
337 # Don't install libtool archives for server modules 413 # Don't install libtool archives (even with static-libs)
338 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 414 remove_libtool_files all
339 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
340 -exec rm -f {} ';'
341 fi
342 415
343 [[ -n ${FONT} ]] && remove_font_metadata 416 [[ -n ${FONT} ]] && remove_font_metadata
344} 417}
345 418
346# @FUNCTION: xorg-2_pkg_postinst 419# @FUNCTION: xorg-2_pkg_postinst
347# @DESCRIPTION: 420# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 421# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 422# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 423xorg-2_pkg_postinst() {
424 debug-print-function ${FUNCNAME} "$@"
425
351 [[ -n ${FONT} ]] && setup_fonts 426 [[ -n ${FONT} ]] && setup_fonts "$@"
352} 427}
353 428
354# @FUNCTION: xorg-2_pkg_postrm 429# @FUNCTION: xorg-2_pkg_postrm
355# @DESCRIPTION: 430# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 431# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 432# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 433xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 434 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 435
361 fi 436 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 437}
363 438
364# @FUNCTION: setup_fonts 439# @FUNCTION: setup_fonts
365# @DESCRIPTION: 440# @DESCRIPTION:
366# Generates needed files for fonts and fixes font permissions 441# Generates needed files for fonts and fixes font permissions
367setup_fonts() { 442setup_fonts() {
443 debug-print-function ${FUNCNAME} "$@"
444
368 create_fonts_scale 445 create_fonts_scale
369 create_fonts_dir 446 create_fonts_dir
370 font_pkg_postinst 447 font_pkg_postinst
371} 448}
372 449
373# @FUNCTION: remove_font_metadata 450# @FUNCTION: remove_font_metadata
374# @DESCRIPTION: 451# @DESCRIPTION:
375# Don't let the package install generated font files that may overlap 452# Don't let the package install generated font files that may overlap
376# with other packages. Instead, they're generated in pkg_postinst(). 453# with other packages. Instead, they're generated in pkg_postinst().
377remove_font_metadata() { 454remove_font_metadata() {
455 debug-print-function ${FUNCNAME} "$@"
456
378 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 457 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
379 einfo "Removing font metadata" 458 einfo "Removing font metadata"
380 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 459 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
381 fi 460 fi
382} 461}
383 462
384# @FUNCTION: create_fonts_scale 463# @FUNCTION: create_fonts_scale
385# @DESCRIPTION: 464# @DESCRIPTION:
386# Create fonts.scale file, used by the old server-side fonts subsystem. 465# Create fonts.scale file, used by the old server-side fonts subsystem.
387create_fonts_scale() { 466create_fonts_scale() {
467 debug-print-function ${FUNCNAME} "$@"
468
388 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 469 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
389 ebegin "Generating font.scale" 470 ebegin "Generating font.scale"
390 mkfontscale \ 471 mkfontscale \
391 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 472 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
392 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 473 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
396 477
397# @FUNCTION: create_fonts_dir 478# @FUNCTION: create_fonts_dir
398# @DESCRIPTION: 479# @DESCRIPTION:
399# Create fonts.dir file, used by the old server-side fonts subsystem. 480# Create fonts.dir file, used by the old server-side fonts subsystem.
400create_fonts_dir() { 481create_fonts_dir() {
482 debug-print-function ${FUNCNAME} "$@"
483
401 ebegin "Generating fonts.dir" 484 ebegin "Generating fonts.dir"
402 mkfontdir \ 485 mkfontdir \
403 -e "${EROOT}"/usr/share/fonts/encodings \ 486 -e "${EROOT}"/usr/share/fonts/encodings \
404 -e "${EROOT}"/usr/share/fonts/encodings/large \ 487 -e "${EROOT}"/usr/share/fonts/encodings/large \
405 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 488 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

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

  ViewVC Help
Powered by ViewVC 1.1.20