inherit eutils

Package-Manager: portage-2.0.51.22-r2

4 files changed, 11 insertions, 47 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 2ea2839ac42a..845378f98fd0 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.53 2005/07/02 20:33:30 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.54 2005/09/20 03:23:07 vanquirius Exp $
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -tcpdump-3.8.3-r1.ebuild, tcpdump-3.8.3-r4.ebuild:
+  inherit eutils.
 
   02 Jul 2005; Hardave Riar <hardave@gentoo.org> tcpdump-3.8.3-r4.ebuild:
   Stable on mips, bug #95349
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r1 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r1
deleted file mode 100644
index 3fe68092ba2f..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30645001f4b97019677cad88d3811904 tcpdump-3.8.3.tar.gz 567116
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild
deleted file mode 100644
index 5bf2c4e3fcb7..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild,v 1.16 2005/05/16 01:08:22 vanquirius Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
-	http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa ia64 amd64 ppc64"
-IUSE="ssl ipv6"
-
-DEPEND="virtual/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-
-src_compile() {
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time #48747
-	fi
-
-	econf `use_with ssl crypto` `use_enable ipv6` || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
index 7cc86b672924..e0af9c160b93 100644
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild,v 1.2 2005/07/02 20:33:30 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild,v 1.3 2005/09/20 03:23:07 vanquirius Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -20,12 +20,12 @@ DEPEND="virtual/libpcap
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-	epatch ${FILESDIR}/${P}-bgp-infinite-loop2.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-bgp-infinite-loop2.patch"
 
 	if use ssl ; then
-		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' ${S}/configure || \
+		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
 			die "sed configure failed"
 	fi
 }