Version bump with a new GError class hierarchy. Make license more precise.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

4 files changed, 79 insertions, 5 deletions

diff --git a/dev-libs/gjs/ChangeLog b/dev-libs/gjs/ChangeLog
index 935a4e7aab7e..ce0b57090131 100644
--- a/dev-libs/gjs/ChangeLog
+++ b/dev-libs/gjs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gjs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.10 2012/08/13 18:40:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.11 2012/09/25 11:52:27 tetromino Exp $
+
+*gjs-1.34.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gjs-1.30.1.ebuild,
+  gjs-1.32.0.ebuild, +gjs-1.34.0.ebuild:
+  Version bump with a new GError class hierarchy. Make license more precise.
 
   13 Aug 2012; Anthony G. Basile <blueness@gentoo.org> gjs-1.32.0.ebuild:
   Keyword ~ppc, dep for bug #385237
diff --git a/dev-libs/gjs/gjs-1.30.1.ebuild b/dev-libs/gjs/gjs-1.30.1.ebuild
index 06a9ff288264..818cc3ec79d4 100644
--- a/dev-libs/gjs/gjs-1.30.1.ebuild
+++ b/dev-libs/gjs/gjs-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # 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.30.1.ebuild,v 1.2 2012/05/04 18:35:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.1.ebuild,v 1.3 2012/09/25 11:52:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 python virtualx
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
 
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="examples test"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/gjs/gjs-1.32.0.ebuild b/dev-libs/gjs/gjs-1.32.0.ebuild
index 090942b8c9d0..8d86a18ebe3f 100644
--- a/dev-libs/gjs/gjs-1.32.0.ebuild
+++ b/dev-libs/gjs/gjs-1.32.0.ebuild
@@ -1,6 +1,6 @@
 # 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.32.0.ebuild,v 1.4 2012/08/13 18:40:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.5 2012/09/25 11:52:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 pax-utils python virtualx
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
 
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="examples test"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
diff --git a/dev-libs/gjs/gjs-1.34.0.ebuild b/dev-libs/gjs/gjs-1.34.0.ebuild
new file mode 100644
index 000000000000..fb2fc044e2fc
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.34.0.ebuild
@@ -0,0 +1,68 @@
+# 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.34.0.ebuild,v 1.1 2012/09/25 11:52:27 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit gnome2 pax-utils python virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="examples test"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.33.10
+
+	dev-libs/dbus-glib
+	sys-libs/readline
+	x11-libs/cairo
+	>=dev-lang/spidermonkey-1.8.5
+	virtual/libffi"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	G2CONF="${G2CONF}
+		--disable-systemtap
+		--disable-dtrace
+		--disable-coverage
+		$(use_enable test tests)"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+}
+
+src_test() {
+	# Tests need dbus
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}