Let it compile with glib-2.32, bug #438418 by Flameeyes.

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 173 insertions, 17 deletions

diff --git a/games-board/gnono/ChangeLog b/games-board/gnono/ChangeLog
index 87184f3dc7ba..62770dbeadc8 100644
--- a/games-board/gnono/ChangeLog
+++ b/games-board/gnono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnono
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/ChangeLog,v 1.14 2009/11/23 14:32:31 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/ChangeLog,v 1.15 2012/10/21 10:33:28 pacho Exp $
+
+  21 Oct 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gnono-1.9.1-glib-single-include.patch, gnono-1.9.1.ebuild:
+  Let it compile with glib-2.32, bug #438418 by Flameeyes.
 
   23 Nov 2009; Markus Meier <maekke@gentoo.org> gnono-1.9.1.ebuild:
   amd64/x86 stable, bug #294145
diff --git a/games-board/gnono/Manifest b/games-board/gnono/Manifest
index 87358b4d5ed2..23a84ac8e87c 100644
--- a/games-board/gnono/Manifest
+++ b/games-board/gnono/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gnono-1.9.1-gentoo.patch 1622 RMD160 6070e5437c9332db2efd22c1bf5bcf81e54acef3 SHA1 62d618c9d3d2a380c5db3c8b90c85d988de490be SHA256 cadd6bc59f171adaf04f6d8b61ef4d6601e172526e688bcfbc4cb39d2271be31
-DIST gnono-1.9.1.tar.bz2 421461 RMD160 2e86cf671e409f5c96cd5df904b3ea795d363547 SHA1 367a73e70182c1b4f0807353d7ba1aae8d8943d7 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c
-EBUILD gnono-1.9.1.ebuild 957 RMD160 eae3d92dfb7aeb0ed55485a6d3e3858565caeed2 SHA1 2017d967a220b6903944eb6d281387d698323473 SHA256 0217a44a687b6bee02b4edbf40ba8fb83ec410c92b60c693efa7a21dc6146097
-MISC ChangeLog 1496 RMD160 26257ed3d2b17c3a6a04505d8bfe6c57c5e96ef9 SHA1 dd45d31ea32fdabcc4e3545fde30903571a00295 SHA256 f46b603dc17de32bd3346220d105dc5f14aca2ea28a1036d013e11593d1f7fdc
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX gnono-1.9.1-gentoo.patch 1622 SHA256 cadd6bc59f171adaf04f6d8b61ef4d6601e172526e688bcfbc4cb39d2271be31 SHA512 f899145fc7789dd4b10422871bdc6a432da75ba3e5433ee43ed6cfea8d3a2b25da0222cccbafdd1a8cd49d15164dd589c9bce6f80a148a432a6c3be05fa88655 WHIRLPOOL 3a31844af9c650952241adc4113a1d4b0896da422ccaa8cfce13bfe044d1e85dddc798aaebe1bfc0404a8dbd78ddaa72a733e8102e61c35c2809ee473c033658
+AUX gnono-1.9.1-glib-single-include.patch 3813 SHA256 bbea6e785dd48c2b6af20f6464e66053240b3a0be84baa2c6e736eee5697d689 SHA512 3acc2b25587878b1da4a698d6ccfe3029715b173f4a44e97b8d41e899695a0eaf539906c00dce240602d03a86fe9a05c138de4f847e73eb1ef828d7d13506b3d WHIRLPOOL cb37500c3b48ab37d80ae9661d900763e3a22d0f116c3ed52f3950dbabcf3bd7195fc1dc0425d5bede8eb194b49d04e615dc1e06709e9eceaad1084f5ef7ca58
+DIST gnono-1.9.1.tar.bz2 421461 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c SHA512 de67453cab0177d633b674ab2cf99b606373dc01e6d821478e8aa6adf9f0f40b04538e5d564df990739a62fb47225f83eff13ab6c12af26fe05afba309632d62 WHIRLPOOL 8b950b96c16e7c6290b5f4f6156404d96521e124516234fdf561ba4f55c63bd93366676ad0184e6c43f10e7dceef85e076dd999cf6c3c03595c75f9eade3ff8b
+EBUILD gnono-1.9.1.ebuild 916 SHA256 89387ddb4d492d700cc37a2a5710adcc094daf6f2645399e9055ddb26b03f5f0 SHA512 f631588babeb05b8ebb2f3580367cac9286a8e862380481fd60caaa662916075a0fe019e15878586e472a5174ec267a8bd2734285433018f6778d23f2a080570 WHIRLPOOL 03380b540b9a5331c10b6fe3d21398877a55ef18cd9879cbea8351c4ce10b393452f2c1183494d7684ef963ac2772be20e89b56ab6a6589649bdcc4cedd69f88
+MISC ChangeLog 1669 SHA256 be8609de34dae478317d817f9eac475eeea567b01056bb03c4d462dd4e39733e SHA512 2b4abf7d11e037e0583c4095b518f85a4000bc1d46ba2fdef89835d9a9935e20120ac71e55f10af62f571c863dbd3fcd5bf83d013577211458de3e233ead933c WHIRLPOOL f57ac1bf96e10d29fc4c274f8bd32d636d34213df9afecce71dd0afe1265c70b6a96e3123bed875e1f4b1d31e2c75e61d9459122752d6e3edb20c0a6ef718274
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAksKnQ8ACgkQkKaRLQcq0GKRyACeMO/s3TQ/MqEz5zPA8f8YajiI
-CBEAn0LDSw8kJ7rKf8XfA45p+lsVvvBw
-=hFA7
+iEYEAREIAAYFAlCDz3kACgkQCaWpQKGI+9TlAACfcOLi7s/Uc//5ztCnmoZqPcDv
+Tg4AnA9dItIYApL6MftLsdNakWpt49Wr
+=uJod
 -----END PGP SIGNATURE-----
