/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.93 Revision 1.109
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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/x-modular.eclass,v 1.93 2008/03/06 04:42:26 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.109 2009/05/14 12:40:55 remi Exp $
4# 4#
5# @ECLASS: x-modular.eclass 5# @ECLASS: x-modular.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
… …
15# All you need to do in a basic ebuild is inherit this eclass and set 15# 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 16# 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 17# with the other X packages, you don't need to set SRC_URI. Pretty much
18# everything else should be automatic. 18# everything else should be automatic.
19 19
20if [[ ${PV} = 9999* ]]; then
21 GIT_ECLASS="git"
22 SNAPSHOT="yes"
23 SRC_URI=""
24fi
25
26# If we're a font package, but not the font.alias one
27FONT_ECLASS=""
28if [[ "${PN/#font-}" != "${PN}" ]] \
29 && [[ "${CATEGORY}" = "media-fonts" ]] \
30 && [[ "${PN}" != "font-alias" ]] \
31 && [[ "${PN}" != "font-util" ]]; then
32 # Activate font code in the rest of the eclass
33 FONT="yes"
34
35 # Whether to inherit the font eclass
36 FONT_ECLASS="font"
37fi
38
39inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
40 ${FONT_ECLASS} ${GIT_ECLASS}
41
42EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
43
44case "${EAPI:-0}" in
45 0|1)
46 ;;
47 2)
48 EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
49 ;;
50 *)
51 die "Unknown EAPI ${EAPI}"
52 ;;
53esac
54
55# exports must be ALWAYS after inherit
56EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57
20# @ECLASS-VARIABLE: XDIR 58# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION: 59# @DESCRIPTION:
22# Directory prefix to use for everything. If you want to install to a 60# Directory prefix to use for everything. If you want to install to a
23# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been 61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
24# recently tested. You may need to uncomment the setting of datadir and 62# recently tested. You may need to uncomment the setting of datadir and
25# mandir in x-modular_src_install() or add it back in if it's no longer 63# mandir in x-modular_src_install() or add it back in if it's no longer
26# there. You may also want to change the SLOT. 64# there. You may also want to change the SLOT.
27XDIR="/usr" 65XDIR="/usr"
28 66
29if [[ -z "${XDPVER}" ]]; then
30# @ECLASS-VARIABLE: XDPVER
31# @DESCRIPTION:
32# Set up default patchset version(s) if necessary for driver patches. If
33# you want to change the auto-application of the driver patchset or
34# prevent it from applying, edit XDPVER in the ebuild. Set it to -1 to
35# prevent patch application or positive integers for that patch version.
36# Set before inheriting this eclass.
37 XDPVER="1"
38fi
39
40IUSE="" 67IUSE=""
41HOMEPAGE="http://xorg.freedesktop.org/" 68HOMEPAGE="http://xorg.freedesktop.org/"
42 69
43if [[ -z ${SNAPSHOT} ]]; then 70if [[ -z ${SNAPSHOT} ]]; then
44# @ECLASS-VARIABLE: SNAPSHOT 71# @ECLASS-VARIABLE: SNAPSHOT
… …
46# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 73# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
47# before inheriting this eclass. 74# before inheriting this eclass.
48 SNAPSHOT="no" 75 SNAPSHOT="no"
49fi 76fi
50 77
51if [[ ${PV} = 9999* ]]; then
52 GIT_ECLASS="git"
53 SNAPSHOT="yes"
54 SRC_URI=""
55fi
56
57# Set up SRC_URI for individual modular releases 78# Set up SRC_URI for individual modular releases
58BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 79BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
59if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 80# @ECLASS-VARIABLE: MODULE
81# @DESCRIPTION:
82# The subdirectory to download source from. Possible settings are app,
83# doc, data, util, driver, font, lib, proto, xserver. Set above the
84# inherit to override the default autoconfigured module.
85if [[ -z ${MODULE} ]]; then
60 MODULE="app" 86 MODULE=""
61elif [[ ${CATEGORY} = app-doc ]]; then 87 case ${CATEGORY} in
62 MODULE="doc" 88 app-doc) MODULE="doc" ;;
63# x11-misc contains data and util, x11-themes contains data 89 media-fonts) MODULE="font" ;;
64elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 90 x11-apps|x11-wm) MODULE="app" ;;
65 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 91 x11-misc|x11-themes) MODULE="util" ;;
66 MODULE="data" 92 x11-drivers) MODULE="driver" ;;
67 else 93 x11-base) MODULE="xserver" ;;
68 MODULE="data" 94 x11-proto) MODULE="proto" ;;
69 fi 95 x11-libs) MODULE="lib" ;;
70elif [[ ${CATEGORY} = x11-drivers ]]; then 96 esac
71 MODULE="driver"
72elif [[ ${CATEGORY} = media-fonts ]]; then
73 MODULE="font"
74elif [[ ${CATEGORY} = x11-libs ]]; then
75 MODULE="lib"
76elif [[ ${CATEGORY} = x11-proto ]]; then
77 MODULE="proto"
78elif [[ ${CATEGORY} = x11-base ]]; then
79 MODULE="xserver"
80fi 97fi
81 98
82if [[ -n ${GIT_ECLASS} ]]; then 99if [[ -n ${GIT_ECLASS} ]]; then
83 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 100 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
84else 101else
… …
99 >=sys-devel/m4-1.4" 116 >=sys-devel/m4-1.4"
100 WANT_AUTOCONF="latest" 117 WANT_AUTOCONF="latest"
101 WANT_AUTOMAKE="latest" 118 WANT_AUTOMAKE="latest"
102fi 119fi
103 120
104# If we're a font package, but not the font.alias one 121if [[ -n "${FONT}" ]]; then
105FONT_ECLASS=""
106if [[ "${PN/#font-}" != "${PN}" ]] \
107 && [[ "${CATEGORY}" = "media-fonts" ]] \
108 && [[ "${PN}" != "font-alias" ]] \
109 && [[ "${PN}" != "font-util" ]]; then
110 # Activate font code in the rest of the eclass
111 FONT="yes"
112
113 # Whether to inherit the font eclass
114 FONT_ECLASS="font"
115
116 RDEPEND="${RDEPEND} 122 RDEPEND="${RDEPEND}
117 media-fonts/encodings 123 media-fonts/encodings
118 x11-apps/mkfontscale 124 x11-apps/mkfontscale
119 x11-apps/mkfontdir" 125 x11-apps/mkfontdir"
120 PDEPEND="${PDEPEND} 126 PDEPEND="${PDEPEND}
… …
143 149
144 # Set up configure option 150 # Set up configure option
145 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 151 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
146 152
147 if [[ -n "${FONT}" ]]; then 153 if [[ -n "${FONT}" ]]; then
148 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 154 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
149 IUSE="${IUSE} nls" 155 IUSE="${IUSE} nls"
150 fi 156 fi
151 fi 157 fi
152fi 158fi
153 159
154# If we're a driver package 160# If we're a driver package
155if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 161if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
156 # Enable driver code in the rest of the eclass 162 # Enable driver code in the rest of the eclass
157 DRIVER="yes" 163 DRIVER="yes"
158
159 if [[ ${XDPVER} != -1 ]]; then
160 # Add driver patchset to SRC_URI
161 SRC_URI="${SRC_URI}
162 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
163 fi
164fi 164fi
165 165
166# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
167if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
… …
189RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
190 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
191# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
192# x11-base/x11-env" 192# x11-base/x11-env"
193 193
194inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
195 ${FONT_ECLASS} ${GIT_ECLASS}
196
197# @FUNCTION: x-modular_specs_check 194# @FUNCTION: x-modular_specs_check
198# @USAGE: 195# @USAGE:
199# @DESCRIPTION: 196# @DESCRIPTION:
200# Make any necessary changes related to gcc specs (generally hardened) 197# Make any necessary changes related to gcc specs (generally hardened)
201x-modular_specs_check() { 198x-modular_specs_check() {
… …
211# @DESCRIPTION: 208# @DESCRIPTION:
212# Ensures the server supports DRI if building a driver with DRI support 209# Ensures the server supports DRI if building a driver with DRI support
213x-modular_dri_check() { 210x-modular_dri_check() {
214 # (#120057) Enabling DRI in drivers requires that the server was built with 211 # (#120057) Enabling DRI in drivers requires that the server was built with
215 # support for it 212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
216 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
217 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
218 einfo "Checking for direct rendering capabilities ..." 217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
219 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
220 die "You must build x11-base/xorg-server with USE=dri." 224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
221 fi 226 fi
222 fi 227 fi
223 fi 228 fi
224} 229}
225 230
… …
248 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
249 git_src_unpack 254 git_src_unpack
250 else 255 else
251 unpack ${A} 256 unpack ${A}
252 fi 257 fi
253 cd ${S} 258 cd "${S}"
254 259
255 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
256 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
257 fi 262 fi
258} 263}
… …
267 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
268 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
269 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
270 fi 275 fi
271 276
272 # If this is a driver package we need to fix man page install location.
273 # Running autoreconf will use the patched util-macros to make the
274 # change for us, so we only need to patch if it is not going to run.
275 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
276 && [[ ${XDPVER} != -1 ]]; then
277 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
278 fi
279
280# @VARIABLE: PATCHES 277# @VARIABLE: PATCHES
281# @DESCRIPTION: 278# @DESCRIPTION:
282# If you have any patches to apply, set PATCHES to their locations and epatch 279# If you have any patches to apply, set PATCHES to their locations and epatch
283# will apply them. It also handles epatch-style bulk patches, if you know how to 280# will apply them. It also handles epatch-style bulk patches, if you know how to
284# use them and set the correct variables. If you don't, read eutils.eclass. 281# use them and set the correct variables. If you don't, read eutils.eclass.
282 if [[ ${#PATCHES[@]} -gt 1 ]]; then
283 for x in "${PATCHES[@]}"; do
284 epatch "${x}"
285 done
285 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
286 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
287 do
288 epatch ${PATCH} 288 epatch "${x}"
289 done 289 done
290 # For non-default directory bulk patching 290 # For non-default directory bulk patching
291 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
292 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
293 # For standard bulk patching 293 # For standard bulk patching
… …
313 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
314 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
315 elibtoolize 315 elibtoolize
316} 316}
317 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
318# @FUNCTION: x-modular_src_unpack 329# @FUNCTION: x-modular_src_unpack
319# @USAGE: 330# @USAGE:
320# @DESCRIPTION: 331# @DESCRIPTION:
321# Unpack a package, performing all X-related tasks. 332# Unpack a package, performing all X-related tasks.
322x-modular_src_unpack() { 333x-modular_src_unpack() {
323 x-modular_specs_check 334 x-modular_specs_check
324 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
325 x-modular_dri_check 336 x-modular_dri_check
326 x-modular_unpack_source 337 x-modular_unpack_source
327 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
328 x-modular_reconf_source
329} 339}
330 340
331# @FUNCTION: x-modular_font_configure 341# @FUNCTION: x-modular_font_configure
332# @USAGE: 342# @USAGE:
333# @DESCRIPTION: 343# @DESCRIPTION:
… …
381 x-modular_debug_setup 391 x-modular_debug_setup
382 392
383# @VARIABLE: CONFIGURE_OPTIONS 393# @VARIABLE: CONFIGURE_OPTIONS
384# @DESCRIPTION: 394# @DESCRIPTION:
385# Any options to pass to configure 395# Any options to pass to configure
386[[ -n ${CONFIGURE_OPTIONTS} ]] 396[[ -n ${CONFIGURE_OPTIONS} ]]
387 397
388 # If prefix isn't set here, .pc files cause problems 398 # If prefix isn't set here, .pc files cause problems
389 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 399 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
390 econf --prefix=${XDIR} \ 400 econf --prefix=${XDIR} \
391 --datadir=${XDIR}/share \ 401 --datadir=${XDIR}/share \
… …
401# Run make. 411# Run make.
402x-modular_src_make() { 412x-modular_src_make() {
403 emake || die "emake failed" 413 emake || die "emake failed"
404} 414}
405 415
406# @FUNCTION: x-modular_src_configure 416# @FUNCTION: x-modular_src_compile
407# @USAGE: 417# @USAGE:
408# @DESCRIPTION: 418# @DESCRIPTION:
409# Compile a package, performing all X-related tasks. 419# Compile a package, performing all X-related tasks.
410x-modular_src_compile() { 420x-modular_src_compile() {
411 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
412 x-modular_src_make 422 x-modular_src_make
413} 423}
414 424
415# @FUNCTION: x-modular_src_install 425# @FUNCTION: x-modular_src_install
416# @USAGE: 426# @USAGE:
417# @DESCRIPTION: 427# @DESCRIPTION:
418# Install a built package to ${D}, performing any necessary steps. 428# Install a built package to ${D}, performing any necessary steps.
419# Creates a ChangeLog from git if using live ebuilds. 429# Creates a ChangeLog from git if using live ebuilds.
420x-modular_src_install() { 430x-modular_src_install() {
421 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
422 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
423 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
424 install 436 install \
437 || die
438 else
439 make \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
425# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
426# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
427# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
428# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
429 448
… …
432 git log ${GIT_TREE} > "${S}"/ChangeLog 451 git log ${GIT_TREE} > "${S}"/ChangeLog
433 popd 452 popd
434 fi 453 fi
435 454
436 if [[ -e ${S}/ChangeLog ]]; then 455 if [[ -e ${S}/ChangeLog ]]; then
437 dodoc ${S}/ChangeLog 456 dodoc "${S}"/ChangeLog
438 fi 457 fi
439# @VARIABLE: DOCS 458# @VARIABLE: DOCS
440# @DESCRIPTION: 459# @DESCRIPTION:
441# Any documentation to install 460# Any documentation to install
442 [[ -n ${DOCS} ]] && dodoc ${DOCS} 461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
443 462
444 # Make sure docs get compressed
445 prepalldocs
446
447 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
448 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
449 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
450 | xargs rm -f 466 | xargs rm -f
451 fi 467 fi
452 468
453 if [[ -n "${FONT}" ]]; then 469 if [[ -n "${FONT}" ]]; then
454 remove_font_metadata 470 remove_font_metadata
… …
557 for DIR in ${FONT_DIR}; do 573 for DIR in ${FONT_DIR}; do
558 if [[ "${DIR}" != "Speedo" ]] && \ 574 if [[ "${DIR}" != "Speedo" ]] && \
559 [[ "${DIR}" != "CID" ]] ; then 575 [[ "${DIR}" != "CID" ]] ; then
560 # Delete font metadata files 576 # Delete font metadata files
561 # fonts.scale, fonts.dir, fonts.cache-1 577 # fonts.scale, fonts.dir, fonts.cache-1
562 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 578 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
563 fi 579 fi
564 done 580 done
565} 581}
566 582
567# @FUNCTION: install_driver_hwdata 583# @FUNCTION: install_driver_hwdata
… …
606 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 622 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
607 # <dberkholz@gentoo.org> 2 August 2004 623 # <dberkholz@gentoo.org> 2 August 2004
608 if [[ "${x/encodings}" = "${x}" ]] \ 624 if [[ "${x/encodings}" = "${x}" ]] \
609 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 625 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
610 mkfontscale \ 626 mkfontscale \
611 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 627 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
612 -- ${x} 628 -- ${x}
613 fi 629 fi
614 done 630 done
615 eend 0 631 eend 0
616} 632}
… …
626 [[ -z "$(ls ${x}/)" ]] && continue 642 [[ -z "$(ls ${x}/)" ]] && continue
627 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 643 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
628 644
629 if [[ "${x/encodings}" = "${x}" ]]; then 645 if [[ "${x/encodings}" = "${x}" ]]; then
630 mkfontdir \ 646 mkfontdir \
631 -e ${ROOT}/usr/share/fonts/encodings \ 647 -e "${ROOT}"/usr/share/fonts/encodings \
632 -e ${ROOT}/usr/share/fonts/encodings/large \ 648 -e "${ROOT}"/usr/share/fonts/encodings/large \
633 -- ${x} 649 -- ${x}
634 fi 650 fi
635 done 651 done
636 eend 0 652 eend 0
637} 653}
… …
641# @DESCRIPTION: 657# @DESCRIPTION:
642# Font files should have 644 permissions. Ensure this is the case. 658# Font files should have 644 permissions. Ensure this is the case.
643fix_font_permissions() { 659fix_font_permissions() {
644 ebegin "Fixing permissions" 660 ebegin "Fixing permissions"
645 for DIR in ${FONT_DIR}; do 661 for DIR in ${FONT_DIR}; do
646 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 662 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
647 -exec chmod 0644 {} \; 663 -exec chmod 0644 {} \;
648 done 664 done
649 eend 0 665 eend 0
650} 666}
651 667
… …
655# Create fonts.cache-1 files, used by the new client-side fonts 671# Create fonts.cache-1 files, used by the new client-side fonts
656# subsystem. 672# subsystem.
657create_font_cache() { 673create_font_cache() {
658 font_pkg_postinst 674 font_pkg_postinst
659} 675}
660
661EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.93  
changed lines
  Added in v.1.109
  ViewVC Help
Powered by ViewVC 1.1.13