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

[Alexandre Restovtsev]

commit:     db62b3fde1c3528bea18c15285bacb4f0620364f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 11:26:49 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr 16 11:26:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=db62b3fd

dev-libs/gobject-introspection: moved to gx86 + sync 9999 with gx86

---
 .../gobject-introspection-1.31.22.ebuild           |   94 --------------------
 .../gobject-introspection-9999.ebuild              |   13 ++-
 2 files changed, 9 insertions(+), 98 deletions(-)

diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.31.22.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.31.22.ebuild
deleted file mode 100644
index 4d57120..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.31.22.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.10 2011/05/02 04:39:55 jer Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.7"
-
-inherit python gnome2
-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/glib-2.29.7:2
-	doctool? ( dev-python/mako )
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	test? ( x11-libs/cairo )"
-# 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
-
-	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
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
-	python_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib*/${PN}/giscanner
-}

diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index 4d57120..f6648d8 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
@@ -25,15 +25,15 @@ fi
 
 IUSE="doc doctool test"
 
-RDEPEND=">=dev-libs/glib-2.29.7:2
+RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.31.22:2
 	doctool? ( dev-python/mako )
 	virtual/libffi"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	test? ( x11-libs/cairo )"
+	doc? ( >=dev-util/gtk-doc-1.15 )"
 # PDEPEND to avoid circular dependencies, bug #391213
 PDEPEND="x11-libs/cairo[glib]"
 
@@ -82,6 +82,11 @@ 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() {
@@ -90,5 +95,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/lib*/${PN}/giscanner
+	python_mod_cleanup /usr/$(get_libdir)/${PN}/giscanner
 }