[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-02-15 Thread Sam James
commit: 6e90e0d239c96dd201d50bce9656a5c04279fd79
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 10:47:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 10:47:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e90e0d2

net-analyzer/wireshark: Stabilize 3.4.3 arm64, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 443fd2b7994..311f89608fe 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-02-12 Thread Sam James
commit: 2db25b57ba238d8fd9a00cc4b83297d9627fe2f6
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 13 01:31:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 13 01:31:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db25b57

net-analyzer/wireshark: Stabilize 3.4.3 ppc64, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 21cdd17f9d6..443fd2b7994 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-02-01 Thread Sam James
commit: c856b320468cc9094878325367f6f10810f987a6
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 08:31:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 08:31:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c856b320

net-analyzer/wireshark: cleanup old (non-slotted Lua)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 259 --
 1 file changed, 259 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
deleted file mode 100644
index 7b5d2c8ef07..000
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
-   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
-   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   ilbc? ( media-libs/libilbc )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:0= )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   opus? ( media-libs/opus )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
-)
-
-src_configure() {
-   local mycmakeargs
-
-   # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-   # --with-ssl to ./configure. (Mimics code from acinclude.m4).
-   if use kerberos; then
-   case $(krb5-config --libs) in
-   *-lcrypto*)
-   ewarn "Kerberos was built with ssl support: 
linkage with openssl is enabled."
-   ewarn "Note there are annoying license 
incompatibilities between the OpenSSL"
-   ewarn "license and the GPL, so do your check 
before distributing such package."
-   mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-   ;;
-   esac
-   fi
-
-   if use qt5; then
-   export QT_MIN_VERSION=5.3.0
-   append-cxxflags -fPIC -DPIC
-   fi
-
-   python_setup
-
-   mycmakeargs+=(
-   $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-   $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-   $(usex qt5 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-31 Thread Sam James
commit: 12923f3ebfc6373b9fc7ab1ad0bcde619aa6dfea
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12923f3e

net-analyzer/wireshark: Stabilize 3.4.3 amd64, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 16956159e8f..21cdd17f9d6 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-31 Thread Sam James
commit: 47ee5647b95f44a74ab92a1035c1c9562a52e8a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ee5647

net-analyzer/wireshark: Stabilize 3.4.3 x86, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 9451bd4cdcb..16956159e8f 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-30 Thread Sam James
commit: baa8ae27d3abfd0faa992d2af8b6483be46a8214
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 16:14:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 16:14:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa8ae27

net-analyzer/wireshark: Stabilize 3.4.3 arm, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 08c989bf5fc..2b202352daf 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-29 Thread Sam James
commit: 18636ed86aaf2f10466ab6fff726b6bd9d833e38
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 01:15:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 04:31:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18636ed8

net-analyzer/wireshark: bump to 3.4.3

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 273 ++
 2 files changed, 274 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1b280d0987c..d56babae8d6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B 
dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09
 SHA512 
38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
+DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
new file mode 100644
index 000..08c989bf5fc
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( ${LUA_DEPS} )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   lua? ( ${LUA_REQUIRED_USE} )
+   plugin-ifdemo? ( plugins )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs
+
+   # Workaround bug #213705. If 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-23 Thread Sam James
commit: d9e05df0cc794de07f45cf29f7c4692e9881d587
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 22:51:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 22:51:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e05df0

net-analyzer/wireshark: Stabilize 3.4.2-r100 arm64, #766528

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 79c5c0d2596..c63668e4853 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-23 Thread Sam James
commit: 0b9145a8e26af238aa1ad652bf2e1615339977ab
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 22:50:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 22:50:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9145a8

net-analyzer/wireshark: Stabilize 3.4.2-r100 arm, #766528

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 55f105bd978..79c5c0d2596 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-22 Thread Sam James
commit: 8dbc0d305ddd555910dfbc2aed59fcefe6e2cbc2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 04:19:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 04:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbc0d30

net-analyzer/wireshark: Stabilize 3.4.2-r100 x86, #766528

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 134858ed2ae..55f105bd978 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-22 Thread Sam James
commit: 29e5600111e1edc5ec24a985c9767276961c8d10
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 04:09:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 04:09:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e56001

net-analyzer/wireshark: Stabilize 3.4.2-r100 amd64, #766528

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 8a5f5b3e6df..134858ed2ae 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-23 Thread Sam James
commit: 181b6a478073f4f88bc41a164fe76516990a4bbd
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 23 22:59:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 23 22:59:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181b6a47

net-analyzer/wireshark: security cleanup

Bug: https://bugs.gentoo.org/760800
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 259 --
 net-analyzer/wireshark/wireshark-3.4.1.ebuild | 259 --
 3 files changed, 520 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 26950acdb18..1b280d0987c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
-DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B 
aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088
 SHA512 
a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
 DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B 
dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09
 SHA512 
38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
deleted file mode 100644
index ddabdfd5f7b..000
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
-   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
-   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   ilbc? ( media-libs/libilbc )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:0= )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   opus? ( media-libs/opus )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-23 Thread Sam James
commit: cf8478e22daaffe4b7bcadcf8631e2de46a00567
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 23 22:46:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 23 22:46:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf8478e2

net-analyzer/wireshark: Stabilize 3.4.2 ppc64, #760800

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index a720c8ad6d9..ddabdfd5f7b 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-22 Thread Sam James
commit: d53921158bd8a2d953df0bcdda2f5e06d51b2452
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 23 00:09:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 23 00:10:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5392115

net-analyzer/wireshark: Stabilize 3.4.2 arm64, #760800

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index c95fe3129e8..a720c8ad6d9 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/, profiles/

2020-12-20 Thread Marek Szuba
commit: 6636718bb751bf82e39dd6127a596a4cef54a087
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 20 22:36:37 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 20 22:44:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6636718b

net-analyzer/wireshark: migrate to lua-single.eclass

Both the latest release and the live ebuild. Nothing special, just
the usual version-selection treatment. Compatibility as specified
in the upstream build scripts.

Closes: https://bugs.gentoo.org/752789
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/wireshark-3.4.2-cmake-lua-version.patch  | 11 ++
 ....ebuild => wireshark-3.4.2-r100.ebuild} | 25 --
 net-analyzer/wireshark/wireshark-.ebuild   | 21 +-
 profiles/package.mask  |  1 +
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git 
a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch 
b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
new file mode 100644
index 000..18f663b7d81
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindLUA.cmake
 b/cmake/modules/FindLUA.cmake
