/[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.71 Revision 1.77
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.71 2006/07/04 02:11:26 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.77 2006/10/30 05:44:33 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.
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"
172 175
173x-modular_specs_check() { 176x-modular_specs_check() {
222 fi 225 fi
223 226
224 # If this is a driver package we need to fix man page install location. 227 # 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 228 # 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. 229 # change for us, so we only need to patch if it is not going to run.
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
231 && [[ ${XDPVER} != -1 ]]; then
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 232 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
229 fi 233 fi
230 234
231 # For specific list of patches 235 # For specific list of patches
232 if [[ -n "${PATCHES}" ]] ; then 236 if [[ -n "${PATCHES}" ]] ; then
246x-modular_reconf_source() { 250x-modular_reconf_source() {
247 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
248 if [[ "${SNAPSHOT}" = "yes" ]] 252 if [[ "${SNAPSHOT}" = "yes" ]]
249 then 253 then
250 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
251 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
252 then 256 then
253 eautoreconf 257 eautoreconf
254 fi 258 fi
255 fi 259 fi
256 260
353 # Don't install overlapping fonts.* files 357 # Don't install overlapping fonts.* files
354 # Generate them instead when possible 358 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then 359 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata 360 remove_font_metadata
357 fi 361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
365 fi
358} 366}
359 367
360x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 369 # We no longer do anything here, but we can't remove it from the API
362 discover_font_dirs 370 :
363 fi
364} 371}
365 372
366x-modular_pkg_postinst() { 373x-modular_pkg_postinst() {
367 if [[ -n "${FONT}" ]]; then 374 if [[ -n "${FONT}" ]]; then
368 setup_fonts 375 setup_fonts
409 eend 0 416 eend 0
410 done 417 done
411} 418}
412 419
413setup_fonts() { 420setup_fonts() {
414 if [[ ! -n "${FONT_DIRS}" ]]; then 421 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." 422 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
416 eerror "${msg}" 423 eerror "${msg}"
417 die "${msg}" 424 die "${msg}"
418 fi 425 fi
419 426
420 create_fonts_scale 427 create_fonts_scale
433 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 440 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
434 fi 441 fi
435 done 442 done
436} 443}
437 444
445# Installs device-to-driver mappings for system-config-display
446# and anything else that uses hwdata
447install_driver_hwdata() {
448 insinto /usr/share/hwdata/videoaliases
449 for i in "${FILESDIR}"/*.xinf; do
450 # We need this for the case when none exist,
451 # so *.xinf doesn't expand
452 if [[ -e $i ]]; then
453 doins $i
454 fi
455 done
456}
457
438discover_font_dirs() { 458discover_font_dirs() {
439 pushd ${IMAGE}/usr/share/fonts 459 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} 460}
444 461
445create_fonts_scale() { 462create_fonts_scale() {
446 ebegin "Creating fonts.scale files" 463 ebegin "Creating fonts.scale files"
447 local x 464 local x
448 for FONT_DIR in ${FONT_DIRS}; do 465 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 466 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 467 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 469
453 # Only generate .scale files if truetype, opentype or type1 470 # Only generate .scale files if truetype, opentype or type1
454 # fonts are present ... 471 # fonts are present ...
488 eend 0 505 eend 0
489} 506}
490 507
491create_fonts_dir() { 508create_fonts_dir() {
492 ebegin "Generating fonts.dir files" 509 ebegin "Generating fonts.dir files"
493 for FONT_DIR in ${FONT_DIRS}; do 510 for DIR in ${FONT_DIR}; do
494 x=${ROOT}/usr/share/fonts/${FONT_DIR} 511 x=${ROOT}/usr/share/fonts/${DIR}
495 [[ -z "$(ls ${x}/)" ]] && continue 512 [[ -z "$(ls ${x}/)" ]] && continue
496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
497 514
498 if [[ "${x/encodings}" = "${x}" ]]; then 515 if [[ "${x/encodings}" = "${x}" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
506 eend 0 523 eend 0
507} 524}
508 525
509fix_font_permissions() { 526fix_font_permissions() {
510 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
511 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
512 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
513 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
514 done 531 done
515 eend 0 532 eend 0
516} 533}
517 534

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.77

  ViewVC Help
Powered by ViewVC 1.1.20