/[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.80 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.80 2006/10/30 18:40:58 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 36
28# Directory prefix to use for everything 37# Directory prefix to use for everything
29XDIR="/usr" 38XDIR="/usr"
… …
75 84
76# Set up shared dependencies 85# Set up shared dependencies
77if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
78# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
79 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
80 >=sys-devel/autoconf-2.57
81 >=sys-devel/automake-1.7
82 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
83 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
84fi 93fi
85 94
86# 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
87FONT_ECLASS="" 96FONT_ECLASS=""
88if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
… …
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
… …
313x-modular_src_configure() { 317x-modular_src_configure() {
314 x-modular_font_configure 318 x-modular_font_configure
315 x-modular_debug_setup 319 x-modular_debug_setup
316 320
317 # If prefix isn't set here, .pc files cause problems 321 # If prefix isn't set here, .pc files cause problems
318 if [[ -x ./configure ]]; then 322 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
319 econf --prefix=${XDIR} \ 323 econf --prefix=${XDIR} \
320 --datadir=${XDIR}/share \ 324 --datadir=${XDIR}/share \
321 ${FONT_OPTIONS} \ 325 ${FONT_OPTIONS} \
322 ${DRIVER_OPTIONS} \ 326 ${DRIVER_OPTIONS} \
323 ${CONFIGURE_OPTIONS} 327 ${CONFIGURE_OPTIONS}
… …
472 476
473 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
474 # fonts are present ... 478 # fonts are present ...
475 479
476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
477 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
478 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
480 mkfontscale \ 484 mkfontscale \
481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
482 -- ${x} 486 -- ${x}
Legend:
Removed from v.1.80  
changed lines
  Added in v.1.86
  ViewVC Help
Powered by ViewVC 1.1.13