summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2007-03-12 11:57:49 +0000
committerRaúl Porcel <armin76@gentoo.org>2007-03-12 11:57:49 +0000
commit0cfa75c0c61299acf58dff36f53c5c3368703947 (patch)
tree60a01c50e2fe46ff72964f83117e4632c442e45c /eclass/mozconfig-2.eclass
parentFix for bug 169678. (diff)
downloadgentoo-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-2.eclass')
-rw-r--r--eclass/mozconfig-2.eclass17
1 files changed, 7 insertions, 10 deletions
diff --git a/eclass/mozconfig-2.eclass b/eclass/mozconfig-2.eclass
index 08b13b68601e..d8b99bebb91e 100644
--- a/eclass/mozconfig-2.eclass
+++ b/eclass/mozconfig-2.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-2.eclass,v 1.14 2006/11/24 02:15:13 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.15 2007/03/12 11:57:49 armin76 Exp $
#
# mozconfig.eclass: the new mozilla.eclass
@@ -8,12 +8,9 @@ inherit multilib flag-o-matic mozcoreconf
IUSE="debug gnome ipv6 xinerama xprint"
-RDEPEND="|| ( ( x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXmu
- )
- virtual/x11
- )
+RDEPEND="x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXmu
>=media-libs/jpeg-6b
>=media-libs/libpng-1.2.1
dev-libs/expat
@@ -33,8 +30,8 @@ RDEPEND="|| ( ( x11-libs/libXrender
DEPEND="${RDEPEND}
- xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
- xprint? ( || ( x11-proto/printproto virtual/x11 ) )"
+ xinerama? ( x11-proto/xineramaproto )
+ xprint? ( x11-proto/printproto )"
mozconfig_config() {
mozconfig_use_enable ipv6