Revision bump; previous ebuilds do not enable SSL with USE=ssl, bug 97471. Tidy old ebuilds.

Package-Manager: portage-2.0.51.22-r1

6 files changed, 25 insertions, 61 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 4e537d04cfdb..bf504ca518a8 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,13 @@
 # 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.51 2005/06/11 08:17:08 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.52 2005/06/30 14:13:21 ka0ttic Exp $
+
+*tcpdump-3.8.3-r4 (30 Jun 2005)
+
+  30 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> -tcpdump-3.8.3-r2.ebuild,
+  -tcpdump-3.8.3-r3.ebuild, +tcpdump-3.8.3-r4.ebuild:
+  Revision bump; previous ebuilds do not enable SSL with USE=ssl, bug 97471.
+  Tidy old ebuilds.
 
   11 Jun 2005; Yuta SATOH <nigoro@gentoo.org> tcpdump-3.8.3-r3.ebuild:
   Stable on ppc64, bug #95349
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 07554883f26f..890c2f656e85 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 23f9c2dfabbaaa6c7e8c8d459e89dd7d tcpdump-3.8.3-r4.ebuild 1459
 MD5 af669d9e6e0070e8ba421ce299c25af1 tcpdump-3.8.3-r1.ebuild 1103
+MD5 dd032db5540e148277daf617e808407d ChangeLog 7132
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
-MD5 8dc0b8f2b666a8fdad1d4a12b882ac1b tcpdump-3.8.3-r2.ebuild 1243
-MD5 29a61a590a84f8be19a9e332e98e0bf0 ChangeLog 6871
-MD5 b2ed799044ce5c3d283c916617c59c22 tcpdump-3.8.3-r3.ebuild 1292
-MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r1 65
-MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r2 65
-MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
 MD5 373e9bba235a67d1de8eb1356151f32c files/tcpdump-3.8.3-gcc4.patch 3162
-MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r3 65
+MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r1 65
+MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r4 65
 MD5 f02e63da753d8b83de7f47d3de976e95 files/tcpdump-3.8.3-bgp-infinite-loop2.patch 556
+MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCqp4k60LfUIagIAkRArMQAKDHKsr9cnxiPpKojpRjSqVzjCmsgQCffiHR
-g1GfTWg5LPJVJiuy34szY5U=
-=XRfs
+iD8DBQFCw/4eEZCkKN40op4RAkLhAKCCm/wugbhUgGWyt63FT4ItcbifegCdH9z/
+aYasso+uDYoO96d+XK/GE/4=
+=ottr
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3
deleted file mode 100644
index 3fe68092ba2f..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30645001f4b97019677cad88d3811904 tcpdump-3.8.3.tar.gz 567116
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r2 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r4
index 3fe68092ba2f..3fe68092ba2f 100644
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r2
+++ b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r4
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild
deleted file mode 100644
index 7c2566ebe337..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild
+++ /dev/null
@@ -1,47 +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-r2.ebuild,v 1.10 2005/05/25 04:03:16 vapier 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ssl ipv6"
-
-DEPEND="virtual/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	if [[ $(gcc-major-version) -gt 3 ]] || \
-		[[ $(gcc-major-version) -eq 3 && $(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-r3.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
index 51b55fb77a81..74c404375792 100644
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.8 2005/06/11 08:17:08 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild,v 1.1 2005/06/30 14:13:21 ka0ttic Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -23,6 +23,11 @@ src_unpack() {
 	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 || \
+			die "sed configure failed"
+	fi
 }
 
 src_compile() {
@@ -36,7 +41,9 @@ src_compile() {
 		append-flags -fno-unit-at-a-time #48747
 	fi
 
-	econf $(use_with ssl crypto) $(use_enable ipv6) || die
+	local myconf
+	use ssl || myconf="${myconf} --without-crypto"
+	econf $(use_enable ipv6) ${myconf} || die
 	make CCOPT="$CFLAGS" || die
 }