/[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.89 Revision 1.97
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.89 2007/11/13 22:50:04 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.97 2008/05/09 07:18:19 dberkholz Exp $
4# 4#
5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
5# Author: Donnie Berkholz <dberkholz@gentoo.org> 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching,
13# running eautoreconf, passing options to configure and installing docs.
6# 14#
7# This eclass is designed to reduce code duplication in the modularized X11 15# All you need to do in a basic ebuild is inherit this eclass and set
8# ebuilds. 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
9# 17# with the other X packages, you don't need to set SRC_URI. Pretty much
10# Using this eclass:
11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
34#
35# Pretty much everything else should be automatic. 18# everything else should be automatic.
36 19
37# Directory prefix to use for everything 20# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION:
22# 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
24# 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
26# there. You may also want to change the SLOT.
38XDIR="/usr" 27XDIR="/usr"
39
40# Set up default patchset version(s) if necessary
41# x11-driver-patches
42if [[ -z "${XDPVER}" ]]; then
43 XDPVER="1"
44fi
45 28
46IUSE="" 29IUSE=""
47HOMEPAGE="http://xorg.freedesktop.org/" 30HOMEPAGE="http://xorg.freedesktop.org/"
31
32if [[ -z ${SNAPSHOT} ]]; then
33# @ECLASS-VARIABLE: SNAPSHOT
34# @DESCRIPTION:
35# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
36# before inheriting this eclass.
37 SNAPSHOT="no"
38fi
48 39
49if [[ ${PV} = 9999* ]]; then 40if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git" 41 GIT_ECLASS="git"
51 SNAPSHOT="yes" 42 SNAPSHOT="yes"
52 SRC_URI="" 43 SRC_URI=""
… …
61# x11-misc contains data and util, x11-themes contains data 52# x11-misc contains data and util, x11-themes contains data
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 54 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
64 MODULE="data" 55 MODULE="data"
65 else 56 else
66 MODULE="data" 57 MODULE="util"
67 fi 58 fi
68elif [[ ${CATEGORY} = x11-drivers ]]; then 59elif [[ ${CATEGORY} = x11-drivers ]]; then
69 MODULE="driver" 60 MODULE="driver"
70elif [[ ${CATEGORY} = media-fonts ]]; then 61elif [[ ${CATEGORY} = media-fonts ]]; then
71 MODULE="font" 62 MODULE="font"
… …
121 # Starting with 7.0RC3, we can specify the font directory 112 # Starting with 7.0RC3, we can specify the font directory
122 # But oddly, we can't do the same for encodings or font-alias 113 # But oddly, we can't do the same for encodings or font-alias
123 114
124 # Wrap in `if` so ebuilds can set it too 115 # Wrap in `if` so ebuilds can set it too
125 if [[ -z ${FONT_DIR} ]]; then 116 if [[ -z ${FONT_DIR} ]]; then
117# @ECLASS-VARIABLE: FONT_DIR
118# @DESCRIPTION:
119# If you're creating a font package and the suffix of PN is not equal to
120# the subdirectory of /usr/share/fonts/ it should install into, set
121# FONT_DIR to that directory or directories. Set before inheriting this
122# eclass.
126 FONT_DIR=${PN##*-} 123 FONT_DIR=${PN##*-}
127 124
128 fi 125 fi
129 126
130 # Fix case of font directories 127 # Fix case of font directories
… …
135 132
136 # Set up configure option 133 # Set up configure option
137 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 134 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
138 135
139 if [[ -n "${FONT}" ]]; then 136 if [[ -n "${FONT}" ]]; then
140 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 137 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
141 IUSE="${IUSE} nls" 138 IUSE="${IUSE} nls"
142 fi 139 fi
143 fi 140 fi
144fi 141fi
145 142
146# If we're a driver package 143# If we're a driver package
147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 144if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
148 # Enable driver code in the rest of the eclass 145 # Enable driver code in the rest of the eclass
149 DRIVER="yes" 146 DRIVER="yes"
150
151 if [[ ${XDPVER} != -1 ]]; then
152 # Add driver patchset to SRC_URI
153 SRC_URI="${SRC_URI}
154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
155 fi
156fi 147fi
157 148
158# Debugging -- ignore packages that can't be built with debugging 149# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \ 150if [[ -z "${FONT}" ]] \
160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 151 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
… …
184# x11-base/x11-env" 175# x11-base/x11-env"
185 176
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 177inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS} 178 ${FONT_ECLASS} ${GIT_ECLASS}
188 179
180# @FUNCTION: x-modular_specs_check
181# @USAGE:
182# @DESCRIPTION:
183# Make any necessary changes related to gcc specs (generally hardened)
189x-modular_specs_check() { 184x-modular_specs_check() {
190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 185 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
191 append-ldflags -Wl,-z,lazy 186 append-ldflags -Wl,-z,lazy
192 # (#116698) breaks loading 187 # (#116698) breaks loading
193 filter-ldflags -Wl,-z,now 188 filter-ldflags -Wl,-z,now
194 fi 189 fi
195} 190}
196 191
192# @FUNCTION: x-modular_dri_check
193# @USAGE:
194# @DESCRIPTION:
195# Ensures the server supports DRI if building a driver with DRI support
197x-modular_dri_check() { 196x-modular_dri_check() {
198 # (#120057) Enabling DRI in drivers requires that the server was built with 197 # (#120057) Enabling DRI in drivers requires that the server was built with
199 # support for it 198 # support for it
200 if [[ -n "${DRIVER}" ]]; then 199 if [[ -n "${DRIVER}" ]]; then
201 if has dri ${IUSE} && use dri; then 200 if has dri ${IUSE} && use dri; then
… …
205 fi 204 fi
206 fi 205 fi
207 fi 206 fi
208} 207}
209 208
209# @FUNCTION: x-modular_server_supports_drivers_check
210# @USAGE:
211# @DESCRIPTION:
212# Ensures the server SDK is installed if a driver is being built
210x-modular_server_supports_drivers_check() { 213x-modular_server_supports_drivers_check() {
211 # (#135873) Only certain servers will actually use or be capable of 214 # (#135873) Only certain servers will actually use or be capable of
212 # building external drivers, including binary drivers. 215 # building external drivers, including binary drivers.
213 if [[ -n "${DRIVER}" ]]; then 216 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then 217 if has_version '>=x11-base/xorg-server-1.1'; then
… …
218 fi 221 fi
219 fi 222 fi
220 fi 223 fi
221} 224}
222 225
226# @FUNCTION: x-modular_unpack_source
227# @USAGE:
228# @DESCRIPTION:
229# Simply unpack source code. Nothing else.
223x-modular_unpack_source() { 230x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then 231 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack 232 git_src_unpack
226 else 233 else
227 unpack ${A} 234 unpack ${A}
… …
231 if [[ -n ${FONT_OPTIONS} ]]; then 238 if [[ -n ${FONT_OPTIONS} ]]; then
232 einfo "Detected font directory: ${FONT_DIR}" 239 einfo "Detected font directory: ${FONT_DIR}"
233 fi 240 fi
234} 241}
235 242
243# @FUNCTION: x-modular_patch_source
244# @USAGE:
245# @DESCRIPTION:
246# Apply all patches
236x-modular_patch_source() { 247x-modular_patch_source() {
237 # Use standardized names and locations with bulk patching 248 # Use standardized names and locations with bulk patching
238 # Patch directory is ${WORKDIR}/patch 249 # Patch directory is ${WORKDIR}/patch
239 # See epatch() in eutils.eclass for more documentation 250 # See epatch() in eutils.eclass for more documentation
240 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 251 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
241 EPATCH_SUFFIX="patch" 252 EPATCH_SUFFIX="patch"
242 fi 253 fi
243 254
244 # If this is a driver package we need to fix man page install location. 255# @VARIABLE: PATCHES
245 # Running autoreconf will use the patched util-macros to make the 256# @DESCRIPTION:
246 # change for us, so we only need to patch if it is not going to run. 257# If you have any patches to apply, set PATCHES to their locations and epatch
247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 258# will apply them. It also handles epatch-style bulk patches, if you know how to
248 && [[ ${XDPVER} != -1 ]]; then 259# use them and set the correct variables. If you don't, read eutils.eclass.
249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 260 if [[ ${#PATCHES[@]} -gt 1 ]]; then
250 fi 261 for x in "${PATCHES[@]}"; do
251 262 epatch "${x}"
252 # For specific list of patches 263 done
253 if [[ -n "${PATCHES}" ]] ; then 264 elif [[ -n "${PATCHES}" ]]; then
254 for PATCH in ${PATCHES} 265 for x in ${PATCHES}; do
255 do
256 epatch ${PATCH} 266 epatch "${x}"
257 done 267 done
258 # For non-default directory bulk patching 268 # For non-default directory bulk patching
259 elif [[ -n "${PATCH_LOC}" ]] ; then 269 elif [[ -n "${PATCH_LOC}" ]] ; then
260 epatch ${PATCH_LOC} 270 epatch ${PATCH_LOC}
261 # For standard bulk patching 271 # For standard bulk patching
262 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 272 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
263 epatch 273 epatch
264 fi 274 fi
265} 275}
266 276
277# @FUNCTION: x-modular_reconf_source
278# @USAGE:
279# @DESCRIPTION:
280# Run eautoreconf if necessary, and run elibtoolize.
267x-modular_reconf_source() { 281x-modular_reconf_source() {
268 # Run autoreconf for CVS snapshots only
269 if [[ "${SNAPSHOT}" = "yes" ]] 282 if [[ "${SNAPSHOT}" = "yes" ]]
270 then 283 then
271 # If possible, generate configure if it doesn't exist 284 # If possible, generate configure if it doesn't exist
272 if [ -f "./configure.ac" ] 285 if [ -f "./configure.ac" ]
273 then 286 then
… …
278 # Joshua Baergen - October 23, 2005 291 # Joshua Baergen - October 23, 2005
279 # Fix shared lib issues on MIPS, FBSD, etc etc 292 # Fix shared lib issues on MIPS, FBSD, etc etc
280 elibtoolize 293 elibtoolize
281} 294}
282 295
296# @FUNCTION: x-modular_src_unpack
297# @USAGE:
298# @DESCRIPTION:
299# Unpack a package, performing all X-related tasks.
283x-modular_src_unpack() { 300x-modular_src_unpack() {
284 x-modular_specs_check 301 x-modular_specs_check
285 x-modular_server_supports_drivers_check 302 x-modular_server_supports_drivers_check
286 x-modular_dri_check 303 x-modular_dri_check
287 x-modular_unpack_source 304 x-modular_unpack_source
288 x-modular_patch_source 305 x-modular_patch_source
289 x-modular_reconf_source 306 x-modular_reconf_source
290} 307}
291 308
309# @FUNCTION: x-modular_font_configure
310# @USAGE:
311# @DESCRIPTION:
312# If a font package, perform any necessary configuration steps
292x-modular_font_configure() { 313x-modular_font_configure() {
293 if [[ -n "${FONT}" ]]; then 314 if [[ -n "${FONT}" ]]; then
294 # Might be worth adding an option to configure your desired font 315 # Might be worth adding an option to configure your desired font
295 # and exclude all others. Also, should this USE be nls or minimal? 316 # and exclude all others. Also, should this USE be nls or minimal?
296 if ! use nls; then 317 if ! use nls; then
… …
314 --disable-koi8-r" 335 --disable-koi8-r"
315 fi 336 fi
316 fi 337 fi
317} 338}
318 339
340# @FUNCTION: x-modular_debug_setup
341# @USAGE:
342# @DESCRIPTION:
343# Set up CFLAGS for a debug build
319x-modular_debug_setup() { 344x-modular_debug_setup() {
320 if [[ -n "${DEBUGGABLE}" ]]; then 345 if [[ -n "${DEBUGGABLE}" ]]; then
321 if use debug; then 346 if use debug; then
322 strip-flags 347 strip-flags
323 append-flags -g 348 append-flags -g
324 fi 349 fi
325 fi 350 fi
326} 351}
327 352
353# @FUNCTION: x-modular_src_configure
354# @USAGE:
355# @DESCRIPTION:
356# Perform any necessary pre-configuration steps, then run configure
328x-modular_src_configure() { 357x-modular_src_configure() {
329 x-modular_font_configure 358 x-modular_font_configure
330 x-modular_debug_setup 359 x-modular_debug_setup
360
361# @VARIABLE: CONFIGURE_OPTIONS
362# @DESCRIPTION:
363# Any options to pass to configure
364[[ -n ${CONFIGURE_OPTIONTS} ]]
331 365
332 # If prefix isn't set here, .pc files cause problems 366 # If prefix isn't set here, .pc files cause problems
333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 367 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
334 econf --prefix=${XDIR} \ 368 econf --prefix=${XDIR} \
335 --datadir=${XDIR}/share \ 369 --datadir=${XDIR}/share \
… …
337 ${DRIVER_OPTIONS} \ 371 ${DRIVER_OPTIONS} \
338 ${CONFIGURE_OPTIONS} 372 ${CONFIGURE_OPTIONS}
339 fi 373 fi
340} 374}
341 375
376# @FUNCTION: x-modular_src_make
377# @USAGE:
378# @DESCRIPTION:
379# Run make.
342x-modular_src_make() { 380x-modular_src_make() {
343 emake || die "emake failed" 381 emake || die "emake failed"
344} 382}
345 383
384# @FUNCTION: x-modular_src_configure
385# @USAGE:
386# @DESCRIPTION:
387# Compile a package, performing all X-related tasks.
346x-modular_src_compile() { 388x-modular_src_compile() {
347 x-modular_src_configure 389 x-modular_src_configure
348 x-modular_src_make 390 x-modular_src_make
349} 391}
350 392
393# @FUNCTION: x-modular_src_install
394# @USAGE:
395# @DESCRIPTION:
396# Install a built package to ${D}, performing any necessary steps.
397# Creates a ChangeLog from git if using live ebuilds.
351x-modular_src_install() { 398x-modular_src_install() {
352 # Install everything to ${XDIR} 399 # Install everything to ${XDIR}
353 make \ 400 make \
354 DESTDIR="${D}" \ 401 DESTDIR="${D}" \
355 install 402 install
… …
365 fi 412 fi
366 413
367 if [[ -e ${S}/ChangeLog ]]; then 414 if [[ -e ${S}/ChangeLog ]]; then
368 dodoc ${S}/ChangeLog 415 dodoc ${S}/ChangeLog
369 fi 416 fi
417# @VARIABLE: DOCS
418# @DESCRIPTION:
419# Any documentation to install
420 [[ -n ${DOCS} ]] && dodoc ${DOCS}
370 421
371 # Make sure docs get compressed 422 # Make sure docs get compressed
372 prepalldocs 423 prepalldocs
373 424
374 # Don't install libtool archives for server modules 425 # Don't install libtool archives for server modules
375 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 426 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
376 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 427 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
377 | xargs rm -f 428 | xargs rm -f
378 fi 429 fi
379 430
380 # Don't install overlapping fonts.* files
381 # Generate them instead when possible
382 if [[ -n "${FONT}" ]]; then 431 if [[ -n "${FONT}" ]]; then
383 remove_font_metadata 432 remove_font_metadata
384 fi 433 fi
385 434
386 if [[ -n "${DRIVER}" ]]; then 435 if [[ -n "${DRIVER}" ]]; then
387 install_driver_hwdata 436 install_driver_hwdata
388 fi 437 fi
389} 438}
390 439
440# @FUNCTION: x-modular_pkg_preinst
441# @USAGE:
442# @DESCRIPTION:
443# This function doesn't do anything right now, but it may in the future.
391x-modular_pkg_preinst() { 444x-modular_pkg_preinst() {
392 # We no longer do anything here, but we can't remove it from the API 445 # We no longer do anything here, but we can't remove it from the API
393 : 446 :
394} 447}
395 448
449# @FUNCTION: x-modular_pkg_postinst
450# @USAGE:
451# @DESCRIPTION:
452# Run X-specific post-installation tasks on the live filesystem. The
453# only task right now is some setup for font packages.
396x-modular_pkg_postinst() { 454x-modular_pkg_postinst() {
397 if [[ -n "${FONT}" ]]; then 455 if [[ -n "${FONT}" ]]; then
398 setup_fonts 456 setup_fonts
399 fi 457 fi
400} 458}
401 459
460# @FUNCTION: x-modular_pkg_postrm
461# @USAGE:
462# @DESCRIPTION:
463# Run X-specific post-removal tasks on the live filesystem. The only
464# task right now is some cleanup for font packages.
402x-modular_pkg_postrm() { 465x-modular_pkg_postrm() {
403 if [[ -n "${FONT}" ]]; then 466 if [[ -n "${FONT}" ]]; then
404 cleanup_fonts 467 cleanup_fonts
405 font_pkg_postrm 468 font_pkg_postrm
406 fi 469 fi
407} 470}
408 471
472# @FUNCTION: cleanup_fonts
473# @USAGE:
474# @DESCRIPTION:
475# Get rid of font directories that only contain generated files
409cleanup_fonts() { 476cleanup_fonts() {
410 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 477 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
411 for DIR in ${FONT_DIR}; do 478 for DIR in ${FONT_DIR}; do
412 unset KEEP_FONTDIR 479 unset KEEP_FONTDIR
413 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 480 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
… …
439 fi 506 fi
440 eend 0 507 eend 0
441 done 508 done
442} 509}
443 510
511# @FUNCTION: setup_fonts
512# @USAGE:
513# @DESCRIPTION:
514# Generates needed files for fonts and fixes font permissions
444setup_fonts() { 515setup_fonts() {
445 if [[ ! -n "${FONT_DIR}" ]]; then 516 if [[ ! -n "${FONT_DIR}" ]]; then
446 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 517 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
447 eerror "${msg}" 518 eerror "${msg}"
448 die "${msg}" 519 die "${msg}"
… …
452 create_fonts_dir 523 create_fonts_dir
453 fix_font_permissions 524 fix_font_permissions
454 create_font_cache 525 create_font_cache
455} 526}
456 527
528# @FUNCTION: remove_font_metadata
529# @USAGE:
530# @DESCRIPTION:
531# Don't let the package install generated font files that may overlap
532# with other packages. Instead, they're generated in pkg_postinst().
457remove_font_metadata() { 533remove_font_metadata() {
458 local DIR 534 local DIR
459 for DIR in ${FONT_DIR}; do 535 for DIR in ${FONT_DIR}; do
460 if [[ "${DIR}" != "Speedo" ]] && \ 536 if [[ "${DIR}" != "Speedo" ]] && \
461 [[ "${DIR}" != "CID" ]] ; then 537 [[ "${DIR}" != "CID" ]] ; then
… …
464 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 540 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
465 fi 541 fi
466 done 542 done
467} 543}
468 544
545# @FUNCTION: install_driver_hwdata
546# @USAGE:
547# @DESCRIPTION:
469# Installs device-to-driver mappings for system-config-display 548# Installs device-to-driver mappings for system-config-display and
470# and anything else that uses hwdata 549# anything else that uses hwdata.
471install_driver_hwdata() { 550install_driver_hwdata() {
472 insinto /usr/share/hwdata/videoaliases 551 insinto /usr/share/hwdata/videoaliases
473 for i in "${FILESDIR}"/*.xinf; do 552 for i in "${FILESDIR}"/*.xinf; do
474 # We need this for the case when none exist, 553 # We need this for the case when none exist,
475 # so *.xinf doesn't expand 554 # so *.xinf doesn't expand
… …
477 doins $i 556 doins $i
478 fi 557 fi
479 done 558 done
480} 559}
481 560
561# @FUNCTION: discover_font_dirs
562# @USAGE:
563# @DESCRIPTION:
564# Deprecated. Sets up the now-unused FONT_DIRS variable.
482discover_font_dirs() { 565discover_font_dirs() {
483 FONT_DIRS="${FONT_DIR}" 566 FONT_DIRS="${FONT_DIR}"
484} 567}
485 568
569# @FUNCTION: create_fonts_scale
570# @USAGE:
571# @DESCRIPTION:
572# Create fonts.scale file, used by the old server-side fonts subsystem.
486create_fonts_scale() { 573create_fonts_scale() {
487 ebegin "Creating fonts.scale files" 574 ebegin "Creating fonts.scale files"
488 local x 575 local x
489 for DIR in ${FONT_DIR}; do 576 for DIR in ${FONT_DIR}; do
490 x=${ROOT}/usr/share/fonts/${DIR} 577 x=${ROOT}/usr/share/fonts/${DIR}
… …
504 fi 591 fi
505 done 592 done
506 eend 0 593 eend 0
507} 594}
508 595
596# @FUNCTION: create_fonts_dir
597# @USAGE:
598# @DESCRIPTION:
599# Create fonts.dir file, used by the old server-side fonts subsystem.
509create_fonts_dir() { 600create_fonts_dir() {
510 ebegin "Generating fonts.dir files" 601 ebegin "Generating fonts.dir files"
511 for DIR in ${FONT_DIR}; do 602 for DIR in ${FONT_DIR}; do
512 x=${ROOT}/usr/share/fonts/${DIR} 603 x=${ROOT}/usr/share/fonts/${DIR}
513 [[ -z "$(ls ${x}/)" ]] && continue 604 [[ -z "$(ls ${x}/)" ]] && continue
… …
521 fi 612 fi
522 done 613 done
523 eend 0 614 eend 0
524} 615}
525 616
617# @FUNCTION: fix_font_permissions
618# @USAGE:
619# @DESCRIPTION:
620# Font files should have 644 permissions. Ensure this is the case.
526fix_font_permissions() { 621fix_font_permissions() {
527 ebegin "Fixing permissions" 622 ebegin "Fixing permissions"
528 for DIR in ${FONT_DIR}; do 623 for DIR in ${FONT_DIR}; do
529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 624 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
530 -exec chmod 0644 {} \; 625 -exec chmod 0644 {} \;
531 done 626 done
532 eend 0 627 eend 0
533} 628}
534 629
630# @FUNCTION: create_font_cache
631# @USAGE:
632# @DESCRIPTION:
633# Create fonts.cache-1 files, used by the new client-side fonts
634# subsystem.
535create_font_cache() { 635create_font_cache() {
536 font_pkg_postinst 636 font_pkg_postinst
537} 637}
538 638
539EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 639EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.89  
changed lines
  Added in v.1.97
  ViewVC Help
Powered by ViewVC 1.1.13