Version bump with a new documentation tool and numerous bugfixes. Autotools macros were split off into a separate package, gobject-introspection-common. Drop old.

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

4 files changed, 107 insertions, 70 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index d6c5fc38d25e..4d11e77aa35d 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.62 2012/03/25 15:42:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.63 2012/03/28 00:59:16 tetromino Exp $
+
+*gobject-introspection-1.32.0 (28 Mar 2012)
+
+  28 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gobject-introspection-1.30.0.ebuild, +gobject-introspection-1.32.0.ebuild,
+  metadata.xml:
+  Version bump with a new documentation tool and numerous bugfixes. Autotools
+  macros were split off into a separate package, gobject-introspection-common.
+  Drop old.
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org>
   gobject-introspection-1.30.0-r2.ebuild:
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild
deleted file mode 100644
index ff3446fb8d8e..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.30.0.ebuild
+++ /dev/null
@@ -1,69 +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.30.0.ebuild,v 1.4 2012/02/07 21:00:27 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-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"
-
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/glib-2.29.7:2
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-	doc? ( >=dev-util/gtk-doc-1.15 )
-	test? ( x11-libs/cairo )"
-
-pkg_setup() {
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		YACC=$(type -p yacc)
-		$(use_enable test tests)"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=659824
-	sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die
-
-	# FIXME: Parallel compilation failure with USE=doc
-	use doc && MAKEOPTS="-j1"
-
-	# Don't pre-compile .py
-	echo '#!/bin/sh' > py-compile
-	echo '#!/bin/sh' > build-aux/py-compile
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,doc-tool,scanner}
-}
-
-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-1.32.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild
new file mode 100644
index 000000000000..0b8e10fa9148
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild
@@ -0,0 +1,93 @@
+# 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.0.ebuild,v 1.1 2012/03/28 00:59:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.7"
+
+inherit gnome2 python
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+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"
+
+IUSE="doc doctool test"
+
+RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.29.7:2
+	doctool? ( dev-python/mako )
+	virtual/libffi"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	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
+
+	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/metadata.xml b/dev-libs/gobject-introspection/metadata.xml
index da6fd63d0085..d1585c3f58c6 100644
--- a/dev-libs/gobject-introspection/metadata.xml
+++ b/dev-libs/gobject-introspection/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="doctool">Install g-ir-doc-tool for generating documentation
+		from introspected data</flag>
+</use>
 </pkgmetadata>