| 1 |
commit: 17991a6c48b8763ebec53b22447352cd84bc1835 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jul 29 17:55:45 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Jul 29 17:55:45 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=17991a6c |
| 7 |
|
| 8 |
dev-libs/gjs: limit spidermonkey blocker to 1.8.2* |
| 9 |
|
| 10 |
gjs can build with xulrunner (and run, and pass tests) on a system that |
| 11 |
has spidermonkey-1.7.x installed since 1.7 installs libjs.so instead of |
| 12 |
libmozjs.so. Thanks to _AxS_ for pointing this out in #gentoo-desktop. |
| 13 |
|
| 14 |
--- |
| 15 |
dev-libs/gjs/gjs-1.29.15.ebuild | 9 +++++---- |
| 16 |
dev-libs/gjs/gjs-9999.ebuild | 9 +++++---- |
| 17 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.ebuild |
| 20 |
index 01b7230..65f2c9a 100644 |
| 21 |
--- a/dev-libs/gjs/gjs-1.29.15.ebuild |
| 22 |
+++ b/dev-libs/gjs/gjs-1.29.15.ebuild |
| 23 |
@@ -34,12 +34,13 @@ RDEPEND=">=dev-libs/glib-2.18:2 |
| 24 |
sys-libs/readline |
| 25 |
x11-libs/cairo |
| 26 |
spidermonkey? ( =dev-lang/spidermonkey-1.8.5* ) |
| 27 |
- !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )" |
| 28 |
+ !spidermonkey? ( |
| 29 |
+ >=net-libs/xulrunner-2.0:1.9 |
| 30 |
+ !=dev-lang/spidermonkey-1.8.2* )" |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
sys-devel/gettext |
| 33 |
- >=dev-util/pkgconfig-0.9 |
| 34 |
- !<dev-lang/spidermonkey-1.8.5" |
| 35 |
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed |
| 36 |
+ >=dev-util/pkgconfig-0.9" |
| 37 |
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1.8.2* installed |
| 38 |
|
| 39 |
pkg_setup() { |
| 40 |
# AUTHORS, ChangeLog are empty |
| 41 |
|
| 42 |
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild |
| 43 |
index 100223c..5484633 100644 |
| 44 |
--- a/dev-libs/gjs/gjs-9999.ebuild |
| 45 |
+++ b/dev-libs/gjs/gjs-9999.ebuild |
| 46 |
@@ -34,12 +34,13 @@ RDEPEND=">=dev-libs/glib-2.18:2 |
| 47 |
sys-libs/readline |
| 48 |
x11-libs/cairo |
| 49 |
spidermonkey? ( =dev-lang/spidermonkey-1.8.5* ) |
| 50 |
- !spidermonkey? ( >=net-libs/xulrunner-2.0:1.9 )" |
| 51 |
+ !spidermonkey? ( |
| 52 |
+ >=net-libs/xulrunner-2.0:1.9 |
| 53 |
+ !=dev-lang/spidermonkey-1.8.2* )" |
| 54 |
DEPEND="${RDEPEND} |
| 55 |
sys-devel/gettext |
| 56 |
- >=dev-util/pkgconfig-0.9 |
| 57 |
- !<dev-lang/spidermonkey-1.8.5" |
| 58 |
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with old spidermonkey installed |
| 59 |
+ >=dev-util/pkgconfig-0.9" |
| 60 |
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1.8.2* installed |
| 61 |
|
| 62 |
pkg_setup() { |
| 63 |
# AUTHORS, ChangeLog are empty |
Archives