From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QmrKs-0004CG-Ri for garchives@archives.gentoo.org; Fri, 29 Jul 2011 17:58:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8968A21C2D2; Fri, 29 Jul 2011 17:58:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5E5DC21C2D2 for ; Fri, 29 Jul 2011 17:58:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D4F11B401A for ; Fri, 29 Jul 2011 17:58:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E69308003D for ; Fri, 29 Jul 2011 17:58:43 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <17991a6c48b8763ebec53b22447352cd84bc1835.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/gjs/gjs-1.29.15.ebuild dev-libs/gjs/gjs-9999.ebuild X-VCS-Directories: dev-libs/gjs/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 17991a6c48b8763ebec53b22447352cd84bc1835 Date: Fri, 29 Jul 2011 17:58:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8f3eeae22a32212f95baac59175b29a9 commit: 17991a6c48b8763ebec53b22447352cd84bc1835 Author: Alexandre Rostovtsev gmail com> AuthorDate: Fri Jul 29 17:55:45 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Jul 29 17:55:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D17991a6c dev-libs/gjs: limit spidermonkey blocker to 1.8.2* gjs can build with xulrunner (and run, and pass tests) on a system that has spidermonkey-1.7.x installed since 1.7 installs libjs.so instead of libmozjs.so. Thanks to _AxS_ for pointing this out in #gentoo-desktop. --- dev-libs/gjs/gjs-1.29.15.ebuild | 9 +++++---- dev-libs/gjs/gjs-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15.e= build index 01b7230..65f2c9a 100644 --- a/dev-libs/gjs/gjs-1.29.15.ebuild +++ b/dev-libs/gjs/gjs-1.29.15.ebuild @@ -34,12 +34,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.18:2 sys-libs/readline x11-libs/cairo spidermonkey? ( =3Ddev-lang/spidermonkey-1.8.5* ) - !spidermonkey? ( >=3Dnet-libs/xulrunner-2.0:1.9 )" + !spidermonkey? ( + >=3Dnet-libs/xulrunner-2.0:1.9 + !=3Ddev-lang/spidermonkey-1.8.2* )" DEPEND=3D"${RDEPEND} sys-devel/gettext - >=3Ddev-util/pkgconfig-0.9 - !=3Ddev-util/pkgconfig-0.9" +# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1= .8.2* installed =20 pkg_setup() { # AUTHORS, ChangeLog are empty diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild index 100223c..5484633 100644 --- a/dev-libs/gjs/gjs-9999.ebuild +++ b/dev-libs/gjs/gjs-9999.ebuild @@ -34,12 +34,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.18:2 sys-libs/readline x11-libs/cairo spidermonkey? ( =3Ddev-lang/spidermonkey-1.8.5* ) - !spidermonkey? ( >=3Dnet-libs/xulrunner-2.0:1.9 )" + !spidermonkey? ( + >=3Dnet-libs/xulrunner-2.0:1.9 + !=3Ddev-lang/spidermonkey-1.8.2* )" DEPEND=3D"${RDEPEND} sys-devel/gettext - >=3Ddev-util/pkgconfig-0.9 - !=3Ddev-util/pkgconfig-0.9" +# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey-1= .8.2* installed =20 pkg_setup() { # AUTHORS, ChangeLog are empty