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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     65099a09cf7c4cfd7d81b74e5ba4ec0e6cef67f8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 21:37:05 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 21:38:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=65099a09

dev-libs/gjs: 1.36.1 → 1.38.1

---
 dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch | 50 +++++++++++++++++
 dev-libs/gjs/gjs-1.38.1.ebuild                    | 68 +++++++++++++++++++++++
 dev-libs/gjs/gjs-9999.ebuild                      | 53 ++++++++----------
 dev-libs/gjs/metadata.xml                         |  5 ++
 4 files changed, 145 insertions(+), 31 deletions(-)

diff --git a/dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch b/dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch
new file mode 100644
index 0000000..3a34301
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch
@@ -0,0 +1,50 @@
+From f87c38787640f639da5ebf73014bbcf3b98cd9fc Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 25 Oct 2013 16:56:37 +0100
+Subject: [PATCH] tests: Force generation of shared libraries
+
+If installed tests are disabled, we need to force libtool
+to generate .so files that can be dlopened by introspection.
+
+https://bugzilla.gnome.org/710697
+---
+ Makefile-insttest.am | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile-insttest.am b/Makefile-insttest.am
+index 2ebdc77..e63709f 100644
+--- a/Makefile-insttest.am
++++ b/Makefile-insttest.am
+@@ -37,10 +37,15 @@ else
+ check_LTLIBRARIES += libregress.la libwarnlib.la libgimarshallingtests.la
+ endif
+ 
++# This rpath /nowhere thing is the libtool upstream recommended way to
++# force generation of shared libraries, which we need in order for the
++# tests to work uninstalled.
++common_test_ldflags = -avoid-version -rpath /nowhere $(GJS_LIBS)
++
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CPPFLAGS = $(AM_CPPFLAGS)
+ libregress_la_CFLAGS = $(GJS_CFLAGS)
+-libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libregress_la_LDFLAGS = $(common_test_ldflags)
+ libregress_scannerflags_includes = --include=Gio-2.0
+ if ENABLE_CAIRO
+ libregress_la_CFLAGS += $(GJS_CAIRO_CFLAGS)
+@@ -51,10 +56,10 @@ libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO
+ endif
+ nodist_libwarnlib_la_SOURCES = $(GI_DATADIR)/tests/warnlib.c $(GI_DATADIR)/tests/warnlib.h
+ libwarnlib_la_CFLAGS = $(GJS_CFLAGS)
+-libwarnlib_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libwarnlib_la_LDFLAGS = $(common_test_ldflags)
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+ libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS)
+-libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS)
++libgimarshallingtests_la_LDFLAGS = $(common_test_ldflags)
+ 
+ Regress-1.0.gir: libregress.la
+ Regress_1_0_gir_LIBS = libregress.la
+-- 
+1.8.3.2
+

diff --git a/dev-libs/gjs/gjs-1.38.1.ebuild b/dev-libs/gjs/gjs-1.38.1.ebuild
new file mode 100644
index 0000000..2d53fea
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.38.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.38
+
+	sys-libs/readline
+	dev-lang/spidermonkey:17
+	virtual/libffi
+	cairo? ( x11-libs/cairo )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# From master/1.39
+	epatch "${FILESDIR}/${PN}-1.38.1-fix-unittests.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# 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
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo)
+}
+
+src_test() {
+	# Tests need dbus
+	#Xemake check
+	dbus-launch emake 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"
+}

diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index ecd05a0..1390fe0 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 
-inherit gnome2 pax-utils python virtualx
+inherit gnome2 pax-utils virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,43 +15,36 @@ HOMEPAGE="http://live.gnome.org/Gjs"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="examples test"
+IUSE="cairo examples"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.33.10
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.38
 
-	dev-libs/dbus-glib
 	sys-libs/readline
-	x11-libs/cairo
-	>=dev-lang/spidermonkey-1.8.5
-	virtual/libffi"
+	dev-lang/spidermonkey:17
+	virtual/libffi
+	cairo? ( x11-libs/cairo )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
+src_configure() {
 	# 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
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo)
 }
 
 src_test() {
@@ -66,8 +57,8 @@ src_install() {
 	gnome2_src_install -j1
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins ${S}/examples/*
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
 	fi
 
 	# Required for gjs-console to run correctly on PaX systems

diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/dev-libs/gjs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>