/[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.68 Revision 1.84
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.68 2006/07/01 05:36:26 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.84 2007/07/02 14:24:27 peper Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@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.
9# 9#
10# Using this eclass: 10# Using this eclass:
… …
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
25# 34#
26# Pretty much everything else should be automatic. 35# Pretty much everything else should be automatic.
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
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
… …
79 84
80# Set up shared dependencies 85# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
88fi 93fi
89 94
90# If we're a font package, but not the font.alias one 95# If we're a font package, but not the font.alias one
96FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 98 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
96 FONT="yes" 102 FONT="yes"
97 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
106
98 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
99 media-fonts/encodings 108 media-fonts/encodings
100 x11-apps/mkfontscale 109 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
… …
130# If we're a driver package 139# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 142 DRIVER="yes"
134 143
144 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi
138fi 149fi
139 150
140# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 153 || [[ "${PN/app-doc}" != "${PN}" ]] \
… …
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \ 159 || [[ "${PN/xcursor}" != "${PN}" ]] \
149 ; then 160 ; then
150 DEBUGGABLE="yes" 161 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug" 162 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
157fi 163fi
158 164
159DEPEND="${DEPEND} 165DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 166 >=dev-util/pkgconfig-0.18"
161 167
… …
164 >=x11-misc/util-macros-0.99.2 170 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3" 171 >=sys-devel/binutils-2.16.1-r3"
166fi 172fi
167 173
168RDEPEND="${RDEPEND} 174RDEPEND="${RDEPEND}
175 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
169 !<=x11-base/xorg-x11-6.9" 176 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 177# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 178# x11-base/x11-env"
179
180inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
172 181
173x-modular_specs_check() { 182x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 183 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy 184 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading 185 # (#116698) breaks loading
… …
222 fi 231 fi
223 232
224 # If this is a driver package we need to fix man page install location. 233 # 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 234 # 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. 235 # change for us, so we only need to patch if it is not going to run.
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 236 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
237 && [[ ${XDPVER} != -1 ]]; then
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 238 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
229 fi 239 fi
230 240
231 # For specific list of patches 241 # For specific list of patches
232 if [[ -n "${PATCHES}" ]] ; then 242 if [[ -n "${PATCHES}" ]] ; then
… …
246x-modular_reconf_source() { 256x-modular_reconf_source() {
247 # Run autoreconf for CVS snapshots only 257 # Run autoreconf for CVS snapshots only
248 if [[ "${SNAPSHOT}" = "yes" ]] 258 if [[ "${SNAPSHOT}" = "yes" ]]
249 then 259 then
250 # If possible, generate configure if it doesn't exist 260 # If possible, generate configure if it doesn't exist
251 if [ -f "${S}/configure.ac" ] 261 if [ -f "./configure.ac" ]
252 then 262 then
253 eautoreconf 263 eautoreconf
254 fi 264 fi
255 fi 265 fi
256 266
… …
343 353
344 # Make sure docs get compressed 354 # Make sure docs get compressed
345 prepalldocs 355 prepalldocs
346 356
347 # Don't install libtool archives for server modules 357 # Don't install libtool archives for server modules
348 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 358 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
349 find ${D}/usr/lib/xorg/modules -name '*.la' \ 359 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
350 | xargs rm -f 360 | xargs rm -f
351 fi 361 fi
352 362
353 # Don't install overlapping fonts.* files 363 # Don't install overlapping fonts.* files
354 # Generate them instead when possible 364 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then 365 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata 366 remove_font_metadata
357 fi 367 fi
368
369 if [[ -n "${DRIVER}" ]]; then
370 install_driver_hwdata
371 fi
358} 372}
359 373
360x-modular_pkg_preinst() { 374x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 375 # We no longer do anything here, but we can't remove it from the API
362 discover_font_dirs 376 :
363 fi
364} 377}
365 378
366x-modular_pkg_postinst() { 379x-modular_pkg_postinst() {
367 if [[ -n "${FONT}" ]]; then 380 if [[ -n "${FONT}" ]]; then
368 setup_fonts 381 setup_fonts
… …
370} 383}
371 384
372x-modular_pkg_postrm() { 385x-modular_pkg_postrm() {
373 if [[ -n "${FONT}" ]]; then 386 if [[ -n "${FONT}" ]]; then
374 cleanup_fonts 387 cleanup_fonts
388 font_pkg_postrm
375 fi 389 fi
376} 390}
377 391
378cleanup_fonts() { 392cleanup_fonts() {
379 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 393 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
… …
409 eend 0 423 eend 0
410 done 424 done
411} 425}
412 426
413setup_fonts() { 427setup_fonts() {
414 if [[ ! -n "${FONT_DIRS}" ]]; then 428 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." 429 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
416 eerror "${msg}" 430 eerror "${msg}"
417 die "${msg}" 431 die "${msg}"
418 fi 432 fi
419 433
420 create_fonts_scale 434 create_fonts_scale
… …
433 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 447 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
434 fi 448 fi
435 done 449 done
436} 450}
437 451
452# Installs device-to-driver mappings for system-config-display
453# and anything else that uses hwdata
454install_driver_hwdata() {
455 insinto /usr/share/hwdata/videoaliases
456 for i in "${FILESDIR}"/*.xinf; do
457 # We need this for the case when none exist,
458 # so *.xinf doesn't expand
459 if [[ -e $i ]]; then
460 doins $i
461 fi
462 done
463}
464
438discover_font_dirs() { 465discover_font_dirs() {
439 pushd ${IMAGE}/usr/share/fonts 466 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} 467}
444 468
445create_fonts_scale() { 469create_fonts_scale() {
446 ebegin "Creating fonts.scale files" 470 ebegin "Creating fonts.scale files"
447 local x 471 local x
448 for FONT_DIR in ${FONT_DIRS}; do 472 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 473 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 474 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 475 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 476
453 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
454 # fonts are present ... 478 # fonts are present ...
455 479
456 # First truetype (ttf,ttc)
457 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
458 # Also, there is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
459 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
460 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
461 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
462 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
463 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
464 ${ROOT}/usr/bin/ttmkfdir -x 2 \
465 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
466 -o ${x}/fonts.scale -d ${x}
467 # ttmkfdir fails on some stuff, so try mkfontscale if it does
468 local ttmkfdir_return=$?
469 else
470 # We didn't use ttmkfdir at all
471 local ttmkfdir_return=2
472 fi
473 if [[ ${ttmkfdir_return} -ne 0 ]]; then
474 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
475 ${ROOT}/usr/bin/mkfontscale \
476 -a /usr/share/fonts/encodings/encodings.dir \
477 -- ${x}
478 fi
479 # Next type1 and opentype (pfa,pfb,otf,otc)
480 elif [[ "${x/encodings}" = "${x}" ]] \
481 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
482 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 mkfontscale \
483 ${ROOT}/usr/bin/mkfontscale \
484 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
485 -- ${x} 486 -- ${x}
486 fi 487 fi
487 done 488 done
488 eend 0 489 eend 0
489} 490}
490 491
491create_fonts_dir() { 492create_fonts_dir() {
492 ebegin "Generating fonts.dir files" 493 ebegin "Generating fonts.dir files"
493 for FONT_DIR in ${FONT_DIRS}; do 494 for DIR in ${FONT_DIR}; do
494 x=${ROOT}/usr/share/fonts/${FONT_DIR} 495 x=${ROOT}/usr/share/fonts/${DIR}
495 [[ -z "$(ls ${x}/)" ]] && continue 496 [[ -z "$(ls ${x}/)" ]] && continue
496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 497 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
497 498
498 if [[ "${x/encodings}" = "${x}" ]]; then 499 if [[ "${x/encodings}" = "${x}" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 500 mkfontdir \
500 ${ROOT}/usr/bin/mkfontdir \
501 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
502 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
503 -- ${x} 503 -- ${x}
504 fi 504 fi
505 done 505 done
506 eend 0 506 eend 0
507} 507}
508 508
509fix_font_permissions() { 509fix_font_permissions() {
510 ebegin "Fixing permissions" 510 ebegin "Fixing permissions"
511 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
512 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 512 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
513 -exec chmod 0644 {} \; 513 -exec chmod 0644 {} \;
514 done 514 done
515 eend 0 515 eend 0
516} 516}
517 517
518create_font_cache() { 518create_font_cache() {
519 # danarmak found out that fc-cache should be run AFTER all the above 519 font_pkg_postinst
520 # stuff, as otherwise the cache is invalid, and has to be run again
521 # as root anyway
522 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
523 ebegin "Creating FC font cache"
524 HOME="/root" ${ROOT}/usr/bin/fc-cache
525 eend 0
526 fi
527} 520}
521
522EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.68  
changed lines
  Added in v.1.84
  ViewVC Help
Powered by ViewVC 1.1.13