Fixed compile error against newer glib. Added ~amd64 keyword.

Package-Manager: portage-2.1-r1

4 files changed, 57 insertions, 11 deletions

diff --git a/www-client/ochusha/ChangeLog b/www-client/ochusha/ChangeLog
index bad3b3ec1b70..5d54effed167 100644
--- a/www-client/ochusha/ChangeLog
+++ b/www-client/ochusha/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/ochusha
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ChangeLog,v 1.14 2006/06/17 12:30:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ChangeLog,v 1.15 2006/08/01 08:55:16 usata Exp $
+
+  01 Aug 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ochusha-0.5.8.2-glib-2.10.diff, ochusha-0.5.8.2-r1.ebuild:
+  Fixed compile error against newer glib. Added ~amd64 keyword.
 
 *ochusha-0.5.8.2-r1 (17 Jun 2006)
 
diff --git a/www-client/ochusha/Manifest b/www-client/ochusha/Manifest
index b40f92191234..a3a6182bc36a 100644
--- a/www-client/ochusha/Manifest
+++ b/www-client/ochusha/Manifest
@@ -2,19 +2,23 @@ AUX ochusha-0.5.8.2-gentoo.diff 2394 RMD160 8d83d5fcdbd4c20cea82738d0febb9e903e1
 MD5 d6c0fbb0c34583ce342579d70e38d76a files/ochusha-0.5.8.2-gentoo.diff 2394
 RMD160 8d83d5fcdbd4c20cea82738d0febb9e903e12ba2 files/ochusha-0.5.8.2-gentoo.diff 2394
 SHA256 f10027ffb52ec47f633ff3289e5cd009846ecee64880a548af7161584c9e4ed8 files/ochusha-0.5.8.2-gentoo.diff 2394
+AUX ochusha-0.5.8.2-glib-2.10.diff 1237 RMD160 ea6e9d768031afec304355ae0fb99df29be2e38a SHA1 667ded9a9c20e194c7c327b5138157347046d29f SHA256 f0948301d7a8ec3284dba7998a1817f375d268effaafb232023932ac44a0b2f1
+MD5 3888e5325c90ed1a9b3ae95b6aadb7b9 files/ochusha-0.5.8.2-glib-2.10.diff 1237
+RMD160 ea6e9d768031afec304355ae0fb99df29be2e38a files/ochusha-0.5.8.2-glib-2.10.diff 1237
+SHA256 f0948301d7a8ec3284dba7998a1817f375d268effaafb232023932ac44a0b2f1 files/ochusha-0.5.8.2-glib-2.10.diff 1237
 DIST ochusha-0.5.8.2.tar.bz2 1794268 RMD160 5990fd327165b3d3c415aec5639babe1ce9ad6ba SHA1 1b302b9cc084d5e44eb32b68f67399f6f37deda1 SHA256 91a4429b085be335ad34c9af3ed2ab8871b6245839348abe21073a48789dbe7c
-EBUILD ochusha-0.5.8.2-r1.ebuild 1055 RMD160 cc7169fa1d1064c397636407c51a68c66ca9df55 SHA1 792dc32b663be459a3881bcb69bfc29a4732203e SHA256 612ea6afac059eb9213bba28a3a1a7e4c871a18c9be06514de928c100d4363b3
-MD5 7c8c481f3a35071a25e605ea9b5622c7 ochusha-0.5.8.2-r1.ebuild 1055
-RMD160 cc7169fa1d1064c397636407c51a68c66ca9df55 ochusha-0.5.8.2-r1.ebuild 1055
-SHA256 612ea6afac059eb9213bba28a3a1a7e4c871a18c9be06514de928c100d4363b3 ochusha-0.5.8.2-r1.ebuild 1055
+EBUILD ochusha-0.5.8.2-r1.ebuild 1102 RMD160 434a47b9dd464292865253aec93c3922c2a716f4 SHA1 7b2515cd96f0341a4cc6feb05bb3fe51b2a71d82 SHA256 19f879ca3b4cec1cd82955309e47668278bed4feab7eff79c5f9d40e1dcbd57c
+MD5 5c43e5adf0b909b693aaa2332f8ac5e7 ochusha-0.5.8.2-r1.ebuild 1102
+RMD160 434a47b9dd464292865253aec93c3922c2a716f4 ochusha-0.5.8.2-r1.ebuild 1102
+SHA256 19f879ca3b4cec1cd82955309e47668278bed4feab7eff79c5f9d40e1dcbd57c ochusha-0.5.8.2-r1.ebuild 1102
 EBUILD ochusha-0.5.8.2.ebuild 965 RMD160 380234c0d36b8172609ee9daf33374964bfa3eef SHA1 a341abaeaecc91c802646929bee7e782e266d1af SHA256 042b1140da443a08c9990d41ed0d4fa2c77799ac069463869f1b7b3d4e985680
 MD5 ed4d365040bd83fc8be8a8fe50cc2b40 ochusha-0.5.8.2.ebuild 965
 RMD160 380234c0d36b8172609ee9daf33374964bfa3eef ochusha-0.5.8.2.ebuild 965
 SHA256 042b1140da443a08c9990d41ed0d4fa2c77799ac069463869f1b7b3d4e985680 ochusha-0.5.8.2.ebuild 965
