/[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.92 Revision 1.110
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.92 2008/02/22 05:10:03 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.110 2009/07/24 13:32:44 pva 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
70if [[ -z ${SNAPSHOT} ]]; then
43# @ECLASS-VARIABLE: SNAPSHOT 71# @ECLASS-VARIABLE: SNAPSHOT
44# @DESCRIPTION: 72# @DESCRIPTION:
45# 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
46# before inheriting this eclass. 74# before inheriting this eclass.
47SNAPSHOT="no" 75 SNAPSHOT="no"
48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi 76fi
54 77
55# Set up SRC_URI for individual modular releases 78# Set up SRC_URI for individual modular releases
56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 79BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
57if [[ ${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
58 MODULE="app" 86 MODULE=""
59elif [[ ${CATEGORY} = app-doc ]]; then 87 case ${CATEGORY} in
60 MODULE="doc" 88 app-doc) MODULE="doc" ;;
61# x11-misc contains data and util, x11-themes contains data 89 media-fonts) MODULE="font" ;;
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 90 x11-apps|x11-wm) MODULE="app" ;;
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 91 x11-misc|x11-themes) MODULE="util" ;;
64 MODULE="data" 92 x11-drivers) MODULE="driver" ;;
65 else 93 x11-base) MODULE="xserver" ;;
66 MODULE="data" 94 x11-proto) MODULE="proto" ;;
67 fi 95 x11-libs) MODULE="lib" ;;
68elif [[ ${CATEGORY} = x11-drivers ]]; then 96 esac
69 MODULE="driver"
70elif [[ ${CATEGORY} = media-fonts ]]; then
71 MODULE="font"
72elif [[ ${CATEGORY} = x11-libs ]]; then
73 MODULE="lib"
74elif [[ ${CATEGORY} = x11-proto ]]; then
75 MODULE="proto"
76elif [[ ${CATEGORY} = x11-base ]]; then
77 MODULE="xserver"
78fi 97fi
79 98
80if [[ -n ${GIT_ECLASS} ]]; then 99if [[ -n ${GIT_ECLASS} ]]; then
81 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 100 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
82else 101else
97 >=sys-devel/m4-1.4" 116 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest" 117 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest" 118 WANT_AUTOMAKE="latest"
100fi 119fi
101 120
102# If we're a font package, but not the font.alias one 121if [[ -n "${FONT}" ]]; then
103FONT_ECLASS=""
104if [[ "${PN/#font-}" != "${PN}" ]] \
105 && [[ "${CATEGORY}" = "media-fonts" ]] \
106 && [[ "${PN}" != "font-alias" ]] \
107 && [[ "${PN}" != "font-util" ]]; then
108 # Activate font code in the rest of the eclass
109 FONT="yes"
110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
114 RDEPEND="${RDEPEND} 122 RDEPEND="${RDEPEND}
115 media-fonts/encodings 123 media-fonts/encodings
116 x11-apps/mkfontscale 124 x11-apps/mkfontscale
117 x11-apps/mkfontdir" 125 x11-apps/mkfontdir"
118 PDEPEND="${PDEPEND} 126 PDEPEND="${PDEPEND}
141 149
142 # Set up configure option 150 # Set up configure option
143 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 151 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
144 152
145 if [[ -n "${FONT}" ]]; then 153 if [[ -n "${FONT}" ]]; then
146 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 154 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
147 IUSE="${IUSE} nls" 155 IUSE="${IUSE} nls"
148 fi 156 fi
149 fi 157 fi
150fi 158fi
151 159
152# If we're a driver package 160# If we're a driver package
153if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 161if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
154 # Enable driver code in the rest of the eclass 162 # Enable driver code in the rest of the eclass
155 DRIVER="yes" 163 DRIVER="yes"
156
157 if [[ ${XDPVER} != -1 ]]; then
158 # Add driver patchset to SRC_URI
159 SRC_URI="${SRC_URI}
160 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
161 fi
162fi 164fi
163 165
164# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
165if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
166 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
187RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
188 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
189# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
190# x11-base/x11-env" 192# x11-base/x11-env"
191 193
192inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
193 ${FONT_ECLASS} ${GIT_ECLASS}
194
195# @FUNCTION: x-modular_specs_check 194# @FUNCTION: x-modular_specs_check
196# @USAGE: 195# @USAGE:
197# @DESCRIPTION: 196# @DESCRIPTION:
198# Make any necessary changes related to gcc specs (generally hardened) 197# Make any necessary changes related to gcc specs (generally hardened)
199x-modular_specs_check() { 198x-modular_specs_check() {
209# @DESCRIPTION: 208# @DESCRIPTION:
210# 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
211x-modular_dri_check() { 210x-modular_dri_check() {
212 # (#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
213 # 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)
214 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
215 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
216 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
217 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
218 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
219 fi 226 fi
220 fi 227 fi
221 fi 228 fi
222} 229}
223 230
246 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
247 git_src_unpack 254 git_src_unpack
248 else 255 else
249 unpack ${A} 256 unpack ${A}
250 fi 257 fi
251 cd ${S} 258 cd "${S}"
252 259
253 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
254 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
255 fi 262 fi
256} 263}
265 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
266 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
267 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
268 fi 275 fi
269 276
270 # If this is a driver package we need to fix man page install location.
271 # Running autoreconf will use the patched util-macros to make the
272 # change for us, so we only need to patch if it is not going to run.
273 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
274 && [[ ${XDPVER} != -1 ]]; then
275 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
276 fi
277
278# @VARIABLE: PATCHES 277# @VARIABLE: PATCHES
279# @DESCRIPTION: 278# @DESCRIPTION:
280# 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
281# 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
282# 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
283 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
284 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
285 do
286 epatch ${PATCH} 288 epatch "${x}"
287 done 289 done
288 # For non-default directory bulk patching 290 # For non-default directory bulk patching
289 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
290 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
291 # For standard bulk patching 293 # For standard bulk patching
311 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
312 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
313 elibtoolize 315 elibtoolize
314} 316}
315 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
316# @FUNCTION: x-modular_src_unpack 329# @FUNCTION: x-modular_src_unpack
317# @USAGE: 330# @USAGE:
318# @DESCRIPTION: 331# @DESCRIPTION:
319# Unpack a package, performing all X-related tasks. 332# Unpack a package, performing all X-related tasks.
320x-modular_src_unpack() { 333x-modular_src_unpack() {
321 x-modular_specs_check 334 x-modular_specs_check
322 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
323 x-modular_dri_check 336 x-modular_dri_check
324 x-modular_unpack_source 337 x-modular_unpack_source
325 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
326 x-modular_reconf_source
327} 339}
328 340
329# @FUNCTION: x-modular_font_configure 341# @FUNCTION: x-modular_font_configure
330# @USAGE: 342# @USAGE:
331# @DESCRIPTION: 343# @DESCRIPTION:
379 x-modular_debug_setup 391 x-modular_debug_setup
380 392
381# @VARIABLE: CONFIGURE_OPTIONS 393# @VARIABLE: CONFIGURE_OPTIONS
382# @DESCRIPTION: 394# @DESCRIPTION:
383# Any options to pass to configure 395# Any options to pass to configure
384[[ -n ${CONFIGURE_OPTIONTS} ]] 396[[ -n ${CONFIGURE_OPTIONS} ]]
385 397
386 # If prefix isn't set here, .pc files cause problems 398 # If prefix isn't set here, .pc files cause problems
387 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 399 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
388 econf --prefix=${XDIR} \ 400 econf --prefix=${XDIR} \
389 --datadir=${XDIR}/share \ 401 --datadir=${XDIR}/share \
399# Run make. 411# Run make.
400x-modular_src_make() { 412x-modular_src_make() {
401 emake || die "emake failed" 413 emake || die "emake failed"
402} 414}
403 415
404# @FUNCTION: x-modular_src_configure 416# @FUNCTION: x-modular_src_compile
405# @USAGE: 417# @USAGE:
406# @DESCRIPTION: 418# @DESCRIPTION:
407# Compile a package, performing all X-related tasks. 419# Compile a package, performing all X-related tasks.
408x-modular_src_compile() { 420x-modular_src_compile() {
409 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
410 x-modular_src_make 422 x-modular_src_make
411} 423}
412 424
413# @FUNCTION: x-modular_src_install 425# @FUNCTION: x-modular_src_install
414# @USAGE: 426# @USAGE:
415# @DESCRIPTION: 427# @DESCRIPTION:
416# Install a built package to ${D}, performing any necessary steps. 428# Install a built package to ${D}, performing any necessary steps.
417# Creates a ChangeLog from git if using live ebuilds. 429# Creates a ChangeLog from git if using live ebuilds.
418x-modular_src_install() { 430x-modular_src_install() {
419 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
420 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
421 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
422 install 436 install \
437 || die
438 else
439 # FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
440 [[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
441 make \
442 DESTDIR="${D}" \
443 install \
444 || die
445 fi
423# Shouldn't be necessary in XDIR=/usr 446# Shouldn't be necessary in XDIR=/usr
424# einstall forces datadir, so we need to re-force it 447# einstall forces datadir, so we need to re-force it
425# datadir=${XDIR}/share \ 448# datadir=${XDIR}/share \
426# mandir=${XDIR}/share/man \ 449# mandir=${XDIR}/share/man \
427 450
430 git log ${GIT_TREE} > "${S}"/ChangeLog 453 git log ${GIT_TREE} > "${S}"/ChangeLog
431 popd 454 popd
432 fi 455 fi
433 456
434 if [[ -e ${S}/ChangeLog ]]; then 457 if [[ -e ${S}/ChangeLog ]]; then
435 dodoc ${S}/ChangeLog 458 dodoc "${S}"/ChangeLog
436 fi 459 fi
437# @VARIABLE: DOCS 460# @VARIABLE: DOCS
438# @DESCRIPTION: 461# @DESCRIPTION:
439# Any documentation to install 462# Any documentation to install
440 [[ -n ${DOCS} ]] && dodoc ${DOCS} 463 [[ -n ${DOCS} ]] && dodoc ${DOCS}
441 464
442 # Make sure docs get compressed
443 prepalldocs
444
445 # Don't install libtool archives for server modules 465 # Don't install libtool archives for server modules
446 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 466 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
447 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 467 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
448 | xargs rm -f 468 | xargs rm -f
449 fi 469 fi
450 470
451 if [[ -n "${FONT}" ]]; then 471 if [[ -n "${FONT}" ]]; then
452 remove_font_metadata 472 remove_font_metadata
555 for DIR in ${FONT_DIR}; do 575 for DIR in ${FONT_DIR}; do
556 if [[ "${DIR}" != "Speedo" ]] && \ 576 if [[ "${DIR}" != "Speedo" ]] && \
557 [[ "${DIR}" != "CID" ]] ; then 577 [[ "${DIR}" != "CID" ]] ; then
558 # Delete font metadata files 578 # Delete font metadata files
559 # fonts.scale, fonts.dir, fonts.cache-1 579 # fonts.scale, fonts.dir, fonts.cache-1
560 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 580 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
561 fi 581 fi
562 done 582 done
563} 583}
564 584
565# @FUNCTION: install_driver_hwdata 585# @FUNCTION: install_driver_hwdata
604 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 624 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
605 # <dberkholz@gentoo.org> 2 August 2004 625 # <dberkholz@gentoo.org> 2 August 2004
606 if [[ "${x/encodings}" = "${x}" ]] \ 626 if [[ "${x/encodings}" = "${x}" ]] \
607 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 627 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
608 mkfontscale \ 628 mkfontscale \
609 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 629 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
610 -- ${x} 630 -- ${x}
611 fi 631 fi
612 done 632 done
613 eend 0 633 eend 0
614} 634}
624 [[ -z "$(ls ${x}/)" ]] && continue 644 [[ -z "$(ls ${x}/)" ]] && continue
625 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 645 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
626 646
627 if [[ "${x/encodings}" = "${x}" ]]; then 647 if [[ "${x/encodings}" = "${x}" ]]; then
628 mkfontdir \ 648 mkfontdir \
629 -e ${ROOT}/usr/share/fonts/encodings \ 649 -e "${ROOT}"/usr/share/fonts/encodings \
630 -e ${ROOT}/usr/share/fonts/encodings/large \ 650 -e "${ROOT}"/usr/share/fonts/encodings/large \
631 -- ${x} 651 -- ${x}
632 fi 652 fi
633 done 653 done
634 eend 0 654 eend 0
635} 655}
639# @DESCRIPTION: 659# @DESCRIPTION:
640# Font files should have 644 permissions. Ensure this is the case. 660# Font files should have 644 permissions. Ensure this is the case.
641fix_font_permissions() { 661fix_font_permissions() {
642 ebegin "Fixing permissions" 662 ebegin "Fixing permissions"
643 for DIR in ${FONT_DIR}; do 663 for DIR in ${FONT_DIR}; do
644 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 664 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
645 -exec chmod 0644 {} \; 665 -exec chmod 0644 {} \;
646 done 666 done
647 eend 0 667 eend 0
648} 668}
649 669
653# Create fonts.cache-1 files, used by the new client-side fonts 673# Create fonts.cache-1 files, used by the new client-side fonts
654# subsystem. 674# subsystem.
655create_font_cache() { 675create_font_cache() {
656 font_pkg_postinst 676 font_pkg_postinst
657} 677}
658
659EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.110

  ViewVC Help
Powered by ViewVC 1.1.20