/[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.63 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.63 2006/06/30 03:52:57 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}" ]] \
… …
155 fi 155 fi
156 fi 156 fi
157fi 157fi
158 158
159DEPEND="${DEPEND} 159DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18 160 >=dev-util/pkgconfig-0.18"
161 >=sys-devel/binutils-2.16.1-r3"
162 161
163if [[ "${PN/util-macros}" = "${PN}" ]]; then 162if [[ "${PN/util-macros}" = "${PN}" ]]; then
164 DEPEND="${DEPEND} 163 DEPEND="${DEPEND}
165 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3"
166fi 166fi
167 167
168RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
169 !<=x11-base/xorg-x11-6.9" 170 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 171# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 172# x11-base/x11-env"
172 173
173x-modular_specs_check() { 174x-modular_specs_check() {
… …
193 194
194x-modular_server_supports_drivers_check() { 195x-modular_server_supports_drivers_check() {
195 # (#135873) Only certain servers will actually use or be capable of 196 # (#135873) Only certain servers will actually use or be capable of
196 # building external drivers, including binary drivers. 197 # building external drivers, including binary drivers.
197 if [[ -n "${DRIVER}" ]]; then 198 if [[ -n "${DRIVER}" ]]; then
199 if has_version '>=x11-base/xorg-server-1.1'; then
198 if ! built_with_use x11-base/xorg-server xorg; then 200 if ! built_with_use x11-base/xorg-server xorg; then
199 eerror "x11-base/xorg-server is not built with support for external drivers." 201 eerror "x11-base/xorg-server is not built with support for external drivers."
200 die "You must build x11-base/xorg-server with USE=xorg." 202 die "You must build x11-base/xorg-server with USE=xorg."
203 fi
201 fi 204 fi
202 fi 205 fi
203} 206}
204 207
205x-modular_unpack_source() { 208x-modular_unpack_source() {
… …
220 fi 223 fi
221 224
222 # 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.
223 # Running autoreconf will use the patched util-macros to make the 226 # Running autoreconf will use the patched util-macros to make the
224 # 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.
225 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 228 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
229 && [[ ${XDPVER} != -1 ]]; then
226 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
227 fi 231 fi
228 232
229 # For specific list of patches 233 # For specific list of patches
230 if [[ -n "${PATCHES}" ]] ; then 234 if [[ -n "${PATCHES}" ]] ; then
… …
244x-modular_reconf_source() { 248x-modular_reconf_source() {
245 # Run autoreconf for CVS snapshots only 249 # Run autoreconf for CVS snapshots only
246 if [[ "${SNAPSHOT}" = "yes" ]] 250 if [[ "${SNAPSHOT}" = "yes" ]]
247 then 251 then
248 # If possible, generate configure if it doesn't exist 252 # If possible, generate configure if it doesn't exist
249 if [ -f "${S}/configure.ac" ] 253 if [ -f "./configure.ac" ]
250 then 254 then
251 eautoreconf 255 eautoreconf
252 fi 256 fi
253 fi 257 fi
254 258
… …
341 345
342 # Make sure docs get compressed 346 # Make sure docs get compressed
343 prepalldocs 347 prepalldocs
344 348
345 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
346 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 350 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
347 find ${D}/usr/lib/xorg/modules -name '*.la' \ 351 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
348 | xargs rm -f 352 | xargs rm -f
349 fi 353 fi
350 354
351 # Don't install overlapping fonts.* files 355 # Don't install overlapping fonts.* files
352 # Generate them instead when possible 356 # Generate them instead when possible
353 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
354 remove_font_metadata 358 remove_font_metadata
355 fi 359 fi
360
361 if [[ -n "${DRIVER}" ]]; then
362 install_driver_hwdata
363 fi
356} 364}
357 365
358x-modular_pkg_preinst() { 366x-modular_pkg_preinst() {
359 if [[ -n "${FONT}" ]]; then 367 # We no longer do anything here, but we can't remove it from the API
360 discover_font_dirs 368 :
361 fi
362} 369}
363 370
364x-modular_pkg_postinst() { 371x-modular_pkg_postinst() {
365 if [[ -n "${FONT}" ]]; then 372 if [[ -n "${FONT}" ]]; then
366 setup_fonts 373 setup_fonts
… …
368} 375}
369 376
370x-modular_pkg_postrm() { 377x-modular_pkg_postrm() {
371 if [[ -n "${FONT}" ]]; then 378 if [[ -n "${FONT}" ]]; then
372 cleanup_fonts 379 cleanup_fonts
380 font_pkg_postrm
373 fi 381 fi
374} 382}
375 383
376cleanup_fonts() { 384cleanup_fonts() {
377 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"
… …
407 eend 0 415 eend 0
408 done 416 done
409} 417}
410 418
411setup_fonts() { 419setup_fonts() {
412 if [[ ! -n "${FONT_DIRS}" ]]; then 420 if [[ ! -n "${FONT_DIR}" ]]; then
413 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."
414 eerror "${msg}" 422 eerror "${msg}"
415 die "${msg}" 423 die "${msg}"
416 fi 424 fi
417 425
418 create_fonts_scale 426 create_fonts_scale
… …
431 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}
432 fi 440 fi
433 done 441 done
434} 442}
435 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
436discover_font_dirs() { 457discover_font_dirs() {
437 pushd ${IMAGE}/usr/share/fonts 458 FONT_DIRS="${FONT_DIR}"
438 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
439 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
440 popd
441} 459}
442 460
443create_fonts_scale() { 461create_fonts_scale() {
444 ebegin "Creating fonts.scale files" 462 ebegin "Creating fonts.scale files"
445 local x 463 local x
446 for FONT_DIR in ${FONT_DIRS}; do 464 for DIR in ${FONT_DIR}; do
447 x=${ROOT}/usr/share/fonts/${FONT_DIR} 465 x=${ROOT}/usr/share/fonts/${DIR}
448 [[ -z "$(ls ${x}/)" ]] && continue 466 [[ -z "$(ls ${x}/)" ]] && continue
449 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
450 468
451 # Only generate .scale files if truetype, opentype or type1 469 # Only generate .scale files if truetype, opentype or type1
452 # fonts are present ... 470 # fonts are present ...
… …
486 eend 0 504 eend 0
487} 505}
488 506
489create_fonts_dir() { 507create_fonts_dir() {
490 ebegin "Generating fonts.dir files" 508 ebegin "Generating fonts.dir files"
491 for FONT_DIR in ${FONT_DIRS}; do 509 for DIR in ${FONT_DIR}; do
492 x=${ROOT}/usr/share/fonts/${FONT_DIR} 510 x=${ROOT}/usr/share/fonts/${DIR}
493 [[ -z "$(ls ${x}/)" ]] && continue 511 [[ -z "$(ls ${x}/)" ]] && continue
494 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 512 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
495 513
496 if [[ "${x/encodings}" = "${x}" ]]; then 514 if [[ "${x/encodings}" = "${x}" ]]; then
497 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 515 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
… …
504 eend 0 522 eend 0
505} 523}
506 524
507fix_font_permissions() { 525fix_font_permissions() {
508 ebegin "Fixing permissions" 526 ebegin "Fixing permissions"
509 for FONT_DIR in ${FONT_DIRS}; do 527 for DIR in ${FONT_DIR}; do
510 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 528 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
511 -exec chmod 0644 {} \; 529 -exec chmod 0644 {} \;
512 done 530 done
513 eend 0 531 eend 0
514} 532}
515 533
516create_font_cache() { 534create_font_cache() {
517 # danarmak found out that fc-cache should be run AFTER all the above 535 font_pkg_postinst
518 # stuff, as otherwise the cache is invalid, and has to be run again
519 # as root anyway
520 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
521 ebegin "Creating FC font cache"
522 HOME="/root" ${ROOT}/usr/bin/fc-cache
523 eend 0
524 fi
525} 536}
537
538EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.63  
changed lines
  Added in v.1.78
  ViewVC Help
Powered by ViewVC 1.1.13