Let it compile against glib-2.32

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

4 files changed, 68 insertions, 18 deletions

diff --git a/games-arcade/monkey-bubble/ChangeLog b/games-arcade/monkey-bubble/ChangeLog
index 82ce3c6dc23b..2fc2efe818e9 100644
--- a/games-arcade/monkey-bubble/ChangeLog
+++ b/games-arcade/monkey-bubble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/monkey-bubble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/ChangeLog,v 1.30 2012/03/17 20:39:30 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/ChangeLog,v 1.31 2012/07/21 16:23:26 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/monkey-bubble-0.4.0-glib-single-include.patch,
+  monkey-bubble-0.4.0.ebuild:
+  Let it compile against glib-2.32
 
   17 Mar 2012; Tupone Alfredo <tupone@gentoo.org> monkey-bubble-0.4.0.ebuild:
   Add dependency on app-text/gnome-doc-utils. Should fix bug #408455 by
@@ -127,4 +132,3 @@
   monkey-bubble-0.1.3.ebuild:
   initial commit; ebuild modified from one submitted by Minati jean michel via
   bug 29573
-
diff --git a/games-arcade/monkey-bubble/Manifest b/games-arcade/monkey-bubble/Manifest
index 2927c21f5dea..e8cc0004e9cf 100644
--- a/games-arcade/monkey-bubble/Manifest
+++ b/games-arcade/monkey-bubble/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX monkey-bubble-0.4.0-asneeded.patch 711 RMD160 2d7b1e8f4b473a672102e79e2cebfde6b7a157a2 SHA1 781c2b7b3553ad53dbd1021c65f07d40e3af084a SHA256 1cf34d0e98fa1015776278268c7c65010b7ac0048a103ee709f009ff838c0fbb
-AUX monkey-bubble-0.4.0-gnome-doc.patch 1361 RMD160 38adec66dead7ba319ecb1e286ce73ae5bbfd899 SHA1 d9e45b7533c07196a33a1f1c34652a660c4f8995 SHA256 a0317ef6ff37c2f72b64000a3d584f97578103ae016b40ef54bed74b7a61cd78
-AUX monkey-bubble-0.4.0-noesound.patch 467 RMD160 106d24145ef39169b96c503e67415a88d92bb19a SHA1 90ddcba50274c8f94347164db1eceee572fb2b6f SHA256 cf6807d8c3baf79d6a2f2007eb439c0ce7c2484c1feb629fbaf596290261e816
-DIST monkey-bubble-0.4.0.tar.gz 5360713 RMD160 1b01057841062bdefe9bbf5db565a2ee2b22153f SHA1 67b6d68f38c0182a676120c49646ab3b8725667d SHA256 eb96293a0fadbbfc3cd3ae0bbb557d9bf8a4dd8edccdd8ce1b913e8ba49a1c89
-EBUILD monkey-bubble-0.4.0.ebuild 1141 RMD160 69fd66d55c00065bde34258ec7c3d2d6ef45840d SHA1 4a67371c835049698d81bfc3227057d0a117d1c1 SHA256 1de65bafaac06ba35b03e57b852c7b24b17a0bcd054f9a501e1265e03982a2e4
-MISC ChangeLog 4376 RMD160 2ca2e3b7186f920cfe83518769c5384063b06f2a SHA1 fe0f9223f7b6d5fa5b836f78e8273e796995fed1 SHA256 19c0a941832f5845721bab461163d7a6f00a5f2a6086ec74d2fbb1c5d982c64b
-MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
+AUX monkey-bubble-0.4.0-asneeded.patch 711 SHA256 1cf34d0e98fa1015776278268c7c65010b7ac0048a103ee709f009ff838c0fbb SHA512 04d9c59a529a5563409935af439dd753175d1b61326fd3bdc1f1ebd80d9e1bd61772cad04d0ced4bbd1906a73ff5a7cdda4068e016c5a4afb6a72cab0f72cac1 WHIRLPOOL 4223cedcd04bb0a89755dcc3eb4f7eb46ba7dd186a3c571ec6c114baece28e7ca29220a1e27f30f0ad5d648f001874882247072ebd6a2359fb10698d64781f5a
+AUX monkey-bubble-0.4.0-glib-single-include.patch 1294 SHA256 f51356a55591a95d353bb83570fa24de28618f6e20e367f39e76a3ab24a41ecd SHA512 bc25455334e1155dc80eec97cc4e7586d47defe7a730495945f0e92a3aaed33841812d589fb39017168a4f61cbbe6adc5e6a276be9e465354f91b43164f8e0c4 WHIRLPOOL cb2f85a0bf8356460e9bde02fdcd117db7dce6547789c4d4d655186c0a3a14a0e344b7622e3f3b253e6b97539e244606f5c90f3b609e644bb38545a09b7c7f35
+AUX monkey-bubble-0.4.0-gnome-doc.patch 1361 SHA256 a0317ef6ff37c2f72b64000a3d584f97578103ae016b40ef54bed74b7a61cd78 SHA512 bb275de2f426422c83d1767496450210f4d4321a42b6365d65776ed3669e83c51a462b53d429ed7e437ddfe35f582ed48883bcdef93d4f1c14917019fa52be19 WHIRLPOOL 5b79287dedda8a65e616d283ee03a742eebd96c2444fe9ad3a1579bbab83629e72a29334657e706b97a81c1159578fc79d8caa829cfcbb203ae828c4fe770249
+AUX monkey-bubble-0.4.0-noesound.patch 467 SHA256 cf6807d8c3baf79d6a2f2007eb439c0ce7c2484c1feb629fbaf596290261e816 SHA512 2a2f4657114a8e274024209e432ed2d3daa2a539d4b86a721bc496f5fc8ef6fce571a42ed37bf255bd316e7873b2c4fd4573f580cede111102b7d47b9995855d WHIRLPOOL ec27a5b317d83de7ccacbc1ca25349da0131b0850c00cf3151769e2fb1c7b9212c00e5fd16c59a10e6535baf8a5db9d54f38e4f6a813d471b2c63a995ca3ab7f
+DIST monkey-bubble-0.4.0.tar.gz 5360713 SHA256 eb96293a0fadbbfc3cd3ae0bbb557d9bf8a4dd8edccdd8ce1b913e8ba49a1c89 SHA512 def3603972462e19d99d0d1dd86d522386d64cbb4190b1361d0d94bc175f476738619ba34fb78451669456a9365f157a96feb4d996870b37acc9d9e68024ae34 WHIRLPOOL 0a86f6a8a2d81b6c6ef58f565683ac0aecd5a6eb6fba468d35d9986ce94ab55b4fb1d3bde8dfb04fb1e3a107b7c4bcb4d8eed463c81df5d2f1435bf316656c7b
+EBUILD monkey-bubble-0.4.0.ebuild 1128 SHA256 149bc0713d7b340cbd578c816ef8207a947a0b0741826bf2dc71f08269e1828e SHA512 63f5f6223cc716334c52035831d1c24d679d61f3cca14841848e0cef1683ff4e324bb535504975e8e6f8b699efc30469403d33b313df6d3d858a80f5e2b13f07 WHIRLPOOL b1b0d038273238b7d0e7838bd8f38f4cbe6f70c2de1f2c01aa9d510fa76d03da5342271a5c456eadb2cbc6adb8cf67723454b4cd22a809442e2ff1edceb99fcb
+MISC ChangeLog 4542 SHA256 1ceb530c8d2fc2b8d8bedb40970020fedaae34b25991c338acf8807c88b3371a SHA512 b58c1602081e38e940e137e09c0c527598c293fd99ffdea6bd746c3be83e53073f1d975acacc7dc43c113a658a3393e45a5e49d0ae06059c32c2bba90f26f7b0 WHIRLPOOL 7b637d9416964a267f75f686bb94059182ebe8a8c05a17cfdfb0f2d1ea8822d7af83a5fc26e20ecfb4a4fee49de3884afbc0acb3218f3356860f70d4fa6b47d3
+MISC metadata.xml 251 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe SHA512 6aee7ba0f0c5615fd2e3bc3b7ee827dd12f469c157f21ce326a6ea15633169812c7ed54f1c24b515285eece0f09bef176944b4f7d9ab004120cc11afb9c45e42 WHIRLPOOL e5384ae4b6e662670512ab747fd5e62ddece6ab467cf991e044b8e421164419ed30597392ab62c1779158695ad35f00ab9921ef1e25fe8f5b540a8043adb90b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9k9o8ACgkQIY77eQFFFC38awCeNgQ7iT3YVuD0WSaxU247oHnj
-ooQAoNtWfC/RJd5KadWF8UuytwbBUBJ7
-=/VXk
+iEYEAREIAAYFAlAK14MACgkQCaWpQKGI+9RXcgCdHfsnB1B5mmWMJZ537j68hjVF
+T1YAnjyeBLesmhDNxxdYvbP6iVqihGGn
+=+ZOF
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch
new file mode 100644
index 000000000000..67109beff7f7
--- /dev/null
+++ b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch
@@ -0,0 +1,45 @@
+Index: monkey-bubble-0.4.0/src/net/message-handler.c
+===================================================================
+--- monkey-bubble-0.4.0.orig/src/net/message-handler.c
++++ monkey-bubble-0.4.0/src/net/message-handler.c
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/time.h>
+ #include <time.h>
+ 
+Index: monkey-bubble-0.4.0/src/net/simple-server.c
+===================================================================
+--- monkey-bubble-0.4.0.orig/src/net/simple-server.c
++++ monkey-bubble-0.4.0/src/net/simple-server.c
+@@ -31,13 +31,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/time.h>
+ #include <time.h>
+ 
+ 
+ #include <glib-object.h>
+-#include <glib.h>
+ 
+ #include "simple-server.h"
+ #include "message-handler.h"
+Index: monkey-bubble-0.4.0/src/ui/main.c
+===================================================================
+--- monkey-bubble-0.4.0.orig/src/ui/main.c
++++ monkey-bubble-0.4.0/src/ui/main.c
+@@ -15,7 +15,7 @@
+ #include <gtk/gtk.h>
+ #include <gst/gst.h>
+ #include <bonobo/bonobo-i18n.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <libgnomeui/gnome-ui-init.h>
+ 
+ #include <math.h>
diff --git a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
index b62faee86cb2..19c1013d15ac 100644
--- a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
+++ b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.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/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild,v 1.11 2012/03/17 20:39:30 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild,v 1.12 2012/07/21 16:23:26 pacho Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils gnome2
 
 DESCRIPTION="A Puzzle Bobble clone"
@@ -31,7 +31,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-gnome-doc.patch \
-		"${FILESDIR}"/${P}-noesound.patch
+		"${FILESDIR}"/${P}-noesound.patch \
+		"${FILESDIR}"/${P}-glib-single-include.patch
 	# bug 260895
 	sed -i \
 		-e 's/ -Werror//' \
@@ -39,5 +40,4 @@ src_prepare() {
 		|| die "sed failed"
 	AT_NOELIBTOOLIZE=yes eautoreconf
 	gnome2_src_prepare
-	intltoolize --force || die "intltoolize failed" #bug 180458
 }