From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-643179-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 733EA138247
	for <garchives@archives.gentoo.org>; Sun, 24 Nov 2013 19:34:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7A28BE09ED;
	Sun, 24 Nov 2013 19:34:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 8A46EE09C1
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2013 19:34:30 +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 6E05B33F374
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2013 19:34:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 59B7419002C
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2013 19:34:27 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <1385321613.a702cb9b5145eb91ef668de75232840a2f9f22a9.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/gobject-introspection/
X-VCS-Repository: proj/gnome
X-VCS-Files: dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
X-VCS-Directories: dev-libs/gobject-introspection/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: a702cb9b5145eb91ef668de75232840a2f9f22a9
X-VCS-Branch: master
Date: Sun, 24 Nov 2013 19:34:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1a6be0af-b9be-4584-94b0-5600d01463eb
X-Archives-Hash: 38578a84051c215fb6378ca35eb0f645

commit:     a702cb9b5145eb91ef668de75232840a2f9f22a9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 18:15:28 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:33:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a702cb9b

dev-libs/gobject-introspection: 1.36.0-r1 → 1.38.0

---
 .../gobject-introspection-1.38.0.ebuild            | 70 ++++++++++++++++
 .../gobject-introspection-9999.ebuild              | 95 +++++++++-------------
 2 files changed, 107 insertions(+), 58 deletions(-)

diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild
new file mode 100644
index 0000000..33a6d2c
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	!<dev-lang/vala-0.20.0
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure(){
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC=$(tc-getCC) \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}

diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index 16b5456..b2e503e 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
@@ -1,14 +1,13 @@
-# 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:2.7"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
 
-inherit gnome2 python toolchain-funcs
+inherit gnome2 python-single-r1 toolchain-funcs
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -18,88 +17,68 @@ HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
+	IUSE="${IUSE} doc"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="doc doctool test"
-
-RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.34:2
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
 	doctool? ( dev-python/mako )
-	virtual/libffi"
+	virtual/libffi:=
+	!<dev-lang/vala-0.20.0
+"
 # Wants real bison, not virtual/yacc
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="x11-libs/cairo[glib]"
+"
 
-pkg_setup() {
-	# To prevent crosscompiling problems, bug #414105
-	CC=$(tc-getCC)
+if [[ ${PV} == 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.15 )"
+fi
 
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		YACC=$(type -p yacc)
-		$(use_enable doctool)
-		$(use_enable test tests)"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
 
-	python_set_active_version 2
-	python_pkg_setup
+pkg_setup() {
+	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# FIXME: Parallel compilation failure with USE=doc
-	use doc && MAKEOPTS="-j1"
-
-	gnome2_src_prepare
-
-	python_clean_py-compile_files
-
-	# avoid GNU-isms
-	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
-
-	gi_skip_tests=
+src_configure(){
 	if ! has_version "x11-libs/cairo[glib]"; then
 		# Bug #391213: enable cairo-gobject support even if it's not installed
 		# We only PDEPEND on cairo to avoid circular dependencies
 		export CAIRO_LIBS="-lcairo -lcairo-gobject"
 		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-		if use test; then
-			G2CONF="${G2CONF} --disable-tests"
-			gi_skip_tests=yes
-			ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present"
-			ewarn "on your system. Consider installing it to get tests to run."
-		fi
 	fi
-}
 
-src_test() {
-	[[ -z ${gi_skip_tests} ]] && default
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC=$(tc-getCC) \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
 }
 
 src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
 	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,scanner}
-	use doctool && python_convert_shebangs 2 "${ED}"usr/bin/g-ir-doc-tool
 
 	# Prevent collision with gobject-introspection-common
 	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
 		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
 	rmdir "${ED}"usr/share/aclocal || die
 }
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
-	python_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}/giscanner
-}