/[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.20 Revision 1.34
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.20 2010/11/09 18:25:00 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.34 2011/03/16 20:57:43 mgorny 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: XORG_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: ${XORG_BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
66
64# @ECLASS-VARIABLE: MODULE 67# @ECLASS-VARIABLE: XORG_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 ${XORG_MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 73 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 74 app-doc) XORG_MODULE=doc/ ;;
73 media-fonts) MODULE="font" ;; 75 media-fonts) XORG_MODULE=font/ ;;
74 x11-apps|x11-wm) MODULE="app" ;; 76 x11-apps|x11-wm) XORG_MODULE=app/ ;;
75 x11-misc|x11-themes) MODULE="util" ;; 77 x11-misc|x11-themes) XORG_MODULE=util/ ;;
76 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 78 x11-base) XORG_MODULE=xserver/ ;;
79 x11-drivers) XORG_MODULE=driver/ ;;
78 x11-proto) MODULE="proto" ;; 80 x11-proto) XORG_MODULE=proto/ ;;
79 x11-libs) MODULE="lib" ;; 81 x11-libs) XORG_MODULE=lib/ ;;
82 *) XORG_MODULE= ;;
80 esac 83 esac
81fi 84fi
82 85
86# backcompat, remove when everything in main tree fixed
87[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "Your ebuild is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
88
83# @ECLASS-VARIABLE: PACKAGE_NAME 89# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
84# @DESCRIPTION: 90# @DESCRIPTION:
85# For git checkout git repository migth differ from package name 91# For git checkout the git repository might differ from package name.
86# so it can be overriden via this variable. 92# This variable can be used for proper directory specification
87: ${PACKAGE_NAME:=${PN}} 93: ${XORG_PACKAGE_NAME:=${PN}}
88 94
89if [[ -n ${GIT_ECLASS} ]]; then 95if [[ -n ${GIT_ECLASS} ]]; then
90 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}" 96 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
91else 97elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
92 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 98 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
93fi 99fi
94 100
95: ${SLOT:=0} 101: ${SLOT:=0}
96 102
97# Set the license for the package. This can be overridden by setting 103# Set the license for the package. This can be overridden by setting
104XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" 110XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
105EAUTORECONF_DEPEND+=" 111EAUTORECONF_DEPEND+="
106 >=sys-devel/libtool-2.2.6a 112 >=sys-devel/libtool-2.2.6a
107 sys-devel/m4" 113 sys-devel/m4"
108if [[ ${PN} != util-macros ]] ; then 114if [[ ${PN} != util-macros ]] ; then
109 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0" 115 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
110 # Required even by xorg-server 116 # Required even by xorg-server
111 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 117 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
112fi 118fi
113WANT_AUTOCONF="latest" 119WANT_AUTOCONF="latest"
114WANT_AUTOMAKE="latest" 120WANT_AUTOMAKE="latest"
172 IUSE+=" static-libs" 178 IUSE+=" static-libs"
173fi 179fi
174 180
175DEPEND+=" >=dev-util/pkgconfig-0.23" 181DEPEND+=" >=dev-util/pkgconfig-0.23"
176 182
177# Check deps on xorg-server 183# @ECLASS-VARIABLE: XORG_DRI
178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 184# @DESCRIPTION:
179[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 185# Possible values are "always" or the value of the useflag DRI capabilities
186# are required for. Default value is "no"
187#
188# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
189: ${XORG_DRI:="no"}
190
191DRI_COMMON_DEPEND="
192 x11-base/xorg-server[-minimal]
193 x11-libs/libdrm
194"
195DRI_DEPEND="
196 x11-proto/xf86driproto
197 x11-proto/glproto
198 x11-proto/dri2proto
199"
200case ${XORG_DRI} in
201 no)
202 ;;
203 always)
204 COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
205 DEPEND+=" ${DRI_DEPEND}"
206 ;;
207 *)
208 COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
209 DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
210 IUSE="${XORG_DRI}"
211 ;;
212esac
213unset DRI_DEPEND
214unset DRI_COMMONDEPEND
215
216if [[ -n "${DRIVER}" ]]; then
217 COMMON_DEPEND+="
218 x11-base/xorg-server[xorg]
219 "
220fi
221if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
222 COMMON_DEPEND+="
223 x11-libs/libpciaccess
224 "
225 # we also needs some protos and libs in all cases
226 DEPEND+="
227 x11-proto/fontsproto
228 x11-proto/randrproto
229 x11-proto/renderproto
230 x11-proto/videoproto
231 x11-proto/xextproto
232 x11-proto/xineramaproto
233 x11-proto/xproto
234 "
235fi
236
237# @ECLASS-VARIABLE: XORG_DOC
238# @DESCRIPTION:
239# Possible values are "always" or the value of the useflag doc packages
240# are required for. Default value is "no"
241#
242# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
243: ${XORG_DOC:="no"}
244
245DOC_DEPEND="
246 doc? (
247 app-text/asciidoc
248 app-text/xmlto
249 app-doc/doxygen
250 app-text/docbook-xml-dtd:4.1.2
251 app-text/docbook-xml-dtd:4.2
252 app-text/docbook-xml-dtd:4.3
253 )
254"
255case ${XORG_DOC} in
256 no)
257 ;;
258 always)
259 DEPEND+=" ${DOC_DEPEND}"
260 ;;
261 *)
262 DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
263 IUSE="${XORG_DOC}"
264 ;;
265esac
266unset DOC_DEPEND
267
268DEPEND+=" ${COMMON_DEPEND}"
269RDEPEND+=" ${COMMON_DEPEND}"
270unset COMMON_DEPEND
271
272debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
273debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
274debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
180 275
181# @FUNCTION: xorg-2_pkg_setup 276# @FUNCTION: xorg-2_pkg_setup
182# @DESCRIPTION: 277# @DESCRIPTION:
183# Setup prefix compat 278# Setup prefix compat
184xorg-2_pkg_setup() { 279xorg-2_pkg_setup() {
280 debug-print-function ${FUNCNAME} "$@"
281
185 [[ ${FONT} == yes ]] && font_pkg_setup 282 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
186} 283}
187 284
188# @FUNCTION: xorg-2_src_unpack 285# @FUNCTION: xorg-2_src_unpack
189# @DESCRIPTION: 286# @DESCRIPTION:
190# Simply unpack source code. 287# Simply unpack source code.
191xorg-2_src_unpack() { 288xorg-2_src_unpack() {
289 debug-print-function ${FUNCNAME} "$@"
290
192 if [[ -n ${GIT_ECLASS} ]]; then 291 if [[ -n ${GIT_ECLASS} ]]; then
193 git_src_unpack 292 git_src_unpack
194 else 293 else
195 unpack ${A} 294 unpack ${A}
196 fi 295 fi
200 299
201# @FUNCTION: xorg-2_patch_source 300# @FUNCTION: xorg-2_patch_source
202# @DESCRIPTION: 301# @DESCRIPTION:
203# Apply all patches 302# Apply all patches
204xorg-2_patch_source() { 303xorg-2_patch_source() {
304 debug-print-function ${FUNCNAME} "$@"
305
205 # Use standardized names and locations with bulk patching 306 # Use standardized names and locations with bulk patching
206 # Patch directory is ${WORKDIR}/patch 307 # Patch directory is ${WORKDIR}/patch
207 # See epatch() in eutils.eclass for more documentation 308 # See epatch() in eutils.eclass for more documentation
208 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 309 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
209 310
210 [[ -d "${EPATCH_SOURCE}" ]] && epatch 311 [[ -d "${EPATCH_SOURCE}" ]] && epatch
211 base_src_prepare 312 autotools-utils_src_prepare "$@"
212} 313}
213 314
214# @FUNCTION: xorg-2_reconf_source 315# @FUNCTION: xorg-2_reconf_source
215# @DESCRIPTION: 316# @DESCRIPTION:
216# Run eautoreconf if necessary, and run elibtoolize. 317# Run eautoreconf if necessary, and run elibtoolize.
217xorg-2_reconf_source() { 318xorg-2_reconf_source() {
319 debug-print-function ${FUNCNAME} "$@"
320
218 case ${CHOST} in 321 case ${CHOST} in
219 *-interix* | *-aix* | *-winnt*) 322 *-interix* | *-aix* | *-winnt*)
220 # some hosts need full eautoreconf 323 # some hosts need full eautoreconf
221 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 324 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
222 ;; 325 ;;
229 332
230# @FUNCTION: xorg-2_src_prepare 333# @FUNCTION: xorg-2_src_prepare
231# @DESCRIPTION: 334# @DESCRIPTION:
232# Prepare a package after unpacking, performing all X-related tasks. 335# Prepare a package after unpacking, performing all X-related tasks.
233xorg-2_src_prepare() { 336xorg-2_src_prepare() {
337 debug-print-function ${FUNCNAME} "$@"
338
234 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 339 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
235 xorg-2_patch_source 340 xorg-2_patch_source
236 xorg-2_reconf_source 341 xorg-2_reconf_source
237} 342}
238 343
239# @FUNCTION: xorg-2_font_configure 344# @FUNCTION: xorg-2_font_configure
240# @DESCRIPTION: 345# @DESCRIPTION:
241# If a font package, perform any necessary configuration steps 346# If a font package, perform any necessary configuration steps
242xorg-2_font_configure() { 347xorg-2_font_configure() {
348 debug-print-function ${FUNCNAME} "$@"
349
243 if has nls ${IUSE//+} && ! use nls; then 350 if has nls ${IUSE//+} && ! use nls; then
351 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
244 FONT_OPTIONS+=" 352 FONT_OPTIONS+="
353 --disable-all-encodings"
354 else
355 FONT_OPTIONS+="
245 --disable-iso8859-2 356 --disable-iso8859-2
246 --disable-iso8859-3 357 --disable-iso8859-3
247 --disable-iso8859-4 358 --disable-iso8859-4
248 --disable-iso8859-5 359 --disable-iso8859-5
249 --disable-iso8859-6 360 --disable-iso8859-6
250 --disable-iso8859-7 361 --disable-iso8859-7
251 --disable-iso8859-8 362 --disable-iso8859-8
252 --disable-iso8859-9 363 --disable-iso8859-9
253 --disable-iso8859-10 364 --disable-iso8859-10
254 --disable-iso8859-11 365 --disable-iso8859-11
255 --disable-iso8859-12 366 --disable-iso8859-12
256 --disable-iso8859-13 367 --disable-iso8859-13
257 --disable-iso8859-14 368 --disable-iso8859-14
258 --disable-iso8859-15 369 --disable-iso8859-15
259 --disable-iso8859-16 370 --disable-iso8859-16
260 --disable-jisx0201 371 --disable-jisx0201
261 --disable-koi8-r" 372 --disable-koi8-r"
373 fi
262 fi 374 fi
263} 375}
264 376
265# @FUNCTION: xorg-2_flags_setup 377# @FUNCTION: xorg-2_flags_setup
266# @DESCRIPTION: 378# @DESCRIPTION:
267# Set up CFLAGS for a debug build 379# Set up CFLAGS for a debug build
268xorg-2_flags_setup() { 380xorg-2_flags_setup() {
381 debug-print-function ${FUNCNAME} "$@"
382
269 # Win32 require special define 383 # Win32 require special define
270 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 384 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
271 # hardened ldflags 385 # hardened ldflags
272 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 386 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
273 387
281 395
282# @FUNCTION: xorg-2_src_configure 396# @FUNCTION: xorg-2_src_configure
283# @DESCRIPTION: 397# @DESCRIPTION:
284# Perform any necessary pre-configuration steps, then run configure 398# Perform any necessary pre-configuration steps, then run configure
285xorg-2_src_configure() { 399xorg-2_src_configure() {
286 local myopts="" 400 debug-print-function ${FUNCNAME} "$@"
287 401
288 xorg-2_flags_setup 402 xorg-2_flags_setup
289 [[ -n "${FONT}" ]] && xorg-2_font_configure
290 403
291 # @VARIABLE: CONFIGURE_OPTIONS 404 # @VARIABLE: CONFIGURE_OPTIONS
292 # @DESCRIPTION: 405 # @DESCRIPTION:
293 # Any options to pass to configure 406 # Any options to pass to configure
294 # @DEFAULT_UNSET 407 # @DEFAULT_UNSET
295 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 408 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
296 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 409
297 if has static-libs ${IUSE//+}; then 410 [[ -n "${FONT}" ]] && xorg-2_font_configure
298 myopts+=" $(use_enable static-libs static)" 411 local myeconfargs=(
299 fi 412 --disable-dependency-tracking
300 econf \
301 ${FONT_OPTIONS} \
302 ${CONFIGURE_OPTIONS} \ 413 ${CONFIGURE_OPTIONS}
303 ${myopts} 414 ${FONT_OPTIONS}
304 fi 415 )
416
417 autotools-utils_src_configure "$@"
305} 418}
306 419
307# @FUNCTION: xorg-2_src_compile 420# @FUNCTION: xorg-2_src_compile
308# @DESCRIPTION: 421# @DESCRIPTION:
309# Compile a package, performing all X-related tasks. 422# Compile a package, performing all X-related tasks.
310xorg-2_src_compile() { 423xorg-2_src_compile() {
311 base_src_compile 424 debug-print-function ${FUNCNAME} "$@"
425
426 autotools-utils_src_compile "$@"
312} 427}
313 428
314# @FUNCTION: xorg-2_src_install 429# @FUNCTION: xorg-2_src_install
315# @DESCRIPTION: 430# @DESCRIPTION:
316# Install a built package to ${D}, performing any necessary steps. 431# Install a built package to ${D}, performing any necessary steps.
317# Creates a ChangeLog from git if using live ebuilds. 432# Creates a ChangeLog from git if using live ebuilds.
318xorg-2_src_install() { 433xorg-2_src_install() {
434 debug-print-function ${FUNCNAME} "$@"
435
319 if [[ ${CATEGORY} == x11-proto ]]; then 436 if [[ ${CATEGORY} == x11-proto ]]; then
320 emake \ 437 autotools-utils_src_install \
321 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 438 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
322 docdir=${EPREFIX}/usr/share/doc/${PF} \ 439 docdir="${EPREFIX}/usr/share/doc/${PF}"
323 DESTDIR="${D}" \
324 install || die "emake install failed"
325 else 440 else
326 emake \ 441 autotools-utils_src_install \
327 docdir=${EPREFIX}/usr/share/doc/${PF} \ 442 docdir="${EPREFIX}/usr/share/doc/${PF}"
328 DESTDIR="${D}" \
329 install || die "emake install failed"
330 fi 443 fi
331 444
332 if [[ -n ${GIT_ECLASS} ]]; then 445 if [[ -n ${GIT_ECLASS} ]]; then
333 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 446 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
334 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 447 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
335 popd > /dev/null 448 popd > /dev/null
336 fi 449 fi
337 450
338 if [[ -e "${S}"/ChangeLog ]]; then 451 if [[ -e "${S}"/ChangeLog ]]; then
339 dodoc "${S}"/ChangeLog
340 fi
341 # @VARIABLE: DOCS
342 # @DESCRIPTION:
343 # Any documentation to install
344 # @DEFAULT_UNSET
345 if [[ -n ${DOCS} ]]; then
346 dodoc ${DOCS} || die "dodoc failed" 452 dodoc "${S}"/ChangeLog || die "dodoc failed"
347 fi 453 fi
348 454
349 # Don't install libtool archives for server modules 455 # Don't install libtool archives (even with static-libs)
350 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 456 remove_libtool_files all
351 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
352 -exec rm -f {} ';'
353 fi
354 457
355 [[ -n ${FONT} ]] && remove_font_metadata 458 [[ -n ${FONT} ]] && remove_font_metadata
356} 459}
357 460
358# @FUNCTION: xorg-2_pkg_postinst 461# @FUNCTION: xorg-2_pkg_postinst
359# @DESCRIPTION: 462# @DESCRIPTION:
360# Run X-specific post-installation tasks on the live filesystem. The 463# Run X-specific post-installation tasks on the live filesystem. The
361# only task right now is some setup for font packages. 464# only task right now is some setup for font packages.
362xorg-2_pkg_postinst() { 465xorg-2_pkg_postinst() {
466 debug-print-function ${FUNCNAME} "$@"
467
363 [[ -n ${FONT} ]] && setup_fonts 468 [[ -n ${FONT} ]] && setup_fonts "$@"
364} 469}
365 470
366# @FUNCTION: xorg-2_pkg_postrm 471# @FUNCTION: xorg-2_pkg_postrm
367# @DESCRIPTION: 472# @DESCRIPTION:
368# Run X-specific post-removal tasks on the live filesystem. The only 473# Run X-specific post-removal tasks on the live filesystem. The only
369# task right now is some cleanup for font packages. 474# task right now is some cleanup for font packages.
370xorg-2_pkg_postrm() { 475xorg-2_pkg_postrm() {
371 if [[ -n ${FONT} ]]; then 476 debug-print-function ${FUNCNAME} "$@"
372 font_pkg_postrm 477
373 fi 478 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
374} 479}
375 480
376# @FUNCTION: setup_fonts 481# @FUNCTION: setup_fonts
377# @DESCRIPTION: 482# @DESCRIPTION:
378# Generates needed files for fonts and fixes font permissions 483# Generates needed files for fonts and fixes font permissions
379setup_fonts() { 484setup_fonts() {
485 debug-print-function ${FUNCNAME} "$@"
486
380 create_fonts_scale 487 create_fonts_scale
381 create_fonts_dir 488 create_fonts_dir
382 font_pkg_postinst 489 font_pkg_postinst
383} 490}
384 491
385# @FUNCTION: remove_font_metadata 492# @FUNCTION: remove_font_metadata
386# @DESCRIPTION: 493# @DESCRIPTION:
387# Don't let the package install generated font files that may overlap 494# Don't let the package install generated font files that may overlap
388# with other packages. Instead, they're generated in pkg_postinst(). 495# with other packages. Instead, they're generated in pkg_postinst().
389remove_font_metadata() { 496remove_font_metadata() {
497 debug-print-function ${FUNCNAME} "$@"
498
390 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 499 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
391 einfo "Removing font metadata" 500 einfo "Removing font metadata"
392 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 501 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
393 fi 502 fi
394} 503}
395 504
396# @FUNCTION: create_fonts_scale 505# @FUNCTION: create_fonts_scale
397# @DESCRIPTION: 506# @DESCRIPTION:
398# Create fonts.scale file, used by the old server-side fonts subsystem. 507# Create fonts.scale file, used by the old server-side fonts subsystem.
399create_fonts_scale() { 508create_fonts_scale() {
509 debug-print-function ${FUNCNAME} "$@"
510
400 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 511 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
401 ebegin "Generating font.scale" 512 ebegin "Generating font.scale"
402 mkfontscale \ 513 mkfontscale \
403 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 514 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
404 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 515 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
408 519
409# @FUNCTION: create_fonts_dir 520# @FUNCTION: create_fonts_dir
410# @DESCRIPTION: 521# @DESCRIPTION:
411# Create fonts.dir file, used by the old server-side fonts subsystem. 522# Create fonts.dir file, used by the old server-side fonts subsystem.
412create_fonts_dir() { 523create_fonts_dir() {
524 debug-print-function ${FUNCNAME} "$@"
525
413 ebegin "Generating fonts.dir" 526 ebegin "Generating fonts.dir"
414 mkfontdir \ 527 mkfontdir \
415 -e "${EROOT}"/usr/share/fonts/encodings \ 528 -e "${EROOT}"/usr/share/fonts/encodings \
416 -e "${EROOT}"/usr/share/fonts/encodings/large \ 529 -e "${EROOT}"/usr/share/fonts/encodings/large \
417 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 530 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.34

  ViewVC Help
Powered by ViewVC 1.1.20