| 1 |
commit: 357e6b8112a7eddca4bcca3412e995834dee4454 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 29 19:01:07 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Jul 29 19:01:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=357e6b81 |
| 7 |
|
| 8 |
dev-libs/gjs: switch from spidermonkey to xulrunner USE flag |
| 9 |
|
| 10 |
Control the choice of javascript engine with the "xulrunner" USE flag |
| 11 |
instead of "spidermonkey". First, xulrunner is already a global USE |
| 12 |
flag; second, spidermonkey is preferred by upstream; third, apparently |
| 13 |
xulrunner in gentoo will be going away at some point in the future. |
| 14 |
|
| 15 |
Since spidermonkey-1.8.5 is currently masked (and breaks lots of stuff), |
| 16 |
make the xulrunner flag default + for now. When this ebuild is moved to |
| 17 |
gx86, the xulrunner flag should be forced on with package.use.force until |
| 18 |
the new spidermonkey is unmasked. |
| 19 |
|
| 20 |
--- |
| 21 |
dev-libs/gjs/gjs-1.29.15.ebuild | 14 +++++++------- |
| 22 |
dev-libs/gjs/gjs-9999.ebuild | 14 +++++++------- |
| 23 |
2 files changed, 14 insertions(+), 14 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild |
| 26 |
index 65f2c9a..9bd562c 100644 |
| 27 |
--- a/dev-libs/gjs/gjs-1.29.15.ebuild |
| 28 |
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild |
| 29 |
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/Gjs" |
| 30 |
|
| 31 |
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2" |
| 32 |
SLOT="0" |
| 33 |
-IUSE="examples spidermonkey test" |
| 34 |
+IUSE="examples test +xulrunner" |
| 35 |
if [[ ${PV} = 9999 ]]; then |
| 36 |
KEYWORDS="" |
| 37 |
else |
| 38 |
@@ -33,10 +33,10 @@ RDEPEND=">=dev-libs/glib-2.18:2 |
| 39 |
dev-libs/dbus-glib |
| 40 |
sys-libs/readline |
| 41 |
x11-libs/cairo |
| 42 |
- spidermonkey? ( =dev-lang/spidermonkey-1.8.5* ) |
| 43 |
- !spidermonkey? ( |
| 44 |
+ xulrunner? ( |
| 45 |
>=net-libs/xulrunner-2.0:1.9 |
| 46 |
- !=dev-lang/spidermonkey-1.8.2* )" |
| 47 |
+ !=dev-lang/spidermonkey-1.8.2* ) |
| 48 |
+ !xulrunner? ( =dev-lang/spidermonkey-1.8.5* )" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
sys-devel/gettext |
| 51 |
>=dev-util/pkgconfig-0.9" |
| 52 |
@@ -52,10 +52,10 @@ pkg_setup() { |
| 53 |
--disable-systemtap |
| 54 |
--disable-dtrace |
| 55 |
--disable-coverage" |
| 56 |
- if use spidermonkey; then |
| 57 |
- G2CONF="${G2CONF} --with-js-package=mozjs185" |
| 58 |
- else |
| 59 |
+ if use xulrunner; then |
| 60 |
G2CONF="${G2CONF} --with-js-package=mozilla-js" |
| 61 |
+ else |
| 62 |
+ G2CONF="${G2CONF} --with-js-package=mozjs185" |
| 63 |
fi |
| 64 |
} |
| 65 |
|
| 66 |
|
| 67 |
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild |
| 68 |
index 5484633..bdab10a 100644 |
| 69 |
--- a/dev-libs/gjs/gjs-9999.ebuild |
| 70 |
+++ b/dev-libs/gjs/gjs-9999.ebuild |
| 71 |
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/Gjs" |
| 72 |
|
| 73 |
LICENSE="MIT MPL-1.1 LGPL-2 GPL-2" |
| 74 |
SLOT="0" |
| 75 |
-IUSE="examples spidermonkey test" |
| 76 |
+IUSE="examples test xulrunner" |
| 77 |
if [[ ${PV} = 9999 ]]; then |
| 78 |
KEYWORDS="" |
| 79 |
else |
| 80 |
@@ -33,10 +33,10 @@ RDEPEND=">=dev-libs/glib-2.18:2 |
| 81 |
dev-libs/dbus-glib |
| 82 |
sys-libs/readline |
| 83 |
x11-libs/cairo |
| 84 |
- spidermonkey? ( =dev-lang/spidermonkey-1.8.5* ) |
| 85 |
- !spidermonkey? ( |
| 86 |
+ xulrunner? ( |
| 87 |
>=net-libs/xulrunner-2.0:1.9 |
| 88 |
- !=dev-lang/spidermonkey-1.8.2* )" |
| 89 |
+ !=dev-lang/spidermonkey-1.8.2* ) |
| 90 |
+ !xulrunner? ( =dev-lang/spidermonkey-1.8.5* )" |
| 91 |
DEPEND="${RDEPEND} |
| 92 |
sys-devel/gettext |
| 93 |
>=dev-util/pkgconfig-0.9" |
| 94 |
@@ -52,10 +52,10 @@ pkg_setup() { |
| 95 |
--disable-systemtap |
| 96 |
--disable-dtrace |
| 97 |
--disable-coverage" |
| 98 |
- if use spidermonkey; then |
| 99 |
- G2CONF="${G2CONF} --with-js-package=mozjs185" |
| 100 |
- else |
| 101 |
+ if use xulrunner; then |
| 102 |
G2CONF="${G2CONF} --with-js-package=mozilla-js" |
| 103 |
+ else |
| 104 |
+ mG2CONF="${G2CONF} --with-js-package=mozjs185" |
| 105 |
fi |
| 106 |
} |
Archives