/[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.67 Revision 1.78
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.67 2006/06/30 23:15:32 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.78 2006/10/30 05:57:41 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.
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 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 28inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font
31 29
32# Directory prefix to use for everything 30# Directory prefix to use for everything
33XDIR="/usr" 31XDIR="/usr"
34 32
35# Set up default patchset version(s) if necessary 33# Set up default patchset version(s) if necessary
130# If we're a driver package 128# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 129if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 130 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 131 DRIVER="yes"
134 132
133 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 134 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 135 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 136 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
137 fi
138fi 138fi
139 139
140# Debugging -- ignore packages that can't be built with debugging 140# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 141if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 142 || [[ "${PN/app-doc}" != "${PN}" ]] \
159DEPEND="${DEPEND} 159DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 160 >=dev-util/pkgconfig-0.18"
161 161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 163 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3"
165fi 166fi
166 167
167RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
168 !<=x11-base/xorg-x11-6.9" 170 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 171# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 172# x11-base/x11-env"
171 173
172x-modular_specs_check() { 174x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 175 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 176 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading 177 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now 178 filter-ldflags -Wl,-z,now
183 fi 179 fi
184} 180}
227 fi 223 fi
228 224
229 # If this is a driver package we need to fix man page install location. 225 # If this is a driver package we need to fix man page install location.
230 # Running autoreconf will use the patched util-macros to make the 226 # Running autoreconf will use the patched util-macros to make the
231 # change for us, so we only need to patch if it is not going to run. 227 # change for us, so we only need to patch if it is not going to run.
232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 228 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
229 && [[ ${XDPVER} != -1 ]]; then
233 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
234 fi 231 fi
235 232
236 # For specific list of patches 233 # For specific list of patches
237 if [[ -n "${PATCHES}" ]] ; then 234 if [[ -n "${PATCHES}" ]] ; then
251x-modular_reconf_source() { 248x-modular_reconf_source() {
252 # Run autoreconf for CVS snapshots only 249 # Run autoreconf for CVS snapshots only
253 if [[ "${SNAPSHOT}" = "yes" ]] 250 if [[ "${SNAPSHOT}" = "yes" ]]
254 then 251 then
255 # If possible, generate configure if it doesn't exist 252 # If possible, generate configure if it doesn't exist
256 if [ -f "${S}/configure.ac" ] 253 if [ -f "./configure.ac" ]
257 then 254 then
258 eautoreconf 255 eautoreconf
259 fi 256 fi
260 fi 257 fi
261 258
348 345
349 # Make sure docs get compressed 346 # Make sure docs get compressed
350 prepalldocs 347 prepalldocs
351 348
352 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
353 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 350 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
354 find ${D}/usr/lib/xorg/modules -name '*.la' \ 351 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
355 | xargs rm -f 352 | xargs rm -f
356 fi 353 fi
357 354
358 # Don't install overlapping fonts.* files 355 # Don't install overlapping fonts.* files
359 # Generate them instead when possible 356 # Generate them instead when possible
360 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
361 remove_font_metadata 358 remove_font_metadata
362 fi 359 fi
360
361 if [[ -n "${DRIVER}" ]]; then
362 install_driver_hwdata
363 fi
363} 364}
364 365
365x-modular_pkg_preinst() { 366x-modular_pkg_preinst() {
366 if [[ -n "${FONT}" ]]; then 367 # We no longer do anything here, but we can't remove it from the API
367 discover_font_dirs 368 :
368 fi
369} 369}
370 370
371x-modular_pkg_postinst() { 371x-modular_pkg_postinst() {
372 if [[ -n "${FONT}" ]]; then 372 if [[ -n "${FONT}" ]]; then
373 setup_fonts 373 setup_fonts
375} 375}
376 376
377x-modular_pkg_postrm() { 377x-modular_pkg_postrm() {
378 if [[ -n "${FONT}" ]]; then 378 if [[ -n "${FONT}" ]]; then
379 cleanup_fonts 379 cleanup_fonts
380 font_pkg_postrm
380 fi 381 fi
381} 382}
382 383
383cleanup_fonts() { 384cleanup_fonts() {
384 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 385 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
414 eend 0 415 eend 0
415 done 416 done
416} 417}
417 418
418setup_fonts() { 419setup_fonts() {
419 if [[ ! -n "${FONT_DIRS}" ]]; then 420 if [[ ! -n "${FONT_DIR}" ]]; then
420 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 421 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
421 eerror "${msg}" 422 eerror "${msg}"
422 die "${msg}" 423 die "${msg}"
423 fi 424 fi
424 425
425 create_fonts_scale 426 create_fonts_scale
438 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 439 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
439 fi 440 fi
440 done 441 done
441} 442}
442 443
444# Installs device-to-driver mappings for system-config-display
445# and anything else that uses hwdata
446install_driver_hwdata() {
447 insinto /usr/share/hwdata/videoaliases
448 for i in "${FILESDIR}"/*.xinf; do
449 # We need this for the case when none exist,
450 # so *.xinf doesn't expand
451 if [[ -e $i ]]; then
452 doins $i
453 fi
454 done
455}
456
443discover_font_dirs() { 457discover_font_dirs() {
444 pushd ${IMAGE}/usr/share/fonts 458 FONT_DIRS="${FONT_DIR}"
445 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
446 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
447 popd
448} 459}
449 460
450create_fonts_scale() { 461create_fonts_scale() {
451 ebegin "Creating fonts.scale files" 462 ebegin "Creating fonts.scale files"
452 local x 463 local x
453 for FONT_DIR in ${FONT_DIRS}; do 464 for DIR in ${FONT_DIR}; do
454 x=${ROOT}/usr/share/fonts/${FONT_DIR} 465 x=${ROOT}/usr/share/fonts/${DIR}
455 [[ -z "$(ls ${x}/)" ]] && continue 466 [[ -z "$(ls ${x}/)" ]] && continue
456 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
457 468
458 # Only generate .scale files if truetype, opentype or type1 469 # Only generate .scale files if truetype, opentype or type1
459 # fonts are present ... 470 # fonts are present ...
493 eend 0 504 eend 0
494} 505}
495 506
496create_fonts_dir() { 507create_fonts_dir() {
497 ebegin "Generating fonts.dir files" 508 ebegin "Generating fonts.dir files"
498 for FONT_DIR in ${FONT_DIRS}; do 509 for DIR in ${FONT_DIR}; do
499 x=${ROOT}/usr/share/fonts/${FONT_DIR} 510 x=${ROOT}/usr/share/fonts/${DIR}
500 [[ -z "$(ls ${x}/)" ]] && continue 511 [[ -z "$(ls ${x}/)" ]] && continue
501 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 512 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
502 513
503 if [[ "${x/encodings}" = "${x}" ]]; then 514 if [[ "${x/encodings}" = "${x}" ]]; then
504 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 515 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
511 eend 0 522 eend 0
512} 523}
513 524
514fix_font_permissions() { 525fix_font_permissions() {
515 ebegin "Fixing permissions" 526 ebegin "Fixing permissions"
516 for FONT_DIR in ${FONT_DIRS}; do 527 for DIR in ${FONT_DIR}; do
517 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 528 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
518 -exec chmod 0644 {} \; 529 -exec chmod 0644 {} \;
519 done 530 done
520 eend 0 531 eend 0
521} 532}
522 533
523create_font_cache() { 534create_font_cache() {
524 # danarmak found out that fc-cache should be run AFTER all the above 535 font_pkg_postinst
525 # stuff, as otherwise the cache is invalid, and has to be run again
526 # as root anyway
527 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
528 ebegin "Creating FC font cache"
529 HOME="/root" ${ROOT}/usr/bin/fc-cache
530 eend 0
531 fi
532} 536}
537
538EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.78

  ViewVC Help
Powered by ViewVC 1.1.20