nmap gcc41 fix

Package-Manager: portage-2.0.53_rc7

4 files changed, 32 insertions, 11 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 634c7bb9bffe..5f60c9d6e382 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.104 2005/10/02 02:30:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.105 2005/11/29 21:23:00 hanno Exp $
+
+  29 Nov 2005; Hanno Boeck <hanno@gentoo.org> +files/nmap-3.93-gcc41.patch,
+  nmap-3.93.ebuild:
+  Fix for gcc 4.1.
 
   02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> nmap-3.83.ebuild:
   Alpha stable.
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index c49ce59cb340..cb2f6f10277a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
-MD5 02b22b2857aba87133e2c756f634d8d2 nmap-3.81.ebuild 943
-MD5 1d04a4500eed78d744d670e7fa310820 nmap-3.83.ebuild 1028
-MD5 b0916d4858fdc6819d8b4fd3733f986a nmap-3.90.ebuild 959
-MD5 2acb253b4611180a085712da0ac581a2 nmap-3.93.ebuild 959
-MD5 c2cd7864e634a6b49764c8be26544384 ChangeLog 12649
+MD5 57574043542872d66c07452727597019 ChangeLog 12764
 MD5 a9321c7613a34f902b2bcf53af008bc3 files/digest-nmap-3.81 63
 MD5 90ee137382c6272e7524f0c4648c45f4 files/digest-nmap-3.83 68
 MD5 5dcee02c4729204bc26ce3c1652b977f files/digest-nmap-3.90 63
 MD5 5a7f498a284c3404568251a4e4d6ecfa files/digest-nmap-3.93 63
+MD5 b092d5d6fe8f6bb48da3996626ec4a7f files/nmap-3.93-gcc41.patch 509
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 02b22b2857aba87133e2c756f634d8d2 nmap-3.81.ebuild 943
+MD5 1d04a4500eed78d744d670e7fa310820 nmap-3.83.ebuild 1028
+MD5 b0916d4858fdc6819d8b4fd3733f986a nmap-3.90.ebuild 959
+MD5 36fc36ab4709c15a30c28c83c7214cbc nmap-3.93.ebuild 1031
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDP0ZiKf2g/qXtneoRAoVDAJ0aABvbqEZFSTdG0px/BLTRHK7hMwCgie8X
-bTfltLQGfs4UsvpVYH7vhAY=
-=UCoJ
+iD8DBQFDjMbLr2QksT29OyARAnPfAJ9Q0yDE0UwRz38NgqucI5gPbjkWgQCgoaoH
+GZhfDbMBJaedqkUqOWmYdiY=
+=UiqK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-3.93-gcc41.patch b/net-analyzer/nmap/files/nmap-3.93-gcc41.patch
new file mode 100644
index 000000000000..85fb48d87f33
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-3.93-gcc41.patch
@@ -0,0 +1,11 @@
+--- nmap-3.93/tcpip.h	2005-08-24 21:22:15.000000000 +0200
++++ nmap-3.93-gcc41/tcpip.h	2005-11-29 13:24:10.486220750 +0100
+@@ -286,7 +286,7 @@
+      direction must be PacketTrace::SENT or PacketTrace::RCVD .
+      Optional 'now' argument makes this function slightly more
+      efficient by avoiding a gettimeofday() call. */
+-  static void PacketTrace::traceArp(pdirection pdir, const u8 *frame, u32 len,
++  static void traceArp(pdirection pdir, const u8 *frame, u32 len,
+ 				    struct timeval *now);
+ };
+ 
diff --git a/net-analyzer/nmap/nmap-3.93.ebuild b/net-analyzer/nmap/nmap-3.93.ebuild
index 46a75c77593f..c1ae6dbb2452 100644
--- a/net-analyzer/nmap/nmap-3.93.ebuild
+++ b/net-analyzer/nmap/nmap-3.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.93.ebuild,v 1.2 2005/09/17 08:26:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.93.ebuild,v 1.3 2005/11/29 21:23:00 hanno Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,11 @@ DEPEND="virtual/libc
 	gtk? ( =x11-libs/gtk+-1.2* )
 	ssl? ( dev-libs/openssl )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/nmap-3.93-gcc41.patch
+}
+
 src_compile() {
 	use ppc-macos && filter-flags -fstrict-aliasing -O2
 	econf \