/[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.113 Revision 1.117
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.113 2009/09/19 21:19:29 remi Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.117 2009/11/28 10:25:37 scarabeus Exp $
4# 4#
5# @ECLASS: x-modular.eclass 5# @ECLASS: x-modular.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
183DEPEND="${DEPEND} 183DEPEND="${DEPEND}
184 >=dev-util/pkgconfig-0.18" 184 >=dev-util/pkgconfig-0.18"
185 185
186if [[ "${PN/util-macros}" = "${PN}" ]]; then 186if [[ "${PN/util-macros}" = "${PN}" ]]; then
187 DEPEND="${DEPEND} 187 DEPEND="${DEPEND}
188 >=x11-misc/util-macros-0.99.2 188 >=x11-misc/util-macros-1.3.0
189 >=sys-devel/binutils-2.16.1-r3" 189 sys-devel/binutils"
190fi 190fi
191 191
192RDEPEND="${RDEPEND} 192RDEPEND="${RDEPEND}
193 !<=x11-base/xorg-x11-6.9" 193 !<=x11-base/xorg-x11-6.9"
194# Provides virtual/x11 for temporary use until packages are ported 194# Provides virtual/x11 for temporary use until packages are ported
437 ${PN/proto/}docdir=/usr/share/doc/${PF} \ 437 ${PN/proto/}docdir=/usr/share/doc/${PF} \
438 DESTDIR="${D}" \ 438 DESTDIR="${D}" \
439 install \ 439 install \
440 || die 440 || die
441 else 441 else
442 # FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
443 [[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
444 make \ 442 make \
443 docdir=/usr/share/doc/${PF} \
445 DESTDIR="${D}" \ 444 DESTDIR="${D}" \
446 install \ 445 install \
447 || die 446 || die
448 fi 447 fi
449# Shouldn't be necessary in XDIR=/usr 448# Shouldn't be necessary in XDIR=/usr
515# @FUNCTION: cleanup_fonts 514# @FUNCTION: cleanup_fonts
516# @USAGE: 515# @USAGE:
517# @DESCRIPTION: 516# @DESCRIPTION:
518# Get rid of font directories that only contain generated files 517# Get rid of font directories that only contain generated files
519cleanup_fonts() { 518cleanup_fonts() {
520 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 519 local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
521 for DIR in ${FONT_DIR}; do 520 for DIR in ${FONT_DIR}; do
522 unset KEEP_FONTDIR 521 unset KEEP_FONTDIR
523 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 522 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
524 523
525 ebegin "Checking ${REAL_DIR} for useless files" 524 ebegin "Checking ${REAL_DIR} for useless files"

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.117

  ViewVC Help
Powered by ViewVC 1.1.20