diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 18:40:58 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 18:40:58 +0000 |
| commit | 1e772d79369c4d5eadd6441f01d31d8178f380ca (patch) | |
| tree | a61498c74556773469c32af84d04432445c41c03 /eclass | |
| parent | Stable on ppc wrt bug 153216 (diff) | |
| download | gentoo-2-1e772d79369c4d5eadd6441f01d31d8178f380ca.tar.gz gentoo-2-1e772d79369c4d5eadd6441f01d31d8178f380ca.tar.bz2 gentoo-2-1e772d79369c4d5eadd6441f01d31d8178f380ca.zip | |
Only inherit font.eclass on fonts so we don't get USE=X for everything. This requires the inherit line to move below the FONT setup. Idea from Diego Pettenó.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index b5de1f2682e7..31dcd85a1186 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.79 2006/10/30 06:13:48 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.80 2006/10/30 18:40:58 dberkholz Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -25,8 +25,6 @@ # # Pretty much everything else should be automatic. -inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font - # Directory prefix to use for everything XDIR="/usr" @@ -86,6 +84,7 @@ if [[ -n "${SNAPSHOT}" ]]; then fi # If we're a font package, but not the font.alias one +FONT_ECLASS="" if [[ "${PN/#font-}" != "${PN}" ]] \ && [[ "${CATEGORY}" = "media-fonts" ]] \ && [[ "${PN}" != "font-alias" ]] \ @@ -93,6 +92,9 @@ if [[ "${PN/#font-}" != "${PN}" ]] \ # Activate font code in the rest of the eclass FONT="yes" + # Whether to inherit the font eclass + FONT_ECLASS="font" + RDEPEND="${RDEPEND} media-fonts/encodings x11-apps/mkfontscale @@ -171,6 +173,8 @@ RDEPEND="${RDEPEND} # Provides virtual/x11 for temporary use until packages are ported # x11-base/x11-env" +inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS} + x-modular_specs_check() { if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then append-ldflags -Wl,-z,lazy |