/[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.79 Revision 1.80
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.79 2006/10/30 06:13:48 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.80 2006/10/30 18:40:58 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@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.
22# directory or directories. 22# directory or directories.
23# 23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25# 25#
26# Pretty much everything else should be automatic. 26# Pretty much everything else should be automatic.
27
28inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font
29 27
30# Directory prefix to use for everything 28# Directory prefix to use for everything
31XDIR="/usr" 29XDIR="/usr"
32 30
33# Set up default patchset version(s) if necessary 31# Set up default patchset version(s) if necessary
84 >=sys-devel/libtool-1.5 82 >=sys-devel/libtool-1.5
85 >=sys-devel/m4-1.4" 83 >=sys-devel/m4-1.4"
86fi 84fi
87 85
88# If we're a font package, but not the font.alias one 86# If we're a font package, but not the font.alias one
87FONT_ECLASS=""
89if [[ "${PN/#font-}" != "${PN}" ]] \ 88if [[ "${PN/#font-}" != "${PN}" ]] \
90 && [[ "${CATEGORY}" = "media-fonts" ]] \ 89 && [[ "${CATEGORY}" = "media-fonts" ]] \
91 && [[ "${PN}" != "font-alias" ]] \ 90 && [[ "${PN}" != "font-alias" ]] \
92 && [[ "${PN}" != "font-util" ]]; then 91 && [[ "${PN}" != "font-util" ]]; then
93 # Activate font code in the rest of the eclass 92 # Activate font code in the rest of the eclass
94 FONT="yes" 93 FONT="yes"
94
95 # Whether to inherit the font eclass
96 FONT_ECLASS="font"
95 97
96 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
97 media-fonts/encodings 99 media-fonts/encodings
98 x11-apps/mkfontscale 100 x11-apps/mkfontscale
99 x11-apps/mkfontdir" 101 x11-apps/mkfontdir"
168RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
170 !<=x11-base/xorg-x11-6.9" 172 !<=x11-base/xorg-x11-6.9"
171# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
172# x11-base/x11-env" 174# x11-base/x11-env"
175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
173 177
174x-modular_specs_check() { 178x-modular_specs_check() {
175 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
176 append-ldflags -Wl,-z,lazy 180 append-ldflags -Wl,-z,lazy
177 # (#116698) breaks loading 181 # (#116698) breaks loading

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20