+@@ -19,7 +19,7 @@
+ 
+ if(NOT WIN32)
+   find_package(PkgConfig)
+-  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51)
++  pkg_search_module(LUA lua)
+   if(NOT LUA_FOUND)
+   pkg_search_module(LUA "lua<=5.2.99")
+   endif()

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
similarity index 91%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 25d08cbda03..8a5f5b3e6df 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -2,24 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils 
cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
-EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
-RESTRICT="!test? ( test )"
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:0= )
+   lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
qt5? (
dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
+   lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
 "
+RESTRICT="test"
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_configure() {
local mycmakeargs
 
@@ -159,6 +169,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+   -DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 25d08cbda03..61860be16a1 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-20 Thread Thomas Deutschmann
commit: b151e4b7c41f182dcc8ef1303569bbd83d11c292
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Dec 20 16:10:02 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Dec 20 16:30:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b151e4b7

net-analyzer/wireshark: x86 stable (bug #760800)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index 22885fe9799..c95fe3129e8 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-20 Thread Sam James
commit: d96fceaffa9268bca4119a97fa71e4fb0c392652
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 20 14:09:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 20 14:09:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96fceaf

net-analyzer/wireshark: Stabilize 3.4.2 arm, #760800

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index f208b41476c..22885fe9799 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-20 Thread Sam James
commit: 4d38406b962b78768ce1fc77a98c3c4a5711adb1
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 20 12:33:21 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 20 12:33:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d38406b

net-analyzer/wireshark: Stabilize 3.4.2 amd64, #760800

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index 9d0abd59564..f208b41476c 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-19 Thread Sam James
commit: dd9e905c82b1eddf42123ed911c6c19e42d2876c
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 20 04:34:04 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 20 04:34:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9e905c

net-analyzer/wireshark: bump to 3.4.2

Bug: https://bugs.gentoo.org/760800
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.2.ebuild | 259 ++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 82559cb9aac..26950acdb18 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
 DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B 
aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088
 SHA512 
a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
+DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B 
dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09
 SHA512 
38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a

diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
new file mode 100644
index 000..9d0abd59564
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:0= )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-18 Thread Sam James
commit: 53d7e0a73f96eb8a005616024057d88944acf6cf
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 17 18:52:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 17 18:52:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d7e0a7

net-analyzer/wireshark: Stabilize 3.4.1 arm, #759541

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
index b72304eb72c..f577758732b 100644
--- a/net-analyzer/wireshark/wireshark-3.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-17 Thread Sam James
commit: 4c603e1d4a5941dcdb894df408956953a1256eff
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 17 10:17:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 17 10:18:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c603e1d

net-analyzer/wireshark: Stabilize 3.4.1 arm64, #759541

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
index f208b41476c..b72304eb72c 100644
--- a/net-analyzer/wireshark/wireshark-3.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-16 Thread Sam James
commit: d889503900844d2744767c80f72485cd6e1353e2
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 16 13:44:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 16 13:44:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8895039

net-analyzer/wireshark: Stabilize 3.4.1 amd64, #759541

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
index 9d0abd59564..f208b41476c 100644
--- a/net-analyzer/wireshark/wireshark-3.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-12-14 Thread Sam James
commit: dcfcf95c3cba1fc240793c5fc5ae479513587943
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 15 03:37:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 15 03:37:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfcf95c

net-analyzer/wireshark: bump to 3.4.1

Bug: https://bugs.gentoo.org/759541
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.1.ebuild | 259 ++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2728ff86217..82559cb9aac 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
+DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B 
aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088
 SHA512 
a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728

diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
new file mode 100644
index 000..341e4cf131a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+)
+
+src_configure() {
+   local mycmakeargs
+
+   # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+   # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+   if use kerberos; then
+ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2020-11-15 Thread Sam James
commit: cf1f049003feaf74580f26c50ad6a91c35056d8e
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 16 06:10:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 16 06:10:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1f0490

net-analyzer/wireshark: security cleanup

Bug: https://bugs.gentoo.org/750692
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest|   1 -
 .../files/wireshark-2.4-androiddump.patch  |  27 ---
 .../files/wireshark-2.9.0-tfshark-libm.patch   |  10 -
 .../wireshark--androiddump-wsutil.patch|  19 --
 .../wireshark/files/wireshark--qtsvg.patch |  10 -
 net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild   | 256 -
 6 files changed, 323 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b08688c3b81..2728ff86217 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649

diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch 
b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
deleted file mode 100644
index 2272ef891c2..000
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 a/extcap/androiddump.c
-+++ b/extcap/androiddump.c
-@@ -438,13 +438,13 @@
- pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, 
PCAP_TSTAMP_PRECISION_NANO);
- extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
- if (!extcap_dumper.dumper.pcap) {
--g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
-+g_warning("Can't open %s for saving packets: %s", fifo, 
pcap_geterr(pcap));
- pcap_close(pcap);
- exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
- }
- extcap_dumper.encap = encap;
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--g_warning("Write to %s failed: %s", g_strerror(errno));
-+g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
-@@ -480,7 +480,7 @@
- 
- pcap_dump((u_char *) extcap_dumper.dumper.pcap, _header, buffer);
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--g_warning("Write to %s failed: %s", g_strerror(errno));
-+g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- int err = 0;

diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch 
b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
deleted file mode 100644
index 40082c43501..000
--- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2314,6 +2314,7 @@
- 
- if(BUILD_tfshark)
-   set(tfshark_LIBS
-+  m
-   ui
-   wiretap
-   epan

diff --git 
a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch 
b/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
deleted file mode 100644
index 3d3a2a9c932..000
--- a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/extcap/CMakeLists.txt
-+++ b/extcap/CMakeLists.txt
-@@ -91,6 +91,8 @@ if(BUILD_androiddump)
-   if(HAVE_LIBPCAP)
-   set(androiddump_LIBS
-   ui
-+  wiretap
-+  wsutil
-   ${GLIB2_LIBRARIES}
-   ${WIN_WS2_32_LIBRARY}
-   $<$:pcap::pcap>
-@@ -102,6 +104,7 @@ if(BUILD_androiddump)
-   set(androiddump_LIBS
-   ui
-   wiretap
-+  wsutil
-   ${GLIB2_LIBRARIES}
-   ${ZLIB_LIBRARIES}
-   ${CMAKE_DL_LIBS}

diff --git a/net-analyzer/wireshark/files/wireshark--qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark--qtsvg.patch
deleted file mode 100644
index 8cff4bdd075..000
--- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-08 Thread Sam James
commit: 5f7467e212ab77a7e3da135ebe31a7353d11bdad
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  8 10:21:50 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  8 10:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7467e2

net-analyzer/wireshark: Stabilize 3.4.0 x86, #750692

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index d4da4388501..21e823418e4 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-06 Thread Sam James
commit: fe2c78d1cb765ff814d2230bc851ae5400971b79
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  6 21:42:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  6 21:42:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2c78d1

net-analyzer/wireshark: ppc64 stable (bug #750692)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index 38548fae80c..d4da4388501 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-06 Thread Sam James
commit: 185f5873a447e239dd23051ecba47cc8537d8778
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  6 20:14:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  6 20:14:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185f5873

net-analyzer/wireshark: Stabilize 3.4.0 amd64, #750692

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index 9f9a00dde86..38548fae80c 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-04 Thread Sam James
commit: 4539e1dded6f122bced5e6698fc479a5fcae081e
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  4 09:22:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  4 09:22:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4539e1dd

net-analyzer/wireshark: Stabilize 3.4.0 arm, #750692

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index 4b9328a0da8..9f9a00dde86 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Sam James
commit: ccdb306c0a35ad01f65c017230194871c50dfea3
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  4 02:45:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  4 02:47:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdb306c

net-analyzer/wireshark: update metadata.xml

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/metadata.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 52d26a9049d..715f6af2e19 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,14 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   b...@gentoo.org
-   Aaron Bauman
-   

zlog...@gentoo.org
Mikle Kolyada

+   
+   b...@gentoo.org
+   Aaron Bauman
+   

s...@gentoo.org
Sam James



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Sam James
commit: 876c12457dc26aebfc27cf705af5c03b852d7c83
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  4 01:47:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  4 01:47:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876c1245

net-analyzer/wireshark: Stabilize 3.4.0 arm64, #750692

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index 341e4cf131a..4b9328a0da8 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Sam James
commit: 20816fdc876c1f7de0454c905229c04c494dfcee
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  4 00:36:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  4 00:36:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20816fdc

net-analyzer/wireshark: join as co-maintainer

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 82f9e68ead7..52d26a9049d 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -9,6 +9,10 @@
zlog...@gentoo.org
Mikle Kolyada

+   
+   s...@gentoo.org
+   Sam James
+   

Wireshark is the world's foremost network protocol analyzer, 
and is the de
facto (and often de jure) standard across many industries and 
educational



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Aaron Bauman
commit: 8edf479c0cf33ff3e01b96250b6de74cb79fba61
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Nov  3 22:08:53 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Nov  3 22:14:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edf479c

net-analyzer/wireshark: add myself as co-maint

Signed-off-by: Aaron Bauman  gentoo.org>

 net-analyzer/wireshark/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 77415b0af25..82f9e68ead7 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   b...@gentoo.org
+   Aaron Bauman
+   

zlog...@gentoo.org
Mikle Kolyada



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Aaron Bauman
commit: 067d2acd9b76171ca1346fd087a2ebbd9d4d8470
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Nov  3 22:11:32 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Nov  3 22:14:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067d2acd

net-analyzer/wireshark: add missing test restrict

Signed-off-by: Aaron Bauman  gentoo.org>

 net-analyzer/wireshark/wireshark-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index d2276be5cf2..bb74c337607 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -19,6 +19,7 @@ IUSE="
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
+RESTRICT="!test? ( test )"
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-11-03 Thread Mikle Kolyada
commit: 18cc0c5c8b0712ca3b27909a51418dbb25da62b6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Nov  3 21:42:56 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Nov  3 21:42:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18cc0c5c

net-analyzer/wireshark: Add myself as maintainer

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/wireshark/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 88b34a75cc7..77415b0af25 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,9 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   net...@gentoo.org
-   Gentoo network monitoring and analysis project
+   
+   zlog...@gentoo.org
+   Mikle Kolyada


Wireshark is the world's foremost network protocol analyzer, 
and is the de



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-29 Thread David Seifert
commit: 7e870cc59a011d588b0f932c565bab52021a0b59
Author: David Seifert  gentoo  org>
AuthorDate: Thu Oct 29 22:09:13 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Oct 29 22:09:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e870cc5

net-analyzer/wireshark: Version bump to 3.4.0

Bug: https://bugs.gentoo.org/750692
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.0.ebuild | 259 ++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2febba0549d..97a0816e921 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
+DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
 DIST wireshark-3.4.0rc1.tar.xz 32500352 BLAKE2B 
fdcd29ef8a6bb8cb03941600fa6d08b18c68ba03815054e5a71d15557b4e067a383160a08d02c8e31974db31ec0d532936710fae202f2197aa1e540cb6987714
 SHA512 
861bf645e43df6238869da1ed7d152bb43923ab848b3f4241b487c76895fb95e6c47c03de0547f9330b302d04fd605c555b33d20826298289068ad652a7e5f8a

diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
new file mode 100644
index 000..341e4cf131a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-29 Thread David Seifert
commit: fa6c736f85d46e3b77b0dca1213025d208517a94
Author: David Seifert  gentoo  org>
AuthorDate: Thu Oct 29 22:09:16 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Oct 29 22:09:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6c736f

net-analyzer/wireshark: Remove old 3.4.0_rc1

Bug: https://bugs.gentoo.org/750692
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild | 259 --
 2 files changed, 260 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 97a0816e921..b08688c3b81 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
-DIST wireshark-3.4.0rc1.tar.xz 32500352 BLAKE2B 
fdcd29ef8a6bb8cb03941600fa6d08b18c68ba03815054e5a71d15557b4e067a383160a08d02c8e31974db31ec0d532936710fae202f2197aa1e540cb6987714
 SHA512 
861bf645e43df6238869da1ed7d152bb43923ab848b3f4241b487c76895fb95e6c47c03de0547f9330b302d04fd605c555b33d20826298289068ad652a7e5f8a

diff --git a/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
deleted file mode 100644
index 341e4cf131a..000
--- a/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
-   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
-   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   ilbc? ( media-libs/libilbc )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   opus? ( media-libs/opus )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-24 Thread David Seifert
commit: 27795fa60970293285f8ac117462dbf1f345500b
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 11:16:43 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 11:16:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27795fa6

net-analyzer/wireshark: [QA] Remove invalid use of EROOT in src_configure

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild  | 1 -
 net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild | 1 -
 net-analyzer/wireshark/wireshark-.ebuild  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
index 7f35aeb71f8..6d52a93fcec 100644
--- a/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
@@ -148,7 +148,6 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
-   -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)

diff --git a/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
index 9a0fc7c6efd..341e4cf131a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
@@ -148,7 +148,6 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
-   -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index ef9604fe2d1..d2276be5cf2 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -144,7 +144,6 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
-   -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, profiles/

2020-10-24 Thread David Seifert
commit: 121edbb190e7bb197dac9cf4d51078d17f4d1e96
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 11:03:58 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 11:03:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121edbb1

net-analyzer/wireshark: Remove old 3.3.0-r1

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/Manifest  |   1 -
 net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild | 256 ---
 profiles/package.mask|   8 -
 3 files changed, 265 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 361d957069b..2febba0549d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
-DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
 DIST wireshark-3.4.0rc1.tar.xz 32500352 BLAKE2B 
fdcd29ef8a6bb8cb03941600fa6d08b18c68ba03815054e5a71d15557b4e067a383160a08d02c8e31974db31ec0d532936710fae202f2197aa1e540cb6987714
 SHA512 
861bf645e43df6238869da1ed7d152bb43923ab848b3f4241b487c76895fb95e6c47c03de0547f9330b302d04fd605c555b33d20826298289068ad652a7e5f8a

diff --git a/net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild
deleted file mode 100644
index 64b826a93c8..000
--- a/net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
-   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
-   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   ilbc? ( media-libs/libilbc )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-24 Thread David Seifert
commit: e924e702a1193a46add96220fe6b311b6cea41a4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 11:03:57 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 11:03:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e924e702

net-analyzer/wireshark: Version bump to 3.4.0_rc1

* Added USE=opus

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild | 260 ++
 2 files changed, 261 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 41e8b657b11..361d957069b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
+DIST wireshark-3.4.0rc1.tar.xz 32500352 BLAKE2B 
fdcd29ef8a6bb8cb03941600fa6d08b18c68ba03815054e5a71d15557b4e067a383160a08d02c8e31974db31ec0d532936710fae202f2197aa1e540cb6987714
 SHA512 
861bf645e43df6238869da1ed7d152bb43923ab848b3f4241b487c76895fb95e6c47c03de0547f9330b302d04fd605c555b33d20826298289068ad652a7e5f8a

diff --git a/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
new file mode 100644
index 000..9a0fc7c6efd
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.0_rc1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-24 Thread David Seifert
commit: 071e4bbb4122e0322e9cd1d085dd4b986e4f98e4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 10:07:10 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 10:07:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e4bbb

net-analyzer/wireshark: Indent metadata.xml

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/wireshark/metadata.xml | 122 ++--
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 940a96ed59a..88b34a75cc7 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,65 +1,65 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-net...@gentoo.org
-Gentoo network monitoring and analysis project
-
-
-Wireshark is the world's foremost network protocol analyzer, and is the de
-facto (and often de jure) standard across many industries and educational
-institutions. Wireshark has a rich feature set which includes 1) deep
-inspection of hundreds of protocols, with more being added all the time, 2)
-live capture and offline analysis, 3) standard three-pane packet browser, 4)
-captured network data can be browsed via a GUI, or via the TTY-mode TShark
-utility, 5) the most powerful display filters in the industry, 6) rich VoIP
-analysis, 7) read/write many different capture file formats: tcpdump (libpcap),
-Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network
-General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®,
-Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer,
-Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime,
-WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files
-compressed with gzip can be decompressed on the fly, 9) live data can be read
-from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame
-Relay, FDDI, and others, 10) decryption support for many protocols, including
-IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules
-can be applied to the packet list for quick, intuitive analysis, 12) output can
-be exported to XML, PostScript®, CSV, or plain text.
-
-
-Install androiddump, an extcap interface to capture 
from Android devices
-Use media-libs/bcg729 for G.729 codec support 
in RTP Player
-Use app-arch/brotli for 
compression/decompression
-Install capinfos, to print information about capture 
files
-Install captype, to print the file types of capture 
files
-Install ciscodump, extcap interface to capture from a 
remote Cisco router
-Install dftest, to display filter byte-code, for debugging 
dfilter routines
-Install dpauxmon, an external capture interface (extcap) 
that captures DisplayPort AUX channel data from linux kernel drivers
-Install dumpcap, to dump network traffic from inside 
wireshark
-Install editcap, to edit and/or translate the format of 
capture files
-Use net-libs/nghttp2 for HTTP/2 support
-Build with iLBC support in RTP Player using 
media-libs/libilbc
-Use dev-libs/libxml2 for handling XML 
configuration in dissectors
-Enable link time optimization
-Use dev-libs/libmaxminddb for IP address 
geolocation
-Install mergecap, to merge two or more capture files 
into one
-Build with zip file compression support
-Use dev-libs/libnl
-Use net-libs/libpcap for network packet capturing 
(build dumpcap, rawshark)
-Install plugin interface demo
-Install plugins
-Install randpkt, a utility for creating pcap trace files 
full of random packets
-Install randpktdump, an extcap interface to provide 
access to the random packet generator (randpkt)
-Install reordercap, to reorder input file by timestamp 
into output file
-Use media-libs/sbc for playing back SBC encoded 
packets
-Install sdjournal, an extcap that captures systemd 
journal entries
-Install sharkd, the daemon variant of wireshark
-Use net-libs/libsmi to resolve numeric OIDs into 
human readable format
-Use media-libs/spandsp for for G.722 and G.726 
codec support in the RTP Player
-Install sshdump, an extcap interface to capture from a 
remote host through SSH
-Install text2pcap, to generate a capture file from an 
ASCII hexdump of packets
-Install tfshark, a terminal-based version of the 
FileShark capability
-Install tshark, to dump and analyzer network traffic from 
the command line
-Install udpdump, to get packets exported from a source 
(like a network device or a GSMTAP producer) that are dumped to a pcap 
file
-
+   
+   net...@gentoo.org
+   Gentoo network monitoring and analysis project
+   
+   
+   Wireshark is the world's foremost network protocol analyzer, 
and is the de
+   facto (and often de jure) standard across many industries and 
educational
+   institutions. Wireshark has a rich feature 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, profiles/

