/[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.74 Revision 1.83
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.74 2006/08/28 16:07:30 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.83 2007/05/02 07:10:33 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
9# 9#
10# Using this eclass: 10# Using this eclass:
… …
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 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 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 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#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 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.
25# 34#
26# Pretty much everything else should be automatic. 35# Pretty much everything else should be automatic.
27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29
30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
… …
79 84
80# Set up shared dependencies 85# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
88fi 93fi
89 94
90# If we're a font package, but not the font.alias one 95# If we're a font package, but not the font.alias one
96FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 98 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
96 FONT="yes" 102 FONT="yes"
103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
97 106
98 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
99 media-fonts/encodings 108 media-fonts/encodings
100 x11-apps/mkfontscale 109 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
… …
166 >=x11-misc/util-macros-0.99.2 175 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3" 176 >=sys-devel/binutils-2.16.1-r3"
168fi 177fi
169 178
170RDEPEND="${RDEPEND} 179RDEPEND="${RDEPEND}
171 >=sys-apps/man-1.6b-r2 180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 181 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 182# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 183# x11-base/x11-env"
184
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
175 186
176x-modular_specs_check() { 187x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 189 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 190 # (#116698) breaks loading
… …
357 # Don't install overlapping fonts.* files 368 # Don't install overlapping fonts.* files
358 # Generate them instead when possible 369 # Generate them instead when possible
359 if [[ -n "${FONT}" ]]; then 370 if [[ -n "${FONT}" ]]; then
360 remove_font_metadata 371 remove_font_metadata
361 fi 372 fi
373
374 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata
376 fi
362} 377}
363 378
364x-modular_pkg_preinst() { 379x-modular_pkg_preinst() {
365 if [[ -n "${FONT}" ]]; then 380 # We no longer do anything here, but we can't remove it from the API
366 discover_font_dirs 381 :
367 fi
368} 382}
369 383
370x-modular_pkg_postinst() { 384x-modular_pkg_postinst() {
371 if [[ -n "${FONT}" ]]; then 385 if [[ -n "${FONT}" ]]; then
372 setup_fonts 386 setup_fonts
… …
374} 388}
375 389
376x-modular_pkg_postrm() { 390x-modular_pkg_postrm() {
377 if [[ -n "${FONT}" ]]; then 391 if [[ -n "${FONT}" ]]; then
378 cleanup_fonts 392 cleanup_fonts
393 font_pkg_postrm
379 fi 394 fi
380} 395}
381 396
382cleanup_fonts() { 397cleanup_fonts() {
383 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 398 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
… …
413 eend 0 428 eend 0
414 done 429 done
415} 430}
416 431
417setup_fonts() { 432setup_fonts() {
418 if [[ ! -n "${FONT_DIRS}" ]]; then 433 if [[ ! -n "${FONT_DIR}" ]]; then
419 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 434 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
420 eerror "${msg}" 435 eerror "${msg}"
421 die "${msg}" 436 die "${msg}"
422 fi 437 fi
423 438
424 create_fonts_scale 439 create_fonts_scale
… …
437 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 452 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
438 fi 453 fi
439 done 454 done
440} 455}
441 456
457# Installs device-to-driver mappings for system-config-display
458# and anything else that uses hwdata
459install_driver_hwdata() {
460 insinto /usr/share/hwdata/videoaliases
461 for i in "${FILESDIR}"/*.xinf; do
462 # We need this for the case when none exist,
463 # so *.xinf doesn't expand
464 if [[ -e $i ]]; then
465 doins $i
466 fi
467 done
468}
469
442discover_font_dirs() { 470discover_font_dirs() {
443 pushd ${IMAGE}/usr/share/fonts 471 FONT_DIRS="${FONT_DIR}"
444 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
445 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
446 popd
447} 472}
448 473
449create_fonts_scale() { 474create_fonts_scale() {
450 ebegin "Creating fonts.scale files" 475 ebegin "Creating fonts.scale files"
451 local x 476 local x
452 for FONT_DIR in ${FONT_DIRS}; do 477 for DIR in ${FONT_DIR}; do
453 x=${ROOT}/usr/share/fonts/${FONT_DIR} 478 x=${ROOT}/usr/share/fonts/${DIR}
454 [[ -z "$(ls ${x}/)" ]] && continue 479 [[ -z "$(ls ${x}/)" ]] && continue
455 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
456 481
457 # Only generate .scale files if truetype, opentype or type1 482 # Only generate .scale files if truetype, opentype or type1
458 # fonts are present ... 483 # fonts are present ...
459 484
460 # First truetype (ttf,ttc)
461 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
462 # Also, there is no way to regenerate Speedo/CID fonts.scale 485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
463 # <spyderous@gentoo.org> 2 August 2004 486 # <dberkholz@gentoo.org> 2 August 2004
464 if [[ "${x/encodings}" = "${x}" ]] \ 487 if [[ "${x/encodings}" = "${x}" ]] \
465 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
466 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
467 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
468 ${ROOT}/usr/bin/ttmkfdir -x 2 \
469 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
470 -o ${x}/fonts.scale -d ${x}
471 # ttmkfdir fails on some stuff, so try mkfontscale if it does
472 local ttmkfdir_return=$?
473 else
474 # We didn't use ttmkfdir at all
475 local ttmkfdir_return=2
476 fi
477 if [[ ${ttmkfdir_return} -ne 0 ]]; then
478 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
479 ${ROOT}/usr/bin/mkfontscale \
480 -a /usr/share/fonts/encodings/encodings.dir \
481 -- ${x}
482 fi
483 # Next type1 and opentype (pfa,pfb,otf,otc)
484 elif [[ "${x/encodings}" = "${x}" ]] \
485 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
486 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 mkfontscale \
487 ${ROOT}/usr/bin/mkfontscale \
488 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
489 -- ${x} 491 -- ${x}
490 fi 492 fi
491 done 493 done
492 eend 0 494 eend 0
493} 495}
494 496
495create_fonts_dir() { 497create_fonts_dir() {
496 ebegin "Generating fonts.dir files" 498 ebegin "Generating fonts.dir files"
497 for FONT_DIR in ${FONT_DIRS}; do 499 for DIR in ${FONT_DIR}; do
498 x=${ROOT}/usr/share/fonts/${FONT_DIR} 500 x=${ROOT}/usr/share/fonts/${DIR}
499 [[ -z "$(ls ${x}/)" ]] && continue 501 [[ -z "$(ls ${x}/)" ]] && continue
500 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
501 503
502 if [[ "${x/encodings}" = "${x}" ]]; then 504 if [[ "${x/encodings}" = "${x}" ]]; then
503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 505 mkfontdir \
504 ${ROOT}/usr/bin/mkfontdir \
505 -e ${ROOT}/usr/share/fonts/encodings \ 506 -e ${ROOT}/usr/share/fonts/encodings \
506 -e ${ROOT}/usr/share/fonts/encodings/large \ 507 -e ${ROOT}/usr/share/fonts/encodings/large \
507 -- ${x} 508 -- ${x}
508 fi 509 fi
509 done 510 done
510 eend 0 511 eend 0
511} 512}
512 513
513fix_font_permissions() { 514fix_font_permissions() {
514 ebegin "Fixing permissions" 515 ebegin "Fixing permissions"
515 for FONT_DIR in ${FONT_DIRS}; do 516 for DIR in ${FONT_DIR}; do
516 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
517 -exec chmod 0644 {} \; 518 -exec chmod 0644 {} \;
518 done 519 done
519 eend 0 520 eend 0
520} 521}
521 522
522create_font_cache() { 523create_font_cache() {
523 # danarmak found out that fc-cache should be run AFTER all the above 524 font_pkg_postinst
524 # stuff, as otherwise the cache is invalid, and has to be run again
525 # as root anyway
526 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
527 ebegin "Creating FC font cache"
528 HOME="/root" ${ROOT}/usr/bin/fc-cache
529 eend 0
530 fi
531} 525}
526
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.74  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.13