--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.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 13 insertions, 94 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/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() {