--disable-chroot is now --without-chroot, bug #277001 thank Conrad Kostecki for report. Disable samba support with IUSE default, bug #275100 thank Matthias Schwarzott for suggestion. Dropped versions not to be stabilized.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 16 insertions, 99 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 92d38487570b..e44f5ba8ee9e 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.136 2009/06/17 07:21:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.137 2009/07/09 15:49:03 pva Exp $
+
+*tcpdump-4.0.1_pre20090709 (09 Jul 2009)
+
+  09 Jul 2009; Peter Volkov <pva@gentoo.org> -tcpdump-4.0.0.ebuild,
+  -tcpdump-4.0.1_pre20090616.ebuild, +tcpdump-4.0.1_pre20090709.ebuild:
+  --disable-chroot is now --without-chroot, bug #277001 thank Conrad
+  Kostecki for report. Disable samba support with IUSE default, bug #275100
+  thank Matthias Schwarzott for suggestion. Dropped versions not to be
+  stabilized.
 
   17 Jun 2009; Peter Volkov <pva@gentoo.org> tcpdump-3.9.8.ebuild,
   tcpdump-3.9.8-r1.ebuild, tcpdump-4.0.0.ebuild,
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 7bc643e57dba..52d9361ff3d7 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,11 +1,9 @@
 AUX tcpdump-4.0.0-ipv6-build.patch 288 RMD160 8e14d69d20dc2e431c6d10fc9ae694ab8976ebfb SHA1 a2e791b9612a7be04f882488e9d77e1f5c812a7e SHA256 c61cf785e854b44bfc015e4de6223051912547b0564bf61dbbfa97d1ddc4a63a
 AUX tcpdump-4.0.0-libsmi-autodep.patch 653 RMD160 5ac1093c524f83b4aaf21271d302e3acde2d8220 SHA1 e5cd061e6e5a918fa648b39aa0110f8ed043d8f1 SHA256 bdbd422f50b93f0c4232ae9cea0f4497976ab15559079575ec5ef1bca9dca72d
 DIST tcpdump-3.9.8.tar.gz 938054 RMD160 76b17d131f4d89342c2bcdc27c40d23d29ecb1f1 SHA1 98be9acb1e9154656838fcb89c4a36417cf56042 SHA256 2309c8eb1dc87436a410f4a8d041b0453ade5753c35ce7a2c5bc9a0263a8d299
-DIST tcpdump-4.0.0.tar.gz 708774 RMD160 294e8cc7b7026357fa061c296434eab363281de1 SHA1 618ac122d1a9d80f64865f0a4e4c4391baa54132 SHA256 5fe99efe0274b5764c9974417c96a38b5f94e21096d8a94cc1fa172a42035284
-DIST tcpdump-4.0.1-20090616.tar.gz 1559814 RMD160 2eb7875e4119182d8591db692a0559a6f171b4e5 SHA1 b2ad368c1e7a5a4028b21cf4a0f4d6f6e55155d8 SHA256 062f31ff5b9eaadca4f2fe69f5f0f1cd1c47673311efb559697009fd0ea264ce
+DIST tcpdump-4.0.1-20090709.tar.gz 1553485 RMD160 5f56cad6a6e25ac3d320a58912b513bbae29f635 SHA1 b6ed8d5e9a57863c87bb77eabc2d8f319645f1b1 SHA256 e662e3c101fc105831b5e15d708cb95be6e80399c050a4e28a9b474436c7d8ae
 EBUILD tcpdump-3.9.8-r1.ebuild 2236 RMD160 d26544e9bdc968b912ef40f3e97e4fafb7cf2b8e SHA1 b0328f68b4d3f26b24ca46798a7b9ca8e89c1331 SHA256 9bc30491dccd1c8198af78d593e8d91ba37fd0c36efc930d7bbeaf71d97aaa59
 EBUILD tcpdump-3.9.8.ebuild 1908 RMD160 e1842d7bdfa207f74f2c164fcda84283780b3b42 SHA1 64b8be1fc9b2e1786836ebe42c343bdc7041fc3e SHA256 b5f1450e23d5cff9d9d3c57caf1dbaf8861e8867f97954c78a54d43f6bc78b56
