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

2021-11-18 Thread Sam James
commit: 81551e0c1f854850c74f0fc38daa0b535f931c70
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 09:03:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 09:03:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81551e0c

net-analyzer/wireshark: Stabilize 3.4.9 x86, #823677

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 843f0ac4a8f0..68cb4ab7a929 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-11-18 Thread Sam James
commit: bb31040ef449b5666bd0c5c6bf8fe8ba5393b06d
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 09:03:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 09:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb31040e

net-analyzer/wireshark: Stabilize 3.4.9 amd64, #823677

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 119c5a3c00cc..55cf51710bae 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-11-18 Thread Sam James
commit: dccb1adb48ff777b2beac6bb3c1b5a62d7e1ced5
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 09:03:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 09:03:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccb1adb

net-analyzer/wireshark: fix MissingTestRestrict

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index a684bf49242d..9d120d24bcf1 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -29,6 +29,8 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins 
plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+RESTRICT="!test? ( test )"
+
 # bug #753062 for speexdsp
 CDEPEND="
acct-group/pcap

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index a684bf49242d..9d120d24bcf1 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -29,6 +29,8 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins 
plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+RESTRICT="!test? ( test )"
+
 # bug #753062 for speexdsp
 CDEPEND="
acct-group/pcap



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

2021-11-18 Thread Sam James
commit: 41315217e84013c8c4e501d69b9c27370c66b3f2
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 09:02:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 09:02:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41315217

net-analyzer/wireshark: Stabilize 3.4.9 arm64, #823677

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 9725dcaddb0a..119c5a3c00cc 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-11-18 Thread Sam James
commit: 87d6a9904b211382bff874f539e96268369f81ac
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 08:56:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 08:59:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d6a990

net-analyzer/wireshark: add 3.4.10

Now with tests! Restricted known-failing ones.

Bug: https://bugs.gentoo.org/824474
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest  | 1 +
 .../wireshark/{wireshark-.ebuild => wireshark-3.4.10.ebuild} | 5 +++--
 net-analyzer/wireshark/wireshark-.ebuild | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a36dea5ccec4..beb51ec249d5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B 
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
 SHA512 
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
 SHA512 
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B 
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
 SHA512 
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
 DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
 SHA512 
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
similarity index 98%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.10.ebuild
index 4871d3fcafeb..a684bf49242d 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -102,8 +102,6 @@ REQUIRED_USE="
plugin-ifdemo? ( plugins )
 "
 
-RESTRICT="test"
-
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -200,6 +198,9 @@ src_test() {
--disable-capture
--skip-missing-programs=all
--verbose
+
+   # Skip known failing tests
+   -E "(suite_decryption|suite_extcaps|suite_nameres)"
)
 
cmake_src_test

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 4871d3fcafeb..a684bf49242d 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -102,8 +102,6 @@ REQUIRED_USE="
plugin-ifdemo? ( plugins )
 "
 
-RESTRICT="test"
-
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -200,6 +198,9 @@ src_test() {
--disable-capture
--skip-missing-programs=all
--verbose
+
+   # Skip known failing tests
+   -E "(suite_decryption|suite_extcaps|suite_nameres)"
)
 
cmake_src_test



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

2021-11-14 Thread Sam James
commit: df2a3805baa71da4bcb45eb031f015ac1e202dfc
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 14 08:38:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 14 08:38:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2a3805

net-analyzer/wireshark: Stabilize 3.4.9 ppc64, #823677

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 4871d3fcafeb..9725dcaddb0a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-10-16 Thread Sam James
commit: 5ee97c984f8ca4f05d3eec3458b2177f988393b8
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 16 21:58:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 21:58:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee97c98

net-analyzer/wireshark: Stabilize 3.4.8 arm64, #814908

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 470019b2ab7..68cb4ab7a92 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-10-06 Thread Sam James
commit: b9e1235bd22d32199f68927c21dd84c79f917afe
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  7 02:41:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  7 02:41:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e1235b

net-analyzer/wireshark: add 3.4.9

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.9.ebuild | 280 ++
 2 files changed, 281 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6002f96ee43..a36dea5ccec 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
 SHA512 
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B 
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
 SHA512 
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
+DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
 SHA512 
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb

diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
new file mode 100644
index 000..4871d3fcafe
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -0,0 +1,280 @@
+# 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_{8..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/";
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+# bug #753062 for speexdsp
+CDEPEND="
+   acct-group/pcap
+   >=dev-libs/glib-2.32:2
+   >=net-dns/c-ares-1.5:=
+   dev-libs/libgcrypt:=
+   media-libs/speexdsp
+   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 )
+  

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

2021-10-02 Thread Sam James
commit: 124090ee066c9c0c42e522ef6a926a337ecdae7a
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  2 23:24:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  2 23:24:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124090ee

net-analyzer/wireshark: Stabilize 3.4.8 arm, #814908

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index f16c381920a..470019b2ab7 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-09-26 Thread Agostino Sarubbo
commit: 615a4c66bc8bc67e42ce08e4d292d7283db672ae
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep 27 06:56:37 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep 27 06:56:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615a4c66

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

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 8c0da6ea1fe..f16c381920a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-09-25 Thread Sam James
commit: a94b1cf31be16849e4e4193eb8ea153af31b39c0
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 26 05:00:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 26 05:00:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94b1cf3

net-analyzer/wireshark: Stabilize 3.4.8 x86, #814908

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 23935a69391..8c0da6ea1fe 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-09-25 Thread Sam James
commit: 36a7ec2f13b442406db3ba3f732bea70674cf174
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 26 04:59:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 26 04:59:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a7ec2f

net-analyzer/wireshark: Stabilize 3.4.8 amd64, #814908

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 4871d3fcafe..23935a69391 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-08-26 Thread Sam James
commit: 748144db1799a844dc2ea5da6474539f862f4748
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 26 18:00:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 26 18:21:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748144db

net-analyzer/wireshark: add 3.4.8

For now, we're adding an unconditional speexdsp dependency
because it's automagic right now. It has no dependencies
and is rather quick to build.

Bug: https://bugs.gentoo.org/753062
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest | 1 +
 .../wireshark/{wireshark-.ebuild => wireshark-3.4.8.ebuild} | 2 ++
 net-analyzer/wireshark/wireshark-.ebuild| 2 ++
 3 files changed, 5 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 107b0baa6b5..6002f96ee43 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
 SHA512 
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
+DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B 
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
 SHA512 
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
similarity index 99%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 9b37d156c11..4871d3fcafe 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -29,11 +29,13 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins 
plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+# bug #753062 for speexdsp
 CDEPEND="
acct-group/pcap
>=dev-libs/glib-2.32:2
>=net-dns/c-ares-1.5:=
dev-libs/libgcrypt:=
+   media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli:= )
ciscodump? ( >=net-libs/libssh-0.6 )

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 9b37d156c11..4871d3fcafe 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -29,11 +29,13 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins 
plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+# bug #753062 for speexdsp
 CDEPEND="
acct-group/pcap
>=dev-libs/glib-2.32:2
>=net-dns/c-ares-1.5:=
dev-libs/libgcrypt:=
+   media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli:= )
ciscodump? ( >=net-libs/libssh-0.6 )



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

2021-08-13 Thread Sam James
commit: 871363bb0b65513ed306134f5fd3da66ece9ff87
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 14 04:10:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 14 04:10:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871363bb

net-analyzer/wireshark: add additional missing subslot operator on zstd

Signed-off-by: Sam James  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 fcfa50a0391..9b37d156c11 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -65,7 +65,7 @@ CDEPEND="
sshdump? ( >=net-libs/libssh-0.6 )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
-   zstd? ( app-arch/zstd )
+   zstd? ( app-arch/zstd:= )
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122



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

2021-08-13 Thread Sam James
commit: aa7ac6eeae88f2cc06b9b889656526a77be1871c
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 14 03:21:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 14 03:48:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7ac6ee

fixup! net-analyzer/wireshark: add missing subslot dependencies

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

 net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild | 10 +-
 net-analyzer/wireshark/wireshark-.ebuild | 12 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
