From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1101334-garchives=archives.gentoo.org@lists.gentoo.org> 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 CE6DE138334 for <garchives@archives.gentoo.org>; Tue, 23 Jul 2019 07:55:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17EFDE082B; Tue, 23 Jul 2019 07:55:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D4CB0E082B for <gentoo-commits@lists.gentoo.org>; Tue, 23 Jul 2019 07:55:57 +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 6B7C43462DF for <gentoo-commits@lists.gentoo.org>; Tue, 23 Jul 2019 07:55:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1385E6E9 for <gentoo-commits@lists.gentoo.org>; Tue, 23 Jul 2019 07:55:55 +0000 (UTC) From: "Jeroen Roovers" <jer@gentoo.org> 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" <jer@gentoo.org> Message-ID: <1563868553.ab9a7718323b8832c156d42e014508e79859fa34.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-3.0.3.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: ab9a7718323b8832c156d42e014508e79859fa34 X-VCS-Branch: master Date: Tue, 23 Jul 2019 07:55:55 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2e5927d-aff4-4855-bbab-eae77861d74b X-Archives-Hash: 4ba1f0a0167e8577e72d9e586d221fc8 commit: ab9a7718323b8832c156d42e014508e79859fa34 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Jul 23 07:48:29 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Jul 23 07:55:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9a7718 net-analyzer/wireshark: EAPI=7 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/wireshark/wireshark-3.0.3.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild index d1c7241896e..567363ba221 100644 --- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild +++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 qmake-utils user xdg-utils +inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -59,6 +59,8 @@ CDEPEND=" DEPEND=" ${CDEPEND} ${PYTHON_DEPS} +" +BDEPEND=" !<perl-core/Pod-Simple-3.170 !<virtual/perl-Pod-Simple-3.170 dev-lang/perl @@ -168,8 +170,7 @@ src_configure() { } src_test() { - emake -C "${BUILD_DIR}" test-programs - emake -C "${BUILD_DIR}" test + cmake-utils_src_test } src_install() { @@ -215,8 +216,6 @@ src_install() { newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png done fi - - prune_libtool_files } pkg_postinst() {