Add patch for building with gcc-4.1.

Package-Manager: portage-2.1_pre7-r2

diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index 01927eb676105e24c66c55de6d0f619a34e9b332..ce7245d97c3c7252db598c32dd4f8f5be81bfe07 100644 (file)
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ns
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.20 2006/01/30 10:13:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.21 2006/03/29 13:18:32 exg Exp $
+
+  29 Mar 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/ns-2.28-gcc41.patch, ns-2.28.ebuild:
+  Add patch for building with gcc-4.1.
 
   30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> Manifest:
   Manifest fix.

diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest
index 93a76856cac9555673a2db3b899ea300717f7f18..ff4ce256c84e46bd8a779425d525510a1cf71c8b 100644 (file)
--- a/net-analyzer/ns/Manifest
+++ b/net-analyzer/ns/Manifest
@@ -1,15 +1,21 @@
-MD5 036ee0360e44202794328ad85ceab9c6 ChangeLog 2666
-RMD160 84405946ad63f23595ba0c117210805e77ebac89 ChangeLog 2666
-SHA256 7c79c75d4b8985104a9343a7ae85b87380976338a60fb956fb4b13f0c89726c7 ChangeLog 2666
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 63ef88ed777e9fe5026ac84636783b0d ChangeLog 2799
+RMD160 04b65010578788bd1e45fa44b9609a910766dd28 ChangeLog 2799
+SHA256 2d9c5b7f5fbaf82c7aabf79c4aa8481ce53b4e12aba3d0a4158c7833f4ec71fc ChangeLog 2799
 MD5 cbd46edc227114c8538b564b0bdf1ae6 files/digest-ns-2.27-r1 65
 RMD160 99a8314eb1643713b6e599bad0d0be7d52211853 files/digest-ns-2.27-r1 65
 SHA256 1985a2eba47bfb85751536ba8a8163139144fbc61d21d23c981e5bf5ba786695 files/digest-ns-2.27-r1 65
-MD5 5ac49b26502a59b51f8df54099af4e25 files/digest-ns-2.28 65
-RMD160 ef7867e564f04150d0b64702564528a60855e35e files/digest-ns-2.28 65
-SHA256 83ed12e607c43f0db563c825374c98bcd9be8818fe841275795891042bd0d357 files/digest-ns-2.28 65
+MD5 1c0cbe7f195cde2568480f40c0ae9f72 files/digest-ns-2.28 241
+RMD160 e5073d2e7bd29cd52966d7a43cb8b42c8e2c482c files/digest-ns-2.28 241
+SHA256 495131d473ed32577b1256547bf4c2573993c033ec505cba0d1abe1018b80f3b files/digest-ns-2.28 241
 MD5 f7b94c91182a6e9cf19719c8abd4dfda files/ns-2.27-gentoo.diff 11242
 RMD160 bb9f6e76676f5f165a15d1c619a6631cf07e13ca files/ns-2.27-gentoo.diff 11242
 SHA256 c418bf7db4498a43de84bf146492262b893d100acd84e8b8f3e34674b6e04e68 files/ns-2.27-gentoo.diff 11242
+MD5 ec07875b0d6daf14bbcd40146efc4ea8 files/ns-2.28-gcc41.patch 1073
+RMD160 59ad45b60bffb671484e88949cc0a0e66613afc6 files/ns-2.28-gcc41.patch 1073
+SHA256 390a61f2aaceecb87abb6ca99ba2d53510b2d6a0da3177bb05f645ac45749d66 files/ns-2.28-gcc41.patch 1073
 MD5 a836c68ff4e3e7d53adf2ba91f47d626 files/ns-2.28-gentoo.diff 2199
 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 files/ns-2.28-gentoo.diff 2199
 SHA256 9632f6b55cdb10b49ea600d45e10c6657aefc40b2891781e07676453fecd1d0b files/ns-2.28-gentoo.diff 2199
@@ -19,6 +25,13 @@ SHA256 cd7225d6a5ad36877aa6ce36825019ec092afcf80b514da29e4798f97554ab36 metadata
 MD5 423e9866f3aaf471426a111b2b31952e ns-2.27-r1.ebuild 2536
 RMD160 ef18f4543e052415370f08e61fc4d9c193cc83e2 ns-2.27-r1.ebuild 2536
 SHA256 43a156513fd5e7cf29d0de576860b95ec18aed61f5575309a7787ef9fb50e1a9 ns-2.27-r1.ebuild 2536
