diff options
| -rw-r--r-- | eclass/mozconfig-2.eclass | 17 | ||||
| -rw-r--r-- | eclass/mozconfig.eclass | 19 | ||||
| -rw-r--r-- | eclass/mozcoreconf.eclass | 21 | ||||
| -rw-r--r-- | eclass/mozextension.eclass | 4 |
4 files changed, 22 insertions, 39 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 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 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() { diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index 370c499ab65b..378070a9c0b5 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.2 2006/01/08 23:29:20 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.3 2007/03/12 11:57:49 armin76 Exp $ # # mozextention.eclass: installing firefox extensions and language packs |