diff options
| author |   Sam James <sam@gentoo.org> | 2022-05-31 07:50:23 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-05-31 07:54:43 +0100 |
| commit | 83298719593bc8a55b806e1c1e797f175a64744e (patch) | |
| tree | 77c8ec7c4d852163517e067addcbabbd10a7463a /net-analyzer/wireshark/wireshark-9999.ebuild | |
| parent | sys-process/parallel: add 20220522 (diff) | |
| download | gentoo-83298719593bc8a55b806e1c1e797f175a64744e.tar.gz gentoo-83298719593bc8a55b806e1c1e797f175a64744e.tar.bz2 gentoo-83298719593bc8a55b806e1c1e797f175a64744e.zip | |
net-analyzer/wireshark: add 3.6.5
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer/wireshark/wireshark-9999.ebuild')
| -rw-r--r-- | net-analyzer/wireshark/wireshark-9999.ebuild | 34 |
1 files changed, 19 insertions, 15 deletions
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() { |