/[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.80
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.80 2006/10/30 18:40:58 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@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.
22# directory or directories. 22# directory or directories.
23# 23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25# 25#
26# Pretty much everything else should be automatic. 26# 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 27
32# Directory prefix to use for everything 28# Directory prefix to use for everything
33XDIR="/usr" 29XDIR="/usr"
34 30
35# Set up default patchset version(s) if necessary 31# Set up default patchset version(s) if necessary
86 >=sys-devel/libtool-1.5 82 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 83 >=sys-devel/m4-1.4"
88fi 84fi
89 85
90# If we're a font package, but not the font.alias one 86# If we're a font package, but not the font.alias one
87FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 88if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 89 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 90 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 91 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 92 # Activate font code in the rest of the eclass
96 FONT="yes" 93 FONT="yes"
94
95 # Whether to inherit the font eclass
96 FONT_ECLASS="font"
97 97
98 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
99 media-fonts/encodings 99 media-fonts/encodings
100 x11-apps/mkfontscale 100 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 101 x11-apps/mkfontdir"
166 >=x11-misc/util-macros-0.99.2 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3" 167 >=sys-devel/binutils-2.16.1-r3"
168fi 168fi
169 169
170RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 >=sys-apps/man-1.6b-r2 171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 172 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 174# x11-base/x11-env"
175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
175 177
176x-modular_specs_check() { 178x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 180 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 181 # (#116698) breaks loading
357 # Don't install overlapping fonts.* files 359 # Don't install overlapping fonts.* files
358 # Generate them instead when possible 360 # Generate them instead when possible
359 if [[ -n "${FONT}" ]]; then 361 if [[ -n "${FONT}" ]]; then
360 remove_font_metadata 362 remove_font_metadata
361 fi 363 fi
364
365 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata
367 fi
362} 368}
363 369
364x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
365 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
366 discover_font_dirs 372 :
367 fi
368} 373}
369 374
370x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
371 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
372 setup_fonts 377 setup_fonts
374} 379}
375 380
376x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
377 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
378 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
379 fi 385 fi
380} 386}
381 387
382cleanup_fonts() { 388cleanup_fonts() {
383 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 389 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
413 eend 0 419 eend 0
414 done 420 done
415} 421}
416 422
417setup_fonts() { 423setup_fonts() {
418 if [[ ! -n "${FONT_DIRS}" ]]; then 424 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." 425 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
420 eerror "${msg}" 426 eerror "${msg}"
421 die "${msg}" 427 die "${msg}"
422 fi 428 fi
423 429
424 create_fonts_scale 430 create_fonts_scale
437 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 443 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
438 fi 444 fi
439 done 445 done
440} 446}
441 447
448# Installs device-to-driver mappings for system-config-display
449# and anything else that uses hwdata
450install_driver_hwdata() {
451 insinto /usr/share/hwdata/videoaliases
452 for i in "${FILESDIR}"/*.xinf; do
453 # We need this for the case when none exist,
454 # so *.xinf doesn't expand
455 if [[ -e $i ]]; then
456 doins $i
457 fi
458 done
459}
460
442discover_font_dirs() { 461discover_font_dirs() {
443 pushd ${IMAGE}/usr/share/fonts 462 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} 463}
448 464
449create_fonts_scale() { 465create_fonts_scale() {
450 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
451 local x 467 local x
452 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
453 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
454 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
455 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
456 472
457 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
458 # fonts are present ... 474 # fonts are present ...
459 475
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 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
463 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
464 if [[ "${x/encodings}" = "${x}" ]] \ 478 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 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
486 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
487 ${ROOT}/usr/bin/mkfontscale \
488 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
489 -- ${x} 482 -- ${x}
490 fi 483 fi
491 done 484 done
492 eend 0 485 eend 0
493} 486}
494 487
495create_fonts_dir() { 488create_fonts_dir() {
496 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
497 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
498 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
499 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
500 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
501 494
502 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
504 ${ROOT}/usr/bin/mkfontdir \
505 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
506 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
507 -- ${x} 499 -- ${x}
508 fi 500 fi
509 done 501 done
510 eend 0 502 eend 0
511} 503}
512 504
513fix_font_permissions() { 505fix_font_permissions() {
514 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
515 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
516 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
517 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
518 done 510 done
519 eend 0 511 eend 0
520} 512}
521 513
522create_font_cache() { 514create_font_cache() {
523 # danarmak found out that fc-cache should be run AFTER all the above 515 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} 516}
517
518EXPORT_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.80

  ViewVC Help
Powered by ViewVC 1.1.20