diff options
| author |   Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-16 18:45:26 +0200 |
|---|---|---|
| committer | Sardem FF7 <sardemff7.pub@gmail.com> | 2011-04-16 18:45:26 +0200 |
| commit | b3cc41a0d9dc8ce767cc499da9ccb63a556eea84 (patch) | |
| tree | 815495bec88de4027353858f678fc15a04fac19f | |
| parent | Default upstream (diff) | |
| download | sardemff7-b3cc41a0d9dc8ce767cc499da9ccb63a556eea84.tar.gz sardemff7-b3cc41a0d9dc8ce767cc499da9ccb63a556eea84.tar.bz2 sardemff7-b3cc41a0d9dc8ce767cc499da9ccb63a556eea84.zip | |
Cleanup mozdom USE-flag
| -rw-r--r-- | eclass/mozilla-scm-fetch.eclass | 2 | ||||
| -rw-r--r-- | eclass/mozilla-scm.eclass | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/eclass/mozilla-scm-fetch.eclass b/eclass/mozilla-scm-fetch.eclass index bbfa062..0803838 100644 --- a/eclass/mozilla-scm-fetch.eclass +++ b/eclass/mozilla-scm-fetch.eclass @@ -34,8 +34,6 @@ 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="" diff --git a/eclass/mozilla-scm.eclass b/eclass/mozilla-scm.eclass index 73caf02..3bf87b9 100644 --- a/eclass/mozilla-scm.eclass +++ b/eclass/mozilla-scm.eclass @@ -15,8 +15,6 @@ MAJ_XUL_PV="6.0" MOZ_HG_BASE_URI="http://hg.mozilla.org" -IUSE="mozdom" - S="${WORKDIR}/${XULRUNNER_HG_MODULE}" # @@ -55,6 +53,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_install pkg_postinst ## ## Base common stuff ## + RDEPEND=" x11-libs/libXrender x11-libs/libXt @@ -62,7 +61,11 @@ RDEPEND=" >=dev-libs/nspr-4.8.7 >=sys-libs/zlib-1.1.4 " -${IS_LIBXUL} || RDEPEND+="~net-libs/xulrunner-9999[libnotify=,mozdom=,raw=,system-sqlite=,webm=,wifi=]" + +if ! ${IS_LIBXUL} && [ -n "${MOZ_APPLICATION}" ]; then + IUSE="mozdom" + RDEPEND+="~net-libs/xulrunner-9999[libnotify=,mozdom=,raw=,system-sqlite=,webm=,wifi=]" +fi DEPEND="${RDEPEND} meta-sync/mozilla-repositories[mozdom=] |