gcc-4.1.1 fix thanks to Pylon

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 83 insertions, 19 deletions

diff --git a/net-analyzer/nettop/ChangeLog b/net-analyzer/nettop/ChangeLog
index 6d95441b1b37..cd01761dfd1c 100644
--- a/net-analyzer/nettop/ChangeLog
+++ b/net-analyzer/nettop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nettop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.13 2006/02/15 23:30:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.14 2006/07/08 13:28:30 dragonheart Exp $
+
+  08 Jul 2006; Daniel Black <dragonheart@gentoo.org> files/nettop.c.patch,
+  nettop-0.2.3.ebuild:
+  gcc-4.1.1 fix thanks to Pylon
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> nettop-0.2.3.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest
index 93cb2ab4727f..ed4ec56a9d72 100644
--- a/net-analyzer/nettop/Manifest
+++ b/net-analyzer/nettop/Manifest
@@ -1,15 +1,30 @@
-MD5 ac7d5eb0a98011b45b99c4588f3cd560 ChangeLog 1664
-RMD160 eb2a08626b307942ee95137336ced3a930818e6e ChangeLog 1664
-SHA256 55573ff909021af26d77bae2a9c2d674da5cf919ae8dc80005e79078709ca0d7 ChangeLog 1664
-MD5 d1dfb4623376711f1542dc52dcb85a7c files/digest-nettop-0.2.3 63
-RMD160 bc2b964345692f3cdc38aa614c36cb12e3daea1f files/digest-nettop-0.2.3 63
-SHA256 32ae5a255b9df7a9b2ca1f67536a8218f3dc674878bf4731fb2aee5e99fb8971 files/digest-nettop-0.2.3 63
-MD5 523f340b61566f16b1a8fcb9343e0f6e files/nettop.c.patch 182
-RMD160 74e518226d2e0c84b0f6f17e2e6ae45206f3d6fc files/nettop.c.patch 182
-SHA256 b0cc681939e555e6bd2bb3743ced7277359acdd59ec1e9a9dcd8f56a08caa43d files/nettop.c.patch 182
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nettop.c.patch 1093 RMD160 3c820d08ba12b8702136db4edf483dc21b11770d SHA1 43b1bd43d1adb393f319faaee7a1c5b4aa5bc7a3 SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299
+MD5 6f3688a56b586f55a6dd4b1d7f8452e6 files/nettop.c.patch 1093
+RMD160 3c820d08ba12b8702136db4edf483dc21b11770d files/nettop.c.patch 1093
+SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299 files/nettop.c.patch 1093
+DIST nettop-0.2.3.tar.gz 22797 RMD160 c3c52ac98f3507046af9c62fad93e9abb3af76cd SHA1 71b28b190c413caf3864dda5fca679ad305fec42 SHA256 4dbb2bdb506c4a5a49d67fbd7bcc860008a881abe55271cf3651316620143556
+EBUILD nettop-0.2.3.ebuild 746 RMD160 9f4c9a24dc28772df0293737e413e5c7879c730a SHA1 c8dc4d6f2d60a6054d108421c3413ff9fdfa1af4 SHA256 beecc4ff936d1e3bbfb75c90db1ab7e6f1287ef27eed068985221271fd832807
+MD5 8d566e008889ac4c721763150dbfb9a9 nettop-0.2.3.ebuild 746
+RMD160 9f4c9a24dc28772df0293737e413e5c7879c730a nettop-0.2.3.ebuild 746
+SHA256 beecc4ff936d1e3bbfb75c90db1ab7e6f1287ef27eed068985221271fd832807 nettop-0.2.3.ebuild 746
+MISC ChangeLog 1801 RMD160 f08ff81f0cc9c298b1160ad0b287015ed79fae56 SHA1 80fc984452f5bcad5bbec66cf8b5f0a47b0cc896 SHA256 ced4c8650451c10e7452fb9963c1c1f6400a0bc15c4f76b3e588b43925ab8293
+MD5 ad524f56352816ed9245a8745fdd5063 ChangeLog 1801
+RMD160 f08ff81f0cc9c298b1160ad0b287015ed79fae56 ChangeLog 1801
+SHA256 ced4c8650451c10e7452fb9963c1c1f6400a0bc15c4f76b3e588b43925ab8293 ChangeLog 1801
+MISC metadata.xml 232 RMD160 d0a563d04a07ed7c8d51c751c5a60767d212c627 SHA1 c7780f13c86e6b46cb81404036d18cc47b61cf1f SHA256 76dc0e7af177a747308be4f49e5c99ee80d9a667ba50f53e53093481209dc063
 MD5 59fafa99faf187e744c602a625052f65 metadata.xml 232
 RMD160 d0a563d04a07ed7c8d51c751c5a60767d212c627 metadata.xml 232
 SHA256 76dc0e7af177a747308be4f49e5c99ee80d9a667ba50f53e53093481209dc063 metadata.xml 232