-EBUILD tcpdump-4.0.0.ebuild 2174 RMD160 2f5f97f7335eb61e8bbb2a12a7aa8992406fdda6 SHA1 452c25926f20c12a7239feb3592884811d66f145 SHA256 fbec3a6077b17ce59763aa60a69a77dc5bc705eb7f7df1f436e02e6955e893bb
-EBUILD tcpdump-4.0.1_pre20090616.ebuild 2374 RMD160 38eaaf5c25cd4bd8148160f2f065ad548156244b SHA1 c10e96d29dc4fe56cf229f7ce97a754626fc25ab SHA256 7a793142986533d9102107438608c6096d01c26f29968d3177644185138f242d
-MISC ChangeLog 18126 RMD160 12f0081b92b31fb6f4bde1ee6f7cb54c2696ec8b SHA1 1bcbb55ce88be747230dcefe88b56e3e84aa41a1 SHA256 dbcb107b39bad02f8248e1e9d4ed2a9c132e6810dd0bf3049b4ddd571e35c3a2
+EBUILD tcpdump-4.0.1_pre20090709.ebuild 2338 RMD160 f7812701c7c1474a6d909b1de171a954944a3acb SHA1 d9743061b470ebac155792b33197b571c222ec2f SHA256 3588e1d9dd2b7df013ea571cc04547f6240a4be36338827c4696bbc42a9f54fc
+MISC ChangeLog 18539 RMD160 dc99435985ebb54095b8659989f1bf4314eda3f2 SHA1 64354e515f4bb197c90a697f9bf0a8552c4ebf76 SHA256 7398e50183cb236c1e663586375daf0d76bf9802d42e0ab3cfcb5e2bc63df609
 MISC metadata.xml 465 RMD160 f9751964faf36897dbf01df6258c8af50791b1e5 SHA1 e4ed0caa1ba72d0827449bee5ce0e792940f3bfe SHA256 e8f218a9ee2e142e9b19c54bdc0e2b336cdccabaed8347a30956b663e6b9f51c
diff --git a/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild
deleted file mode 100644
index 95911482a98f..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild,v 1.3 2009/06/17 07:21:05 pva Exp $
-
-EAPI="1"
-inherit autotools flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+chroot smi ssl ipv6 samba"
-
-DEPEND="net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use samba ; then
-		ewarn
-		ewarn "CAUTION !!! CAUTION !!! CAUTION"
-		ewarn
-		ewarn "You're about to compile tcpdump with samba printing support"
-		ewarn "Upstream tags it as 'possibly-buggy SMB printer'"
-		ewarn "So think twice whether this is fine with you"
-		ewarn
-		ewarn "CAUTION !!! CAUTION !!! CAUTION"
-		ewarn
-		ewarn "(Giving you 10 secs to think about it)"
-		ewarn
-		ebeep 5
-		epause 5
-	fi
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-libsmi-autodep.patch"
-	epatch "${FILESDIR}/${P}-ipv6-build.patch"
-	eautoreconf
-}
-
-src_compile() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
-
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	# Fix wrt bug #48747
-	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
-	fi
-
-	econf --with-user=tcpdump \
-		$(use_with ssl crypto) \
-		$(use_with smi) \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		$(use_enable chroot chroot /var/lib/tcpdump)
-
-	make CCOPT="$CFLAGS" || die "make failed"
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README
-
-	keepdir /var/lib/tcpdump
-	fperms 700 /var/lib/tcpdump
-	fowners tcpdump:tcpdump /var/lib/tcpdump
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090616.ebuild b/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild
index 13506bae9372..cd81fdab59d3 100644
--- a/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090616.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090616.ebuild,v 1.2 2009/06/17 07:21:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild,v 1.1 2009/07/09 15:49:03 pva Exp $
 
 EAPI="2"
 inherit flag-o-matic toolchain-funcs eutils
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+chroot smi ssl ipv6 samba test"
+IUSE="+chroot smi ssl ipv6 -samba test"
 
 RDEPEND="net-libs/libpcap
 	smi? ( net-libs/libsmi )
@@ -45,10 +45,6 @@ pkg_setup() {
 	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
-#src_prepare() {
-# eautoreconf
-#}
-
 src_configure() {
 	# tcpdump needs some optymalization. see bug #108391
 	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
@@ -69,7 +65,7 @@ src_configure() {
 		$(use_with smi) \
 		$(use_enable ipv6) \
 		$(use_enable samba smb) \
-		$(use_enable chroot chroot /var/lib/tcpdump)
+		$(use_with chroot chroot /var/lib/tcpdump)
 }
 
 src_compile() {