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@gentoo.org>

diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index ac253458192dba7af297afdf6228e05068980c1c..cb28f93ddffaba7f51c6b7f71f8cefba050a1f8b 100644 (file)
--- 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 d85aa0a5e072d654f757a3e254e4b8cf02b41667..a4453c74df193cc038bb224a64c21504ab3ae018 100644 (file)
--- 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)