diff options
| author |   Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-14 23:55:13 +0200 |
|---|---|---|
| committer | Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-14 23:55:58 +0200 |
| commit | f59688d8de336311a0ea0cb7139732339489e190 (patch) | |
| tree | 1c9d754a8e363a711e3f215771202b4d0aaa75c3 | |
| parent | Workaround (diff) | |
| download | sardemff7-f59688d8de336311a0ea0cb7139732339489e190.tar.gz sardemff7-f59688d8de336311a0ea0cb7139732339489e190.tar.bz2 sardemff7-f59688d8de336311a0ea0cb7139732339489e190.zip | |
Make DOM Inspector optional
This reverts commit aefe707bd61198d41603afa638b5b24f2accc625.
| -rw-r--r-- | eclass/mozilla-config.eclass | 6 | ||||
| -rw-r--r-- | eclass/mozilla-scm.eclass | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/mozilla-config.eclass b/eclass/mozilla-config.eclass index 26d754b..d8e7328 100644 --- a/eclass/mozilla-config.eclass +++ b/eclass/mozilla-config.eclass @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} webm? ( dev-lang/yasm ) " -IUSE="+alsa custom-optimization dbus +ipc libnotify raw startup-notification +system-sqlite +webm wifi" +IUSE="+alsa custom-optimization dbus +ipc libnotify mozdom raw startup-notification +system-sqlite +webm wifi" # Set by configure (plus USE_AUTOCONF=1), but useful for NSPR export MOZILLA_CLIENT=1 @@ -182,10 +182,12 @@ function mozconfig_configure { -e '/--enable-application=/d' \ -e '/--enable-extensions=/d'\ .mozconfig + local extensions="default" + use mozdom && extensions+=",inspector" mozconfig_annotate 'Application defaults' \ --enable-application=${MOZ_APPLICATION} \ --with-default-mozilla-five-home="${MOZILLA_FIVE_HOME}" \ - --enable-extensions="default,inspector" + --enable-extensions="${extensions}" mozconfig_annotate 'Basic features' \ --enable-crypto \ diff --git a/eclass/mozilla-scm.eclass b/eclass/mozilla-scm.eclass index fee6394..2e3e1f0 100644 --- a/eclass/mozilla-scm.eclass +++ b/eclass/mozilla-scm.eclass @@ -19,6 +19,8 @@ MOZ_HG_BASE_URI="http://hg.mozilla.org" XULRUNNER_HG_MODULE="mozilla-central" MOZDOM_HG_MODULE="dom-inspector" +IUSE="mozdom" + LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" SLOT="0" SRC_URI="" @@ -93,7 +95,7 @@ RDEPEND=" >=dev-libs/nspr-4.8.7 >=sys-libs/zlib-1.1.4 " -${IS_LIBXUL} || RDEPEND+="~net-libs/xulrunner-9999[libnotify=,raw=,system-sqlite=,webm=,wifi=]" +${IS_LIBXUL} || RDEPEND+="~net-libs/xulrunner-9999[libnotify=,mozdom=,raw=,system-sqlite=,webm=,wifi=]" DEPEND="${RDEPEND} app-arch/zip @@ -166,7 +168,7 @@ function mozilla-scm_src_unpack { # It is xul stuff, so xul only can update them ${IS_LIBXUL} || EHG_OFFLINE=yes moz_hg_fetch "${MOZ_HG_BASE_URI}/${XULRUNNER_HG_MODULE}/" "${base_module}" - moz_hg_fetch "${MOZ_HG_BASE_URI}/${MOZDOM_HG_MODULE}/" "${base_module}/extensions/inspector" + use mozdom && moz_hg_fetch "${MOZ_HG_BASE_URI}/${MOZDOM_HG_MODULE}/" "${base_module}/extensions/inspector" EHG_OFFLINE="${old_offline}" } |