index 0f1c44767c2..f0021c06774 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
@@ -33,18 +33,18 @@ CDEPEND="
acct-group/pcap
>=dev-libs/glib-2.32:2
>=net-dns/c-ares-1.5:=
-   dev-libs/libgcrypt:0:=
+   dev-libs/libgcrypt:=
bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
+   brotli? ( app-arch/brotli:= )
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
+   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 )
+   lz4? ( app-arch/lz4:= )
+   maxminddb? ( dev-libs/libmaxminddb:= )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
opus? ( media-libs/opus )

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 7fd9e324e1a..fcfa50a0391 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -32,19 +32,19 @@ IUSE+=" 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
+   >=net-dns/c-ares-1.5:=
+   dev-libs/libgcrypt:=
bcg729? ( media-libs/bcg729 )
-   brotli? ( app-arch/brotli )
+   brotli? ( app-arch/brotli:= )
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
-   http2? ( net-libs/nghttp2 )
+   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 )
+   lz4? ( app-arch/lz4:= )
+   maxminddb? ( dev-libs/libmaxminddb:= )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
opus? ( media-libs/opus )



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

2021-08-13 Thread Sam James
commit: 98e247492a43097253daea6c652ee7e6e6e9e20e
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 14 02:59:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 14 03:48:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e24749

net-analyzer/wireshark: add missing subslot dependencies

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

 .../wireshark/{wireshark-3.4.7.ebuild => wireshark-3.4.7-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-3.4.7.ebuild
rename to net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
index 234f7872444..0f1c44767c2 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
@@ -32,8 +32,8 @@ IUSE+=" 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
+   >=net-dns/c-ares-1.5:=
+   dev-libs/libgcrypt:0:=
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli )
ciscodump? ( >=net-libs/libssh-0.6 )
@@ -65,7 +65,7 @@ CDEPEND="
sshdump? ( >=net-libs/libssh-0.6 )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
-   zstd? ( app-arch/zstd )
+   zstd? ( app-arch/zstd:= )
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122



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

2021-08-05 Thread Sam James
commit: f6345dd7eedd32252fa376637883300a2658c210
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  6 02:58:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  6 03:41:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6345dd7

net-analyzer/wireshark: drop 3.4.6

Bug: https://bugs.gentoo.org/802216
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.4.6.ebuild | 278 --
 2 files changed, 279 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2acde013645..107b0baa6b5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 
17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8
 SHA512 
eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
 SHA512 
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
deleted file mode 100644
index 234f7872444..000
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# 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_{8..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/";
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
-   inherit git-r3
-else
-   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
-   S="${WORKDIR}/${P/_/}"
-
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
-IUSE+=" 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() {

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

2021-07-30 Thread Sam James
commit: 69ef1fb0ce6e218c05b331db9781c4cf5a2c8a75
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 30 22:34:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 30 22:34:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ef1fb0

net-analyzer/wireshark: Stabilize 3.4.7 arm, #802216

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index a10e188cd19..234f7872444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-07-25 Thread Sam James
commit: 96ac5a0713e57f8034b5a234ffa8469303dbc288
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 26 04:36:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 26 04:36:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ac5a07

net-analyzer/wireshark: Stabilize 3.4.7 ppc64, #802216

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 1a9a1653a89..a10e188cd19 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-07-23 Thread Sam James
commit: 152832560403883ff4c1bfd1d03aec0809f91b1e
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 23 17:56:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 23 17:56:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15283256

net-analyzer/wireshark: Stabilize 3.4.7 x86, #802216

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 149df2287a5..1a9a1653a89 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-07-22 Thread Agostino Sarubbo
commit: d713a6b76c0be595e33fa7b006543b1bc26dd802
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 22 07:08:52 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 22 07:08:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d713a6b7

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

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index c7630f4f508..149df2287a5 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-07-21 Thread Sam James
commit: d448b3b6a130e7d11b9b8312694616e5ca464b8a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 22 06:06:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 22 06:06:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d448b3b6

net-analyzer/wireshark: Stabilize 3.4.7 arm64, #802216

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 7fd9e324e1a..c7630f4f508 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"



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

2021-07-14 Thread Sam James
commit: 20a5cf39860d7887dd5d8fd497482f3605f705d6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 03:45:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 03:45:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a5cf39

net-analyzer/wireshark: drop Python 3.7

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 5e3828b5721..234f7872444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 32f8fdef83b..7fd9e324e1a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 32f8fdef83b..7fd9e324e1a 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 



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

