Version bump (bug #499824).

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 15 insertions, 163 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/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
-}