/[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.75
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.75 2006/09/05 23:40:42 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.
… …
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 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29 29
30inherit eutils libtool toolchain-funcs flag-o-matic autotools 30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 31
32# Directory prefix to use for everything 32# Directory prefix to use for everything
33XDIR="/usr" 33XDIR="/usr"
34 34
35# Set up default patchset version(s) if necessary 35# Set up default patchset version(s) if necessary
… …
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}" ]] \
… …
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
165 !alpha? ( >=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
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
… …
343 347
344 # Make sure docs get compressed 348 # Make sure docs get compressed
345 prepalldocs 349 prepalldocs
346 350
347 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
348 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
349 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
350 | xargs rm -f 354 | xargs rm -f
351 fi 355 fi
352 356
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
361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
357 fi 365 fi
358} 366}
359 367
360x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 369 if [[ -n "${FONT}" ]]; then
… …
429 if [[ "${DIR}" != "Speedo" ]] && \ 437 if [[ "${DIR}" != "Speedo" ]] && \
430 [[ "${DIR}" != "CID" ]] ; then 438 [[ "${DIR}" != "CID" ]] ; then
431 # Delete font metadata files 439 # Delete font metadata files
432 # fonts.scale, fonts.dir, fonts.cache-1 440 # fonts.scale, fonts.dir, fonts.cache-1
433 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 441 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
442 fi
443 done
444}
445
446# Installs device-to-driver mappings for system-config-display
447# and anything else that uses hwdata
448install_driver_hwdata() {
449 insinto /usr/share/hwdata/videoaliases
450 for i in "${FILESDIR}"/*.xinf; do
451 # We need this for the case when none exist,
452 # so *.xinf doesn't expand
453 if [[ -e $i ]]; then
454 doins $i
434 fi 455 fi
435 done 456 done
436} 457}
437 458
438discover_font_dirs() { 459discover_font_dirs() {
Legend:
Removed from v.1.69  
changed lines
  Added in v.1.75
  ViewVC Help
Powered by ViewVC 1.1.13