commit:     d519a73f43b47b831493aa3a17326d092bba9a03
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 09:17:49 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 09:18:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d519a73f

net-analyzer/tcpdump: Drop test dependencies providing uudecode

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/705398
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 ...tcpdump-9999.ebuild => tcpdump-4.9.3-r1.ebuild} | 27 ++++------------------
 net-analyzer/tcpdump/tcpdump-9999.ebuild           |  1 -
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild 
b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
similarity index 74%
copy from net-analyzer/tcpdump/tcpdump-9999.ebuild
copy to net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
index a4285888f60..2fc6154ef96 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
@@ -5,23 +5,19 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump";
 HOMEPAGE="
        https://www.tcpdump.org/
-       ${EGIT_REPO_URI}
+       https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+       https://www.tcpdump.org/release/${P}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
-if [[ ${PV} == "9999" ]] ; then
-       inherit git-r3
-       KEYWORDS=""
-else
-       SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
 
 RDEPEND="
        drop-root? ( sys-libs/libcap-ng )
@@ -38,12 +34,8 @@ DEPEND="
        test? (
                >=net-libs/libpcap-1.9.1
                dev-lang/perl
-               || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
        )
 "
-PATCHES=(
-       "${FILESDIR}"/${PN}-9999-libdir.patch
-)
 
 pkg_setup() {
        if use drop-root || use suid; then
@@ -52,15 +44,6 @@ pkg_setup() {
        fi
 }
 
-src_prepare() {
-       default
-
-       sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-       # bug 630394
-       sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
 src_configure() {
        if use drop-root; then
                append-cppflags -DHAVE_CAP_NG_H

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild 
b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index a4285888f60..53e77a2204b 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -38,7 +38,6 @@ DEPEND="
        test? (
                >=net-libs/libpcap-1.9.1
                dev-lang/perl
-               || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
        )
 "
 PATCHES=(

Reply via email to