[gentoo-commits] proj/gnome:master commit in: dev-libs/gobject-introspection-common/, dev-libs/gobject-introspection/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     c21f9a6000ed7c2c3fee8939133f5f84f393b8ce
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 15:33:06 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 15:33:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c21f9a60

dev-libs/gobject-introspection{,-common}: 1.34.0 now in gx86

Sync live ebuilds with gx86 changes.

---
 .../gobject-introspection-common-1.33.14.ebuild    |   43 --------
 .../gobject-introspection-common-9999.ebuild       |    4 +-
 .../gobject-introspection-1.33.14.ebuild           |  104 --------------------
 .../gobject-introspection-9999.ebuild              |   15 ++--
 4 files changed, 10 insertions(+), 156 deletions(-)

diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.33.14.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.33.14.ebuild
deleted file mode 100644
index 6a909e0..0000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.33.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild,v 1.2 2012/04/26 22:28:15 aballier Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-if [[ ${PV} = 9999 ]]; then
-	GCONF_DEBUG="no"
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="as-is"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<dev-libs/gobject-introspection-1.32.0"
-# Before 1.32.0, ${PN} was part of gobject-introspection
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}

diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-9999.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-9999.ebuild
index 6a909e0..81e012a 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-9999.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-9999.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/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild,v 1.2 2012/04/26 22:28:15 aballier Exp $
+# $Header: $
 
 EAPI="4"
 GNOME_ORG_MODULE="gobject-introspection"
@@ -19,7 +19,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 

diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.33.14.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.33.14.ebuild
deleted file mode 100644
index 28dc2d6..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.33.14.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.5 2012/06/04 07:30:23 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="xml"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-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"
-fi
-
-IUSE="doc doctool test"
-
-RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.31.22:2
-	doctool? ( dev-python/mako )
-	virtual/libffi"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	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() {
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		YACC=$(type -p yacc)
-		$(use_enable doctool)
-		$(use_enable test tests)"
-
-	python_set_active_version 2
-	python_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=
-	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"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-		export CAIRO_GOBJECT_LIBS="-lcairo-gobject"
-		export CAIRO_GOBJECT_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
-}
-
-src_install() {
-	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
-}

diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index 28dc2d6..16b5456 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.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/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.5 2012/06/04 07:30:23 tetromino Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.7"
 PYTHON_USE_WITH="xml"
 
-inherit gnome2 python
+inherit gnome2 python toolchain-funcs
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
 HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
 
-LICENSE="LGPL-2 GPL-2"
+LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -27,7 +27,7 @@ fi
 IUSE="doc doctool test"
 
 RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.31.22:2
+	>=dev-libs/glib-2.34:2
 	doctool? ( dev-python/mako )
 	virtual/libffi"
 # Wants real bison, not virtual/yacc
@@ -40,6 +40,9 @@ DEPEND="${RDEPEND}
 PDEPEND="x11-libs/cairo[glib]"
 
 pkg_setup() {
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
 	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
@@ -66,10 +69,8 @@ src_prepare() {
 	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"
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
 		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-		export CAIRO_GOBJECT_LIBS="-lcairo-gobject"
-		export CAIRO_GOBJECT_CFLAGS="-I${EPREFIX}/usr/include/cairo"
 		if use test; then
 			G2CONF="${G2CONF} --disable-tests"
 			gi_skip_tests=yes