-MISC ChangeLog 8565 RMD160 046d7cf7fe754be2609115775d82be0efcc05ff5 SHA1 ed07823f69e65871e3ba8f669fe449ada55cd22b SHA256 3323fc25b8899439332ea91fb40bb817970e13fbffd4c2ffa33325d99e67ed7f
-MD5 16feb87492756dc7d01cba7ccfeae332 ChangeLog 8565
-RMD160 046d7cf7fe754be2609115775d82be0efcc05ff5 ChangeLog 8565
-SHA256 3323fc25b8899439332ea91fb40bb817970e13fbffd4c2ffa33325d99e67ed7f ChangeLog 8565
+MISC ChangeLog 8747 RMD160 82505703ba4b0084f60b98df673de5f8297ca21d SHA1 164db9481136a281613c7377b400dc2034818b5d SHA256 4f1eeed2f4ff080fb8a1998cfcd75c2cca9830a04e0f6fccc8d5fa8611ddaabe
+MD5 56e4edf9df36b94aa727a82ee8c42ce8 ChangeLog 8747
+RMD160 82505703ba4b0084f60b98df673de5f8297ca21d ChangeLog 8747
+SHA256 4f1eeed2f4ff080fb8a1998cfcd75c2cca9830a04e0f6fccc8d5fa8611ddaabe ChangeLog 8747
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
diff --git a/www-client/ochusha/files/ochusha-0.5.8.2-glib-2.10.diff b/www-client/ochusha/files/ochusha-0.5.8.2-glib-2.10.diff
new file mode 100644
index 000000000000..e474da7bdf90
--- /dev/null
+++ b/www-client/ochusha/files/ochusha-0.5.8.2-glib-2.10.diff
@@ -0,0 +1,37 @@
+diff -urN ochusha-0.5.8.2/libmodifiedgtk2/mod_tree_data_list.c ochusha-0.5.8.2-glib-2.10/libmodifiedgtk2/mod_tree_data_list.c
+--- ochusha-0.5.8.2/libmodifiedgtk2/mod_tree_data_list.c	2005-06-06 22:28:01.000000000 +0900
++++ ochusha-0.5.8.2-glib-2.10/libmodifiedgtk2/mod_tree_data_list.c	2006-08-01 17:34:32.000000000 +0900
+@@ -38,9 +38,6 @@
+ #include "mod_tree_data_list.h"
+ #include <string.h>
+ 
+-static GMemChunk *tree_chunk = NULL;
+-#define TREE_CHUNK_PREALLOCS 128
+-
+ /* node allocation
+  */
+ ModTreeDataList *
+@@ -48,13 +45,7 @@
+ {
+   ModTreeDataList *list;
+ 
+-  if (tree_chunk == NULL)
+-    tree_chunk = g_mem_chunk_new ("treedatalist mem chunk",
+-				  sizeof (ModTreeDataList),
+-				  sizeof (ModTreeDataList) * TREE_CHUNK_PREALLOCS,
+-				  G_ALLOC_AND_FREE);
+-
+-  list = g_chunk_new (ModTreeDataList, tree_chunk);
++  list = g_slice_new (ModTreeDataList);
+   memset (list, 0, sizeof (ModTreeDataList));
+ 
+   return list;
+@@ -79,7 +70,7 @@
+       else if (g_type_is_a (column_headers [i], G_TYPE_BOXED) && tmp->data.v_pointer != NULL)
+ 	g_boxed_free (column_headers [i], (gpointer) tmp->data.v_pointer);
+ 
+-      g_mem_chunk_free (tree_chunk, tmp);
++      g_slice_free (ModTreeDataList, tmp);
+       i++;
+       tmp = next;
+     }
diff --git a/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild b/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild
index 547f77badee9..b7b477e93de9 100644
--- a/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild
+++ b/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild,v 1.1 2006/06/17 12:30:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild,v 1.2 2006/08/01 08:55:16 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/16560/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 DEPEND="virtual/xft
 	>=x11-libs/gtk+-2.2.4
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-glib-2.10.diff
 }
 
 src_compile() {