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 1S1sUy-0008TL-91 for garchives@archives.gentoo.org; Mon, 27 Feb 2012 04:47:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22AD1E1486; Mon, 27 Feb 2012 04:47:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D820BE1486 for ; Mon, 27 Feb 2012 04:47:36 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07E071B4003 for ; Mon, 27 Feb 2012 04:47:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B9141E5405 for ; Mon, 27 Feb 2012 04:47:34 +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: <1330317999.8bbb3f0a95d02c6ebc7b6c97f5cb324111353632.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/gjs/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/gjs/gjs-1.31.10.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: 8bbb3f0a95d02c6ebc7b6c97f5cb324111353632 X-VCS-Branch: master Date: Mon, 27 Feb 2012 04:47:34 +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: bc906cde-2aeb-48b3-9055-2cf6bdb3f756 X-Archives-Hash: a1684c27b909fa52b2ee859288e4f8fb commit: 8bbb3f0a95d02c6ebc7b6c97f5cb324111353632 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Feb 27 04:46:39 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Feb 27 04:46:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8bbb3f0a dev-libs/gjs: add 1.31.10 --- .../gjs/{gjs-9999.ebuild =3D> gjs-1.31.10.ebuild} | 22 +++++++-----= ------- dev-libs/gjs/gjs-9999.ebuild | 5 ++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-1.31.10.ebui= ld similarity index 73% copy from dev-libs/gjs/gjs-9999.ebuild copy to dev-libs/gjs/gjs-1.31.10.ebuild index b9b8da2..6d0df65 100644 --- a/dev-libs/gjs/gjs-9999.ebuild +++ b/dev-libs/gjs/gjs-1.31.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.29.0.ebuild,v 1.1 = 2011/06/14 13:19:59 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.1.ebuild,v 1.1 = 2012/01/14 04:54:24 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"no" @@ -8,9 +8,6 @@ GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2" =20 inherit gnome2 python virtualx -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi =20 DESCRIPTION=3D"Javascript bindings for GNOME" HOMEPAGE=3D"http://live.gnome.org/Gjs" @@ -18,13 +15,9 @@ HOMEPAGE=3D"http://live.gnome.org/Gjs" LICENSE=3D"MIT MPL-1.1 LGPL-2 GPL-2" SLOT=3D"0" IUSE=3D"examples test" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~amd64 ~x86" -fi +KEYWORDS=3D"~amd64 ~x86" =20 -RDEPEND=3D">=3Ddev-libs/glib-2.18:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31:2 >=3Ddev-libs/gobject-introspection-1.29.16 =20 dev-libs/dbus-glib @@ -42,10 +35,11 @@ pkg_setup() { # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason # XXX: Do NOT enable coverage, completely useless for portage installs G2CONF=3D"${G2CONF} - --with-js-package=3Dmozjs185 --disable-systemtap --disable-dtrace --disable-coverage" + + python_set_active_version 2 python_pkg_setup } =20 @@ -56,7 +50,7 @@ src_prepare() { =20 src_test() { # Tests need dbus - Xemake check || die + Xemake check } =20 src_install() { @@ -65,6 +59,6 @@ src_install() { =20 if use examples; then insinto /usr/share/doc/${PF}/examples - doins ${S}/examples/* || die "doins examples failed!" + doins ${S}/examples/* fi } diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild index b9b8da2..689cef1 100644 --- a/dev-libs/gjs/gjs-9999.ebuild +++ b/dev-libs/gjs/gjs-9999.ebuild @@ -24,7 +24,7 @@ else KEYWORDS=3D"~amd64 ~x86" fi =20 -RDEPEND=3D">=3Ddev-libs/glib-2.18:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31:2 >=3Ddev-libs/gobject-introspection-1.29.16 =20 dev-libs/dbus-glib @@ -42,10 +42,11 @@ pkg_setup() { # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason # XXX: Do NOT enable coverage, completely useless for portage installs G2CONF=3D"${G2CONF} - --with-js-package=3Dmozjs185 --disable-systemtap --disable-dtrace --disable-coverage" + + python_set_active_version 2 python_pkg_setup } =20