Old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 25 insertions, 187 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/Manifest b/net-analyzer/tcptraceroute/Manifest
index 7f9ac40eec8c..6f92e70b3a90 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,9 +1,14 @@
-AUX 1.4-libnet-1.0.patch 730 SHA256 e4f4c5370f62bce64e8c00abc9ad9fe0f8c9d583bfb618fd1ac9437fd01e2b08 SHA512 3615db10798a7cb5c905c1bd525648055666e533b9eaa84bc479fce2c7ee0f91bb9d637a5c00c9979f84767af6599f212ada626b91f831f961acb2db68ffc76a WHIRLPOOL 3d0d3c5bfe6dc410b0e250bc10cad58ed2db1dbd768be2ad7ab3f97fb0a125a4f0b88c3372a6e9df813de4e959dc52c8e3feb3df6282d467ae3dac7709a5d41b
-AUX ppc64-1.5.patch 1956 SHA256 f43aa774ff3b110bad0f1834110d0d2dc385052e58ed3e5546c3437c2f352c86 SHA512 e61d4c342b75c19dcad44682d284eaeac8b56e3e8a924b50cb22b1a647db76d395f0fe4fb00d57990427e95eb4ad3b234dac2feac1edb2e4efb572b8408204f0 WHIRLPOOL 1d2dc0c5e93d11fb2e984a648a58b263c70a901df091250ed367f09e1ebf3bf1c52d0b7ec6697ac61549fc08cd9fb593cc596d3d7209c49047432812015fd33e
-AUX tcptraceroute-1.4-gentoo.patch 1116 SHA256 3ec266a6cc6e626fb63d2b794f37f111c7a871d2ccc36faf8d8f121a06064433 SHA512 92abdf9fcfd4a096c2b8467793fb946bfb9f5598c773e6418bfea6f19cbec2409c216742447f73615f918f24f692e21a5620545b0ebc2a386f83a925d2bbc187 WHIRLPOOL 281ece6b2073f4bef9a219acb06d336128241067b8fc6446a783a09ce89b09137dcccd759d2007acb810e6b43a3ad69b4edc74da0a96f5d9baa47014409793ee
-DIST tcptraceroute-1.4.tar.gz 31918 SHA256 1ef6c4736b55f47d3a2bb26b999cbb409953a112f637bcbec4106da2a0937bde
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST tcptraceroute-1.5beta7.tar.gz 119119 SHA256 aed5b163ed4886f04242b46005a6cb4876ef38ad72001a94facb62a99dc99c57 SHA512 bd975872e6a2132cc88bdcb3f680d30741cf4265c618a5c2dc36e356d53dd8f7ecccdf798372bacf4dc616abe6dccae910cc7398c35091243cd53ac0f29953ae WHIRLPOOL 35f04d2019eb6cea4b39d7b0dc50ebb5f4f9c8c7d2b5feeb9d69faef84e571ddd4fcc248bce820af87be52cd717abba26dbfdebc15de9a15ae664e72e8288d93
-EBUILD tcptraceroute-1.4-r3.ebuild 1005 SHA256 0b973a3c8b4b9777d39e22cc5a2303b50a1c18783953d05b669ceda9e978a545 SHA512 c5df2e462f04057f5fbc570be4682117d4cbc6a061cabf6687eb5b0422774ffc06a32ca6976401edcaac3a6c7663d8e2fa5b3198e54d8f959d754ec15985bda6 WHIRLPOOL 4adf152013fdf62fdaa5a56b95be52a703f4a496949410921426174490511488ab1023ba605a93d8555cf55fe428dc309ab89c880ce7540dd2768e0131b03dc2
-EBUILD tcptraceroute-1.5_beta7-r1.ebuild 914 SHA256 f5bb1d7835aa36949f8518e8804772c719067a5c00d96b4a32484e60d65765c4 SHA512 e7f0e3cec6ae0a39375b606460f67dce56381f41b5e69dd7215fa63c2ecc6e343168015644b1c1ded1945107ce89541a1c4cdd0f5e2c08e5c161c98df9390923 WHIRLPOOL 85e3b2b0dc93a101f6b7fbf0264b4b0ce0551b8a9bb3b44ae19711bd6ee4543ecef97ac54eaebce3700b71d2466a27fd31e8453bf9cbd0d98db89a724b6ede85
-MISC ChangeLog 6146 SHA256 9438f8e40f51274a00a5fc594a1cc55c1200dabf94961e56aa0524ab6b7d65b5 SHA512 8fbe05ba4421e53ef6a57bd1ffcc1f647f25552c8ee02fa95ebb0dbff7e80c091e184281ce10df8f5e5ece30fa0d2903ece0621dcfe7a47c9c0dcd7c53cb2549 WHIRLPOOL b893fb1a5b7529873a2e551948eca759d91481ac8f2c51d915b5d51f6b77ef8de91f15b2eb11b2bfc51792c2bf62cfb7aa6cc7a43d43e950315edd77703d3944
+EBUILD tcptraceroute-1.5_beta7-r1.ebuild 944 SHA256 472cb583315a537a91989218f13da2a8b528ab5f5a798d4e479ab58281a9bfd8 SHA512 45a3742d9cad7383a31fa97237f861e498830653c53f1429e6918696644cc07ebfd13c575d59c75ab4666079687b237195755fcb4c62ac47f1d801a54efaf320 WHIRLPOOL 07060acbb4a128fa75b6ace4fdcf2eb37f7197e3bb1cce0ac5dd04a5d85e7b8d1563d8b1f1cee4d9b831c92f316baecf166e0a24ef69c4ac894816bbdf69c7da
+MISC ChangeLog 6327 SHA256 879de7f0152dbc32e501ec441cc3e6f46ad1dbd88c00b11192d6bec8de0d61da SHA512 27ede169462cbea52842247c5f96a586b563ec33987f7a2684ecc5c6fc3276ef3e8314d2c84ee45acc977f023a72d516cdd05f3567187a69ebdd3d1b71029316 WHIRLPOOL a7f32c95ce66a2ff684c6293d674ad3a6560a5a050ffa9ca1d83289576c4b78e71e82f04b7f4953005745b4a19bbac0058c237a6ac4d09f285033ecb2a5511d6
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlETxUQACgkQVWmRsqeSphPXewCfTJboxe1S8QrwYjzuE70/WEgR
+bnMAn0jn4F2sO3h/Z5qJ7H2bVIHemER8
+=G32h
+-----END PGP SIGNATURE-----
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