/[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.96 Revision 1.117
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.96 2008/04/30 17:37:42 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.117 2009/11/28 10:25:37 scarabeus 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="util" 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
86fi 103fi
87 104
88SLOT="0" 105SLOT="0"
89 106
90# Set the license for the package. This can be overridden by setting 107# Set the license for the package. This can be overridden by setting
91# LICENSE after the inherit. 108# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
92LICENSE=${PN} 109# are under the MIT license. (This is what Red Hat does in their rpms)
110LICENSE="MIT"
93 111
94# Set up shared dependencies 112# Set up shared dependencies
95if [[ -n "${SNAPSHOT}" ]]; then 113if [[ -n "${SNAPSHOT}" ]]; then
96# FIXME: What's the minimal libtool version supporting arbitrary versioning? 114# FIXME: What's the minimal libtool version supporting arbitrary versioning?
97 DEPEND="${DEPEND} 115 DEPEND="${DEPEND}
99 >=sys-devel/m4-1.4" 117 >=sys-devel/m4-1.4"
100 WANT_AUTOCONF="latest" 118 WANT_AUTOCONF="latest"
101 WANT_AUTOMAKE="latest" 119 WANT_AUTOMAKE="latest"
102fi 120fi
103 121
104# If we're a font package, but not the font.alias one 122if [[ -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} 123 RDEPEND="${RDEPEND}
117 media-fonts/encodings 124 media-fonts/encodings
118 x11-apps/mkfontscale 125 x11-apps/mkfontscale
119 x11-apps/mkfontdir" 126 x11-apps/mkfontdir"
120 PDEPEND="${PDEPEND} 127 PDEPEND="${PDEPEND}
139 FONT_DIR=${FONT_DIR/ttf/TTF} 146 FONT_DIR=${FONT_DIR/ttf/TTF}
140 FONT_DIR=${FONT_DIR/otf/OTF} 147 FONT_DIR=${FONT_DIR/otf/OTF}
141 FONT_DIR=${FONT_DIR/type1/Type1} 148 FONT_DIR=${FONT_DIR/type1/Type1}
142 FONT_DIR=${FONT_DIR/speedo/Speedo} 149 FONT_DIR=${FONT_DIR/speedo/Speedo}
143 150
144 # Set up configure option 151 # Set up configure options, wrapped so ebuilds can override if need be
152 if [[ -z ${FONT_OPTIONS} ]]; then
145 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 153 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
154 fi
146 155
147 if [[ -n "${FONT}" ]]; then 156 if [[ -n "${FONT}" ]]; then
148 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then 157 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
149 IUSE="${IUSE} nls" 158 IUSE="${IUSE} nls"
150 fi 159 fi
153 162
154# If we're a driver package 163# If we're a driver package
155if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 164if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
156 # Enable driver code in the rest of the eclass 165 # Enable driver code in the rest of the eclass
157 DRIVER="yes" 166 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 167fi
165 168
166# Debugging -- ignore packages that can't be built with debugging 169# Debugging -- ignore packages that can't be built with debugging
167if [[ -z "${FONT}" ]] \ 170if [[ -z "${FONT}" ]] \
168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 171 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
180DEPEND="${DEPEND} 183DEPEND="${DEPEND}
181 >=dev-util/pkgconfig-0.18" 184 >=dev-util/pkgconfig-0.18"
182 185
183if [[ "${PN/util-macros}" = "${PN}" ]]; then 186if [[ "${PN/util-macros}" = "${PN}" ]]; then
184 DEPEND="${DEPEND} 187 DEPEND="${DEPEND}
185 >=x11-misc/util-macros-0.99.2 188 >=x11-misc/util-macros-1.3.0
186 >=sys-devel/binutils-2.16.1-r3" 189 sys-devel/binutils"
187fi 190fi
188 191
189RDEPEND="${RDEPEND} 192RDEPEND="${RDEPEND}
190 !<=x11-base/xorg-x11-6.9" 193 !<=x11-base/xorg-x11-6.9"
191# Provides virtual/x11 for temporary use until packages are ported 194# Provides virtual/x11 for temporary use until packages are ported
192# x11-base/x11-env" 195# x11-base/x11-env"
193
194inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
195 ${FONT_ECLASS} ${GIT_ECLASS}
196 196
197# @FUNCTION: x-modular_specs_check 197# @FUNCTION: x-modular_specs_check
198# @USAGE: 198# @USAGE:
199# @DESCRIPTION: 199# @DESCRIPTION:
200# Make any necessary changes related to gcc specs (generally hardened) 200# Make any necessary changes related to gcc specs (generally hardened)
211# @DESCRIPTION: 211# @DESCRIPTION:
212# Ensures the server supports DRI if building a driver with DRI support 212# Ensures the server supports DRI if building a driver with DRI support
213x-modular_dri_check() { 213x-modular_dri_check() {
214 # (#120057) Enabling DRI in drivers requires that the server was built with 214 # (#120057) Enabling DRI in drivers requires that the server was built with
215 # support for it 215 # support for it
216 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
217 # USE=minimal is set (see bug #252084)
216 if [[ -n "${DRIVER}" ]]; then 218 if [[ -n "${DRIVER}" ]]; then
217 if has dri ${IUSE} && use dri; then 219 if has dri ${IUSE} && use dri; then
218 einfo "Checking for direct rendering capabilities ..." 220 einfo "Checking for direct rendering capabilities ..."
221 if has_version '>=x11-base/xorg-server-1.5.3'; then
222 if built_with_use x11-base/xorg-server minimal; then
223 die "You must build x11-base/xorg-server with USE=-minimal."
224 fi
225 else
219 if ! built_with_use x11-base/xorg-server dri; then 226 if ! built_with_use x11-base/xorg-server dri; then
220 die "You must build x11-base/xorg-server with USE=dri." 227 die "You must build x11-base/xorg-server with USE=dri."
228 fi
221 fi 229 fi
222 fi 230 fi
223 fi 231 fi
224} 232}
225 233
248 if [[ -n ${GIT_ECLASS} ]]; then 256 if [[ -n ${GIT_ECLASS} ]]; then
249 git_src_unpack 257 git_src_unpack
250 else 258 else
251 unpack ${A} 259 unpack ${A}
252 fi 260 fi
253 cd ${S} 261 cd "${S}"
254 262
255 if [[ -n ${FONT_OPTIONS} ]]; then 263 if [[ -n ${FONT_OPTIONS} ]]; then
256 einfo "Detected font directory: ${FONT_DIR}" 264 einfo "Detected font directory: ${FONT_DIR}"
257 fi 265 fi
258} 266}
265 # Use standardized names and locations with bulk patching 273 # Use standardized names and locations with bulk patching
266 # Patch directory is ${WORKDIR}/patch 274 # Patch directory is ${WORKDIR}/patch
267 # See epatch() in eutils.eclass for more documentation 275 # See epatch() in eutils.eclass for more documentation
268 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 276 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
269 EPATCH_SUFFIX="patch" 277 EPATCH_SUFFIX="patch"
270 fi
271
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 278 fi
279 279
280# @VARIABLE: PATCHES 280# @VARIABLE: PATCHES
281# @DESCRIPTION: 281# @DESCRIPTION:
282# If you have any patches to apply, set PATCHES to their locations and epatch 282# If you have any patches to apply, set PATCHES to their locations and epatch
316 # Joshua Baergen - October 23, 2005 316 # Joshua Baergen - October 23, 2005
317 # Fix shared lib issues on MIPS, FBSD, etc etc 317 # Fix shared lib issues on MIPS, FBSD, etc etc
318 elibtoolize 318 elibtoolize
319} 319}
320 320
321# @FUNCTION: x-modular_src_prepare
322# @USAGE:
323# @DESCRIPTION:
324# Prepare a package after unpacking, performing all X-related tasks.
325x-modular_src_prepare() {
326 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
327 && git_src_prepare
328 x-modular_patch_source
329 x-modular_reconf_source
330}
331
321# @FUNCTION: x-modular_src_unpack 332# @FUNCTION: x-modular_src_unpack
322# @USAGE: 333# @USAGE:
323# @DESCRIPTION: 334# @DESCRIPTION:
324# Unpack a package, performing all X-related tasks. 335# Unpack a package, performing all X-related tasks.
325x-modular_src_unpack() { 336x-modular_src_unpack() {
326 x-modular_specs_check 337 x-modular_specs_check
327 x-modular_server_supports_drivers_check 338 x-modular_server_supports_drivers_check
328 x-modular_dri_check 339 x-modular_dri_check
329 x-modular_unpack_source 340 x-modular_unpack_source
330 x-modular_patch_source 341 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
331 x-modular_reconf_source
332} 342}
333 343
334# @FUNCTION: x-modular_font_configure 344# @FUNCTION: x-modular_font_configure
335# @USAGE: 345# @USAGE:
336# @DESCRIPTION: 346# @DESCRIPTION:
337# If a font package, perform any necessary configuration steps 347# If a font package, perform any necessary configuration steps
338x-modular_font_configure() { 348x-modular_font_configure() {
339 if [[ -n "${FONT}" ]]; then 349 if [[ -n "${FONT}" ]]; then
340 # Might be worth adding an option to configure your desired font 350 # Might be worth adding an option to configure your desired font
341 # and exclude all others. Also, should this USE be nls or minimal? 351 # and exclude all others. Also, should this USE be nls or minimal?
342 if ! use nls; then 352 if has nls ${IUSE//+} && ! use nls; then
343 FONT_OPTIONS="${FONT_OPTIONS} 353 FONT_OPTIONS="${FONT_OPTIONS}
344 --disable-iso8859-2 354 --disable-iso8859-2
345 --disable-iso8859-3 355 --disable-iso8859-3
346 --disable-iso8859-4 356 --disable-iso8859-4
347 --disable-iso8859-5 357 --disable-iso8859-5
384 x-modular_debug_setup 394 x-modular_debug_setup
385 395
386# @VARIABLE: CONFIGURE_OPTIONS 396# @VARIABLE: CONFIGURE_OPTIONS
387# @DESCRIPTION: 397# @DESCRIPTION:
388# Any options to pass to configure 398# Any options to pass to configure
389[[ -n ${CONFIGURE_OPTIONTS} ]] 399[[ -n ${CONFIGURE_OPTIONS} ]]
390 400
391 # If prefix isn't set here, .pc files cause problems 401 # If prefix isn't set here, .pc files cause problems
392 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 402 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
393 econf --prefix=${XDIR} \ 403 econf --prefix=${XDIR} \
394 --datadir=${XDIR}/share \ 404 --datadir=${XDIR}/share \
404# Run make. 414# Run make.
405x-modular_src_make() { 415x-modular_src_make() {
406 emake || die "emake failed" 416 emake || die "emake failed"
407} 417}
408 418
409# @FUNCTION: x-modular_src_configure 419# @FUNCTION: x-modular_src_compile
410# @USAGE: 420# @USAGE:
411# @DESCRIPTION: 421# @DESCRIPTION:
412# Compile a package, performing all X-related tasks. 422# Compile a package, performing all X-related tasks.
413x-modular_src_compile() { 423x-modular_src_compile() {
414 x-modular_src_configure 424 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
415 x-modular_src_make 425 x-modular_src_make
416} 426}
417 427
418# @FUNCTION: x-modular_src_install 428# @FUNCTION: x-modular_src_install
419# @USAGE: 429# @USAGE:
420# @DESCRIPTION: 430# @DESCRIPTION:
421# Install a built package to ${D}, performing any necessary steps. 431# Install a built package to ${D}, performing any necessary steps.
422# Creates a ChangeLog from git if using live ebuilds. 432# Creates a ChangeLog from git if using live ebuilds.
423x-modular_src_install() { 433x-modular_src_install() {
424 # Install everything to ${XDIR} 434 # Install everything to ${XDIR}
435 if [[ ${CATEGORY} = x11-proto ]]; then
425 make \ 436 make \
437 ${PN/proto/}docdir=/usr/share/doc/${PF} \
426 DESTDIR="${D}" \ 438 DESTDIR="${D}" \
427 install 439 install \
440 || die
441 else
442 make \
443 docdir=/usr/share/doc/${PF} \
444 DESTDIR="${D}" \
445 install \
446 || die
447 fi
428# Shouldn't be necessary in XDIR=/usr 448# Shouldn't be necessary in XDIR=/usr
429# einstall forces datadir, so we need to re-force it 449# einstall forces datadir, so we need to re-force it
430# datadir=${XDIR}/share \ 450# datadir=${XDIR}/share \
431# mandir=${XDIR}/share/man \ 451# mandir=${XDIR}/share/man \
432 452
435 git log ${GIT_TREE} > "${S}"/ChangeLog 455 git log ${GIT_TREE} > "${S}"/ChangeLog
436 popd 456 popd
437 fi 457 fi
438 458
439 if [[ -e ${S}/ChangeLog ]]; then 459 if [[ -e ${S}/ChangeLog ]]; then
440 dodoc ${S}/ChangeLog 460 dodoc "${S}"/ChangeLog
441 fi 461 fi
442# @VARIABLE: DOCS 462# @VARIABLE: DOCS
443# @DESCRIPTION: 463# @DESCRIPTION:
444# Any documentation to install 464# Any documentation to install
445 [[ -n ${DOCS} ]] && dodoc ${DOCS} 465 [[ -n ${DOCS} ]] && dodoc ${DOCS}
446 466
447 # Make sure docs get compressed
448 prepalldocs
449
450 # Don't install libtool archives for server modules 467 # Don't install libtool archives for server modules
451 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 468 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
452 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 469 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
453 | xargs rm -f 470 | xargs rm -f
454 fi 471 fi
455 472
456 if [[ -n "${FONT}" ]]; then 473 if [[ -n "${FONT}" ]]; then
457 remove_font_metadata 474 remove_font_metadata
497# @FUNCTION: cleanup_fonts 514# @FUNCTION: cleanup_fonts
498# @USAGE: 515# @USAGE:
499# @DESCRIPTION: 516# @DESCRIPTION:
500# Get rid of font directories that only contain generated files 517# Get rid of font directories that only contain generated files
501cleanup_fonts() { 518cleanup_fonts() {
502 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 519 local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
503 for DIR in ${FONT_DIR}; do 520 for DIR in ${FONT_DIR}; do
504 unset KEEP_FONTDIR 521 unset KEEP_FONTDIR
505 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 522 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
506 523
507 ebegin "Checking ${REAL_DIR} for useless files" 524 ebegin "Checking ${REAL_DIR} for useless files"
544 die "${msg}" 561 die "${msg}"
545 fi 562 fi
546 563
547 create_fonts_scale 564 create_fonts_scale
548 create_fonts_dir 565 create_fonts_dir
549 fix_font_permissions
550 create_font_cache 566 create_font_cache
551} 567}
552 568
553# @FUNCTION: remove_font_metadata 569# @FUNCTION: remove_font_metadata
554# @USAGE: 570# @USAGE:
560 for DIR in ${FONT_DIR}; do 576 for DIR in ${FONT_DIR}; do
561 if [[ "${DIR}" != "Speedo" ]] && \ 577 if [[ "${DIR}" != "Speedo" ]] && \
562 [[ "${DIR}" != "CID" ]] ; then 578 [[ "${DIR}" != "CID" ]] ; then
563 # Delete font metadata files 579 # Delete font metadata files
564 # fonts.scale, fonts.dir, fonts.cache-1 580 # fonts.scale, fonts.dir, fonts.cache-1
565 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 581 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
566 fi 582 fi
567 done 583 done
568} 584}
569 585
570# @FUNCTION: install_driver_hwdata 586# @FUNCTION: install_driver_hwdata
609 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 625 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
610 # <dberkholz@gentoo.org> 2 August 2004 626 # <dberkholz@gentoo.org> 2 August 2004
611 if [[ "${x/encodings}" = "${x}" ]] \ 627 if [[ "${x/encodings}" = "${x}" ]] \
612 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 628 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
613 mkfontscale \ 629 mkfontscale \
614 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 630 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
615 -- ${x} 631 -- ${x}
616 fi 632 fi
617 done 633 done
618 eend 0 634 eend 0
619} 635}
629 [[ -z "$(ls ${x}/)" ]] && continue 645 [[ -z "$(ls ${x}/)" ]] && continue
630 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 646 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
631 647
632 if [[ "${x/encodings}" = "${x}" ]]; then 648 if [[ "${x/encodings}" = "${x}" ]]; then
633 mkfontdir \ 649 mkfontdir \
634 -e ${ROOT}/usr/share/fonts/encodings \ 650 -e "${ROOT}"/usr/share/fonts/encodings \
635 -e ${ROOT}/usr/share/fonts/encodings/large \ 651 -e "${ROOT}"/usr/share/fonts/encodings/large \
636 -- ${x} 652 -- ${x}
637 fi 653 fi
638 done 654 done
639 eend 0 655 eend 0
640} 656}
641 657
642# @FUNCTION: fix_font_permissions
643# @USAGE:
644# @DESCRIPTION:
645# Font files should have 644 permissions. Ensure this is the case.
646fix_font_permissions() {
647 ebegin "Fixing permissions"
648 for DIR in ${FONT_DIR}; do
649 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
650 -exec chmod 0644 {} \;
651 done
652 eend 0
653}
654
655# @FUNCTION: create_font_cache 658# @FUNCTION: create_font_cache
656# @USAGE: 659# @USAGE:
657# @DESCRIPTION: 660# @DESCRIPTION:
658# Create fonts.cache-1 files, used by the new client-side fonts 661# Create fonts.cache-1 files, used by the new client-side fonts
659# subsystem. 662# subsystem.
660create_font_cache() { 663create_font_cache() {
661 font_pkg_postinst 664 font_pkg_postinst
662} 665}
663
664EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.117

  ViewVC Help
Powered by ViewVC 1.1.20