[gentoo-commits] proj/gnome:master commit in: dev-libs/gjs/

[Alexandre Restovtsev]

commit:     8bbb3f0a95d02c6ebc7b6c97f5cb324111353632
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 04:46:39 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Feb 27 04:46:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8bbb3f0a

dev-libs/gjs: add 1.31.10

---
 .../gjs/{gjs-9999.ebuild => 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.ebuild
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 $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
 inherit gnome2 python virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
@@ -18,13 +15,9 @@ HOMEPAGE="http://live.gnome.org/Gjs"
 LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
 SLOT="0"
 IUSE="examples test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND=">=dev-libs/glib-2.31:2
 	>=dev-libs/gobject-introspection-1.29.16
 
 	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="${G2CONF}
-		--with-js-package=mozjs185
 		--disable-systemtap
 		--disable-dtrace
 		--disable-coverage"
+
+	python_set_active_version 2
 	python_pkg_setup
 }
 
@@ -56,7 +50,7 @@ src_prepare() {
 
 src_test() {
 	# Tests need dbus
-	Xemake check || die
+	Xemake check
 }
 
 src_install() {
@@ -65,6 +59,6 @@ src_install() {
 
 	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="~amd64 ~x86"
 fi
 
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND=">=dev-libs/glib-2.31:2
 	>=dev-libs/gobject-introspection-1.29.16
 
 	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="${G2CONF}
-		--with-js-package=mozjs185
 		--disable-systemtap
 		--disable-dtrace
 		--disable-coverage"
+
+	python_set_active_version 2
 	python_pkg_setup
 }