/[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.84
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.84 2007/07/02 14:24:27 peper 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"
… …
149 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
150 || [[ "${PN/xcursor}" != "${PN}" ]] \ 159 || [[ "${PN/xcursor}" != "${PN}" ]] \
151 ; then 160 ; then
152 DEBUGGABLE="yes" 161 DEBUGGABLE="yes"
153 IUSE="${IUSE} debug" 162 IUSE="${IUSE} debug"
154 if use debug; then
155 if ! has splitdebug ${FEATURES}; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
158 fi
159fi 163fi
160 164
161DEPEND="${DEPEND} 165DEPEND="${DEPEND}
162 >=dev-util/pkgconfig-0.18" 166 >=dev-util/pkgconfig-0.18"
163 167
… …
170RDEPEND="${RDEPEND} 174RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 175 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 176 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 177# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 178# x11-base/x11-env"
179
180inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
175 181
176x-modular_specs_check() { 182x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 183 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 184 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 185 # (#116698) breaks loading
… …
364 install_driver_hwdata 370 install_driver_hwdata
365 fi 371 fi
366} 372}
367 373
368x-modular_pkg_preinst() { 374x-modular_pkg_preinst() {
369 if [[ -n "${FONT}" ]]; then 375 # We no longer do anything here, but we can't remove it from the API
370 discover_font_dirs 376 :
371 fi
372} 377}
373 378
374x-modular_pkg_postinst() { 379x-modular_pkg_postinst() {
375 if [[ -n "${FONT}" ]]; then 380 if [[ -n "${FONT}" ]]; then
376 setup_fonts 381 setup_fonts
… …
378} 383}
379 384
380x-modular_pkg_postrm() { 385x-modular_pkg_postrm() {
381 if [[ -n "${FONT}" ]]; then 386 if [[ -n "${FONT}" ]]; then
382 cleanup_fonts 387 cleanup_fonts
388 font_pkg_postrm
383 fi 389 fi
384} 390}
385 391
386cleanup_fonts() { 392cleanup_fonts() {
387 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 393 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
… …
417 eend 0 423 eend 0
418 done 424 done
419} 425}
420 426
421setup_fonts() { 427setup_fonts() {
422 if [[ ! -n "${FONT_DIRS}" ]]; then 428 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." 429 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
424 eerror "${msg}" 430 eerror "${msg}"
425 die "${msg}" 431 die "${msg}"
426 fi 432 fi
427 433
428 create_fonts_scale 434 create_fonts_scale
… …
455 fi 461 fi
456 done 462 done
457} 463}
458 464
459discover_font_dirs() { 465discover_font_dirs() {
460 pushd ${IMAGE}/usr/share/fonts 466 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} 467}
465 468
466create_fonts_scale() { 469create_fonts_scale() {
467 ebegin "Creating fonts.scale files" 470 ebegin "Creating fonts.scale files"
468 local x 471 local x
469 for FONT_DIR in ${FONT_DIRS}; do 472 for DIR in ${FONT_DIR}; do
470 x=${ROOT}/usr/share/fonts/${FONT_DIR} 473 x=${ROOT}/usr/share/fonts/${DIR}
471 [[ -z "$(ls ${x}/)" ]] && continue 474 [[ -z "$(ls ${x}/)" ]] && continue
472 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 475 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
473 476
474 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
475 # fonts are present ... 478 # fonts are present ...
476 479
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 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
480 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
481 if [[ "${x/encodings}" = "${x}" ]] \ 482 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 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 mkfontscale \
504 ${ROOT}/usr/bin/mkfontscale \
505 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
506 -- ${x} 486 -- ${x}
507 fi 487 fi
508 done 488 done
509 eend 0 489 eend 0
510} 490}
511 491
512create_fonts_dir() { 492create_fonts_dir() {
513 ebegin "Generating fonts.dir files" 493 ebegin "Generating fonts.dir files"
514 for FONT_DIR in ${FONT_DIRS}; do 494 for DIR in ${FONT_DIR}; do
515 x=${ROOT}/usr/share/fonts/${FONT_DIR} 495 x=${ROOT}/usr/share/fonts/${DIR}
516 [[ -z "$(ls ${x}/)" ]] && continue 496 [[ -z "$(ls ${x}/)" ]] && continue
517 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 497 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
518 498
519 if [[ "${x/encodings}" = "${x}" ]]; then 499 if [[ "${x/encodings}" = "${x}" ]]; then
520 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 500 mkfontdir \
521 ${ROOT}/usr/bin/mkfontdir \
522 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
523 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
524 -- ${x} 503 -- ${x}
525 fi 504 fi
526 done 505 done
527 eend 0 506 eend 0
528} 507}
529 508
530fix_font_permissions() { 509fix_font_permissions() {
531 ebegin "Fixing permissions" 510 ebegin "Fixing permissions"
532 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
533 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 512 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
534 -exec chmod 0644 {} \; 513 -exec chmod 0644 {} \;
535 done 514 done
536 eend 0 515 eend 0
537} 516}
538 517
539create_font_cache() { 518create_font_cache() {
540 # danarmak found out that fc-cache should be run AFTER all the above 519 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} 520}
521
522EXPORT_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.84
  ViewVC Help
Powered by ViewVC 1.1.13