2020-10-24 Thread David Seifert
commit: 031e54a70563761a40798ebe3ac741cda5fed20e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 09:59:50 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 09:59:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031e54a7

net-analyzer/wireshark: Port to GLEP 81 'pcap' group

Bug: https://bugs.gentoo.org/314463
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../{wireshark-3.2.7.ebuild => wireshark-3.2.7-r1.ebuild}  | 14 +-
 .../{wireshark-3.3.0.ebuild => wireshark-3.3.0-r1.ebuild}  | 14 +-
 net-analyzer/wireshark/wireshark-.ebuild   | 14 +-
 profiles/package.mask  |  2 +-
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
similarity index 95%
rename from net-analyzer/wireshark/wireshark-3.2.7.ebuild
rename to net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
index 275d063e26e..7f35aeb71f8 100644
--- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
@@ -22,6 +22,7 @@ IUSE="
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
+   acct-group/pcap
>=dev-libs/glib-2.32:2
>=net-dns/c-ares-1.5
dev-libs/libgcrypt:0
@@ -97,10 +98,6 @@ PATCHES=(
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
-pkg_setup() {
-   enewgroup wireshark
-}
-
 src_configure() {
local mycmakeargs
 
@@ -240,17 +237,16 @@ pkg_postinst() {
xdg_mimeinfo_database_update
 
# Add group for users allowed to sniff.
-   enewgroup wireshark
-   chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+   chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
if use dumpcap && use pcap; then
-   fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+   fcaps -o 0 -g pcap -m 4710 -M 0710 \
cap_dac_read_search,cap_net_raw,cap_net_admin \
"${EROOT}"/usr/bin/dumpcap
fi
 
ewarn "NOTE: To capture traffic with wireshark as normal user you have 
to"
-   ewarn "add yourself to the wireshark group. This security measure 
ensures"
+   ewarn "add yourself to the pcap group. This security measure ensures"
ewarn "that only trusted users are allowed to sniff your traffic."
 }
 

diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild
similarity index 95%
rename from net-analyzer/wireshark/wireshark-3.3.0.ebuild
rename to net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild
index d2607c117e4..64b826a93c8 100644
--- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
@@ -22,6 +22,7 @@ IUSE="
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
+   acct-group/pcap
>=dev-libs/glib-2.32:2
>=net-dns/c-ares-1.5
dev-libs/libgcrypt:0
@@ -94,10 +95,6 @@ PATCHES=(
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
-pkg_setup() {
-   enewgroup wireshark
-}
-
 src_configure() {
local mycmakeargs
 
@@ -239,17 +236,16 @@ pkg_postinst() {
xdg_mimeinfo_database_update
 
# Add group for users allowed to sniff.
-   enewgroup wireshark
-   chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+   chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
if use dumpcap && use pcap; then
-   fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+   fcaps -o 0 -g pcap -m 4710 -M 0710 \
cap_dac_read_search,cap_net_raw,cap_net_admin \
"${EROOT}"/usr/bin/dumpcap
fi
 
ewarn "NOTE: To capture traffic with wireshark as normal user you have 
to"
-   ewarn "add yourself to the wireshark group. This security measure 
ensures"
+   ewarn "add yourself to the pcap group. This security measure ensures"
ewarn "that only trusted users are allowed to sniff your traffic."
 }
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 8783f28b085..ef9604fe2d1 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-09 Thread Jeroen Roovers
commit: 3f943db29b6756d207c6790470549b1d930f5576
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Oct  9 08:55:51 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Oct  9 08:56:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f943db2

net-analyzer/wireshark: Old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Bug: https://bugs.gentoo.org/744592
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 261 --
 2 files changed, 262 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2609271b4da..41e8b657b11 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
deleted file mode 100644
index 275d063e26e..000
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4-androiddump.patch
-   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-07 Thread Agostino Sarubbo
commit: a59cac7f40db267b37369255b66c2ed8aca025b2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 06:51:16 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 06:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a59cac7f

net-analyzer/wireshark: ppc64 stable wrt bug #744592

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
index b34fd697ae7..ec133a199fa 100644
--- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-03 Thread Sam James
commit: 032cc6b61d2e5bbb240b1795ee69faf8697c9d90
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  3 14:49:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  3 14:52:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032cc6b6

net-analyzer/wireshark: Stabilize 3.2.7 arm, #744592

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
index 5b16741cb38..b34fd697ae7 100644
--- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-02 Thread Jeroen Roovers
commit: b0467141c801b9dd66196fabec0c1d674d2bee66
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Oct  2 11:02:40 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Oct  2 11:11:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0467141

net-analyzer/wireshark: Fix EGIT_REPO_URI

The old repository site is unmaintained, stuck in August 2020, and
contains vulnerable code, yet still returns no redirect or other useful
HTTP status code that would tell the user something is wrong. On
visiting the site with a web browser, and some URL hacking, the original
EGIT_REPO_URI does tell you where to go for the current repository, so
use that instead.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Bug: https://bugs.gentoo.org/744592
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 580fa7c54d0..8783f28b085 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -7,7 +7,7 @@ inherit fcaps flag-o-matic git-r3 multilib python-any-r1 
qmake-utils user xdg-ut
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark;
+EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-01 Thread Andreas K. Hüttel
commit: a49ddce59403d3950d26cc87e36818b76b24ca95
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Oct  1 21:09:11 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Oct  1 21:10:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49ddce5

QA: Revert "net-analyzer/wireshark: Version 3.3.1"

GLEP 81

This reverts commit 6afadd93b76c3107bdeba136409277a2e5f920c0.

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.3.1.ebuild | 260 --
 2 files changed, 261 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 112896602e5..2609271b4da 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
-DIST wireshark-3.3.1.tar.xz 32876876 BLAKE2B 
d8973b9724bece1b9890ed468280bcef56f2ac4f1022882f520140db98dab1e81071f3621fda247a80a8e51ad18a77c606f077efbb3d0e13dea47f986a5300e5
 SHA512 
d6f50c14e79dff0fb902f5b06a2fb5a6975e5b17461205ab3275b05a53df606a5b1e488e8472cc644541b653df7d5f4a3c7009e38a2f75242af4ea2f59af061f

diff --git a/net-analyzer/wireshark/wireshark-3.3.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.1.ebuild
deleted file mode 100644
index d2607c117e4..000
--- a/net-analyzer/wireshark/wireshark-3.3.1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
-   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
-   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   ilbc? ( media-libs/libilbc )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-10-01 Thread Jeroen Roovers
commit: 6afadd93b76c3107bdeba136409277a2e5f920c0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Oct  1 20:19:09 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Oct  1 20:19:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6afadd93

net-analyzer/wireshark: Version 3.3.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.3.1.ebuild | 260 ++
 2 files changed, 261 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2609271b4da..112896602e5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
 DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
+DIST wireshark-3.3.1.tar.xz 32876876 BLAKE2B 
d8973b9724bece1b9890ed468280bcef56f2ac4f1022882f520140db98dab1e81071f3621fda247a80a8e51ad18a77c606f077efbb3d0e13dea47f986a5300e5
 SHA512 
d6f50c14e79dff0fb902f5b06a2fb5a6975e5b17461205ab3275b05a53df606a5b1e488e8472cc644541b653df7d5f4a3c7009e38a2f75242af4ea2f59af061f

diff --git a/net-analyzer/wireshark/wireshark-3.3.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.1.ebuild
new file mode 100644
index 000..d2607c117e4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.3.1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-25 Thread Jeroen Roovers
commit: 6abc81eb706e80d554d2fc68bd0131b8d9df5f58
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Sep 25 08:51:46 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Sep 25 08:52:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abc81eb

net-analyzer/wireshark: Version 3.2.7

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Bug: https://bugs.gentoo.org/744592
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.7.ebuild | 261 ++
 2 files changed, 262 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5f2b26a2c31..2609271b4da 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
+DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a

diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
new file mode 100644
index 000..5b16741cb38
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-23 Thread Jeroen Roovers
commit: 95c14f68a5860abf638ff6d1f6605211e84a4690
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep 23 13:41:00 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep 23 13:41:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c14f68

net-analyzer/wireshark: Old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Bug: https://bugs.gentoo.org/show_bug.cgi?id=736914
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 261 --
 2 files changed, 262 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8e958e7a7d9..5f2b26a2c31 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
 SHA512 
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
deleted file mode 100644
index 33ae5ea2b3f..000
--- a/net-analyzer/wireshark/wireshark-3.2.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4-androiddump.patch
-   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-23 Thread Agostino Sarubbo
commit: b5ac203d633cac571d539be16b1852e83e86644e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 23 10:29:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 23 10:29:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ac203d

net-analyzer/wireshark: ppc64 stable wrt bug #736914

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
index cb2ba6e7439..275d063e26e 100644
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-19 Thread Sergei Trofimovich
commit: fd9ab975c43395b4102a001df56456643b0a3f8e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 19 08:26:14 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 19 08:26:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9ab975

net-analyzer/wireshark: keyworded 3.3.0 for alpha

keyworded wrt bug #

Package-Manager: Portage-3.0.7, Repoman-3.0.1
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/wireshark/wireshark-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
index f7f14707c8c..d2607c117e4 100644
--- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-18 Thread Sergei Trofimovich
commit: 1f2c763244c53a426c659c3d6721078bd8f86c85
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 18 22:51:37 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 18 22:52:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2c7632

net-analyzer/wireshark: keyworded 3.3.0 for ia64

keyworded wrt bug #742911

Package-Manager: Portage-3.0.7, Repoman-3.0.1
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/wireshark/wireshark-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
index c58f2f7a6f8..f7f14707c8c 100644
--- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-16 Thread Jeroen Roovers
commit: 828429a50c59d660b8a082f2a183787873f88ec3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep 16 09:01:09 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep 16 09:15:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828429a5

net-analyzer/wireshark: Add python3_8 support

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://bugs.gentoo.org/722678
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.6.ebuild| 2 +-
 net-analyzer/wireshark/wireshark-3.3.0.ebuild| 2 +-
 net-analyzer/wireshark/wireshark-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
index a5d11219b2f..cb2ba6e7439 100644
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"

diff --git a/net-analyzer/wireshark/wireshark-3.3.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
index 77a2a9acc83..c58f2f7a6f8 100644
--- a/net-analyzer/wireshark/wireshark-3.3.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 58b92ffea15..580fa7c54d0 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user 
xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-09-16 Thread Jeroen Roovers
commit: 6469c659d24b7ce58469fd48283d894ffb92
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep 16 08:43:42 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep 16 08:44:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6469

net-analyzer/wireshark: Version 3.3.0

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest  |  1 +
 net-analyzer/wireshark/metadata.xml  |  2 ++
 ...eshark-.ebuild => wireshark-3.3.0.ebuild} | 20 +---
 net-analyzer/wireshark/wireshark-.ebuild | 13 +
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6e4e811b090..8e958e7a7d9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
 SHA512 
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
+DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
 SHA512 
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 95f198ad6c4..940a96ed59a 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -38,7 +38,9 @@ be exported to XML, PostScript®, CSV, or plain text.
 Install dumpcap, to dump network traffic from inside 
wireshark
 Install editcap, to edit and/or translate the format of 
capture files
 Use net-libs/nghttp2 for HTTP/2 support
+Build with iLBC support in RTP Player using 
media-libs/libilbc
 Use dev-libs/libxml2 for handling XML 
configuration in dissectors
+Enable link time optimization
 Use dev-libs/libmaxminddb for IP address 
geolocation
 Install mergecap, to merge two or more capture files 
into one
 Build with zip file compression support

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
similarity index 90%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.3.0.ebuild
index 0fca7d96422..77a2a9acc83 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
@@ -3,21 +3,21 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user 
xdg-utils cmake
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   test +text2pcap tfshark +tshark +udpdump zlib
+   +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+   +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
+   sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
 S=${WORKDIR}/${P/_/}
 
@@ -30,6 +30,7 @@ CDEPEND="
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
http2? ( net-libs/nghttp2 )
+   ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
lua? ( >=dev-lang/lua-5.1:* )
@@ -54,6 +55,7 @@ CDEPEND="
sshdump? ( >=net-libs/libssh-0.6 )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
+   zstd? ( app-arch/zstd )
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
@@ -86,6 +88,7 @@ RDEPEND="
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-08-17 Thread Agostino Sarubbo
commit: 545fbf2a6c0ca10d2cdcad78dbef5b6e1df613b5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 07:10:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 07:10:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545fbf2a

net-analyzer/wireshark: x86 stable wrt bug #736914

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
index 87526c17b62..a5d11219b2f 100644
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-08-14 Thread Sam James
commit: 11b1d759aa1147c4148a8da93858581fa6ae8dbd
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 15 00:19:28 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 15 00:20:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b1d759

net-analyzer/wireshark: Stabilize 3.2.6 arm, #736914

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
index c6a686e5105..87526c17b62 100644
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-08-14 Thread Sam James
commit: 6cca8b7d0e0f85184bd4fd2134fd0b1e0aebab7c
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 14 21:53:12 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 14 21:55:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cca8b7d

net-analyzer/wireshark: Stabilize 3.2.6 amd64, #736914

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
index 9ecfd3d5c9b..c6a686e5105 100644
--- a/net-analyzer/wireshark/wireshark-3.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-08-12 Thread Jeroen Roovers
commit: 87e098dcd8ae94957d4aa2cb3703e5129a1d6602
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Aug 12 20:07:36 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Aug 12 20:07:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e098dc

net-analyzer/wireshark: Version 3.2.6

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Bug: https://bugs.gentoo.org/736914
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.6.ebuild | 261 ++
 2 files changed, 262 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a58c6782159..6e4e811b090 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
 SHA512 
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277
+DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
 SHA512 
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78

diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
new file mode 100644
index 000..9ecfd3d5c9b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
+   "${FILESDIR}"/${PN}--qtsvg.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+   enewgroup wireshark
+}
+
+src_configure() {
+   local mycmakeargs
+
+   # 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-05 Thread Jeroen Roovers
commit: 18f8cd496417f7e8f41dfdbf68e9907810e9fb6b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jul  5 14:01:32 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jul  5 14:01:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f8cd49

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Bug: https://bugs.gentoo.org/show_bug.cgi?id=730414
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 261 --
 2 files changed, 262 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 081b4d45514..a58c6782159 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B 
c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89
 SHA512 
67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
 DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
 SHA512 
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
deleted file mode 100644
index 33ae5ea2b3f..000
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-   test? (
-   dev-python/pytest
-   dev-python/pytest-xdist
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4-androiddump.patch
-   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
-   "${FILESDIR}"/${PN}--qtsvg.patch
-   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-   enewgroup wireshark
-}
-
-src_configure() {
-   local mycmakeargs
-
-   # 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-05 Thread Agostino Sarubbo
commit: 99c302cb8e57ae3ad550b755a3d2aee0fe3f3703
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  5 13:44:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  5 13:44:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c302cb

net-analyzer/wireshark: x86 stable wrt bug #730414

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
index e6cf6928537..33ae5ea2b3f 100644
--- a/net-analyzer/wireshark/wireshark-3.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-05 Thread Agostino Sarubbo
commit: 9f8c6ed77795df9ea4c8604742dffdf6441bcb3e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  5 13:38:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  5 13:38:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8c6ed7

net-analyzer/wireshark: arm stable wrt bug #730414

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
index 2dcaf595eaa..e6cf6928537 100644
--- a/net-analyzer/wireshark/wireshark-3.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-05 Thread Agostino Sarubbo
commit: ea0cf521b91bcdac96ece008f9acd0c258eabd9c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  5 13:35:27 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  5 13:35:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0cf521

net-analyzer/wireshark: amd64 stable wrt bug #730414

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
index a50a795df0f..2dcaf595eaa 100644
--- a/net-analyzer/wireshark/wireshark-3.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-05 Thread Sergei Trofimovich
commit: e7ddfdf4d3d4c99a25eb3ed4dfa747879261e088
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul  5 08:50:21 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul  5 08:50:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ddfdf4

net-analyzer/wireshark: stable 3.2.5 for ppc64

stable wrt bug #730414

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
index 9ecfd3d5c9b..a50a795df0f 100644
--- a/net-analyzer/wireshark/wireshark-3.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-07-01 Thread Jeroen Roovers
commit: 8b4f7a0189a7403613443bb7b514ba9334c2b616
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jul  1 21:19:20 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jul  1 21:21:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4f7a01

net-analyzer/wireshark: Version 3.2.5

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Bug: https://bugs.gentoo.org/730414
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.5.ebuild | 261 ++
 2 files changed, 262 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 31d6a5d49be..081b4d45514 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B 
c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89
 SHA512 
67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
+DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
 SHA512 
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277

diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
new file mode 100644
index 000..9ecfd3d5c9b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
+   "${FILESDIR}"/${PN}--qtsvg.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+   enewgroup wireshark
+}
+
+src_configure() {
+   local mycmakeargs
+
+   # 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-23 Thread Jeroen Roovers
commit: 48d8cf183b05ac894acd5ad38dcc6152b7f95adc
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jun 23 12:12:31 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jun 23 12:13:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d8cf18

net-analyzer/wireshark: Provide correct ctest argument

According to test/test.py we should use --skip-missing-programs=all. It
does not work, of course, but it is a small step on the way.

Package-Manager: Portage-2.3.101, Repoman-2.3.23
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild| 2 +-
 net-analyzer/wireshark/wireshark-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 4f4102a716e..33ae5ea2b3f 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -181,7 +181,7 @@ src_configure() {
 src_test() {
cmake_build test-programs
 
-   myctestargs=( --disable-capture --skip-missing-programs --verbose )
+   myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
cmake_src_test
 }
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 7c2126e3394..0fca7d96422 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -174,7 +174,7 @@ src_configure() {
 src_test() {
cmake_build test-programs
 
-   myctestargs=( --disable-capture --skip-missing-programs --verbose )
+   myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
cmake_src_test
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/

2020-06-22 Thread Jeroen Roovers
commit: 3b5465d0f2beddc7805bf550262a145fd087a275
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun 22 13:40:12 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun 22 13:41:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5465d0

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest|   2 -
 ...-about_dialog-plugins_add_description.patch |  18 --
 net-analyzer/wireshark/wireshark-3.2.1.ebuild  | 248 
 net-analyzer/wireshark/wireshark-3.2.3.ebuild  | 254 -
 4 files changed, 522 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2bce2029c74..31d6a5d49be 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
-DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 
799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28
 SHA512 
6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a
 DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B 
c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89
 SHA512 
67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097

diff --git 
a/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
 
b/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
deleted file mode 100644
index 5506c6ec2ad..000
--- 
a/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 a/ui/qt/about_dialog.cpp
-+++ b/ui/qt/about_dialog.cpp
-@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
- return QStringList() << tr("Name") << tr("Email");
- }
- 
--#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
- static void plugins_add_description(const char *name, const char *version,
- const char *types, const char *filename,
- void *user_data)
-@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, 
const char *version,
- QStringList plugin_row = QStringList() << name << version << types << 
filename;
- *plugin_data << plugin_row;
- }
--#endif
- 
- PluginListModel::PluginListModel(QObject * parent) : 
AStringListListModel(parent)
- {

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
deleted file mode 100644
index 83b510b0273..000
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-22 Thread Jeroen Roovers
commit: 6f024787e352dbc5dac7dddef85b5d4edd40b5b2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun 22 11:43:31 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun 22 11:45:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f024787

net-analyzer/wireshark: Set ctest arguments

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Bug: https://bugs.gentoo.org/show_bug.cgi?id=673486
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild| 2 ++
 net-analyzer/wireshark/wireshark-.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 80422887a1c..4f4102a716e 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -180,6 +180,8 @@ src_configure() {
 
 src_test() {
cmake_build test-programs
+
+   myctestargs=( --disable-capture --skip-missing-programs --verbose )
cmake_src_test
 }
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index a358f4abf6e..7c2126e3394 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -173,6 +173,8 @@ src_configure() {
 
 src_test() {
cmake_build test-programs
+
+   myctestargs=( --disable-capture --skip-missing-programs --verbose )
cmake_src_test
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-21 Thread Agostino Sarubbo
commit: fabb18f0c925ceebb5ddfc76964838407f63d8fb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 21 17:08:42 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 21 17:08:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fabb18f0

net-analyzer/wireshark: ppc64 stable wrt bug #724132

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 2320f4563fb..80422887a1c 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-21 Thread Agostino Sarubbo
commit: 68cf1fea6623d0fc571bb16971d025bf60f34f5b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 21 16:58:24 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 21 16:58:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cf1fea

net-analyzer/wireshark: arm stable wrt bug #724132

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 50b70fda998..2320f4563fb 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-20 Thread Jeroen Roovers
commit: 53b7dd1fa05cefeb027bf7db4ae5fad2fc601851
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 20 13:51:15 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 20 13:56:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b7dd1f

net-analyzer/wireshark: RESTRICT=test

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Closes: https://bugs.gentoo.org/show_bug.cgi?id=673486
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index ec7bc1b3f92..50b70fda998 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -87,6 +87,7 @@ RDEPEND="
 REQUIRED_USE="
plugin-ifdemo? ( plugins )
 "
+RESTRICT="test"
 PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-06-20 Thread Thomas Deutschmann
commit: de020f72d8c0904d6c1d3fb69dafc9735e6104e9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jun 20 13:47:50 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jun 20 13:48:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de020f72

net-analyzer/wireshark: x86 stable (bug #724132)

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 2a81f3c683d..ec7bc1b3f92 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-05-25 Thread Mikle Kolyada
commit: 71d2eb6e947a6eb744e99b14b634ca329abb35d9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 25 12:20:15 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 25 12:20:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d2eb6e

net-analyzer/wireshark: amd64 stable wrt bug #724132

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index f6f0080e664..2a81f3c683d 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-05-20 Thread Jeroen Roovers
commit: 5a61d35c67d0c12cae64b104107ccab3d216eb5e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed May 20 08:05:31 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed May 20 08:06:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a61d35c

net-analyzer/wireshark: Remove /usr/share/appdata when present

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Fixes: b0222a2948853f723eb7b52e0b972702f1684b29
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild| 4 +++-
 net-analyzer/wireshark/wireshark-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index e5c132a7e21..f6f0080e664 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -226,7 +226,9 @@ src_install() {
done
fi
 
-   rm -r "${D}"/usr/share/appdata || die
+   if [[ -d "${D}"/usr/share/appdata ]]; then
+   rm -r "${D}"/usr/share/appdata || die
+   fi
 }
 
 pkg_postinst() {

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 8014ce38110..a358f4abf6e 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -220,7 +220,9 @@ src_install() {
done
fi
 
-   rm -r "${D}"/usr/share/appdata || die
+   if [[ -d "${D}"/usr/share/appdata ]]; then
+   rm -r "${D}"/usr/share/appdata || die
+   fi
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-05-19 Thread Jeroen Roovers
commit: b0222a2948853f723eb7b52e0b972702f1684b29
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue May 19 21:44:43 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue May 19 21:46:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0222a29

net-analyzer/wireshark: Remove /usr/share/appdata

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.4.ebuild| 2 ++
 net-analyzer/wireshark/wireshark-.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 032bafbb15b..e5c132a7e21 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -225,6 +225,8 @@ src_install() {
newins image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
done
fi
+
+   rm -r "${D}"/usr/share/appdata || die
 }
 
 pkg_postinst() {

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 86206f1ead2..8014ce38110 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -219,6 +219,8 @@ src_install() {
newins image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
done
fi
+
+   rm -r "${D}"/usr/share/appdata || die
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-05-19 Thread Jeroen Roovers
commit: c28b73feb8531f724b67b5b2eb4ca118b669a704
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue May 19 21:03:32 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue May 19 21:08:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28b73fe

net-analyzer/wireshark: Version 3.2.4

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Bug: https://bugs.gentoo.org/show_bug.cgi?id=724132
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.4.ebuild | 254 ++
 2 files changed, 255 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ee0b965d872..2bce2029c74 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
 DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 
799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28
 SHA512 
6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a
+DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B 
c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89
 SHA512 
67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097

diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
new file mode 100644
index 000..032bafbb15b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-04-26 Thread Thomas Deutschmann
commit: 046d3fbd8211f3f07afa747a2424269ebf0f58ba
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Apr 26 23:41:35 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Apr 26 23:43:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046d3fbd

net-analyzer/wireshark: x86 stable (bug #716756)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
index 032bafbb15b..9c28437e763 100644
--- a/net-analyzer/wireshark/wireshark-3.2.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-04-26 Thread Jeroen Roovers
commit: ff2582375047ee9d7849183cd8f6bef3463ee0f2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Apr 26 10:36:27 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Apr 26 10:39:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff258237

net-analyzer/wireshark: Add some test requirements

According to test/README.test:
- pytest{,-xdist} are needed
- the test-programs target needs to be built (manually)

This should allow the suite_unittests target to pass.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.3.ebuild| 7 ++-
 net-analyzer/wireshark/wireshark-.ebuild | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
index a09e19cba2a..032bafbb15b 100644
--- a/net-analyzer/wireshark/wireshark-3.2.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
@@ -17,7 +17,7 @@ IUSE="
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib +zstd
+   test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
 S=${WORKDIR}/${P/_/}
 
@@ -74,6 +74,10 @@ BDEPEND="
qt5? (
dev-qt/linguist-tools:5
)
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
 "
 RDEPEND="
${CDEPEND}
@@ -174,6 +178,7 @@ src_configure() {
 }
 
 src_test() {
+   cmake_build test-programs
cmake_src_test
 }
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 6f9470ca6ee..86206f1ead2 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -17,7 +17,7 @@ IUSE="
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib
+   test +text2pcap tfshark +tshark +udpdump zlib
 "
 S=${WORKDIR}/${P/_/}
 
@@ -73,6 +73,10 @@ BDEPEND="
qt5? (
dev-qt/linguist-tools:5
)
+   test? (
+   dev-python/pytest
+   dev-python/pytest-xdist
+   )
 "
 RDEPEND="
${CDEPEND}
@@ -168,6 +172,7 @@ src_configure() {
 }
 
 src_test() {
+   cmake_build test-programs
cmake_src_test
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-04-10 Thread Jeroen Roovers
commit: 687dcd0fb4b43ae79bfec25e6edd01461c0fa115
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Apr 10 08:08:28 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Apr 10 08:08:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687dcd0f

net-analyzer/wireshark: drop to ~hppa

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 6bff3e0512b..83b510b0273 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-04-09 Thread Jeroen Roovers
commit: 9c17d23b06b7f137950048d7b28075e1a06d9095
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Apr  9 07:16:59 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Apr  9 07:18:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c17d23b

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.2.2.ebuild | 249 --
 2 files changed, 250 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b536a3eae4b..ee0b965d872 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
-DIST wireshark-3.2.2.tar.xz 31548392 BLAKE2B 
c49764f4654d014ba2934ef76fd37a08ede4e4c7caf11fd40811e45221065f33d1946dd6f8328cf6333c7ec2349550483bcfd3df592a0c8d150f8024ccc7768e
 SHA512 
ab0a312369655f10926dc4245c2e11b988e0a1e49ffefe22d8fdad31e4f310b0b141bac080034511f4ffb1c6cace7e6e595c59a8f65d67909fdcb1c16e87b651
 DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 
799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28
 SHA512 
6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a

diff --git a/net-analyzer/wireshark/wireshark-3.2.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.2.ebuild
deleted file mode 100644
index a09e19cba2a..000
--- a/net-analyzer/wireshark/wireshark-3.2.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4-androiddump.patch
-   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
-   "${FILESDIR}"/${PN}--qtsvg.patch
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-04-09 Thread Jeroen Roovers
commit: 037d0a5b3137fe73d7b25ea53aee56a61619defa
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Apr  9 06:39:20 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Apr  9 06:39:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=037d0a5b

net-analyzer/wireshark: Version 3.2.3

Package-Manager: Portage-2.3.97, Repoman-2.3.22
Bug: https://bugs.gentoo.org/716756
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.3.ebuild | 249 ++
 2 files changed, 250 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 17a0caea6d0..b536a3eae4b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
 DIST wireshark-3.2.2.tar.xz 31548392 BLAKE2B 
c49764f4654d014ba2934ef76fd37a08ede4e4c7caf11fd40811e45221065f33d1946dd6f8328cf6333c7ec2349550483bcfd3df592a0c8d150f8024ccc7768e
 SHA512 
ab0a312369655f10926dc4245c2e11b988e0a1e49ffefe22d8fdad31e4f310b0b141bac080034511f4ffb1c6cace7e6e595c59a8f65d67909fdcb1c16e87b651
+DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 
799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28
 SHA512 
6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a

diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
new file mode 100644
index 000..a09e19cba2a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-03-10 Thread Jeroen Roovers
commit: dd462bb7b45a8bf989967919f06806a916356017
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Feb 27 10:51:26 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Mar 10 08:22:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd462bb7

net-analyzer/wireshark: Version 3.2.2

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=710302
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.2.ebuild | 249 ++
 2 files changed, 250 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 246b61becd7..17a0caea6d0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
+DIST wireshark-3.2.2.tar.xz 31548392 BLAKE2B 
c49764f4654d014ba2934ef76fd37a08ede4e4c7caf11fd40811e45221065f33d1946dd6f8328cf6333c7ec2349550483bcfd3df592a0c8d150f8024ccc7768e
 SHA512 
ab0a312369655f10926dc4245c2e11b988e0a1e49ffefe22d8fdad31e4f310b0b141bac080034511f4ffb1c6cace7e6e595c59a8f65d67909fdcb1c16e87b651

diff --git a/net-analyzer/wireshark/wireshark-3.2.2.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.2.ebuild
new file mode 100644
index 000..a09e19cba2a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+   zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   plugin-ifdemo? ( plugins )
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4-androiddump.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
+   "${FILESDIR}"/${PN}--qtsvg.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+   enewgroup wireshark
+}
+
+src_configure() {
+   local mycmakeargs
+
+   # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-02-04 Thread Jeroen Roovers
commit: be88776872a669651fdd99855943d590212a57d3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Feb  4 11:08:11 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Feb  4 11:08:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be887768

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Bug: https://bugs.gentoo.org/show_bug.cgi?id=705506
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/metadata.xml   |   1 -
 net-analyzer/wireshark/wireshark-3.0.3.ebuild | 245 --
 net-analyzer/wireshark/wireshark-3.0.7.ebuild | 245 --
 4 files changed, 493 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2a78508ecdb..246b61becd7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 
05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0
 SHA512 
78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
-DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 
98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b
 SHA512 
64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 651879bc6f8..95f198ad6c4 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -27,7 +27,6 @@ can be applied to the packet list for quick, intuitive 
analysis, 12) output can
 be exported to XML, PostScript®, CSV, or plain text.
 
 
-Use net-dns/c-ares to resolve DNS names
 Install androiddump, an extcap interface to capture 
from Android devices
 Use media-libs/bcg729 for G.729 codec support 
in RTP Player
 Use app-arch/brotli for 
compression/decompression

diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
deleted file mode 100644
index b873b14d54a..000
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-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/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha"
-IUSE="
-   adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux 
+sharkd
-   smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
-   +udpdump zlib
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   dev-libs/libgcrypt:0
-   adns? ( >=net-dns/c-ares-1.5 )
-   bcg729? ( media-libs/bcg729 )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-   ${PYTHON_DEPS}
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-"
-BDEPEND="
-   !https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-
-LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-28 Thread Sergei Trofimovich
commit: e66a7b83d8e085e89fa422d47aaf2dd4f1b76d70
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jan 28 16:19:44 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jan 28 18:07:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66a7b83

net-analyzer/wireshark: stable 3.2.1 for hppa, bug #705506

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 668b60d3c6e..2427bff3fd5 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-27 Thread Mikle Kolyada
commit: b43288c3a9045dda7d937d35c40d31faee008d82
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 27 11:25:51 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 27 11:26:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b43288c3

net-analyzer/wireshark: arm stable wrt bug #705506

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 521ee2a97f0..668b60d3c6e 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-25 Thread Jeroen Roovers
commit: bdc6385f32179e6e4e8115cab20b2fe0b9c512b3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jan 25 10:16:30 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jan 25 10:48:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc6385f

net-analyzer/wireshark: Drop upstream patch

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index d3c4cd86d65..6f9470ca6ee 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -84,7 +84,6 @@ REQUIRED_USE="
 "
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}--androiddump-wsutil.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-20 Thread Jeroen Roovers
commit: 4fa8b996f6dcd95572ed34ba445e85695be67804
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan 20 11:24:10 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan 20 11:24:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa8b996

net-analyzer/wireshark: Drop upstream patches

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 4e0c85ef50a..d3c4cd86d65 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -84,10 +84,7 @@ REQUIRED_USE="
 "
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-   "${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch
"${FILESDIR}"/${PN}--androiddump-wsutil.patch
-   "${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-18 Thread Jeroen Roovers
commit: 70c1f89df5f04bdd0a57b8726b7202ebbce4b2c8
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jan 18 08:23:12 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jan 18 08:28:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c1f89d

net-analyzer/wireshark: Drop upstream patch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index eb3257e5fc4..4e0c85ef50a 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -83,7 +83,6 @@ REQUIRED_USE="
plugin-ifdemo? ( plugins )
 "
 PATCHES=(
-   "${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
"${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/

2020-01-17 Thread Jeroen Roovers
commit: 964659308f26cfe4d6101ac6029e8fcd97aa2b0d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 17 13:59:12 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 17 14:15:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96465930

net-analyzer/wireshark: Update patches

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch  | 8 
 .../wireshark/files/wireshark--androiddump-wsutil.patch   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch 
b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
index e67ab21b6a8..2272ef891c2 100644
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -1,7 +1,7 @@
 --- a/extcap/androiddump.c
 +++ b/extcap/androiddump.c
-@@ -363,13 +363,13 @@
- pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, 
PCAP_TSTAMP_PRECISION_NANO);
+@@ -438,13 +438,13 @@
+ pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, 
PCAP_TSTAMP_PRECISION_NANO);
  extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
  if (!extcap_dumper.dumper.pcap) {
 -g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
@@ -15,8 +15,8 @@
 +g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
  }
  #else
- int err = 0;
-@@ -416,7 +416,7 @@
+ wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
+@@ -480,7 +480,7 @@
  
  pcap_dump((u_char *) extcap_dumper.dumper.pcap, _header, buffer);
  if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {

diff --git 
a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch 
b/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
index 9715de676f1..3d3a2a9c932 100644
--- a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
+++ b/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
@@ -1,15 +1,15 @@
 --- a/extcap/CMakeLists.txt
 +++ b/extcap/CMakeLists.txt
-@@ -68,6 +68,8 @@
+@@ -91,6 +91,8 @@ if(BUILD_androiddump)
if(HAVE_LIBPCAP)
set(androiddump_LIBS
ui
 +  wiretap
 +  wsutil
${GLIB2_LIBRARIES}
-   ${PCAP_LIBRARIES}
-   )
-@@ -78,6 +80,7 @@
+   ${WIN_WS2_32_LIBRARY}
+   $<$:pcap::pcap>
+@@ -102,6 +104,7 @@ if(BUILD_androiddump)
set(androiddump_LIBS
ui
wiretap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2020-01-17 Thread Jeroen Roovers
commit: d457c61eaff3a06ce2a2c6903f4f389330d7b8a4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 17 12:28:22 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 17 12:29:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d457c61e

net-analyzer/wireshark: Fix USE='-lua -plugins'

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/705656
Signed-off-by: Jeroen Roovers  gentoo.org>

 ...-about_dialog-plugins_add_description.patch | 18 ++
 net-analyzer/wireshark/wireshark-3.2.1.ebuild  |  1 +
 net-analyzer/wireshark/wireshark-.ebuild   |  1 +
 3 files changed, 20 insertions(+)

diff --git 
a/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
 
b/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
new file mode 100644
index 000..5506c6ec2ad
--- /dev/null
+++ 
b/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
@@ -0,0 +1,18 @@
+--- a/ui/qt/about_dialog.cpp
 b/ui/qt/about_dialog.cpp
+@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
+ return QStringList() << tr("Name") << tr("Email");
+ }
+ 
+-#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+ static void plugins_add_description(const char *name, const char *version,
+ const char *types, const char *filename,
+ void *user_data)
+@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, 
const char *version,
+ QStringList plugin_row = QStringList() << name << version << types << 
filename;
+ *plugin_data << plugin_row;
+ }
+-#endif
+ 
+ PluginListModel::PluginListModel(QObject * parent) : 
AStringListListModel(parent)
+ {

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index d55d1f311ef..521ee2a97f0 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch
"${FILESDIR}"/${PN}--androiddump-wsutil.patch
"${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index a228b3f00e2..eb3257e5fc4 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch
"${FILESDIR}"/${PN}--androiddump-wsutil.patch
"${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-17 Thread Agostino Sarubbo
commit: 534cb1456d7787bd09126f07400bc656fd5e80d1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 12:25:11 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 12:25:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534cb145

net-analyzer/wireshark: ia64 stable wrt bug #705506

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 34cf8beefcc..d55d1f311ef 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-17 Thread Agostino Sarubbo
commit: c818f4133082638b18e654afc7684d44e1b9df60
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 10:30:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 10:30:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c818f413

net-analyzer/wireshark: x86 stable wrt bug #705506

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index f8f470b2066..34cf8beefcc 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-17 Thread Agostino Sarubbo
commit: b4a9115de992d322dc734c400e8abc053095ca1a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 10:26:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 10:26:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a9115d

net-analyzer/wireshark: ppc64 stable wrt bug #705506

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index ed8d7aa456c..f8f470b2066 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-17 Thread Agostino Sarubbo
commit: c6a350394546d85cadd59c7515f93125360d349e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 17 09:28:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 17 09:29:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a35039

net-analyzer/wireshark: amd64 stable wrt bug #705506

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 931de56a7b3..ed8d7aa456c 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-15 Thread Jeroen Roovers
commit: 6f25a7d5662c9fb0fe356b1984a729d472c21dad
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 15 23:41:50 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 15 23:42:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f25a7d5

net-analyzer/wireshark: Reorganise KEYWORDS

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 587fbb13711..6879b34e8a9 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
+KEYWORDS="alpha"
 IUSE="
adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-15 Thread Jeroen Roovers
commit: 1a3b6ef8b77e70ded1efcd36ed46707b839bb615
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 15 23:40:18 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 15 23:42:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a3b6ef8

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.2.0.ebuild | 247 --
 2 files changed, 248 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 57d386b24bd..2a78508ecdb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 
05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0
 SHA512 
78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 
98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b
 SHA512 
64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
-DIST wireshark-3.2.0.tar.xz 31550972 BLAKE2B 
421304132d3c07ae9cce8e388e93080d12ce430311f9bf4e0bfe165a4d45604169153a262bd1625bc00d8b59a8f62538251484f75c8e7c97d4d41df700ff28fc
 SHA512 
30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530

diff --git a/net-analyzer/wireshark/wireshark-3.2.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
deleted file mode 100644
index 931de56a7b3..000
--- a/net-analyzer/wireshark/wireshark-3.2.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-doc/doxygen
-   dev-ruby/asciidoctor
-   )
-   qt5? (
-   dev-qt/linguist-tools:5
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   qt5? ( virtual/freedesktop-icon-theme )
-   selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-   plugin-ifdemo? ( plugins )
-"
-PATCHES=(
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-15 Thread Jeroen Roovers
commit: a5a931c14349615d2b3ab2a3f38f0c4ece961da7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 15 21:10:43 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 15 21:11:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a931c1

net-analyzer/wireshark: Version 3.2.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Bug: https://bugs.gentoo.org/705506
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.1.ebuild | 247 ++
 2 files changed, 248 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d0018226e49..57d386b24bd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 
05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0
 SHA512 
78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 
98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b
 SHA512 
64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
 DIST wireshark-3.2.0.tar.xz 31550972 BLAKE2B 
421304132d3c07ae9cce8e388e93080d12ce430311f9bf4e0bfe165a4d45604169153a262bd1625bc00d8b59a8f62538251484f75c8e7c97d4d41df700ff28fc
 SHA512 
30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
+DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 
49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1
 SHA512 
78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
new file mode 100644
index 000..931de56a7b3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   +text2pcap tfshark +tshark +udpdump zlib
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   dev-ruby/asciidoctor
+   )
+   qt5? (
+   dev-qt/linguist-tools:5
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   qt5? ( virtual/freedesktop-icon-theme )
+   selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2020-01-05 Thread Jeroen Roovers
commit: f048bbf2244226deeaf2acafd4eb829de3c515c9
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan  5 16:58:37 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan  5 17:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f048bbf2

net-analyzer/wireshark: 8=>{cmake-utils,}.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/wireshark-3.2.0.ebuild| 8 
 net-analyzer/wireshark/wireshark-.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.2.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
index e01ec82368e..931de56a7b3 100644
--- a/net-analyzer/wireshark/wireshark-3.2.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake-utils
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils 
cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
@@ -168,15 +168,15 @@ src_configure() {
-DENABLE_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   cmake-utils_src_test
+   cmake_src_test
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 877a35cd055..a228b3f00e2 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-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
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
@@ -168,15 +168,15 @@ src_configure() {
-DENABLE_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   cmake-utils_src_test
+   cmake_src_test
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2019-12-23 Thread Mikle Kolyada
commit: e5478b962fda383c6febf21bcd280ac39f9d988b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Dec 23 09:27:14 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Dec 23 09:27:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5478b96

net-analyzer/wireshark: arm stable wrt bug #702028

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/wireshark/wireshark-3.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.0.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
index 173425dd948..d5b2bf75a0d 100644
--- a/net-analyzer/wireshark/wireshark-3.0.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2019-12-19 Thread Jeroen Roovers
commit: d34492b70e3995bad4772cfda7ceedc1ed628833
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 19 19:48:59 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 19 19:58:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d34492b7

net-analyzer/wireshark: Version 3.2.0

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.2.0.ebuild | 247 ++
 2 files changed, 248 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d274b1e5667..c063c8020ef 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 
05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0
 SHA512 
78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 
98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b
 SHA512 
64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
+DIST wireshark-3.2.0.tar.xz 31550972 BLAKE2B 
421304132d3c07ae9cce8e388e93080d12ce430311f9bf4e0bfe165a4d45604169153a262bd1625bc00d8b59a8f62538251484f75c8e7c97d4d41df700ff28fc
 SHA512 
30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
 DIST wireshark-3.2.0rc1.tar.xz 31426064 BLAKE2B 
e7fd605701aec50bf982f3775902ca6289862422a2e69dc42308f5955b8a74c3b059553fd187de66b2c771f27062517c6b690fd9af787dfdea44e589759f856a
 SHA512 
6dfc1f46f8555798dbb1d1e6ba49cdebb49719af6733e38819882059aa6db6fc0e72a84e30b5255ec46dda5b2245de905035415c0ef24b71a616c4b94111
 DIST wireshark-3.2.0rc2.tar.xz 31454312 BLAKE2B 
41c25634d89c4e107a65278d679a17c7b21f8b9c566b394ae8b410a8ed38c4ccce4244b12f95c24c2d50c21bba05077cf068ec1e59f3d9c29bc58207c7020afc
 SHA512 
c24bc0358127105f00efe9c79b012eb4f5b5fafd987f3cd47bf5079cb4d4f92810fd5fda207385d031ebe5afd2b26804f911509b85cbc672fa5c2d1d8e69130d

diff --git a/net-analyzer/wireshark/wireshark-3.2.0.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
new file mode 100644
index 000..3252cadf725
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+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/;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
+   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+   +text2pcap tfshark +tshark +udpdump zlib
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5
+   dev-libs/libgcrypt:0
+   bcg729? ( media-libs/bcg729 )
+   brotli? ( app-arch/brotli )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   http2? ( net-libs/nghttp2 )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   minizip? ( sys-libs/zlib[minizip] )
+   netlink? ( dev-libs/libnl:3 )
+   pcap? ( net-libs/libpcap )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-misc/xdg-utils
+   )
+   sbc? ( media-libs/sbc )
+   sdjournal? ( sys-apps/systemd )
+   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 )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
+BDEPEND="
+   dev-lang/perl
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+   doc? (
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2019-12-19 Thread Jeroen Roovers
commit: 18eaa8803e094d9b095565c8b984c8cd77dfc019
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 19 19:57:42 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 19 19:58:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18eaa880

net-analyzer/wireshark: Old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild | 247 --
 net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild | 247 --
 3 files changed, 496 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c063c8020ef..d0018226e49 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 
05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0
 SHA512 
78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 
98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b
 SHA512 
64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
 DIST wireshark-3.2.0.tar.xz 31550972 BLAKE2B 
421304132d3c07ae9cce8e388e93080d12ce430311f9bf4e0bfe165a4d45604169153a262bd1625bc00d8b59a8f62538251484f75c8e7c97d4d41df700ff28fc
 SHA512 
30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
-DIST wireshark-3.2.0rc1.tar.xz 31426064 BLAKE2B 
e7fd605701aec50bf982f3775902ca6289862422a2e69dc42308f5955b8a74c3b059553fd187de66b2c771f27062517c6b690fd9af787dfdea44e589759f856a
 SHA512 
6dfc1f46f8555798dbb1d1e6ba49cdebb49719af6733e38819882059aa6db6fc0e72a84e30b5255ec46dda5b2245de905035415c0ef24b71a616c4b94111
-DIST wireshark-3.2.0rc2.tar.xz 31454312 BLAKE2B 
41c25634d89c4e107a65278d679a17c7b21f8b9c566b394ae8b410a8ed38c4ccce4244b12f95c24c2d50c21bba05077cf068ec1e59f3d9c29bc58207c7020afc
 SHA512 
c24bc0358127105f00efe9c79b012eb4f5b5fafd987f3cd47bf5079cb4d4f92810fd5fda207385d031ebe5afd2b26804f911509b85cbc672fa5c2d1d8e69130d

diff --git a/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
deleted file mode 100644
index 3252cadf725..000
--- a/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-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/;
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-   androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
-   +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-   +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt 
+randpktdump
-   +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-   +text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=net-dns/c-ares-1.5
-   dev-libs/libgcrypt:0
-   bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
-   ciscodump? ( >=net-libs/libssh-0.6 )
-   filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:* )
-   lz4? ( app-arch/lz4 )
-   maxminddb? ( dev-libs/libmaxminddb )
-   minizip? ( sys-libs/zlib[minizip] )
-   netlink? ( dev-libs/libnl:3 )
-   pcap? ( net-libs/libpcap )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-misc/xdg-utils
-   )
-   sbc? ( media-libs/sbc )
-   sdjournal? ( sys-apps/systemd )
-   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 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-   ${CDEPEND}
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   dev-lang/perl
-   

  1   2   3   4   5   >