/[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.65 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.65 2006/06/30 07:55:53 spyderous 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 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"
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}" ]] \
… …
159DEPEND="${DEPEND} 161DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 162 >=dev-util/pkgconfig-0.18"
161 163
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 164if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 165 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
165fi 168fi
166 169
167RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
168 !<=x11-base/xorg-x11-6.9" 172 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 174# x11-base/x11-env"
171 175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
177
172x-modular_specs_check() { 178x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then
175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
176 eerror "$msg"
177 die "$msg"
178 fi
179
180 append-ldflags -Wl,-z,lazy 180 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading 181 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now 182 filter-ldflags -Wl,-z,now
183 fi 183 fi
184} 184}
… …
198 198
199x-modular_server_supports_drivers_check() { 199x-modular_server_supports_drivers_check() {
200 # (#135873) Only certain servers will actually use or be capable of 200 # (#135873) Only certain servers will actually use or be capable of
201 # building external drivers, including binary drivers. 201 # building external drivers, including binary drivers.
202 if [[ -n "${DRIVER}" ]]; then 202 if [[ -n "${DRIVER}" ]]; then
203 if has_version '>=x11-base/xorg-server-1.1'; then
203 if ! built_with_use x11-base/xorg-server xorg; then 204 if ! built_with_use x11-base/xorg-server xorg; then
204 eerror "x11-base/xorg-server is not built with support for external drivers." 205 eerror "x11-base/xorg-server is not built with support for external drivers."
205 die "You must build x11-base/xorg-server with USE=xorg." 206 die "You must build x11-base/xorg-server with USE=xorg."
207 fi
206 fi 208 fi
207 fi 209 fi
208} 210}
209 211
210x-modular_unpack_source() { 212x-modular_unpack_source() {
… …
225 fi 227 fi
226 228
227 # 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.
228 # Running autoreconf will use the patched util-macros to make the 230 # Running autoreconf will use the patched util-macros to make the
229 # 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.
230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
233 && [[ ${XDPVER} != -1 ]]; then
231 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 234 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
232 fi 235 fi
233 236
234 # For specific list of patches 237 # For specific list of patches
235 if [[ -n "${PATCHES}" ]] ; then 238 if [[ -n "${PATCHES}" ]] ; then
… …
249x-modular_reconf_source() { 252x-modular_reconf_source() {
250 # Run autoreconf for CVS snapshots only 253 # Run autoreconf for CVS snapshots only
251 if [[ "${SNAPSHOT}" = "yes" ]] 254 if [[ "${SNAPSHOT}" = "yes" ]]
252 then 255 then
253 # If possible, generate configure if it doesn't exist 256 # If possible, generate configure if it doesn't exist
254 if [ -f "${S}/configure.ac" ] 257 if [ -f "./configure.ac" ]
255 then 258 then
256 eautoreconf 259 eautoreconf
257 fi 260 fi
258 fi 261 fi
259 262
… …
346 349
347 # Make sure docs get compressed 350 # Make sure docs get compressed
348 prepalldocs 351 prepalldocs
349 352
350 # Don't install libtool archives for server modules 353 # Don't install libtool archives for server modules
351 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 354 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
352 find ${D}/usr/lib/xorg/modules -name '*.la' \ 355 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
353 | xargs rm -f 356 | xargs rm -f
354 fi 357 fi
355 358
356 # Don't install overlapping fonts.* files 359 # Don't install overlapping fonts.* files
357 # Generate them instead when possible 360 # Generate them instead when possible
358 if [[ -n "${FONT}" ]]; then 361 if [[ -n "${FONT}" ]]; then
359 remove_font_metadata 362 remove_font_metadata
360 fi 363 fi
364
365 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata
367 fi
361} 368}
362 369
363x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
364 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
365 discover_font_dirs 372 :
366 fi
367} 373}
368 374
369x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
370 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
371 setup_fonts 377 setup_fonts
… …
373} 379}
374 380
375x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
376 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
377 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
378 fi 385 fi
379} 386}
380 387
381cleanup_fonts() { 388cleanup_fonts() {
382 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"
… …
412 eend 0 419 eend 0
413 done 420 done
414} 421}
415 422
416setup_fonts() { 423setup_fonts() {
417 if [[ ! -n "${FONT_DIRS}" ]]; then 424 if [[ ! -n "${FONT_DIR}" ]]; then
418 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."
419 eerror "${msg}" 426 eerror "${msg}"
420 die "${msg}" 427 die "${msg}"
421 fi 428 fi
422 429
423 create_fonts_scale 430 create_fonts_scale
… …
436 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}
437 fi 444 fi
438 done 445 done
439} 446}
440 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
441discover_font_dirs() { 461discover_font_dirs() {
442 pushd ${IMAGE}/usr/share/fonts 462 FONT_DIRS="${FONT_DIR}"
443 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
444 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
445 popd
446} 463}
447 464
448create_fonts_scale() { 465create_fonts_scale() {
449 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
450 local x 467 local x
451 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
452 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
453 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
454 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
455 472
456 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
457 # fonts are present ... 474 # fonts are present ...
458 475
459 # First truetype (ttf,ttc)
460 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
461 # Also, there is no way to regenerate Speedo/CID fonts.scale 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
462 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
463 if [[ "${x/encodings}" = "${x}" ]] \ 478 if [[ "${x/encodings}" = "${x}" ]] \
464 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
465 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
466 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
467 ${ROOT}/usr/bin/ttmkfdir -x 2 \
468 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
469 -o ${x}/fonts.scale -d ${x}
470 # ttmkfdir fails on some stuff, so try mkfontscale if it does
471 local ttmkfdir_return=$?
472 else
473 # We didn't use ttmkfdir at all
474 local ttmkfdir_return=2
475 fi
476 if [[ ${ttmkfdir_return} -ne 0 ]]; then
477 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
478 ${ROOT}/usr/bin/mkfontscale \
479 -a /usr/share/fonts/encodings/encodings.dir \
480 -- ${x}
481 fi
482 # Next type1 and opentype (pfa,pfb,otf,otc)
483 elif [[ "${x/encodings}" = "${x}" ]] \
484 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
485 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
486 ${ROOT}/usr/bin/mkfontscale \
487 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
488 -- ${x} 482 -- ${x}
489 fi 483 fi
490 done 484 done
491 eend 0 485 eend 0
492} 486}
493 487
494create_fonts_dir() { 488create_fonts_dir() {
495 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
496 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
497 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
498 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
499 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
500 494
501 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
502 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
503 ${ROOT}/usr/bin/mkfontdir \
504 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
505 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
506 -- ${x} 499 -- ${x}
507 fi 500 fi
508 done 501 done
509 eend 0 502 eend 0
510} 503}
511 504
512fix_font_permissions() { 505fix_font_permissions() {
513 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
514 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
515 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
516 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
517 done 510 done
518 eend 0 511 eend 0
519} 512}
520 513
521create_font_cache() { 514create_font_cache() {
522 # danarmak found out that fc-cache should be run AFTER all the above 515 font_pkg_postinst
523 # stuff, as otherwise the cache is invalid, and has to be run again
524 # as root anyway
525 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
526 ebegin "Creating FC font cache"
527 HOME="/root" ${ROOT}/usr/bin/fc-cache
528 eend 0
529 fi
530} 516}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.65  
changed lines
  Added in v.1.80
  ViewVC Help
Powered by ViewVC 1.1.13