Old.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 13 insertions, 180 deletions

diff --git a/net-analyzer/tcptraceroute/ChangeLog b/net-analyzer/tcptraceroute/ChangeLog
index 2bbad110d712..46857db3a3fb 100644
--- a/net-analyzer/tcptraceroute/ChangeLog
+++ b/net-analyzer/tcptraceroute/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcptraceroute
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.51 2013/02/02 23:00:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.52 2013/02/07 15:16:19 jer Exp $
+
+  07 Feb 2013; Jeroen Roovers <jer@gentoo.org> -files/1.4-libnet-1.0.patch,
+  -tcptraceroute-1.4-r3.ebuild, -files/tcptraceroute-1.4-gentoo.patch,
+  -files/ppc64-1.5.patch:
+  Old.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
   tcptraceroute-1.5_beta7-r1.ebuild:
diff --git a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
deleted file mode 100644
index 8c91bb0a8e43..000000000000
--- a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	2003-08-19 01:31:28.963869296 -0400
-+++ Makefile	2003-08-19 01:31:45.567345184 -0400
-@@ -11 +11 @@
--	$(CC) $(CFLAGS) `libnet-config --defines` \
-+	$(CC) $(CFLAGS) `libnet-1.0-config --defines` \
-@@ -13 +13 @@
--		`libnet-config --libs` -lpcap
-+		`libnet-1.0-config --libs` -lpcap
---- tcptraceroute.c.orig	2003-08-19 01:31:32.991257040 -0400
-+++ tcptraceroute.c	2003-08-19 01:32:02.723737016 -0400
-@@ -27,2 +27,2 @@
-- *	gcc -O2 -Wall `libnet-config --defines` \
-- *		-o tcptraceroute tcptraceroute.c `libnet-config --libs` -lpcap
-+ *	gcc -O2 -Wall `libnet-1.0-config --defines` \
-+ *		-o tcptraceroute tcptraceroute.c `libnet-1.0-config --libs` -lpcap
-@@ -201 +201 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/tcptraceroute/files/ppc64-1.5.patch b/net-analyzer/tcptraceroute/files/ppc64-1.5.patch
deleted file mode 100644
index f355a0400002..000000000000
--- a/net-analyzer/tcptraceroute/files/ppc64-1.5.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- tcptraceroute.c.old	2003-07-03 19:56:41.000000000 +0000
-+++ tcptraceroute.c	2005-04-15 09:49:58.000000000 +0000
-@@ -189,7 +189,7 @@
- };
- 
- /* Various globals */
--u_long dst_ip, src_ip;
-+unsigned int dst_ip, src_ip;
- u_short src_prt, dst_prt;
- char *device, *name, *dst, *src;
- char dst_name[TEXTSIZE], dst_prt_name[TEXTSIZE], filter[TEXTSIZE];
-@@ -213,7 +213,7 @@
- /* interface linked list, built later by getinterfaces() */
- struct interface_entry {
- 	char *name;
--	u_long addr;
-+	unsigned int addr;
- 	struct interface_entry *next;
- } *interfaces;
- 
-@@ -223,7 +223,7 @@
- 	u_short id, src_prt;
- 	struct timeval timestamp;
- 	double delta;
--	u_long addr;
-+	unsigned int addr;
- 	char *state;
- 	char *string;
- } proberecord;
-@@ -451,7 +451,7 @@
-  */
- 
- #define IPTOSBUFFERS	12
--char *iptos(u_long in)
-+char *iptos(unsigned int in)
- {
- 	static char output[IPTOSBUFFERS][3*4+3+1];
- 	static short which;
-@@ -468,7 +468,7 @@
-  * RFC1918 space.
-  */
- 
--char *iptohost(u_long in)
-+char *iptohost(unsigned int in)
- {
- 	u_char *p = (u_char *)&in;
- 
-@@ -538,7 +538,7 @@
- 	struct ifconf ifc;
- 	struct ifreq *ifrp, ifr;
- 	int numreqs, i, s;
--	u_long addr;
-+	unsigned int addr;
- 	int salen;
- 	char *x;
- 
-@@ -679,7 +679,7 @@
-  * given destination address.
-  */
- 
--u_long findsrc(u_long dest)
-+unsigned int findsrc(unsigned int dest)
- {
- 	struct sockaddr_in sinsrc, sindest;
- 	int s, size;
-@@ -715,7 +715,7 @@
-  * interface exists with an address of 127.0.0.1.
-  */
- 
--char *finddev(u_long with_src)
-+char *finddev(unsigned int with_src)
- {
- 	struct interface_entry *p;
- 	char *device = NULL;
-@@ -812,7 +812,7 @@
- 	/* Variables to keep state between calls */
- 	static char laststate[TEXTSIZE];
- 	static int lastttl;
--	static u_long lastaddr;
-+	static unsigned int lastaddr;
- 	static int everprint;
- 
- 	int printflag = 0;
-@@ -960,7 +960,7 @@
- void defaults(void)
- {
- 	struct servent *serv;
--	u_long recommended_src;
-+	unsigned int recommended_src;
- 
- 	getinterfaces();
- 
diff --git a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch b/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
deleted file mode 100644
index 95199c02bcd8..000000000000
--- a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tcptraceroute-1.4.orig/tcptraceroute.c
-+++ tcptraceroute-1.4/tcptraceroute.c
-@@ -394,4 +394,4 @@
--    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
--       [-l <packet length>] [-q <number of queries>] [-t <tos>]
--       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
--       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-+    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
-+"       [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
-+"       [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
-+"       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-@@ -1185,3 +1185,3 @@
--	safe_snprintf(filter, TEXTSIZE, "
--		(tcp and src host %s and src port %d and dst host %s)
--		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
-+	safe_snprintf(filter, TEXTSIZE, \
-+"		(tcp and src host %s and src port %d and dst host %s)\n"\
-+"		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
-@@ -2003,6 +2003,6 @@
-
- 	defaults();
- 	initcapture();
--	seteuid(getuid());
-+	setuid(getuid());
- 	return trace();
- }
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild
deleted file mode 100644
index afe89169f6c6..000000000000
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild,v 1.9 2006/02/17 16:19:40 jokey Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets"
-HOMEPAGE="http://michael.toren.net/code/tcptraceroute/"
-SRC_URI="http://michael.toren.net/code/tcptraceroute/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	make CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dosbin tcptraceroute
-	fperms 4710 /usr/sbin/tcptraceroute
-	fowners root:wheel /usr/sbin/tcptraceroute
-	doman tcptraceroute.8
-	dodoc examples.txt COPYING README changelog
-	dohtml -r ./
-}
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild
index 5398cbce3f85..fbb77c8764fd 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild,v 1.10 2013/02/02 23:00:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild,v 1.11 2013/02/07 15:16:19 jer Exp $
 
+EAPI=5
 inherit flag-o-matic
 
 MY_P=${P/_beta/beta}
@@ -17,8 +18,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="net-libs/libpcap
-	net-libs/libnet"
+DEPEND="
+	net-libs/libnet
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dosbin tcptraceroute