From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1105596-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 B0EF6138334 for <garchives@archives.gentoo.org>; Wed, 14 Aug 2019 05:48:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17EA5E0857; Wed, 14 Aug 2019 05:48:05 +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 00E1AE0857 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Aug 2019 05:48:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EAD7A349AD3 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Aug 2019 05:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A063763 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Aug 2019 05:48:01 +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: <1565761672.4bbab63820e27fabfcb521667850a01fd47254d8.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.1.0.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 4bbab63820e27fabfcb521667850a01fd47254d8 X-VCS-Branch: master Date: Wed, 14 Aug 2019 05:48:01 +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: 14f29547-8fc8-4a87-bb5e-27e5f6493c1c X-Archives-Hash: 1f23ec5b5e4c7bbfdee474c3b101a045 commit: 4bbab63820e27fabfcb521667850a01fd47254d8 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Aug 14 05:39:40 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Aug 14 05:47:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbab638 net-analyzer/wireshark: Inherit python-any-r1 instead of python-r1 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Bug: https://bugs.gentoo.org/691464 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/wireshark/wireshark-3.1.0.ebuild | 5 ++--- net-analyzer/wireshark/wireshark-99999999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild index ac253458192..cb28f93ddff 100644 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils +inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -82,7 +82,6 @@ RDEPEND=" selinux? ( sec-policy/selinux-wireshark ) " REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} plugin_ifdemo? ( plugins ) " PATCHES=( @@ -119,7 +118,7 @@ src_configure() { append-cxxflags -fPIC -DPIC fi - python_setup 'python3*' + python_setup mycmakeargs+=( $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index d85aa0a5e07..a4453c74df1 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils cmake-utils +inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake-utils DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" @@ -82,7 +82,6 @@ RDEPEND=" selinux? ( sec-policy/selinux-wireshark ) " REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} plugin_ifdemo? ( plugins ) " PATCHES=( @@ -119,7 +118,7 @@ src_configure() { append-cxxflags -fPIC -DPIC fi - python_setup 'python3*' + python_setup mycmakeargs+=( $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)