diff --git a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
new file mode 100644
index 000000000000..edf5238c1475
--- /dev/null
+++ b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
@@ -0,0 +1,151 @@
+Index: gnono-1.9.1/src/ai.c
+===================================================================
+--- gnono-1.9.1.orig/src/ai.c
++++ gnono-1.9.1/src/ai.c
+@@ -24,9 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "cards.h"
+ #include "game.h"
+Index: gnono-1.9.1/src/ai.h
+===================================================================
+--- gnono-1.9.1.orig/src/ai.h
++++ gnono-1.9.1/src/ai.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_AI_H__
+ #define __GN_AI_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ void computer_play (gboolean pickup);
+ 
+Index: gnono-1.9.1/src/cards.c
+===================================================================
+--- gnono-1.9.1.orig/src/cards.c
++++ gnono-1.9.1/src/cards.c
+@@ -25,9 +25,7 @@
+ #endif
+ 
+ #include <stdlib.h>			/* for rand() */
+-#include <glib/garray.h>
+-#include <glib/gmem.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf-core.h>
+ 
+ #include "cards.h"
+Index: gnono-1.9.1/src/cards.h
+===================================================================
+--- gnono-1.9.1.orig/src/cards.h
++++ gnono-1.9.1/src/cards.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_CARDS_H__
+ #define __GN_CARDS_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf-core.h>
+ 
+ static const gdouble GN_CARD_HEIGHT = 98.0;
+Index: gnono-1.9.1/src/game.c
+===================================================================
+--- gnono-1.9.1.orig/src/game.c
++++ gnono-1.9.1/src/game.c
+@@ -24,9 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkmain.h>
+ #include <libgnome/gnome-config.h>
+ 
+Index: gnono-1.9.1/src/game.h
+===================================================================
+--- gnono-1.9.1.orig/src/game.h
++++ gnono-1.9.1/src/game.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_GAME_H__
+ #define __GN_GAME_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ /*#define GN_DEBUG*/
+ 
+Index: gnono-1.9.1/src/interface.h
+===================================================================
+--- gnono-1.9.1.orig/src/interface.h
++++ gnono-1.9.1/src/interface.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_INTERFACE_H__
+ #define __GN_INTERFACE_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ #include <gtk/gtkwindow.h>
+ 
+Index: gnono-1.9.1/src/main.c
+===================================================================
+--- gnono-1.9.1.orig/src/main.c
++++ gnono-1.9.1/src/main.c
+@@ -26,7 +26,7 @@
+ 
+ #include <unistd.h>
+ #include <glib/gi18n.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gtk/gtkmain.h>
+ 
+ #include "interface.h"
+Index: gnono-1.9.1/src/players.c
+===================================================================
+--- gnono-1.9.1.orig/src/players.c
++++ gnono-1.9.1/src/players.c
+@@ -24,8 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkwidget.h>
+Index: gnono-1.9.1/src/players.h
+===================================================================
+--- gnono-1.9.1.orig/src/players.h
++++ gnono-1.9.1/src/players.h
+@@ -23,8 +23,7 @@
+ #ifndef __GN_PLAYERS_H__
+ #define __GN_PLAYERS_H__
+ 
+-#include <glib/garray.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "cards.h"
+ 
+Index: gnono-1.9.1/src/preferences.h
+===================================================================
+--- gnono-1.9.1.orig/src/preferences.h
++++ gnono-1.9.1/src/preferences.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_PREFERENCES_H__
+ #define __GN_PREFERENCES_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ 
+ void dlg_preferences (GtkWidget *caller, gpointer data);
diff --git a/games-board/gnono/gnono-1.9.1.ebuild b/games-board/gnono/gnono-1.9.1.ebuild
index 76aa948f5af8..475fd159b478 100644
--- a/games-board/gnono/gnono-1.9.1.ebuild
+++ b/games-board/gnono/gnono-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/gnono-1.9.1.ebuild,v 1.5 2009/11/23 14:32:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/gnono-1.9.1.ebuild,v 1.6 2012/10/21 10:33:28 pacho Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils gnome2-utils games
 
 DESCRIPTION="A rewrite for GNOME of the Windows card game WUNO"
@@ -21,12 +21,12 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-glib-single-include.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	prepgamesdirs
 }