/[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.76 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.76 2006/10/11 02:31:47 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"
170RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 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
364 install_driver_hwdata 366 install_driver_hwdata
365 fi 367 fi
366} 368}
367 369
368x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
369 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
370 discover_font_dirs 372 :
371 fi
372} 373}
373 374
374x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
375 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
376 setup_fonts 377 setup_fonts
378} 379}
379 380
380x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
381 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
382 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
383 fi 385 fi
384} 386}
385 387
386cleanup_fonts() { 388cleanup_fonts() {
387 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"
417 eend 0 419 eend 0
418 done 420 done
419} 421}
420 422
421setup_fonts() { 423setup_fonts() {
422 if [[ ! -n "${FONT_DIRS}" ]]; then 424 if [[ ! -n "${FONT_DIR}" ]]; then
423 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."
424 eerror "${msg}" 426 eerror "${msg}"
425 die "${msg}" 427 die "${msg}"
426 fi 428 fi
427 429
428 create_fonts_scale 430 create_fonts_scale
455 fi 457 fi
456 done 458 done
457} 459}
458 460
459discover_font_dirs() { 461discover_font_dirs() {
460 pushd ${IMAGE}/usr/share/fonts 462 FONT_DIRS="${FONT_DIR}"
461 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
462 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
463 popd
464} 463}
465 464
466create_fonts_scale() { 465create_fonts_scale() {
467 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
468 local x 467 local x
469 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
470 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
471 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
472 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
473 472
474 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
475 # fonts are present ... 474 # fonts are present ...
476 475
477 # First truetype (ttf,ttc)
478 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
479 # Also, there is no way to regenerate Speedo/CID fonts.scale 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
480 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
481 if [[ "${x/encodings}" = "${x}" ]] \ 478 if [[ "${x/encodings}" = "${x}" ]] \
482 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
483 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
484 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
485 ${ROOT}/usr/bin/ttmkfdir -x 2 \
486 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
487 -o ${x}/fonts.scale -d ${x}
488 # ttmkfdir fails on some stuff, so try mkfontscale if it does
489 local ttmkfdir_return=$?
490 else
491 # We didn't use ttmkfdir at all
492 local ttmkfdir_return=2
493 fi
494 if [[ ${ttmkfdir_return} -ne 0 ]]; then
495 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
496 ${ROOT}/usr/bin/mkfontscale \
497 -a /usr/share/fonts/encodings/encodings.dir \
498 -- ${x}
499 fi
500 # Next type1 and opentype (pfa,pfb,otf,otc)
501 elif [[ "${x/encodings}" = "${x}" ]] \
502 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
504 ${ROOT}/usr/bin/mkfontscale \
505 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
506 -- ${x} 482 -- ${x}
507 fi 483 fi
508 done 484 done
509 eend 0 485 eend 0
510} 486}
511 487
512create_fonts_dir() { 488create_fonts_dir() {
513 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
514 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
515 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
516 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
517 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
518 494
519 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
520 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
521 ${ROOT}/usr/bin/mkfontdir \
522 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
523 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
524 -- ${x} 499 -- ${x}
525 fi 500 fi
526 done 501 done
527 eend 0 502 eend 0
528} 503}
529 504
530fix_font_permissions() { 505fix_font_permissions() {
531 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
532 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
533 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
534 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
535 done 510 done
536 eend 0 511 eend 0
537} 512}
538 513
539create_font_cache() { 514create_font_cache() {
540 # danarmak found out that fc-cache should be run AFTER all the above 515 font_pkg_postinst
541 # stuff, as otherwise the cache is invalid, and has to be run again
542 # as root anyway
543 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
544 ebegin "Creating FC font cache"
545 HOME="/root" ${ROOT}/usr/bin/fc-cache
546 eend 0
547 fi
548} 516}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20