Version bump (bug #499824).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 22 insertions, 172 deletions

diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 5b7897b7bbab..fa49f3b0886b 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/tcpreplay
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.47 2013/05/29 18:37:10 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.48 2014/01/31 13:09:08 jer Exp $
+
+*tcpreplay-4.0.2 (31 Jan 2014)
+
+  31 Jan 2014; Jeroen Roovers <jer@gentoo.org> -tcpreplay-3.4.4-r2.ebuild,
+  -tcpreplay-3.5.0_beta1.ebuild, +tcpreplay-4.0.2.ebuild,
+  -files/tcpreplay-3.4.4-cross-compile.patch:
+  Version bump (bug #499824).
 
   29 May 2013; Jeroen Roovers <jer@gentoo.org> tcpreplay-3.5.0_beta1.ebuild:
   Fix comment. Remove extraneous whitespace.
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 055e4ba1cb0f..db36aa7ddd8e 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 AUX tcpreplay-3.4.4-crash.patch 999 SHA256 1880eccd2616836df6e255757f0683d9c3a9d127848514741f3825f53e560af8 SHA512 c20dbfca93b5304b33163428f15824f0ba59cde2b6b68c40bfe1685f648982f151fbed8896989e3ebc35fa1ec8c1fc5be890ec178cf1d5f25c9198edf13f85e2 WHIRLPOOL 37fcb5aab8a83e496adbea555c6fe283986d92ec261ef57a2f2ae095536cc4ffa08d2eddf2b5e71315d1924f234f98ee0b3e2b1091e76a89c3d78c80b4187ef1
-AUX tcpreplay-3.4.4-cross-compile.patch 1678 SHA256 53ee3e726267d579c4c81d9ed4ae435ebbd62b05df71f229380e0ad43754e6ca SHA512 75179b2d1745c622751317691f514e95c0bba163dd7b1b1c014564eb910c4f21bbf7d069a0a67668464b05c85b0679fc507725203fc522d8d65efd31bdc2329d WHIRLPOOL 2ab5757ed757a27d3728916c6c07d34402d7e36dab981b859d21fd9446a040ccd7a389775831b7c6737dffbadc157df07f8e2437a503849a13036cea2b1885e3
 DIST tcpreplay-3.4.4.tar.gz 947179 SHA256 7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f SHA512 b129f14689d73905fa3238090de397bf845d6764e73411738a82bdf39c3d4605ad9a64e55dfca88035716704015a1cfc8b4fe097e019e30f84379f4126700cc8 WHIRLPOOL dcf25b15e7ae65980a5fa18ce2ab98c8494443c52263ce37878d6adce8f451a5404c6b7b5d2db75877528faec2331ca67e01d1b2f6faeb40f8b0b4a010f33094
-DIST tcpreplay-3.5.0beta1.tar.bz2 943865 SHA256 3b9314a23bcbb2731e2e83933e22644621b06cd6415288d190f304ca470b1137 SHA512 d2d3303f2cb3bdeb5a1be05f4fa0971ece9964e74d840d381b967af4e665cc923669e8bb16b3496ef6e867ed677b0bef16f5b4f47c8708d3d8f6c06d0d85cf48 WHIRLPOOL 5b5f7789c6530cb739c6547e55aed88b00dd2bee1045e9a1b1d3b2f5dced50e1f9fff9cf21296c0033663127d11e3af3c35d187514c7b698718132d33e402cbc
+DIST tcpreplay-4.0.2.tar.gz 2068748 SHA256 afb14a0b401b562ed447774edbc44522dd0392a1deec8a0f8a03d3bda3b6bf2d SHA512 b70f5caf2ce653ee05c4c730d348b0acea5b98de91f89b9b7af3473714618e6520a3457cf60ce033fc5df2ef2ca8fe314e9ee066947ffe73ca75805000a56eaf WHIRLPOOL ec68616d13813f1eaea98d36ba0dfc2de88442c1ed5a6a7fb08e4d2a013c3734ec362d26d0a99e7061cf4606e81c15d7b0000895db775b3b1bf898d20fc0b506
 EBUILD tcpreplay-3.4.4-r1.ebuild 1616 SHA256 fc73db32d49a570ea6c4a76012b9075d243eebaa483aa69bbfdbf2cc8561399b SHA512 854f73f54cb8fbfd89848a54a7f03a5919d643700704e5f74a9500831eea2e45639ddef2dc3d4d6c0cccf85ca546c9fd287e0c1ad0a6d04749760ee27f9de903 WHIRLPOOL 5d116413621a4a0055832dfc6efeb7a1a55ec9e2f8f2ac760daef01b1a3300e0cb0f4bcd8f836cfdd551883391ab6558072b3d37d7a0662b6ee01069c82c1837
-EBUILD tcpreplay-3.4.4-r2.ebuild 1635 SHA256 4b0bf0cd7ae43c2b8ca4c47f103a7fda7184767c57307ad9dcad435df4b6b5ea SHA512 f7ed01051ddd6f10c66c40128a9a4bf58d527080820999a4c1e9654f8759bedf72a8e9eb6a2e6eacef6d840dd4bcc6f7e13531b26c5ba872825f0f1716ca7b9c WHIRLPOOL 6b1cefcbcd6723f9d04fd202f706a598012c0cf45cfbade5a4e8bbb0e4a8fb2e5c33d367ad54b81386be408ccb01dc12fc5a3fbd2b07fc6de8a92f22531b33db
-EBUILD tcpreplay-3.5.0_beta1.ebuild 2309 SHA256 89c65f54d964472442aad9e8ccd1a723c5d12c0fc990819ce3bc3b89c4817e0b SHA512 9f9710f6eb0530fc3615b6ab837c427f1c6280b07cc1c799c842da4cdf93c038709e1827d4b33e767c5509d3a047d9bc1c03b11dc013d4166e2549272a46eba6 WHIRLPOOL 31b8d1c6898b691bff383a5f139b66a631dbf19881840a0762e31076319e1186a9e269e65d05d5ec95fc7d0f6bf317293ab740ecc6a22a30797e2afdab6cebb9
-MISC ChangeLog 7920 SHA256 c4272c5e785e05571b34cf8db0da666ecb5f0f2e474e7e7341e05245aa033cf2 SHA512 0cab21258a3748ffe6a29fe66d82dd7f48936668a607b5bdda0e50189c6d1926af8ca172594d0f12513d8163e8111c74061184c0b3e0661ba6abe2a3ded3db75 WHIRLPOOL a50c3f0d48b3e1912d5d32ce294b302d5e8bdba6efb13cdd14a23e5ba72066f3ed0975b8493e92ed4503d8eddd836b5b6698afe76de509057bbfb3cbf4313221
+EBUILD tcpreplay-4.0.2.ebuild 1951 SHA256 5f100553aba7d264424528b5e053f15fc14e6cae58443169b063b3f67d5e52f0 SHA512 7217e742cb8c9ee3a6f888864b2d1c2206e7c5553ac83e32fad584ea239253165a3828d82a9c6431753aed477c6cd9f964e56881edaea7bb5d3f65fec94b2c00 WHIRLPOOL 550ed7052432b94f70723ee7214b9e950de46ae5fdf8d251c8579e0922c4c955ddb930c19c7f916bb3482ee30de218b81338b53b4163f85cf162c262e65f95fb
+MISC ChangeLog 8162 SHA256 54e44be4ceb586236d85833a0da37a65b262abd428c6a778426f2c2f2b4cda84 SHA512 d1ea8dcd2fed930af9560f63f8e32b2c6284305cb11b77a052fac41dae9980b6f11393d6f898b6ea19f591acdc405b4cc3ae3dd63e838b06ea5d4a5c2bd7297c WHIRLPOOL 3640dc3ed88eb98b5ac4422eef7e5cc5a1d53a5f9c276396f7cad0f0c53996ffa1e5b9f0bd9805baef62686ec287eb02a39d50816500779cbf722a06b70f3c9d
 MISC metadata.xml 835 SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a SHA512 ef0c8a22ac7d6ff7d3bb9c056ab8de2f46136f69e43839c68732e60d2ebd063b09a40f46cdd9165f9cfcfdab0476dbcc7284b6ed40b1c66afbf4d947e8ce848e WHIRLPOOL 991dcb884ad1ace09ab4c785744c2cfa3b2f4d9965f34a429b5ea62f03a9b15a8c8c3a7825cb7c36a73ab28198ab7959b24ad104534f238a40bd1f0b4f0e0d9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlGmStgACgkQVWmRsqeSphMVeACfbA7ihu+vEtyZoNDOWOq5Z0EZ
-mcQAn2KuSrHeL5gBiWMXcFTNBiPuRJmm
-=HZuh
+iEYEAREIAAYFAlLroHUACgkQVWmRsqeSphPcGACfbP6jyiPJJya6TolGRrhnOLmd
+c6AAnRdO9+B1tERXMXfuft4c1OaOL5mQ
+=16H7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch
deleted file mode 100644
index 745a3497c828..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -402,7 +402,6 @@
- 
- dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important
- dnl fix for OSX.  See: http://tcpreplay.synfin.net/trac/ticket/167
--libpcap_version_096=no
- AC_RUN_IFELSE(AC_LANG_PROGRAM([[
- #include <string.h>
- #include <stdlib.h>
-@@ -419,11 +418,12 @@
-             exit(0);
- 
-     exit(1);
--]]), [
--    libpcap_version_096=yes
--])
-+]]),
-+ [libpcap_version_096=yes],
-+ [libpcap_version_096=no],
-+ [libpcap_version_096=yes]
-+)
- 
--libpcap_ver8=no
- AC_RUN_IFELSE(AC_LANG_PROGRAM([[
- #include <string.h>
- #include <stdlib.h>
-@@ -444,13 +444,12 @@
-         exit(0);
- 
-     exit(1);
--]]), [
--    libpcap_ver8=yes
--], [
--    libpcap_ver8=no
--])
-+]]),
-+ [libpcap_ver8=yes],
-+ [libpcap_ver8=no],
-+ [libpcap_ver8=yes]
-+)
- 
--libpcap_ver7=no
- AC_RUN_IFELSE(AC_LANG_PROGRAM([[
- #include <string.h>
- #include <stdlib.h>
-@@ -469,11 +468,11 @@
-             exit(0);
- 
-     exit(1);
--]]), [
--    libpcap_ver7=yes
--], [
--    libpcap_ver7=no
--])
-+]]),
-+ [libpcap_ver7=yes],
-+ [libpcap_ver7=no],
-+ [libpcap_ver7=yes]
-+)
- 
- if test x$libpcap_ver8 = xyes ; then
-     AC_MSG_RESULT(>= 0.8.0)
-@@ -761,8 +760,8 @@
- 
- have_bpf=no
- dnl Check for BSD's BPF
--AC_MSG_CHECKING(for BPF device sending support)
--AC_TRY_RUN([
-+AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf,
-+[AC_TRY_RUN([
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-@@ -796,8 +795,11 @@
-             [Do we have BPF device support?])
-     AC_MSG_RESULT(yes)
-     have_bpf=yes
--],[
--    AC_MSG_RESULT(no)
-+],
-+[AC_MSG_RESULT(no)],
-+[AC_MSG_ERROR([cross-compiling,
-+  presetting ac_cv_have_bpf=(yes|no) will help])]
-+)
- ])
- 
- 
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild
deleted file mode 100644
index 0f5db0486339..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild,v 1.1 2012/04/12 04:04:47 jer Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
-HOMEPAGE="http://tcpreplay.synfin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="debug pcapnav +tcpdump"
-
-DEPEND="
-	>=sys-devel/autogen-5.9.8
-	dev-libs/libdnet
-	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
-	pcapnav? ( net-libs/libpcapnav )
-"
-RDEPEND="${DEPEND}"
-DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} )
-
-src_prepare() {
-	echo "We don't use bundled libopts" > libopts/options.h
-	epatch \
-		"${FILESDIR}"/${P}-crash.patch \
-		"${FILESDIR}"/${P}-cross-compile.patch
-	eautoreconf
-}
-
-src_configure() {
-	# By default it uses static linking. Avoid that, bug 252940
-	econf \
-		--enable-shared \
-		--enable-dynamic-link \
-		--disable-local-libopts \
-		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
-		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
-		$(use_enable debug)
-}
-
-src_test() {
-	if [[ ! ${EUID} -eq 0 ]]; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
-	else
-		emake -j1 test || {
-			ewarn "Note, that some tests require eth0 iface to be UP." ;
-			die "self test failed - see ${S}/test/test.log" ; }
-	fi
-}
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.5.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.0.2.ebuild
index c32ee8d2bcb9..1e3735d46b10 100644
--- a/net-analyzer/tcpreplay/tcpreplay-3.5.0_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.0.2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.5.0_beta1.ebuild,v 1.2 2013/05/29 18:37:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.0.2.ebuild,v 1.1 2014/01/31 13:09:08 jer Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic
 
-MY_P="${P/_/}"
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.synfin.net/"
-SRC_URI="http://synfin.net/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,11 +19,12 @@ DEPEND="
 	dev-libs/libdnet
 	>=net-libs/libpcap-0.9
 	tcpdump? ( net-analyzer/tcpdump )
-	pcapnav? ( net-libs/libpcapnav )"
+	pcapnav? ( net-libs/libpcapnav )
+"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} )
 
 src_prepare() {
 	sed -i \
@@ -40,11 +40,6 @@ src_prepare() {
 		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
 		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
 		src/Makefile.am || die
-	sed -i -e 's|replay_speed325|replay_sleep325|g' test/Makefile.am || die
-
-	# Work around defines unexpectedly implemented in bundled libopts
-	echo "#define tSCC static char const" >> src/tcprewrite_opts.h || die
-	echo "#define tSCC static char const" >> src/tcpprep_opts.h || die
 
 	eautoreconf
 }
@@ -73,8 +68,3 @@ src_test() {
 			die "self test failed - see ${S}/test/test.log" ; }
 	fi
 }
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README docs/{CHANGELOG,CREDIT,HACKING,TODO} || die
-}