2021-07-14 Thread Sam James
commit: af4f245fdcd664de8c138550d217e8fbc0fb
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 03:44:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 03:44:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4f

net-analyzer/wireshark: add 3.4.7

Bug: https://bugs.gentoo.org/802216
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.7.ebuild | 278 ++
 2 files changed, 279 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4d1d537c8d0..2acde013645 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 
17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8
 SHA512 
eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
+DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
 SHA512 
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0

diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
new file mode 100644
index 000..32f8fdef83b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -0,0 +1,278 @@
+# 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_{7..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/";
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" 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() 

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

2021-07-08 Thread Sam James
commit: d290b18cd202b4146f0526fca8f647fe095483da
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  9 02:58:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  9 02:59:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d290b18c

net-analyzer/wireshark: drop 3.4.5

Bug: https://bugs.gentoo.org/793968
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-3.4.5.ebuild | 278 --
 2 files changed, 279 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 54b662e99e0..4d1d537c8d0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 
061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399
 SHA512 
f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 
17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8
 SHA512 
eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
deleted file mode 100644
index 5e3828b5721..000
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# 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_{7..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/";
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
-   inherit git-r3
-else
-   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
-   S="${WORKDIR}/${P/_/}"
-
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
-IUSE+=" 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() {

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

2021-06-08 Thread Agostino Sarubbo
commit: 89daee1f009513a475b8587f6f85cedf4ee3b54f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  9 06:24:09 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  9 06:24:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89daee1f

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

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 2bb18ce9d57..5e3828b5721 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-07 Thread Agostino Sarubbo
commit: a92e357fcbfcb64c49bb138c47a587843b3c5f61
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  8 06:58:17 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  8 06:58:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92e357f

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

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 414a546592d..2bb18ce9d57 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-07 Thread Sam James
commit: 1086d6dfbc11a116959b8a4526d90941c392b924
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  7 23:10:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  7 23:10:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1086d6df

net-analyzer/wireshark: Stabilize 3.4.6 arm64, #793968

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index ea90a662d36..bc1b28e4498 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-07 Thread Sam James
commit: c05f8c0e86d87f0c300682a5382bbb0322202200
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  7 23:10:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  7 23:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05f8c0e

net-analyzer/wireshark: Stabilize 3.4.6 arm, #793968

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index bc1b28e4498..414a546592d 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-07 Thread Sam James
commit: 9ef22349dc9b65ddcc8d1bea25672f5772e331a7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  7 23:08:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  7 23:08:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef22349

net-analyzer/wireshark: Stabilize 3.4.6 x86, #793968

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 32f8fdef83b..ea90a662d36 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-06-03 Thread Sam James
commit: 64cd84f0e34ba29bb319fb9b30fc7519a7676492
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun  3 16:52:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 22:21:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cd84f0

net-analyzer/wireshark: remove unused patch

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21109
Signed-off-by: Sam James  gentoo.org>

 .../files/wireshark-3.4.4-cmake-3.20.patch | 30 --
 1 file changed, 30 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch 
b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
deleted file mode 100644
index 63d62e8e254..000
--- a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/merge_requests/2532?commit_id=6ef6e8f607456e239e5f1a326803846930d34fa8.diff
-https://bugs.gentoo.org/775029
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1115,6 +1115,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
- 
- # Build the Qt GUI?
- if(BUILD_wireshark)
-+  set(CMAKE_AUTOMOC ON)
-+  set(CMAKE_AUTOUIC ON)
-+  set(CMAKE_AUTORCC ON)
-+
-   # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
-   # somewhere. The if WIN32 in this place is annoying as well.
-   if(WIN32)
-diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
-index 
ff0efeae1614511fbe12ed00d5b82f2714fa55f5..cd36913f10d949a8a701060833b0878086798bf4
 100644
 a/ui/qt/CMakeLists.txt
