/[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.69 Revision 1.82
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.69 2006/07/01 06:46:52 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.82 2007/05/02 07:10:02 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.
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 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"
97 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
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"
102 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
130# If we're a driver package 139# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 142 DRIVER="yes"
134 143
144 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi
138fi 149fi
139 150
140# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 153 || [[ "${PN/app-doc}" != "${PN}" ]] \
160 >=dev-util/pkgconfig-0.18" 171 >=dev-util/pkgconfig-0.18"
161 172
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 173if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 174 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2 175 >=x11-misc/util-macros-0.99.2
165 !alpha? ( >=sys-devel/binutils-2.16.1-r3 )" 176 >=sys-devel/binutils-2.16.1-r3"
166fi 177fi
167 178
168RDEPEND="${RDEPEND} 179RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
169 !<=x11-base/xorg-x11-6.9" 181 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 182# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 183# x11-base/x11-env"
184
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
172 186
173x-modular_specs_check() { 187x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy 189 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading 190 # (#116698) breaks loading
222 fi 236 fi
223 237
224 # If this is a driver package we need to fix man page install location. 238 # 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 239 # 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. 240 # change for us, so we only need to patch if it is not going to run.
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
242 && [[ ${XDPVER} != -1 ]]; then
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
229 fi 244 fi
230 245
231 # For specific list of patches 246 # For specific list of patches
232 if [[ -n "${PATCHES}" ]] ; then 247 if [[ -n "${PATCHES}" ]] ; then
246x-modular_reconf_source() { 261x-modular_reconf_source() {
247 # Run autoreconf for CVS snapshots only 262 # Run autoreconf for CVS snapshots only
248 if [[ "${SNAPSHOT}" = "yes" ]] 263 if [[ "${SNAPSHOT}" = "yes" ]]
249 then 264 then
250 # If possible, generate configure if it doesn't exist 265 # If possible, generate configure if it doesn't exist
251 if [ -f "${S}/configure.ac" ] 266 if [ -f "./configure.ac" ]
252 then 267 then
253 eautoreconf 268 eautoreconf
254 fi 269 fi
255 fi 270 fi
256 271
343 358
344 # Make sure docs get compressed 359 # Make sure docs get compressed
345 prepalldocs 360 prepalldocs
346 361
347 # Don't install libtool archives for server modules 362 # Don't install libtool archives for server modules
348 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
349 find ${D}/usr/lib/xorg/modules -name '*.la' \ 364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
350 | xargs rm -f 365 | xargs rm -f
351 fi 366 fi
352 367
353 # Don't install overlapping fonts.* files 368 # Don't install overlapping fonts.* files
354 # Generate them instead when possible 369 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then 370 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata 371 remove_font_metadata
357 fi 372 fi
373
374 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata
376 fi
358} 377}
359 378
360x-modular_pkg_preinst() { 379x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 380 # We no longer do anything here, but we can't remove it from the API
362 discover_font_dirs 381 :
363 fi
364} 382}
365 383
366x-modular_pkg_postinst() { 384x-modular_pkg_postinst() {
367 if [[ -n "${FONT}" ]]; then 385 if [[ -n "${FONT}" ]]; then
368 setup_fonts 386 setup_fonts
370} 388}
371 389
372x-modular_pkg_postrm() { 390x-modular_pkg_postrm() {
373 if [[ -n "${FONT}" ]]; then 391 if [[ -n "${FONT}" ]]; then
374 cleanup_fonts 392 cleanup_fonts
393 font_pkg_postrm
375 fi 394 fi
376} 395}
377 396
378cleanup_fonts() { 397cleanup_fonts() {
379 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"
409 eend 0 428 eend 0
410 done 429 done
411} 430}
412 431
413setup_fonts() { 432setup_fonts() {
414 if [[ ! -n "${FONT_DIRS}" ]]; then 433 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." 434 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
416 eerror "${msg}" 435 eerror "${msg}"
417 die "${msg}" 436 die "${msg}"
418 fi 437 fi
419 438
420 create_fonts_scale 439 create_fonts_scale
433 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}
434 fi 453 fi
435 done 454 done
436} 455}
437 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
438discover_font_dirs() { 470discover_font_dirs() {
439 pushd ${IMAGE}/usr/share/fonts 471 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} 472}
444 473
445create_fonts_scale() { 474create_fonts_scale() {
446 ebegin "Creating fonts.scale files" 475 ebegin "Creating fonts.scale files"
447 local x 476 local x
448 for FONT_DIR in ${FONT_DIRS}; do 477 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 478 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 479 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 481
453 # Only generate .scale files if truetype, opentype or type1 482 # Only generate .scale files if truetype, opentype or type1
454 # fonts are present ... 483 # fonts are present ...
455 484
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 485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
459 # <spyderous@gentoo.org> 2 August 2004 486 # <spyderous@gentoo.org> 2 August 2004
460 if [[ "${x/encodings}" = "${x}" ]] \ 487 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 488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
482 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 mkfontscale \
483 ${ROOT}/usr/bin/mkfontscale \
484 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
485 -- ${x} 491 -- ${x}
486 fi 492 fi
487 done 493 done
488 eend 0 494 eend 0
489} 495}
490 496
491create_fonts_dir() { 497create_fonts_dir() {
492 ebegin "Generating fonts.dir files" 498 ebegin "Generating fonts.dir files"
493 for FONT_DIR in ${FONT_DIRS}; do 499 for DIR in ${FONT_DIR}; do
494 x=${ROOT}/usr/share/fonts/${FONT_DIR} 500 x=${ROOT}/usr/share/fonts/${DIR}
495 [[ -z "$(ls ${x}/)" ]] && continue 501 [[ -z "$(ls ${x}/)" ]] && continue
496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
497 503
498 if [[ "${x/encodings}" = "${x}" ]]; then 504 if [[ "${x/encodings}" = "${x}" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 505 mkfontdir \
500 ${ROOT}/usr/bin/mkfontdir \
501 -e ${ROOT}/usr/share/fonts/encodings \ 506 -e ${ROOT}/usr/share/fonts/encodings \
502 -e ${ROOT}/usr/share/fonts/encodings/large \ 507 -e ${ROOT}/usr/share/fonts/encodings/large \
503 -- ${x} 508 -- ${x}
504 fi 509 fi
505 done 510 done
506 eend 0 511 eend 0
507} 512}
508 513
509fix_font_permissions() { 514fix_font_permissions() {
510 ebegin "Fixing permissions" 515 ebegin "Fixing permissions"
511 for FONT_DIR in ${FONT_DIRS}; do 516 for DIR in ${FONT_DIR}; do
512 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
513 -exec chmod 0644 {} \; 518 -exec chmod 0644 {} \;
514 done 519 done
515 eend 0 520 eend 0
516} 521}
517 522
518create_font_cache() { 523create_font_cache() {
519 # danarmak found out that fc-cache should be run AFTER all the above 524 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} 525}
526
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.69  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20