/[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.68 Revision 1.81
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.68 2006/07/01 05:36:26 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.81 2006/12/17 15:30:25 joshuabaergen 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 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
… …
79 75
80# Set up shared dependencies 76# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 77if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 78# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 79 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 80 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 81 >=sys-devel/m4-1.4"
82 WANT_AUTOCONF="latest"
83 WANT_AUTOMAKE="latest"
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"
97 94
95 # Whether to inherit the font eclass
96 FONT_ECLASS="font"
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"
102 PDEPEND="${PDEPEND} 102 PDEPEND="${PDEPEND}
… …
130# If we're a driver package 130# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 132 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 133 DRIVER="yes"
134 134
135 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 136 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 137 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi
138fi 140fi
139 141
140# Debugging -- ignore packages that can't be built with debugging 142# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 143if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 144 || [[ "${PN/app-doc}" != "${PN}" ]] \
… …
164 >=x11-misc/util-macros-0.99.2 166 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3" 167 >=sys-devel/binutils-2.16.1-r3"
166fi 168fi
167 169
168RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
169 !<=x11-base/xorg-x11-6.9" 172 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 174# x11-base/x11-env"
175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
172 177
173x-modular_specs_check() { 178x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy 180 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading 181 # (#116698) breaks loading
… …
222 fi 227 fi
223 228
224 # If this is a driver package we need to fix man page install location. 229 # If this is a driver package we need to fix man page install location.
225 # Running autoreconf will use the patched util-macros to make the 230 # Running autoreconf will use the patched util-macros to make the
226 # change for us, so we only need to patch if it is not going to run. 231 # change for us, so we only need to patch if it is not going to run.
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
233 && [[ ${XDPVER} != -1 ]]; then
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 234 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
229 fi 235 fi
230 236
231 # For specific list of patches 237 # For specific list of patches
232 if [[ -n "${PATCHES}" ]] ; then 238 if [[ -n "${PATCHES}" ]] ; then
… …
246x-modular_reconf_source() { 252x-modular_reconf_source() {
247 # Run autoreconf for CVS snapshots only 253 # Run autoreconf for CVS snapshots only
248 if [[ "${SNAPSHOT}" = "yes" ]] 254 if [[ "${SNAPSHOT}" = "yes" ]]
249 then 255 then
250 # If possible, generate configure if it doesn't exist 256 # If possible, generate configure if it doesn't exist
251 if [ -f "${S}/configure.ac" ] 257 if [ -f "./configure.ac" ]
252 then 258 then
253 eautoreconf 259 eautoreconf
254 fi 260 fi
255 fi 261 fi
256 262
… …
343 349
344 # Make sure docs get compressed 350 # Make sure docs get compressed
345 prepalldocs 351 prepalldocs
346 352
347 # Don't install libtool archives for server modules 353 # Don't install libtool archives for server modules
348 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 354 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
349 find ${D}/usr/lib/xorg/modules -name '*.la' \ 355 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
350 | xargs rm -f 356 | xargs rm -f
351 fi 357 fi
352 358
353 # Don't install overlapping fonts.* files 359 # Don't install overlapping fonts.* files
354 # Generate them instead when possible 360 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then 361 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata 362 remove_font_metadata
357 fi 363 fi
364
365 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata
367 fi
358} 368}
359 369
360x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
362 discover_font_dirs 372 :
363 fi
364} 373}
365 374
366x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
367 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
368 setup_fonts 377 setup_fonts
… …
370} 379}
371 380
372x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
373 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
374 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
375 fi 385 fi
376} 386}
377 387
378cleanup_fonts() { 388cleanup_fonts() {
379 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"
… …
409 eend 0 419 eend 0
410 done 420 done
411} 421}
412 422
413setup_fonts() { 423setup_fonts() {
414 if [[ ! -n "${FONT_DIRS}" ]]; then 424 if [[ ! -n "${FONT_DIR}" ]]; then
415 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."
416 eerror "${msg}" 426 eerror "${msg}"
417 die "${msg}" 427 die "${msg}"
418 fi 428 fi
419 429
420 create_fonts_scale 430 create_fonts_scale
… …
433 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}
434 fi 444 fi
435 done 445 done
436} 446}
437 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
438discover_font_dirs() { 461discover_font_dirs() {
439 pushd ${IMAGE}/usr/share/fonts 462 FONT_DIRS="${FONT_DIR}"
440 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
441 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
442 popd
443} 463}
444 464
445create_fonts_scale() { 465create_fonts_scale() {
446 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
447 local x 467 local x
448 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 472
453 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
454 # fonts are present ... 474 # fonts are present ...
455 475
456 # First truetype (ttf,ttc)
457 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
458 # Also, there is no way to regenerate Speedo/CID fonts.scale 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
459 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
460 if [[ "${x/encodings}" = "${x}" ]] \ 478 if [[ "${x/encodings}" = "${x}" ]] \
461 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
462 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
463 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
464 ${ROOT}/usr/bin/ttmkfdir -x 2 \
465 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
466 -o ${x}/fonts.scale -d ${x}
467 # ttmkfdir fails on some stuff, so try mkfontscale if it does
468 local ttmkfdir_return=$?
469 else
470 # We didn't use ttmkfdir at all
471 local ttmkfdir_return=2
472 fi
473 if [[ ${ttmkfdir_return} -ne 0 ]]; then
474 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
475 ${ROOT}/usr/bin/mkfontscale \
476 -a /usr/share/fonts/encodings/encodings.dir \
477 -- ${x}
478 fi
479 # Next type1 and opentype (pfa,pfb,otf,otc)
480 elif [[ "${x/encodings}" = "${x}" ]] \
481 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
482 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
483 ${ROOT}/usr/bin/mkfontscale \
484 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
485 -- ${x} 482 -- ${x}
486 fi 483 fi
487 done 484 done
488 eend 0 485 eend 0
489} 486}
490 487
491create_fonts_dir() { 488create_fonts_dir() {
492 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
493 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
494 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
495 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
497 494
498 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
500 ${ROOT}/usr/bin/mkfontdir \
501 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
502 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
503 -- ${x} 499 -- ${x}
504 fi 500 fi
505 done 501 done
506 eend 0 502 eend 0
507} 503}
508 504
509fix_font_permissions() { 505fix_font_permissions() {
510 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
511 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
512 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
513 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
514 done 510 done
515 eend 0 511 eend 0
516} 512}
517 513
518create_font_cache() { 514create_font_cache() {
519 # danarmak found out that fc-cache should be run AFTER all the above 515 font_pkg_postinst
520 # stuff, as otherwise the cache is invalid, and has to be run again
521 # as root anyway
522 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
523 ebegin "Creating FC font cache"
524 HOME="/root" ${ROOT}/usr/bin/fc-cache
525 eend 0
526 fi
527} 516}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.68  
changed lines
  Added in v.1.81
  ViewVC Help
Powered by ViewVC 1.1.13