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/mozcoreconf.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/mozcoreconf.eclass')
| -rw-r--r-- | eclass/mozcoreconf.eclass | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/eclass/mozcoreconf.eclass b/eclass/mozcoreconf.eclass index 55cec2ec68e0..0eb87e578f74 100644 --- a/eclass/mozcoreconf.eclass +++ b/eclass/mozcoreconf.eclass @@ -1,18 +1,15 @@ -# 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/mozcoreconf.eclass,v 1.11 2006/11/24 02:15:13 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf.eclass,v 1.12 2007/03/12 11:57:49 armin76 Exp $ # # mozcoreconf.eclass : core options for mozilla # inherit mozconfig-2 if you need USE flags inherit multilib flag-o-matic -RDEPEND="|| ( ( x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu >=sys-libs/zlib-1.1.4" DEPEND="${RDEPEND} @@ -253,14 +250,6 @@ mozconfig_use_extension() { mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2} } -# Add all the variables for building the final product. -mozconfig_build_opts() { - echo "export BUILD_OFFICIAL=1" >>.mozconfig - echo "export MOZILLA_OFFICIAL=1" >>.mozconfig - echo "mk_add_options BUILD_OFFICIAL=1" >>.mozconfig - echo "mk_add_options MOZILLA_OFFICIAL=1" >>.mozconfig -} - # mozconfig_final: display a table describing all configuration options paired # with reasons, then clean up extensions list mozconfig_final() { |