Add patch for building with gcc-4.1.

(Portage version: 2.1_rc3-r4)

4 files changed, 69 insertions, 6 deletions

diff --git a/net-analyzer/tcptrack/ChangeLog b/net-analyzer/tcptrack/ChangeLog
index 72c850649b79..343b3891c86d 100644
--- a/net-analyzer/tcptrack/ChangeLog
+++ b/net-analyzer/tcptrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tcptrack
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/ChangeLog,v 1.12 2006/02/17 16:20:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/ChangeLog,v 1.13 2006/06/01 20:37:20 exg Exp $
+
+  01 Jun 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/tcptrack-1.1.5-gcc41.patch, tcptrack-1.1.5.ebuild:
+  Add patch for building with gcc-4.1.
 
   17 Feb 2006; Markus Ullmann <jokey@gentoo.org> tcptrack-1.1.5.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/tcptrack/files/digest-tcptrack-1.1.5 b/net-analyzer/tcptrack/files/digest-tcptrack-1.1.5
index 2a4b65c67b80..59dfe680e68b 100644
--- a/net-analyzer/tcptrack/files/digest-tcptrack-1.1.5
+++ b/net-analyzer/tcptrack/files/digest-tcptrack-1.1.5
@@ -1 +1,3 @@
 MD5 ae360bede47cbfd75cae4eeaac90e8ed tcptrack-1.1.5.tar.gz 113384
+RMD160 1a91ab6ad9c6f4fd3fa25cc68bc3546a97c3560d tcptrack-1.1.5.tar.gz 113384
+SHA256 7eb0bac5f6af12cad3d74ba89a957f5df62d1689345deb4ac4ca6b6fa8b82fcd tcptrack-1.1.5.tar.gz 113384
diff --git a/net-analyzer/tcptrack/files/tcptrack-1.1.5-gcc41.patch b/net-analyzer/tcptrack/files/tcptrack-1.1.5-gcc41.patch
new file mode 100644
index 000000000000..6fc46d30c140
--- /dev/null
+++ b/net-analyzer/tcptrack/files/tcptrack-1.1.5-gcc41.patch
@@ -0,0 +1,50 @@
+--- tcptrack-1.1.5/src/IPv4Address.h.old	2006-06-01 22:02:50.000000000 +0200
++++ tcptrack-1.1.5/src/IPv4Address.h	2006-06-01 22:03:33.000000000 +0200
+@@ -13,7 +13,7 @@
+ 	IPv4Address(IPv4Address &na) { a=na.toStruct(); }
+ 	bool operator==( const IPv4Address & ) const;
+ 	bool operator!=( const IPv4Address & ) const;
+-	char * IPv4Address::ptr() const;
++	char * ptr() const;
+ 	friend ostream & operator<<( ostream &, const IPv4Address &);
+ 	struct in_addr toStruct() const;
+ private:
+--- tcptrack-1.1.5/src/TCPPacket.h.old	2006-06-01 22:04:54.000000000 +0200
++++ tcptrack-1.1.5/src/TCPPacket.h	2006-06-01 22:04:56.000000000 +0200
+@@ -29,24 +29,24 @@
+ class TCPPacket
+ {
+ public:
+-	TCPPacket::TCPPacket( const u_char *data, unsigned int data_len );
+-	TCPPacket::TCPPacket( TCPPacket & orig );
+-	seq_t TCPPacket::getSeq() const;
+-	seq_t TCPPacket::getAck() const;
++	TCPPacket( const u_char *data, unsigned int data_len );
++	TCPPacket( TCPPacket & orig );
++	seq_t getSeq() const;
++	seq_t getAck() const;
+ 	bool isFlagSet(unsigned int);
+ 	unsigned short headerLen() const { return header_len; };
+ 
+ 	portnum_t srcPort() const;
+ 	portnum_t dstPort() const;
+ 
+-	bool TCPPacket::fin() const;
+-	bool TCPPacket::syn() const;
+-	bool TCPPacket::rst() const;
+-	bool TCPPacket::psh() const;
+-	bool TCPPacket::ack() const;
+-	bool TCPPacket::urg() const;
+-	bool TCPPacket::ece() const;
+-	bool TCPPacket::cwr() const;
++	bool fin() const;
++	bool syn() const;
++	bool rst() const;
++	bool psh() const;
++	bool ack() const;
++	bool urg() const;
++	bool ece() const;
++	bool cwr() const;
+ 
+ 	friend ostream & operator<<( ostream &, const TCPPacket &);
+ private:
diff --git a/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild b/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild
index a23ab6d0fc19..62135a097c61 100644
--- a/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild
+++ b/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild
@@ -1,19 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild,v 1.3 2006/02/17 16:20:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild,v 1.4 2006/06/01 20:37:20 exg Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="Passive per-connection tcp bandwidth monitor"
-SRC_URI="http://www.rhythm.cx/~steve/devel/tcptrack/release/${PV}/source/${P}.tar.gz"
 HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/"
+SRC_URI="http://www.rhythm.cx/~steve/devel/tcptrack/release/${PV}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND="net-libs/libpcap
+	sys-libs/ncurses"
 
-newdepend "net-libs/libpcap
-	   sys-libs/ncurses"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-gcc41.patch
+}
 
 src_install() {
 	einstall || die