Update fix for bug #391213 to not use eautoreconf.

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

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 23345c40042b9fb72fbb06d801ad5b72f5661def..fb4d63730adf403239d51b1d245d8b666824dee5 100644 (file)
--- 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/Manifest b/dev-libs/gobject-introspection/Manifest
index 4a692e273547b5e87f278663fc3a6fbd0dde5965..e7089998b8871cad2954f6befed13128def58a62 100644 (file)
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,20 +2,19 @@
 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-r2.ebuild 2650 RMD160 487960ac8e6eb596f5ae519464c7c91d1c6292d6 SHA1 c75d72f4f349417bcfabc98075c6e448690f41b6 SHA256 a4ed24c851682e3c5f81f6bec4bbddee435ff8a29489566a7c9af61ddeaaf12c
 EBUILD gobject-introspection-1.30.0.ebuild 1817 RMD160 e5da9ff5d1ca8046dbb248a9afb03a74383cc6d4 SHA1 1c61596d60d32b1e0b8dc6addd77c40e271f1ac2 SHA256 9737954d3feb0688e4ce49121eadcde8cced4f74a7837629f568df4584d1bf11
-MISC ChangeLog 9742 RMD160 25a1b090e88355e6b9b5ee248b4e1f137d3c6483 SHA1 e529545a51059f1909fe4fb881e231ea2be23280 SHA256 994118cd0dd4f051f2dee424f05f2fa05dbc35f3edab54b8cfd0f3d8cc78aa56
+MISC ChangeLog 9955 RMD160 9a0a41d426bb70abde0a96ad85d46340c30a287d SHA1 417db0358d708e8f371953c3625a4552a2103d59 SHA256 070a6ffb0a7ebd54b62945869c70eff8c6e9b16938a86135dacef2853f2760f2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8KILYACgkQdjK8w9WeBnBsNQD9G1KRXYG3n0SmYXGQGqltIvlY
-yVw/QPU3DW46qDES6HYA/RFv+qb6Ask+9I/A4VxoTA4PQPyfuFcuP2KDG9L2NicD
-=+51N
+iF4EAREIAAYFAk8KLVwACgkQdjK8w9WeBnBgQgD/XNO6rlWz3lA1MxNwzZLSzynR
+QAIWG1jkwYE5YoLSLvkBAI3L2/hnyoqM7AXShKMwUgcP0fmxddJAuJJZHmx9nZeK
+=gVxo
 -----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
deleted file mode 100644 (file)
index e2bd8b1..0000000
--- 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 2a63795b20ba5410d9ac0a8d0ad2b0e5f4c1c744..841f891b72e3e2102381b3427300781b5e0969a4 100644 (file)
--- 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
 }