Fix glib-2.32 building.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 28 insertions, 20 deletions

diff --git a/dev-util/mono-debugger/ChangeLog b/dev-util/mono-debugger/ChangeLog
index a77631dfd9c9..e96fc636ad55 100644
--- a/dev-util/mono-debugger/ChangeLog
+++ b/dev-util/mono-debugger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/mono-debugger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.51 2012/04/13 19:13:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.52 2012/04/18 10:22:31 pacho Exp $
+
+  18 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/mono-debugger-2.10-glib2.32.patch, mono-debugger-2.10.ebuild:
+  Fix glib-2.32 building.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> mono-debugger-2.10.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
diff --git a/dev-util/mono-debugger/Manifest b/dev-util/mono-debugger/Manifest
index 678f6be6a45b..4161b75dc100 100644
--- a/dev-util/mono-debugger/Manifest
+++ b/dev-util/mono-debugger/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mono-debugger-2.10-glib2.32.patch 465 RMD160 2d5c648fe595488f690939ac54e68321a2dfaa2c SHA1 b98429ca17d99fa2c466d9d9a5fc7b5857cfbe7b SHA256 30e14eafd2c640595402986e5df30a3b82a3826294628458e50394edb35431e2
 AUX mono-debugger-2.8-system-bfd.patch 2762 RMD160 912e0c686eec67e1e682f9df670845d11b378354 SHA1 a6b05034d62a697d61920648dde0750f96a90d15 SHA256 5678931b3df0b634a3e47ba830ad09e819370192f3efd74c8f3f96393b1c5abf
 DIST mono-debugger-2.10.tar.bz2 1424640 RMD160 b8477c714a2b92da3567dd0c887b7235827fc673 SHA1 b72deb48133683eed4c4a1532022d18302ca69a2 SHA256 6896ae43ab7c8b302364e95725b7675b1642e77d22bcf96b5990c01652d23715
-EBUILD mono-debugger-2.10.ebuild 1092 RMD160 9d751e2c3266bb94f3727a533275137099431db6 SHA1 d00e7978df0f36a77d489ce43bae46381b8aec51 SHA256 8df4e361ffc11842128255c389452728fb7fe505bc827e6761be4df53e4ab08e
-MISC ChangeLog 7647 RMD160 d45052fb58a42939c82b1c71f037e2c8f865e0da SHA1 ff2bc674b9d55706a633fe32909ff4096c1d0369 SHA256 17bd7305491b72b45377b4abb621d8f309a15b13da8779790d864ead06818b50
+EBUILD mono-debugger-2.10.ebuild 1110 RMD160 a8bafecac8eaec4e6bc967a5015a76169b3b06ba SHA1 842bf30e37d38a92510fa8f52a8e28e782c5d35c SHA256 bbcf7a7945a7cbfbf7f74dc29c262410576c0d277175ec55b2445557a56136ec
+MISC ChangeLog 7793 RMD160 fb14e0e79d10729c65e8623fed8a78d682ab3d40 SHA1 2f3fce9e2352bf5d8e03574bd6811baef18be6e6 SHA256 a333c90790ff5d73429d674e5b20c05b82bef72056392db732aa86fd4ca352d2
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiHuZAAoJEDxpGckxwJCBZI0P/AlW6rBgdstdJZt8x9LArLzO
-SO/SorsV/TnzkiQtpPYFKgEVVsYue5XhuW7UdNA141YFVKpsKlKuDDHgKTW0KxRj
-O67OGJxiXWm4V1e3kkkehbkoOVTcuvOuSrc0GIgo111xJ9B4db23Jr5vIGHoWje1
-BNHgKmh80/yzLOacjFBCamC/kW8TNw2fTjPjHrXS+Ua/LZr+g8ktN3wbvOzYYubi
-QD87if68FgSokj9Lhlqb+Ju7YvEm0SEHzAaZI3qE1uAKdWqjb/XX1BMPN2Vlruhn
-rcDIEBp9Jylej3Jlucyb9/ej5vZUdhQGK9d2B5xPvUNWnN1eCiT0IPjxw4Thnz4d
-kiPyezNkVapBykTj2vC/fjsAlruxr9rQGlEu18hSrxXA0ZzTfnX1Z08aiqBoKSmY
-FEtkWg6nhsfqaz9C0NPzik9p+lh5epfoEiemNZksB5nMDYKuAJJ/49qK1Ld9gcj2
-OnvGoAwCVv4kxZI3yJItpsCgYq7kwX9sVr/gFWEhX5voxwDAYm99oCNbX80aC19f
-RJlk4ADsTR92Jcj9P6BBd5tQK7ReQB5bNXDdqT3ju4ubYQ4CEmlP39nUfucA4lmF
-XcltkL/mcFm2Z8m5QHdLktUSmJxir1PSXaaXBBVNA+LRCWgY5077lnsOFnGPM8d1
-RIM8EFncoMzrHfwY5Niw
-=nqh5
+iEYEARECAAYFAk+OlewACgkQCaWpQKGI+9S/cQCdFZVUhd2BQGtv4tDJ8we/BcKI
+e8sAn0FF4OklJIegQux8hlIV8Oou2S/O
+=Rexc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
new file mode 100644
index 000000000000..ea0538a51def
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
@@ -0,0 +1,11 @@
+diff -uNr mono-debugger-2.10.old/sysdeps/server/breakpoints.c mono-debugger-2.10/sysdeps/server/breakpoints.c
+--- mono-debugger-2.10.old/sysdeps/server/breakpoints.c	2011-01-13 23:41:31.000000000 +0100
++++ mono-debugger-2.10/sysdeps/server/breakpoints.c	2011-11-12 15:46:57.909192866 +0100
+@@ -1,6 +1,6 @@
+ #include <server.h>
+ #include <breakpoints.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+ #ifdef HAVE_UNISTD_H
diff --git a/dev-util/mono-debugger/mono-debugger-2.10.ebuild b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
index 89f8632cc620..4f35afde9b34 100644
--- a/dev-util/mono-debugger/mono-debugger-2.10.ebuild
+++ b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-2.10.ebuild,v 1.4 2012/04/13 19:13:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-2.10.ebuild,v 1.5 2012/04/18 10:22:31 pacho Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit go-mono mono autotools flag-o-matic eutils
 
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	go-mono_src_prepare
 
+	epatch "${FILESDIR}/${P}-glib2.32.patch"
+
 	# Allow compilation against system libbfd, bnc#662581
 	epatch "${FILESDIR}/${PN}-2.8-system-bfd.patch"
 	eautoreconf
@@ -43,5 +45,5 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 || die "Failed to build"
+	emake -j1
 }