-+++ b/ui/qt/CMakeLists.txt
-@@ -631,10 +631,6 @@ include_directories(
-   ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
--set(CMAKE_AUTOMOC TRUE)
--set(CMAKE_AUTOUIC TRUE)
--set(CMAKE_AUTORCC TRUE)
--
- if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
-   # Drop the file modification time of source files from generated files
-   # to help with reproducible builds. We do not use QFileInfo.lastModified



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

2021-06-02 Thread Sam James
commit: d6a3d8876a75d86ad50abdea987166a023a273d0
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 20:03:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  2 20:04:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a3d887

net-analyzer/wireshark: drop 3.4.3, 3.4.4

Bug: https://bugs.gentoo.org/775323
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   3 -
 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 273 -
 net-analyzer/wireshark/wireshark-3.4.4.ebuild | 282 --
 3 files changed, 558 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7328474591e..54b662e99e0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,2 @@
-DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
-DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B 
d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047
 SHA512 
4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f
-DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
 DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 
061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399
 SHA512 
f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 
17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8
 SHA512 
eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
deleted file mode 100644
index 7ff5005db92..000
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# 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_{7..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 olde

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

2021-06-02 Thread Sam James
commit: 71196470ab2e6405249f8787286fbb74dce270af
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 20:03:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  2 20:03:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71196470

net-analyzer/wireshark: add 3.4.6

Bug: https://bugs.gentoo.org/793968
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.6.ebuild | 278 ++
 2 files changed, 279 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d8f0951273f..7328474591e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb
 DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B 
d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047
 SHA512 
4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
 DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 
061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399
 SHA512 
f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a
+DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 
17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8
 SHA512 
eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d

diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
new file mode 100644
index 000..32f8fdef83b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -0,0 +1,278 @@
+# 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_{7..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/";
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" 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/

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

2021-05-06 Thread Sam James
commit: be7c9b2cce460d7ffa7b1d1e8781f58cf88a522e
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 10:07:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 10:07:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7c9b2c

net-analyzer/wireshark: Stabilize 3.4.5 ppc64, #784899

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index 2bb18ce9d57..5e3828b5721 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-05-06 Thread Sam James
commit: ec28ee9883aa9151f4d44b0924bca64498686e59
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 09:59:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 09:59:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec28ee98

net-analyzer/wireshark: Stabilize 3.4.5 arm64, #784899

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index 7f7a2a05f83..2bb18ce9d57 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-05-06 Thread Sam James
commit: f6f3d66f542903923b9e144bf75bc253dba3aeab
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 09:55:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 09:55:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f3d66f

net-analyzer/wireshark: Stabilize 3.4.5 arm, #784899

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index 32e079a756d..7f7a2a05f83 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-05-05 Thread Agostino Sarubbo
commit: 1279ce69d60324da23a63a80d190425911193698
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May  5 12:14:06 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May  5 12:14:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1279ce69

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

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index ea90a662d36..32e079a756d 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-05-04 Thread Sam James
commit: a32ff042acc6886239052e735bcc75366d653c9e
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 21:26:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 21:26:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32ff042

net-analyzer/wireshark: Stabilize 3.4.5 x86, #784899

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index 32f8fdef83b..ea90a662d36 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"



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

2021-04-21 Thread Sam James
commit: 7e96f51d65ca7b0f0bd868fec4b1247419e754c0
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 19:52:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 19:56:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e96f51d

net-analyzer/wireshark: add 3.4.5

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-3.4.5.ebuild | 278 ++
 2 files changed, 279 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c8ec3460da7..d8f0951273f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
 DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B 
d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047
 SHA512 
4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
+DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 
061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399
 SHA512 
f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a

diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
new file mode 100644
index 000..32f8fdef83b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -0,0 +1,278 @@
+# 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_{7..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/";
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" 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
+  

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

2021-04-15 Thread Sam James
commit: af2c15fc324fec84244d1e24e80f5e40270aa4c3
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 05:34:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 05:36:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2c15fc

net-analyzer/wireshark: fix EGIT_REPO_URI style

Signed-off-by: Sam James  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 9e293f6104b..32f8fdef83b 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -16,7 +16,6 @@ if [[ ${PV} == ** ]] ; then
inherit git-r3
 else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
-   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz";
S="${WORKDIR}/${P/_/}"
 
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"



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

2021-04-15 Thread Sam James
commit: 38f1aa26c80f353025a8e2763c397dc932a4d100
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 05:17:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 05:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f1aa26

net-analyzer/wireshark: use live template

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

 net-analyzer/wireshark/wireshark-3.4.4.ebuild | 27 +--
 net-analyzer/wireshark/wireshark-.ebuild  | 49 +--
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index d1606cdc102..9b251700aaf 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -10,20 +10,25 @@ 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";
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz";
-S="${WORKDIR}/${P/_/}"
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
+fi
 
 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
-"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
 CDEPEND="
acct-group/pcap

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 0854e2e8254..9e293f6104b 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -6,23 +6,29 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..2} )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils 
xdg-utils cmake
+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";
-LICENSE="GPL-2"
 
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz";
+   S="${WORKDIR}/${P/_/}"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
-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/_/}
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
 CDEPEND="
