/[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.77 Revision 1.86
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.77 2006/10/30 05:44:33 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.86 2007/09/24 08:20:00 dberkholz 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 multilib 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}
… …
133 DRIVER="yes" 142 DRIVER="yes"
134 143
135 if [[ ${XDPVER} != -1 ]]; then 144 if [[ ${XDPVER} != -1 ]]; then
136 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
137 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi 148 fi
140fi 149fi
141 150
142# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
143if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
… …
149 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
150 || [[ "${PN/xcursor}" != "${PN}" ]] \ 159 || [[ "${PN/xcursor}" != "${PN}" ]] \
151 ; then 160 ; then
152 DEBUGGABLE="yes" 161 DEBUGGABLE="yes"
153 IUSE="${IUSE} debug" 162 IUSE="${IUSE} debug"
154 if use debug; then
155 if ! has splitdebug ${FEATURES}; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
158 fi
159fi 163fi
160 164
161DEPEND="${DEPEND} 165DEPEND="${DEPEND}
162 >=dev-util/pkgconfig-0.18" 166 >=dev-util/pkgconfig-0.18"
163 167
… …
170RDEPEND="${RDEPEND} 174RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 175 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 176 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 177# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 178# x11-base/x11-env"
179
180inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
175 181
176x-modular_specs_check() { 182x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 183 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 184 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 185 # (#116698) breaks loading
… …
311x-modular_src_configure() { 317x-modular_src_configure() {
312 x-modular_font_configure 318 x-modular_font_configure
313 x-modular_debug_setup 319 x-modular_debug_setup
314 320
315 # If prefix isn't set here, .pc files cause problems 321 # If prefix isn't set here, .pc files cause problems
316 if [[ -x ./configure ]]; then 322 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
317 econf --prefix=${XDIR} \ 323 econf --prefix=${XDIR} \
318 --datadir=${XDIR}/share \ 324 --datadir=${XDIR}/share \
319 ${FONT_OPTIONS} \ 325 ${FONT_OPTIONS} \
320 ${DRIVER_OPTIONS} \ 326 ${DRIVER_OPTIONS} \
321 ${CONFIGURE_OPTIONS} 327 ${CONFIGURE_OPTIONS}
… …
377} 383}
378 384
379x-modular_pkg_postrm() { 385x-modular_pkg_postrm() {
380 if [[ -n "${FONT}" ]]; then 386 if [[ -n "${FONT}" ]]; then
381 cleanup_fonts 387 cleanup_fonts
388 font_pkg_postrm
382 fi 389 fi
383} 390}
384 391
385cleanup_fonts() { 392cleanup_fonts() {
386 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"
… …
468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 475 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
469 476
470 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
471 # fonts are present ... 478 # fonts are present ...
472 479
473 # First truetype (ttf,ttc)
474 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
475 # Also, there is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
476 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
477 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
478 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
479 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
480 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
481 ${ROOT}/usr/bin/ttmkfdir -x 2 \
482 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
483 -o ${x}/fonts.scale -d ${x}
484 # ttmkfdir fails on some stuff, so try mkfontscale if it does
485 local ttmkfdir_return=$?
486 else
487 # We didn't use ttmkfdir at all
488 local ttmkfdir_return=2
489 fi
490 if [[ ${ttmkfdir_return} -ne 0 ]]; then
491 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
492 ${ROOT}/usr/bin/mkfontscale \
493 -a /usr/share/fonts/encodings/encodings.dir \
494 -- ${x}
495 fi
496 # Next type1 and opentype (pfa,pfb,otf,otc)
497 elif [[ "${x/encodings}" = "${x}" ]] \
498 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 mkfontscale \
500 ${ROOT}/usr/bin/mkfontscale \
501 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
502 -- ${x} 486 -- ${x}
503 fi 487 fi
504 done 488 done
505 eend 0 489 eend 0
… …
511 x=${ROOT}/usr/share/fonts/${DIR} 495 x=${ROOT}/usr/share/fonts/${DIR}
512 [[ -z "$(ls ${x}/)" ]] && continue 496 [[ -z "$(ls ${x}/)" ]] && continue
513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 497 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
514 498
515 if [[ "${x/encodings}" = "${x}" ]]; then 499 if [[ "${x/encodings}" = "${x}" ]]; then
516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 500 mkfontdir \
517 ${ROOT}/usr/bin/mkfontdir \
518 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
519 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
520 -- ${x} 503 -- ${x}
521 fi 504 fi
522 done 505 done
… …
531 done 514 done
532 eend 0 515 eend 0
533} 516}
534 517
535create_font_cache() { 518create_font_cache() {
536 # danarmak found out that fc-cache should be run AFTER all the above 519 font_pkg_postinst
537 # stuff, as otherwise the cache is invalid, and has to be run again
538 # as root anyway
539 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
540 ebegin "Creating FC font cache"
541 HOME="/root" ${ROOT}/usr/bin/fc-cache
542 eend 0
543 fi
544} 520}
521
522EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.77  
changed lines
  Added in v.1.86
  ViewVC Help
Powered by ViewVC 1.1.13