update gjs

svn path=/; revision=314

3 files changed, 42 insertions, 27 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 93ef8c9..f1ddc95 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,3 +1,3 @@
-DIST gjs-0.7.6.tar.bz2 483928 RMD160 3b1e335a3005e42ccb5951323b1df511ec70ab11 SHA1 d029eff8f0e6a5ceafcbae88076d2eab0cd1767b SHA256 dc3441cd9024a36a22d676f317e465e9bff705beb4693f67ec33fcc700382c54
-EBUILD gjs-0.7.6.ebuild 973 RMD160 792abd1cbb2a61a769bc7ec959a1fee692caac29 SHA1 7314601c4a934dbb10f76c6713bef90d68d085c2 SHA256 071674bfb8e36a7a18ad921e0f00ded6a12bb4705a4d5791cf0a2e08fc766a47
-EBUILD gjs-9999.ebuild 1072 RMD160 93e436f27450fa50cce2c5a732f31d6f630fa263 SHA1 93e73a103ba47eb58bbc5e74d775350ba921be52 SHA256 b4b887e245c339777994822eac6e763586350db04cd9cd83b6943384446f86eb
+DIST gjs-0.7.7.tar.bz2 485317 RMD160 4b16c290e060833cee86b2637196c719109b0599 SHA1 fd602d7dc4ce8ea5f04f4ba802afd3e28e15a989 SHA256 30fd38a589dc5520604718b416564f4db4f23c5821c46beaced35e4af0bf4318
+EBUILD gjs-0.7.7.ebuild 1163 RMD160 d63b13f27db079440b6680c9d39acdaa6cbdab12 SHA1 27665ef438ff5b732d7f69b9b9ffe7ba1cb87b7b SHA256 69258c86896f9ccb076fd45e97e90ab5a34a1f2931ad707f30ee34bc95450fde
+EBUILD gjs-9999.ebuild 1219 RMD160 1b355b2231b503ae95a07874b47d8d8b0da9da0c SHA1 a5b1f186a9d5aa2abecb18a7dcfcd22169c34f78 SHA256 9174ae5850dca23acff8a56134bb99d32aa2a0c5474498371182fb255ad8bf25
diff --git a/dev-libs/gjs/gjs-0.7.6.ebuild b/dev-libs/gjs/gjs-0.7.7.ebuild
index 6b9a6c4..91b19cf 100644
--- a/dev-libs/gjs/gjs-0.7.6.ebuild
+++ b/dev-libs/gjs/gjs-0.7.7.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
-inherit gnome2
+inherit autotools gnome2 python
 
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
@@ -14,27 +16,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="coverage examples"
 
-RDEPEND=">=dev-libs/glib-2.16.0
+RDEPEND=">=dev-libs/glib-2.18:2
 	>=dev-libs/gobject-introspection-0.9.5
 
 	dev-libs/dbus-glib
 	x11-libs/cairo
-	net-libs/xulrunner:1.9"
+	>=net-libs/xulrunner-1.9.2:1.9"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	coverage? (
 		sys-devel/gcc
 		dev-util/lcov )"
-# AUTHORS, ChangeLog are empty
-DOCS="NEWS README"
+
+# tests fail and upstream does not support anything but git master
+RESTRICT="test"
 
 pkg_setup() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable coverage)"
-	# Build fails without this :/
-	# .libs/libgjs-gi.so: file not recognized: File format not recognized
-	MAKEOPTS="${MAKEOPTS} -j1"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+	eautoreconf
 }
 
 src_install() {
@@ -44,4 +52,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins ${S}/examples/* || die "doins examples failed!"
 	fi
+
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 }
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index ba64ace..4d2d27e 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
-inherit autotools gnome2 git
+inherit autotools gnome2 python git
 
 EGIT_REPO_URI="git://git.gnome.org/gjs"
 
@@ -17,32 +19,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="coverage examples"
 
-RDEPEND=">=dev-libs/glib-2.16.0
+RDEPEND=">=dev-libs/glib-2.18:2
 	>=dev-libs/gobject-introspection-0.9.5
 
 	dev-libs/dbus-glib
 	x11-libs/cairo
-	net-libs/xulrunner:1.9"
+	>=net-libs/xulrunner-1.9.2:1.9"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	coverage? (
 		sys-devel/gcc
 		dev-util/lcov )"
-# AUTHORS, ChangeLog are empty
-DOCS="NEWS README"
 
-src_prepare() {
-
-	eautoreconf
-}
+# tests fail and upstream does not support anything but git master
+RESTRICT="test"
 
 pkg_setup() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable coverage)"
-	# Build fails without this :/
-	# .libs/libgjs-gi.so: file not recognized: File format not recognized
-	MAKEOPTS="${MAKEOPTS} -j1"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+	eautoreconf
 }
 
 src_install() {
@@ -52,4 +55,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins ${S}/examples/* || die "doins examples failed!"
 	fi
+
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 }