[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/

[Jeroen Roovers]

commit:     6a02c9077040cadb8de63b8252e2a8f43d7ca6b4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 11:35:58 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 11:47:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a02c907

net-analyzer/tcpdump: Require USE=samba for test suite

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Closes: https://bugs.gentoo.org/740142
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild |  3 ++-
 net-analyzer/tcpdump/tcpdump-9999.ebuild       | 10 +++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
index 2034a5392dd..c2cf8713eac 100644
--- a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
@@ -16,8 +16,9 @@ SRC_URI="
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
+IUSE="+drop-root libressl +smi +ssl +samba suid test"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( samba )"
 
 RDEPEND="
 	net-libs/libpcap

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 1df4d6f13e0..8352b63b1cc 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -13,9 +13,10 @@ LICENSE="BSD"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 
 SLOT="0"
-IUSE="+drop-root libressl smi ssl samba suid test"
-RESTRICT="!test? ( test )"
 KEYWORDS=""
+IUSE="+drop-root libressl +smi +ssl +samba suid test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( samba )"
 
 RDEPEND="
 	net-libs/libpcap
@@ -48,11 +49,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-	# bug 630394
-	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-
 	default
 
 	eautoreconf