commit: 83298719593bc8a55b806e1c1e797f175a64744e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 06:50:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 06:54:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83298719
net-analyzer/wireshark: add 3.6.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
...ireshark-9999.ebuild => wireshark-3.6.5.ebuild} | 41 ++++++++++++----------
net-analyzer/wireshark/wireshark-9999.ebuild | 34 ++++++++++--------
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index dc8c2a47fbc4..bd4a9d691d3e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
SHA512
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
+DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
similarity index 90%
copy from net-analyzer/wireshark/wireshark-9999.ebuild
copy to net-analyzer/wireshark/wireshark-3.6.5.ebuild
index 3c9c26865ea3..fffca9343012 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
@@ -86,8 +86,10 @@ BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
)
test? (
- dev-python/pytest
- dev-python/pytest-xdist
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
)"
RDEPEND="${RDEPEND}
qt5? ( virtual/freedesktop-icon-theme )
@@ -98,8 +100,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
)
+python_check_deps() {
+ use test || return 0
+
+ python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+ python_has_version -b
"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
}
src_configure() {
@@ -153,7 +164,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
+ -DDISABLE_WERROR=ON
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
-DENABLE_CAP=$(usex filecaps caps)
@@ -185,18 +196,11 @@ src_configure() {
src_test() {
cmake_build test-programs
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- # extcaps needs a bunch of external programs
- -E "(suite_extcaps)"
- #-E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
+ # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+ epytest \
+ --disable-capture \
+ --skip-missing-programs=all \
+ --program-path "${BUILD_DIR}"/run
}
src_install() {
@@ -207,7 +211,8 @@ src_install() {
# install headers
insinto /usr/include/wireshark
- doins "${BUILD_DIR}"/config.h
+ doins ws_diag_control.h ws_symbol_export.h \
+ "${BUILD_DIR}"/config.h
# If trying to remove this, try build e.g. libvirt first!
# At last check, Fedora is still doing this too.
@@ -232,12 +237,12 @@ src_install() {
for s in 16 32 48 64 128 256 512 1024 ; do
insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins resources/icons/wsicon${s}.png wireshark.png
+ newins image/wsicon${s}.png wireshark.png
done
for s in 16 24 32 48 64 128 256 ; do
insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins resources/icons//WiresharkDoc-${s}.png
application-vnd.tcpdump.pcap.png
+ newins image/WiresharkDoc-${s}.png
application-vnd.tcpdump.pcap.png
done
fi
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-9999.ebuild
index 3c9c26865ea3..68dc99e8c15c 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -86,8 +86,10 @@ BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
)
test? (
- dev-python/pytest
- dev-python/pytest-xdist
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
)"
RDEPEND="${RDEPEND}
qt5? ( virtual/freedesktop-icon-theme )
@@ -98,8 +100,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
)
+python_check_deps() {
+ use test || return 0
+
+ python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+ python_has_version -b
"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
}
src_configure() {
@@ -153,7 +164,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
+ -DDISABLE_WERROR=ON
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
-DENABLE_CAP=$(usex filecaps caps)
@@ -185,18 +196,11 @@ src_configure() {
src_test() {
cmake_build test-programs
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- # extcaps needs a bunch of external programs
- -E "(suite_extcaps)"
- #-E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
+ # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+ epytest \
+ --disable-capture \
+ --skip-missing-programs=all \
+ --program-path "${BUILD_DIR}"/run
}
src_install() {
