Force building cairo-gobject support, and add a PDEPEND on cairo[glib] (PDEPEND instead of RDEPEND to avoid circular dependencies). Fixes bug #391213; thanks to Pacho Ramos, Rafał Mużyło, and the many helpful testers.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 138 insertions, 6 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 4e91d1404655..23345c40042b 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/gobject-introspection
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.50 2011/12/31 21:58:21 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.51 2012/01/08 23:03:03 tetromino Exp $
+
+*gobject-introspection-1.30.0-r2 (08 Jan 2012)
+
+  08 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gobject-introspection-1.30.0-r2.ebuild,
+  +files/gobject-introspection-1.30.0-forced-cairo.patch:
+  Force building cairo-gobject support, and add a PDEPEND on cairo[glib]
+  (PDEPEND instead of RDEPEND to avoid circular dependencies). Fixes bug
+  #391213; thanks to Pacho Ramos, Rafał Mużyło, and the many helpful
+  testers.
 
   31 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0.ebuild,
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index c913a30c3b9e..4a692e273547 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX gobject-introspection-0.10.8-build-tests.patch 3792 RMD160 6699bbe51887e346cd205ecc4087f2c54289149a SHA1 c70bfdbe9a6b0a9981af7c3dcc52c782b08c1cb8 SHA256 00469e23dc415e284cf3240c1cc3e5ff6f63cb37dca249f0ebe56b81ced0521b
+AUX gobject-introspection-1.30.0-forced-cairo.patch 936 RMD160 dc483a07f7379d13af3272da66a5f12114f9a5e9 SHA1 94e90db64eaa090c8d7e5b368e2e6c212415650b SHA256 fb4231a0f9f9bb4b9eba7af314903baea3726b47216b159b95d1574fb746d595
 DIST gobject-introspection-0.10.8.tar.bz2 1024874 RMD160 f542f75920ee95c067563f14215127c3ff95f304 SHA1 410268f5fd16cf0e219038c7dfe393249161b446 SHA256 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e
 DIST gobject-introspection-1.30.0-patches-1.tar.xz 5776 RMD160 6cf7893558cdf7b41e6084d787efe006b8a8c7b4 SHA1 1d621ce328683a4f2b8405589c89e3f97239534d SHA256 90a01c8b3ce6b112d58e9781460f3664d652bed169ddbdd9451a5e0a9fe2d37c
 DIST gobject-introspection-1.30.0.tar.xz 1063720 RMD160 c5e66f2e818e0cdbe38b42516ea3a36e7fbb09e6 SHA1 107425f49e03657c931ee180ffa454dcec201b71 SHA256 8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2
 EBUILD gobject-introspection-0.10.8.ebuild 1841 RMD160 145142de8c069de2d325692f00dc8f224c008e54 SHA1 a4e5cd2b27a79831e0f31c0256711d4598505024 SHA256 6f8022f0a2de57c6f78eacb4dbe77fb867310d9fdcdbcc853c2350ba23f4842c
 EBUILD gobject-introspection-1.30.0-r1.ebuild 1941 RMD160 35ff38c9eb61bfe4e3b46a3043c9d492abc2958a SHA1 f4f9ca794a3d55aab806aae1098688ab7f6848aa SHA256 e3672419000a8d33e525e50af037c3c4f09e96e4f3faea79a042618ead3fdaba
+EBUILD gobject-introspection-1.30.0-r2.ebuild 2527 RMD160 61e9218621f71c83f59f22839435d38647b903ee SHA1 e305049cfe37bca2d33546711f09e14b21a3eb55 SHA256 a7c3e7b690a223e90870086434b713b2ea323ba86df92b5333e098d78b866da3
 EBUILD gobject-introspection-1.30.0.ebuild 1817 RMD160 e5da9ff5d1ca8046dbb248a9afb03a74383cc6d4 SHA1 1c61596d60d32b1e0b8dc6addd77c40e271f1ac2 SHA256 9737954d3feb0688e4ce49121eadcde8cced4f74a7837629f568df4584d1bf11
-MISC ChangeLog 9304 RMD160 8b823b3a1621cd1c8d9f0ce98b06def102ab18ad SHA1 d89d0df4763c81c545ba08777e0cd83320461a4a SHA256 48f84b66123fb3e29f97aa25eb61971b78a5fa7222a95092ce7940c81b73e2b8
+MISC ChangeLog 9742 RMD160 25a1b090e88355e6b9b5ee248b4e1f137d3c6483 SHA1 e529545a51059f1909fe4fb881e231ea2be23280 SHA256 994118cd0dd4f051f2dee424f05f2fa05dbc35f3edab54b8cfd0f3d8cc78aa56
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7/hYMACgkQdjK8w9WeBnBT5AD+Ig7XjUGERg/HdbIohP6Lldk4
-CxRiSAtKyhrnz+zC1YEA/3ArZ1gXUvp635k1EKHS06IJo7eakkIarUjUOv7WCBhi
-=YH7+
+iF4EAREIAAYFAk8KILYACgkQdjK8w9WeBnBsNQD9G1KRXYG3n0SmYXGQGqltIvlY
+yVw/QPU3DW46qDES6HYA/RFv+qb6Ask+9I/A4VxoTA4PQPyfuFcuP2KDG9L2NicD
+=+51N
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-forced-cairo.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-forced-cairo.patch
new file mode 100644
index 000000000000..e2bd8b14bfc6
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-forced-cairo.patch
@@ -0,0 +1,30 @@
+From ca96c4c58042576c57c760aef6884f30a07e713d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Jan 2012 16:21:53 -0500
+Subject: [PATCH] Always build cairo-gobject gir, even if cairo is not
+ installed
+
+This is needed to avoid circular dependencies with cairo and splitting
+gobject-introspection-cairo out of the main package (the patch to do so
+would be invasive and hard to maintain).
+
+https://bugs.gentoo.org/show_bug.cgi?id=391213
+---
+ configure.ac |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cbee79e..5bc36f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,6 +141,7 @@ if test x$have_cairo = xyes; then
+   PKG_CHECK_MODULES(CAIRO_GOBJECT, [cairo-gobject], have_cairo_gobject=yes, have_cairo_gobject=no)
+ fi
+ 
++have_cairo_gobject=yes
+ if test x$have_cairo_gobject = xyes; then
+   case "$host" in
+     *-*-darwin*)
+-- 
+1.7.8.3
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
new file mode 100644
index 000000000000..2a63795b20ba
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
@@ -0,0 +1,90 @@
+# 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-r2.ebuild,v 1.1 2012/01/08 23:03:03 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools gnome2 python
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+SRC_URI="${SRC_URI} mirror://gentoo/${P}-patches-1.tar.xz"
+
+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 )"
+# 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 test tests)"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Useful upstream patches, will be in 1.31
+	epatch ../patches/*.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=659824
+	sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die
+
+	# Enable cairo-gobject support even if cairo is not installed, bug #391213
+	epatch "${FILESDIR}/${PN}-1.30.0-forced-cairo.patch"
+
+	# FIXME: Parallel compilation failure with USE=doc
+	use doc && MAKEOPTS="-j1"
+
+	# Don't pre-compile .py
+	echo > py-compile
+	echo > build-aux/py-compile
+
+	eautoreconf
+	gnome2_src_prepare
+
+	if use test && ! has_version "x11-libs/cairo[glib]"; then
+		# We only PDEPEND on cairo to avoid circular dependencies
+		G2CONF="${G2CONF} --disable-tests"
+		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."
+	else
+		skip_tests=
+	fi
+}
+
+src_test() {
+	[[ -z ${skip_tests} ]] && default
+}
+
+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
+}