acct-group/pcap
@@ -94,7 +100,9 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
 "
-RESTRICT="!test? ( test )"
+
+RESTRICT="test"
+
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -187,7 +195,12 @@ src_configure() {
 src_test() {
cmake

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

2021-04-13 Thread Sam James
commit: 5ae7f366c0862c08beecd2288b9a52d54456a82c
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 22:35:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 22:37:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae7f366

net-analyzer/wireshark: include upstream patches for glib-2.68

Thanks-to: Andrey Volkov  ekb-info.ru> for the backporting work
Closes: https://bugs.gentoo.org/777690
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   | 1 +
 net-analyzer/wireshark/wireshark-3.4.4.ebuild | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 27663064e3d..c8ec3460da7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
+DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B 
d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047
 SHA512 
4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 99695515797..d1606cdc102 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -11,6 +11,7 @@ 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";
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz";
 S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
@@ -102,6 +103,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
"${FILESDIR}"/${P}-cmake-3.20.patch
+   # Temporary, bug #777690
+   "${WORKDIR}"/${P}-glib-2.68-patches
 )
 
 pkg_setup() {



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

2021-03-26 Thread Sam James
commit: ac297875f7971b8421b02e39e550d7662dfd15cd
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 01:14:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 27 02:57:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac297875

net-analyzer/wireshark: fix build with >=dev-util/cmake-3.20.0

Using a patch from upstream.

Closes: https://bugs.gentoo.org/775029
Signed-off-by: Sam James  gentoo.org>

 .../files/wireshark-3.4.4-cmake-3.20.patch | 30 ++
 net-analyzer/wireshark/wireshark-3.4.4.ebuild  |  1 +
 2 files changed, 31 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch 
b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
new file mode 100644
index 000..63d62e8e254
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
@@ -0,0 +1,30 @@
+https://gitlab.com/wireshark/wireshark/-/merge_requests/2532?commit_id=6ef6e8f607456e239e5f1a326803846930d34fa8.diff
+https://bugs.gentoo.org/775029
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1115,6 +1115,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
+ 
+ # Build the Qt GUI?
+ if(BUILD_wireshark)
++  set(CMAKE_AUTOMOC ON)
++  set(CMAKE_AUTOUIC ON)
++  set(CMAKE_AUTORCC ON)
++
+   # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
+   # somewhere. The if WIN32 in this place is annoying as well.
+   if(WIN32)
+diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
+index 
ff0efeae1614511fbe12ed00d5b82f2714fa55f5..cd36913f10d949a8a701060833b0878086798bf4
 100644
+--- a/ui/qt/CMakeLists.txt
 b/ui/qt/CMakeLists.txt
+@@ -631,10 +631,6 @@ include_directories(
+   ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ 
+-set(CMAKE_AUTOMOC TRUE)
+-set(CMAKE_AUTOUIC TRUE)
+-set(CMAKE_AUTORCC TRUE)
+-
+ if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
+   # Drop the file modification time of source files from generated files
+   # to help with reproducible builds. We do not use QFileInfo.lastModified

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index cc5aaa6adc5..c37f3c484d2 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+   "${FILESDIR}"/${P}-cmake-3.20.patch
 )
 
 pkg_setup() {



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

2021-03-26 Thread Sam James
commit: e615c9c656c238279c839f39e1c917142b23ad18
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 11:33:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 11:33:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e615c9c6

net-analyzer/wireshark: Stabilize 3.4.4 arm64, #775323

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 1e2c698ea91..cc5aaa6adc5 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.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-03-25 Thread Sam James
commit: 87e76517dd8370cc8e0b6e74f2b72b41d704b67f
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 23:23:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 23:23:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e76517

Revert "net-analyzer/wireshark: drop 3.4.3 (security cleanup)"

This reverts commit 46bf94892853f4226f3007331f135184d353487a.
Got too excited there...

Bug: https://bugs.gentoo.org/775323
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 40c7b30562f..27663064e3d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
+DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172

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..7ff5005db92
--- /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_{7..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

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

2021-03-25 Thread Sam James
commit: 46bf94892853f4226f3007331f135184d353487a
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 23:21:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 23:21:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bf9489

net-analyzer/wireshark: drop 3.4.3 (security cleanup)

Closes: https://bugs.gentoo.org/775323
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 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 27663064e3d..40c7b30562f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
 DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
deleted file mode 100644
index 7ff5005db92..000
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# 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_{7..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 k

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

2021-03-25 Thread Sam James
commit: 95b2179a07b7f28a61aa825f52c420ea70e1ce27
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 23:15:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 23:15:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b2179a

net-analyzer/wireshark: Stabilize 3.4.4 x86, #775323

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index bc0ac789d14..1e2c698ea91 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.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-03-25 Thread Sam James
commit: 81f582311ab210e5a453bdb645704d1ec1945f2c
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 23:13:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 23:13:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f58231

net-analyzer/wireshark: Stabilize 3.4.4 amd64, #775323

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 3d9a034303c..bc0ac789d14 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.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-03-24 Thread Sam James
commit: 7cc856be93e2941337449be04051bfe0d602dfd8
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 24 19:41:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 24 19:41:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc856be

net-analyzer/wireshark: Stabilize 3.4.4 ppc64, #775323

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 9d6d887293a..3d9a034303c 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.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-03-10 Thread Sam James
commit: d6663bd4120a2d12007ed0c20a5a02f94277d9f1
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 11 03:56:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 11 03:56:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6663bd4

net-analyzer/wireshark: add 3.4.4

Bug: https://bugs.gentoo.org/775323
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e4fe2d2bfcd..27663064e3d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 
076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2
 SHA512 
6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
+DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 
85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd
 SHA512 
388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172

diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
new file mode 100644
index 000..9d6d887293a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.4.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_{7..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 krb5-config --libs has

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

2021-03-03 Thread Sam James
commit: 62f1cb871dbd4acb159060cb2e72344cc208f3c1
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  4 04:54:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  4 04:54:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f1cb87

net-analyzer/wireshark: rename live ebuild

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

 ...9-ui-needs-wiretap.patch => wireshark--ui-needs-wiretap.patch} | 0
 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 .../wireshark/{wireshark-.ebuild => wireshark-.ebuild}| 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch 
b/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
similarity index 100%
rename from 
net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
rename to net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 311f89608fe..7ff5005db92 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -100,7 +100,7 @@ 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
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
 pkg_setup() {

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-.ebuild
rename to net-analyzer/wireshark/wireshark-.ebuild
index 80fb077c9a9..0854e2e8254 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.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
@@ -98,7 +98,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
 pkg_setup() {



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

2021-03-03 Thread Sam James
commit: ccb5fcb72b01151e5ded89f44107d6cc964330a3
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  4 04:54:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  4 04:54:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb5fcb7

net-analyzer/wireshark: remove 3.4.2

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

 net-analyzer/wireshark/Manifest|   1 -
 net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild | 266 -
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d56babae8d6..e4fe2d2bfcd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-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.2-r100.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
deleted file mode 100644
index 803afe19339..000
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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_{7..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";
-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? ( ${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 krb5-config --libs has -lcrypto then pa

[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 MO

[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 krb

[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 git

[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=(
+   "${FILESDIR}"/${PN}-2

[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, &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
--- a/net-analyzer/wireshark/files/wireshark-

[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=(
-   "${FILE

[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 se

[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
+++ b/net-analyzer/wireshark/wiresha

[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
-   "${FILESDIR}"/${PN}-2.9.0-tf

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

2020-10-06 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
+   "${FILESDIR}"/${P

<    1   2   3   4   5   6   7   8   >