diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-03-12 11:57:49 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-03-12 11:57:49 +0000 |
| commit | 0cfa75c0c61299acf58dff36f53c5c3368703947 (patch) | |
| tree | 60a01c50e2fe46ff72964f83117e4632c442e45c /eclass/mozconfig.eclass | |
| parent | Fix for bug 169678. (diff) | |
| download | gentoo-2-0cfa75c0c61299acf58dff36f53c5c3368703947.tar.gz gentoo-2-0cfa75c0c61299acf58dff36f53c5c3368703947.tar.bz2 gentoo-2-0cfa75c0c61299acf58dff36f53c5c3368703947.zip | |
Remove virtual/x11 from mozilla eclasses, and unneeded mozconfig_build_opts from mozcoreconf
Diffstat (limited to 'eclass/mozconfig.eclass')
| -rw-r--r-- | eclass/mozconfig.eclass | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/eclass/mozconfig.eclass b/eclass/mozconfig.eclass index edc70465cc98..fd94bd35cb84 100644 --- a/eclass/mozconfig.eclass +++ b/eclass/mozconfig.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.29 2007/02/27 17:02:37 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.30 2007/03/12 11:57:49 armin76 Exp $ # # mozconfig.eclass: the new mozilla.eclass @@ -8,12 +8,9 @@ inherit multilib flag-o-matic IUSE="debug gnome ipv6 moznoxft truetype xinerama xprint" -RDEPEND="|| ( ( x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu !moznoxft? ( virtual/xft ) >=media-libs/fontconfig-2.1 >=sys-libs/zlib-1.1.4 @@ -33,9 +30,9 @@ RDEPEND="|| ( ( x11-libs/libXrender DEPEND="${RDEPEND} dev-util/pkgconfig - || ( x11-proto/xextproto virtual/x11 ) - xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) ) - xprint? ( || ( x11-proto/printproto virtual/x11 ) )" + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + xprint? ( x11-proto/printproto )" # Set by configure (plus USE_AUTOCONF=1), but useful for NSPR export MOZILLA_CLIENT=1 |