Improve gcc4 patch for bug #231186

Package-Manager: portage-2.1.4.4

3 files changed, 33 insertions, 16 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 781f7984d744..41744b29f2f4 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/bmon
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.37 2008/04/28 04:30:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.38 2008/07/26 18:12:34 cedk Exp $
+
+  26 Jul 2008; Cédric Krier <cedk@gentoo.org> files/bmon-2.1.0-gcc4.diff:
+  Improve gcc4 patch for bug #231186
 
   28 Apr 2008; Jeroen Roovers <jer@gentoo.org> bmon-2.1.0-r3.ebuild:
   Marked ~sparc too.
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 6328dadb3589..f1651e68e120 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,8 +1,8 @@
-AUX bmon-2.1.0-gcc4.diff 732 RMD160 736a050b4fe592cfabcc6c7c9359092bf6799d3b SHA1 d130a87f994e05d3f71b593f2b4e9cf64b826e82 SHA256 9b4c1e57ffbbc3cd2e8c80d985960c59eb00c1c894f1df9caf12b99f4c893ade
+AUX bmon-2.1.0-gcc4.diff 1241 RMD160 e54ba1e1503b82655a65c65178fa5a85d56babc1 SHA1 ad83356830bdad59ee1ad352708c71e565476a7f SHA256 c26daa21662581f29ceb6ad5ba2274a26a6a80ac45557b2f441290e4b15a43fa
 AUX bmon-2.1.0-libnl-1.0.patch 487 RMD160 4d858d51b9cf1c2f1e7327b2f21fe5c574f33aa6 SHA1 7c3db633a7973871a13c7b9900b0286438757841 SHA256 7cf64ee9dac346ec81d111056d658b66292ef5a1ed5d66aba2e91ede7d4a5c1d
 AUX bmon-2.1.0-nostrip.patch 443 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3 SHA1 62382dc8a90c6ba4f797bda542c30a35bbf65d95 SHA256 32b10476f33109cc112c00be5e4396ed010e4a923c9c1537e94d5f7ed303e82a
 DIST bmon-2.1.0.tar.gz 270287 RMD160 7e0a5e0a82bfd3dc30fec899088f2206a75796a0 SHA1 969084269f155583063832751fff5a22a6ac77e3 SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
 EBUILD bmon-2.1.0-r2.ebuild 1074 RMD160 6b3626c3f16fe88d4eb807b26f233ce051d5f9d4 SHA1 7ad19b3e3ba377abf90f6071354b32e5b17c7f10 SHA256 85c6fcdb1157448c2b23c254c383a995e67fd95d94bd187d222a8f8b37902099
 EBUILD bmon-2.1.0-r3.ebuild 1149 RMD160 a5d8b2ace05e8b51eb1b7cf48ead1fa0c909f925 SHA1 80bbcca94091f73854cb1c091216fe8dfd834d33 SHA256 631774bf5cbed596ccba291fdb0d853d5fcb24759f0c893a550077596206de9b
-MISC ChangeLog 4898 RMD160 95074f424dea48f3c52f95fa071e58843ba79875 SHA1 e3e54f45c10d4c64d93440d261024458d4c8c811 SHA256 6c14bb120b3896fb26b7ffa75d8a4696fbce9cc50c6e2fb5214e876d54870570
+MISC ChangeLog 5012 RMD160 52f5c20faf573b2a2569839127b9d6ebfa343dda SHA1 4d6aa8fe272b18751d9623e14258d30962ea7cab SHA256 63afa5c8eba10649209edad315048930135757dc28feeb704373c8a5e63abdac
 MISC metadata.xml 233 RMD160 4ebadbc3b5e818b45feb3bfdccc5613503e0679f SHA1 4c351bbca92efa8abb682eafe358ef72f6427fde SHA256 d76ab458c17254d148b12fb21c5d4399afa9108768b00022942a8b646fe0b598
diff --git a/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff
index 433edf5090de..23c12b5380c3 100644
--- a/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff
+++ b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff
@@ -1,16 +1,6 @@
---- bmon-2.1.0.orig/src/out_xml_event.c	2005-04-05 12:01:33.000000000 -0300
-+++ bmon-2.1.0/src/out_xml_event.c	2005-09-09 17:56:07.000000000 -0300
-@@ -127,7 +127,7 @@
- 	.om_draw = xml_event_draw,
- 	.om_set_opts = xml_event_set_opts,
- 	.om_probe = xml_event_probe,
--	.om_shutdown xml_event_shutdown,
-+	.om_shutdown = xml_event_shutdown
- };
- 
- static void __init xml_event_init(void)
---- bmon-2.1.0.orig/src/out_audio.c	2005-04-05 12:01:33.000000000 -0300
-+++ bmon-2.1.0/src/out_audio.c	2005-09-09 17:58:20.000000000 -0300
+diff -ru bmon-2.1.0~/src/out_audio.c bmon-2.1.0/src/out_audio.c
+--- bmon-2.1.0~/src/out_audio.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_audio.c	2008-07-26 20:09:42.000000000 +0200
 @@ -141,7 +141,7 @@
  	.om_draw = audio_draw,
  	.om_set_opts = audio_set_opts,
@@ -20,3 +10,27 @@
  };
  
  static void __init audio_init(void)
+diff -ru bmon-2.1.0~/src/out_db.c bmon-2.1.0/src/out_db.c
+--- bmon-2.1.0~/src/out_db.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_db.c	2008-07-26 20:07:44.000000000 +0200
+@@ -679,7 +679,7 @@
+ 	.om_draw = db_draw,
+ 	.om_set_opts = db_set_opts,
+ 	.om_probe = db_probe,
+-	.om_shutdown db_shutdown,
++	.om_shutdown = db_shutdown,
+ };
+ 
+ static void __init db_init(void)
+diff -ru bmon-2.1.0~/src/out_xml_event.c bmon-2.1.0/src/out_xml_event.c
+--- bmon-2.1.0~/src/out_xml_event.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_xml_event.c	2008-07-26 20:09:42.000000000 +0200
+@@ -127,7 +127,7 @@
+ 	.om_draw = xml_event_draw,
+ 	.om_set_opts = xml_event_set_opts,
+ 	.om_probe = xml_event_probe,
+-	.om_shutdown xml_event_shutdown,
++	.om_shutdown = xml_event_shutdown
+ };
+ 
+ static void __init xml_event_init(void)