/[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.82 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.82 2007/05/02 07:10:02 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:
142 DRIVER="yes" 142 DRIVER="yes"
143 143
144 if [[ ${XDPVER} != -1 ]]; then 144 if [[ ${XDPVER} != -1 ]]; then
145 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
146 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi 148 fi
149fi 149fi
150 150
151# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
152if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
159 || [[ "${PN/xcursor}" != "${PN}" ]] \ 159 || [[ "${PN/xcursor}" != "${PN}" ]] \
160 ; then 160 ; then
161 DEBUGGABLE="yes" 161 DEBUGGABLE="yes"
162 IUSE="${IUSE} debug" 162 IUSE="${IUSE} debug"
163 if use debug; then
164 if ! has splitdebug ${FEATURES}; then
165 RESTRICT="${RESTRICT} nostrip"
166 fi
167 fi
168fi 163fi
169 164
170DEPEND="${DEPEND} 165DEPEND="${DEPEND}
171 >=dev-util/pkgconfig-0.18" 166 >=dev-util/pkgconfig-0.18"
172 167
322x-modular_src_configure() { 317x-modular_src_configure() {
323 x-modular_font_configure 318 x-modular_font_configure
324 x-modular_debug_setup 319 x-modular_debug_setup
325 320
326 # If prefix isn't set here, .pc files cause problems 321 # If prefix isn't set here, .pc files cause problems
327 if [[ -x ./configure ]]; then 322 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
328 econf --prefix=${XDIR} \ 323 econf --prefix=${XDIR} \
329 --datadir=${XDIR}/share \ 324 --datadir=${XDIR}/share \
330 ${FONT_OPTIONS} \ 325 ${FONT_OPTIONS} \
331 ${DRIVER_OPTIONS} \ 326 ${DRIVER_OPTIONS} \
332 ${CONFIGURE_OPTIONS} 327 ${CONFIGURE_OPTIONS}
481 476
482 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
483 # fonts are present ... 478 # fonts are present ...
484 479
485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
486 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
487 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
489 mkfontscale \ 484 mkfontscale \
490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
491 -- ${x} 486 -- ${x}

Legend:
Removed from v.1.82  
changed lines
  Added in v.1.86

  ViewVC Help
Powered by ViewVC 1.1.20