commit:     18511c4c06b68c69cf4c02b37f5ef6bf03f06939
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 14:00:50 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 14:20:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18511c4c

net-analyzer/wireshark: Set python version

Patch by Lars Wendler (Polynomial-C)
Fixes: https://bugs.gentoo.org/673070
Package-Manager: Portage-2.3.52, Repoman-2.3.12

Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-99999999.ebuild | 25 ++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild 
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 325185d09e2..9cb0fa9e074 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune 
multilib qmake-utils user xdg-utils
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune 
multilib python-r1 qmake-utils user xdg-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/";
@@ -21,19 +22,18 @@ IUSE="
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
-       >=dev-libs/glib-2.14:2
+       >=dev-libs/glib-2.32:2
        dev-libs/libgcrypt:0
-       netlink? ( dev-libs/libnl:3 )
        adns? ( >=net-dns/c-ares-1.5 )
        bcg729? ( media-libs/bcg729 )
+       ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
        kerberos? ( virtual/krb5 )
-       sshdump? ( >=net-libs/libssh-0.6 )
-       ciscodump? ( >=net-libs/libssh-0.6 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
        lz4? ( app-arch/lz4 )
        maxminddb? ( dev-libs/libmaxminddb )
+       netlink? ( dev-libs/libnl:3 )
        nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
@@ -48,6 +48,7 @@ CDEPEND="
        smi? ( net-libs/libsmi )
        snappy? ( app-arch/snappy )
        spandsp? ( media-libs/spandsp )
+       sshdump? ( >=net-libs/libssh-0.6 )
        ssl? ( net-libs/gnutls:= )
        zlib? ( sys-libs/zlib )
 "
@@ -55,9 +56,13 @@ CDEPEND="
 # and broken installs. #455122
 DEPEND="
        ${CDEPEND}
-       dev-lang/perl
-       !<virtual/perl-Pod-Simple-3.170
+       ${PYTHON_DEPS}
        !<perl-core/Pod-Simple-3.170
+       !<virtual/perl-Pod-Simple-3.170
+       dev-lang/perl
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
        doc? (
                app-doc/doxygen
                dev-ruby/asciidoctor
@@ -65,15 +70,13 @@ DEPEND="
        qt5? (
                dev-qt/linguist-tools:5
        )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
 "
 RDEPEND="
        ${CDEPEND}
        qt5? ( virtual/freedesktop-icon-theme )
        selinux? ( sec-policy/selinux-wireshark )
 "
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
        "${FILESDIR}"/${PN}-2.4-androiddump.patch
        "${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -107,6 +110,8 @@ src_configure() {
                append-cxxflags -fPIC -DPIC
        fi
 
+       python_setup 'python3*'
+
        mycmakeargs+=(
                $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
                $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')

Reply via email to