Update fix for bug #391213 to not use eautoreconf.

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

3 files changed, 21 insertions, 44 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 23345c40042b..fb4d63730adf 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2012/01/08 23:03:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.52 2012/01/08 23:57:10 tetromino Exp $
+
+  08 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gobject-introspection-1.30.0-r2.ebuild,
+  -files/gobject-introspection-1.30.0-forced-cairo.patch:
+  Update fix for bug #391213 to not use eautoreconf.
 
 *gobject-introspection-1.30.0-r2 (08 Jan 2012)
 
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
deleted file mode 100644
index e2bd8b14bfc6..000000000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.30.0-forced-cairo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
index 2a63795b20ba..841f891b72e3 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v 1.2 2012/01/08 23:57:10 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit autotools gnome2 python
+inherit gnome2 python
 
 DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
 HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
@@ -47,9 +47,6 @@ src_prepare() {
 	# 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"
 
@@ -57,17 +54,22 @@ src_prepare() {
 	echo > py-compile
 	echo > build-aux/py-compile
 
-	eautoreconf
 	gnome2_src_prepare
 
-	if use test && ! has_version "x11-libs/cairo[glib]"; then
+	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
-		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=
+		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"
+			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
 }