From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB9E7138350 for ; Tue, 14 Jan 2020 09:18:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09B0EE08D1; Tue, 14 Jan 2020 09:18:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5DD2E08D1 for ; Tue, 14 Jan 2020 09:18:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE21834E084 for ; Tue, 14 Jan 2020 09:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41E6D2A for ; Tue, 14 Jan 2020 09:18:39 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1578993514.d519a73f43b47b831493aa3a17326d092bba9a03.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild net-analyzer/tcpdump/tcpdump-9999.ebuild X-VCS-Directories: net-analyzer/tcpdump/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d519a73f43b47b831493aa3a17326d092bba9a03 X-VCS-Branch: master Date: Tue, 14 Jan 2020 09:18:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 073f0720-71a4-4442-8dbe-b633280b4195 X-Archives-Hash: 3ab75ca62f013694057214d8794dddf6 commit: d519a73f43b47b831493aa3a17326d092bba9a03 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jan 14 09:17:49 2020 +0000 Commit: Jeroen Roovers gentoo 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 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=(