/[gentoo-x86]/eclass/xorg-2.eclass
Gentoo

Diff of /eclass/xorg-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.16 Revision 1.18
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 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/xorg-2.eclass,v 1.16 2010/10/28 11:46:32 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 scarabeus Exp $
4# 4#
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
98 DEPEND+=" 98 DEPEND+="
99 >=sys-devel/libtool-2.2.6a 99 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 100 sys-devel/m4"
101 # This MUST BE STABLE 101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 102 if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.8.0" 103 DEPEND+=" >=x11-misc/util-macros-1.11.0"
104 # Required even by xorg-server 104 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 106 fi
107 WANT_AUTOCONF="latest" 107 WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 108 WANT_AUTOMAKE="latest"
147 147
148# Add static-libs useflag where usefull. 148# Add static-libs useflag where usefull.
149if [[ ${XORG_STATIC} == yes \ 149if [[ ${XORG_STATIC} == yes \
150 && ${FONT} != yes \ 150 && ${FONT} != yes \
151 && ${CATEGORY} != app-doc \ 151 && ${CATEGORY} != app-doc \
152 && ${CATEGORY} != x11-apps \
152 && ${CATEGORY} != x11-proto \ 153 && ${CATEGORY} != x11-proto \
153 && ${CATEGORY} != x11-drivers \ 154 && ${CATEGORY} != x11-drivers \
154 && ${CATEGORY} != media-fonts \ 155 && ${CATEGORY} != media-fonts \
155 && ${PN} != util-macros \ 156 && ${PN} != util-macros \
156 && ${PN} != xbitmaps \ 157 && ${PN} != xbitmaps \

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20