-MD5 047c4490d314d17817ca903cd0490fc2 ns-2.28.ebuild 2646
-RMD160 66c12b150ddc0aaa9627513e48852e08c0d8144a ns-2.28.ebuild 2646
-SHA256 16ba1cab078aed54f5ef89f34cf8a599d9e1c047434113465793bbebd02fda71 ns-2.28.ebuild 2646
+MD5 ac636c0a81d57f33b5bc63f51cc64b03 ns-2.28.ebuild 2681
+RMD160 957dcf99d903d91ffbe3a6bc4d662a2129104faa ns-2.28.ebuild 2681
+SHA256 a20a02c253c604c838bed4e37c6119ef46e5a91096377ba91771531a82cbc0cd ns-2.28.ebuild 2681
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEKoi22iXjgNjfe5sRAr1KAJ4j+j/Ca0Uzs1irYLfYAf2Y9RGiUgCghljZ
+jQdXsA1KSME5RBb5o1tssKg=
+=ra8i
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/ns/files/digest-ns-2.28 b/net-analyzer/ns/files/digest-ns-2.28
index 0459d41cf277c40304a8e4ac2f4281c49a79be64..5f690360021ac71512fc3789dc2aeac0e315dc8a 100644 (file)
--- a/net-analyzer/ns/files/digest-ns-2.28
+++ b/net-analyzer/ns/files/digest-ns-2.28
@@ -1 +1,3 @@
 MD5 45ed7d066236aa981fd6cef6f9f44117 ns-src-2.28.tar.gz 46599585
+RMD160 f2ec76b7dc96bbfb75d8485ef2822ebdf50b8ed1 ns-src-2.28.tar.gz 46599585
+SHA256 422ffc5b6f4e0a5a4cfddebf97c728703368435800ce77716adaa7472f4faae1 ns-src-2.28.tar.gz 46599585

diff --git a/net-analyzer/ns/files/ns-2.28-gcc41.patch b/net-analyzer/ns/files/ns-2.28-gcc41.patch
new file mode 100644 (file)
index 0000000..13c4313
--- /dev/null
+++ b/net-analyzer/ns/files/ns-2.28-gcc41.patch
@@ -0,0 +1,38 @@
+--- ns-2.28.orig/sctp/sctp.h   2006-03-28 18:53:00.496028739 +0200
++++ ns-2.28/sctp/sctp.h        2006-03-28 18:52:41.114371797 +0200
+@@ -627,7 +627,7 @@
+ 
+   /* debugging functions
+    */
+-  void SctpAgent::DumpSendBuffer();
++  void DumpSendBuffer();
+ 
+   /* sctp association state variable
+    */
+--- ns-2.28.orig/mobile/god.h  2006-03-28 18:59:00.835568499 +0200
++++ ns-2.28/mobile/god.h       2006-03-28 18:59:29.789995089 +0200
+@@ -85,20 +85,20 @@
+               return sqrt(X*X + Y*Y + Z*Z);
+       }
+ 
+-      inline void vector::operator=(const vector a) {
++      inline void operator=(const vector a) {
+               X = a.X;
+               Y = a.Y;
+               Z = a.Z;
+       }
+-      inline void vector::operator+=(const vector a) {
++      inline void operator+=(const vector a) {
+               X += a.X;
+               Y += a.Y;
+               Z += a.Z;
+       }
+-      inline int vector::operator==(const vector a) {
++      inline int operator==(const vector a) {
+               return (X == a.X && Y == a.Y && Z == a.Z);
+       }
+-      inline int vector::operator!=(const vector a) {
++      inline int operator!=(const vector a) {
+               return (X != a.X || Y != a.Y || Z != a.Z);
+       }
+       inline vector operator-(const vector a) {

diff --git a/net-analyzer/ns/ns-2.28.ebuild b/net-analyzer/ns/ns-2.28.ebuild
index 64f5ea23a120552409b744b9c0c2d46382ef6410..5106abf16cbb1bdbd68fdd42153fb0632403ede6 100644 (file)
--- a/net-analyzer/ns/ns-2.28.ebuild
+++ b/net-analyzer/ns/ns-2.28.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/ns/ns-2.28.ebuild,v 1.4 2006/01/29 20:23:46 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.28.ebuild,v 1.5 2006/03/29 13:18:32 exg Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,6 +31,7 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${FILESDIR}/${P}-gentoo.diff
+       epatch ${FILESDIR}/${P}-gcc41.patch
 }
 
 src_compile() {