/[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.61 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.61 2006/06/28 02:20:31 joshuabaergen 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.
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}" ]] \
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
172x-modular_specs_check() { 176x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 178 append-ldflags -Wl,-z,lazy
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 # (#116698) breaks loading 179 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 180 filter-ldflags -Wl,-z,now
182 fi 181 fi
183} 182}
184 183
197 196
198x-modular_server_supports_drivers_check() { 197x-modular_server_supports_drivers_check() {
199 # (#135873) Only certain servers will actually use or be capable of 198 # (#135873) Only certain servers will actually use or be capable of
200 # building external drivers, including binary drivers. 199 # building external drivers, including binary drivers.
201 if [[ -n "${DRIVER}" ]]; then 200 if [[ -n "${DRIVER}" ]]; then
201 if has_version '>=x11-base/xorg-server-1.1'; then
202 if ! built_with_use x11-base/xorg-server xorg; then 202 if ! built_with_use x11-base/xorg-server xorg; then
203 eerror "x11-base/xorg-server is not built with support for external drivers." 203 eerror "x11-base/xorg-server is not built with support for external drivers."
204 die "You must build x11-base/xorg-server with USE=xorg." 204 die "You must build x11-base/xorg-server with USE=xorg."
205 fi
205 fi 206 fi
206 fi 207 fi
207} 208}
208 209
209x-modular_unpack_source() { 210x-modular_unpack_source() {
224 fi 225 fi
225 226
226 # 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.
227 # Running autoreconf will use the patched util-macros to make the 228 # Running autoreconf will use the patched util-macros to make the
228 # 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.
229 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
231 && [[ ${XDPVER} != -1 ]]; then
230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 232 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
231 fi 233 fi
232 234
233 # For specific list of patches 235 # For specific list of patches
234 if [[ -n "${PATCHES}" ]] ; then 236 if [[ -n "${PATCHES}" ]] ; then
248x-modular_reconf_source() { 250x-modular_reconf_source() {
249 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
250 if [[ "${SNAPSHOT}" = "yes" ]] 252 if [[ "${SNAPSHOT}" = "yes" ]]
251 then 253 then
252 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
253 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
254 then 256 then
255 eautoreconf 257 eautoreconf
256 fi 258 fi
257 fi 259 fi
258 260
345 347
346 # Make sure docs get compressed 348 # Make sure docs get compressed
347 prepalldocs 349 prepalldocs
348 350
349 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
350 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
351 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
352 | xargs rm -f 354 | xargs rm -f
353 fi 355 fi
354 356
355 # Don't install overlapping fonts.* files 357 # Don't install overlapping fonts.* files
356 # Generate them instead when possible 358 # Generate them instead when possible
357 if [[ -n "${FONT}" ]]; then 359 if [[ -n "${FONT}" ]]; then
358 remove_font_metadata 360 remove_font_metadata
359 fi 361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
365 fi
360} 366}
361 367
362x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
363 if [[ -n "${FONT}" ]]; then 369 # We no longer do anything here, but we can't remove it from the API
364 discover_font_dirs 370 :
365 fi
366} 371}
367 372
368x-modular_pkg_postinst() { 373x-modular_pkg_postinst() {
369 if [[ -n "${FONT}" ]]; then 374 if [[ -n "${FONT}" ]]; then
370 setup_fonts 375 setup_fonts
411 eend 0 416 eend 0
412 done 417 done
413} 418}
414 419
415setup_fonts() { 420setup_fonts() {
416 if [[ ! -n "${FONT_DIRS}" ]]; then 421 if [[ ! -n "${FONT_DIR}" ]]; then
417 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."
418 eerror "${msg}" 423 eerror "${msg}"
419 die "${msg}" 424 die "${msg}"
420 fi 425 fi
421 426
422 create_fonts_scale 427 create_fonts_scale
435 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}
436 fi 441 fi
437 done 442 done
438} 443}
439 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
440discover_font_dirs() { 458discover_font_dirs() {
441 pushd ${IMAGE}/usr/share/fonts 459 FONT_DIRS="${FONT_DIR}"
442 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
443 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
444 popd
445} 460}
446 461
447create_fonts_scale() { 462create_fonts_scale() {
448 ebegin "Creating fonts.scale files" 463 ebegin "Creating fonts.scale files"
449 local x 464 local x
450 for FONT_DIR in ${FONT_DIRS}; do 465 for DIR in ${FONT_DIR}; do
451 x=${ROOT}/usr/share/fonts/${FONT_DIR} 466 x=${ROOT}/usr/share/fonts/${DIR}
452 [[ -z "$(ls ${x}/)" ]] && continue 467 [[ -z "$(ls ${x}/)" ]] && continue
453 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
454 469
455 # Only generate .scale files if truetype, opentype or type1 470 # Only generate .scale files if truetype, opentype or type1
456 # fonts are present ... 471 # fonts are present ...
490 eend 0 505 eend 0
491} 506}
492 507
493create_fonts_dir() { 508create_fonts_dir() {
494 ebegin "Generating fonts.dir files" 509 ebegin "Generating fonts.dir files"
495 for FONT_DIR in ${FONT_DIRS}; do 510 for DIR in ${FONT_DIR}; do
496 x=${ROOT}/usr/share/fonts/${FONT_DIR} 511 x=${ROOT}/usr/share/fonts/${DIR}
497 [[ -z "$(ls ${x}/)" ]] && continue 512 [[ -z "$(ls ${x}/)" ]] && continue
498 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
499 514
500 if [[ "${x/encodings}" = "${x}" ]]; then 515 if [[ "${x/encodings}" = "${x}" ]]; then
501 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
508 eend 0 523 eend 0
509} 524}
510 525
511fix_font_permissions() { 526fix_font_permissions() {
512 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
513 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
514 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
515 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
516 done 531 done
517 eend 0 532 eend 0
518} 533}
519 534

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

  ViewVC Help
Powered by ViewVC 1.1.20