-MD5 a7713304a0d001b413b08c2f918b8055 nettop-0.2.3.ebuild 697
-RMD160 c22845ba5f84629c88a3da3ac6a64c1a5335d52d nettop-0.2.3.ebuild 697
-SHA256 cc7fe0148fd2c2e349c52cff02afa3b07894ff4049bafe14b26ea022ccdc1c4f nettop-0.2.3.ebuild 697
+MD5 95059b5d4d176936d0854d509b476de8 files/digest-nettop-0.2.3 235
+RMD160 5640e89178c448d5d37c46b0ed495a7277c348ab files/digest-nettop-0.2.3 235
+SHA256 2677d65c0c26b6cfbd5703b22aff114e9ef71c0563157710ad0e6ab148f53da7 files/digest-nettop-0.2.3 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEr7OsmdTrptrqvGERAo2qAJwJ4dNHSw/g5OAcjW2cCukGo6cWxgCeMBh3
+8tnxeKCLAe8+WQ5TtZa3tng=
+=PLbb
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nettop/files/digest-nettop-0.2.3 b/net-analyzer/nettop/files/digest-nettop-0.2.3
index 360980f9f256..626cebcb1308 100644
--- a/net-analyzer/nettop/files/digest-nettop-0.2.3
+++ b/net-analyzer/nettop/files/digest-nettop-0.2.3
@@ -1 +1,3 @@
 MD5 e76602717e79a26b0ab15ab6799fb1ef nettop-0.2.3.tar.gz 22797
+RMD160 c3c52ac98f3507046af9c62fad93e9abb3af76cd nettop-0.2.3.tar.gz 22797
+SHA256 4dbb2bdb506c4a5a49d67fbd7bcc860008a881abe55271cf3651316620143556 nettop-0.2.3.tar.gz 22797
diff --git a/net-analyzer/nettop/files/nettop.c.patch b/net-analyzer/nettop/files/nettop.c.patch
index 647f8a430edd..227611c4ceb4 100644
--- a/net-analyzer/nettop/files/nettop.c.patch
+++ b/net-analyzer/nettop/files/nettop.c.patch
@@ -1,6 +1,45 @@
---- nettop.c.orig	2004-11-22 19:06:23.648845592 +0200
-+++ nettop.c	2004-11-22 19:06:38.166638552 +0200
-@@ -361,6 +361,7 @@
+--- nettop.c.orig	2006-07-08 23:20:56.000000000 +1000
++++ nettop.c	2006-07-08 23:25:09.000000000 +1000
+@@ -70,6 +70,7 @@
+ #include <time.h>
+ #include <stdlib.h>
+ #include <netdb.h>
++#include <string.h>
+ 
+ #include "node.h"
+ #include "ent.h"
+@@ -216,22 +217,26 @@
+ 		}
+ 	}
+ 
+-	ether.count = ether.size = (int) ether.l = (int) ether.r = 0;
++	ether.count = ether.size = 0;
++	ether.l = ether.r = 0;
+ 	ether.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		ether.size_h[i] = 0;
+ 
+-	ip.count = ip.size = (int) ip.l = (int) ip.r = 0;
++	ip.count = ip.size = 0;
++	ip.l = ip.r = 0;
+ 	ip.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		ip.size_h[i] = 0;
+ 
+-	tcp.count = tcp.size = (int) tcp.l = (int) tcp.r = 0;
++	tcp.count = tcp.size = 0;
++	tcp.l = tcp.r = 0;
+ 	tcp.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		tcp.size_h[i] = 0;
+ 
+-	udp.count = udp.size = (int) udp.l = (int) udp.r = 0;
++	udp.count = udp.size = 0;
++	udp.l = udp.r = 0;
+ 	udp.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		udp.size_h[i] = 0;
+@@ -361,6 +366,7 @@
  				}
  				break;
  			default:
diff --git a/net-analyzer/nettop/nettop-0.2.3.ebuild b/net-analyzer/nettop/nettop-0.2.3.ebuild
index d147a7628bb1..893896b6dd0c 100644
--- a/net-analyzer/nettop/nettop-0.2.3.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3.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/net-analyzer/nettop/nettop-0.2.3.ebuild,v 1.13 2006/02/15 23:30:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3.ebuild,v 1.14 2006/07/08 13:28:30 dragonheart Exp $
 
 inherit eutils
 
@@ -17,9 +17,13 @@ KEYWORDS="amd64 ppc sparc x86"
 DEPEND="sys-libs/slang
 	net-libs/libpcap"
 
-src_compile() {
-	epatch ${FILESDIR}/nettop.c.patch
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nettop.c.patch
+}
 
+src_compile() {
 	local myconf
 	myconf="--prefix=/usr"
 	./configure ${myconf} || die