commit:     dd1dc29662e09caace78b9d9832e7ddb34195b4b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 11:32:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 11:56:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1dc296

net-analyzer/wireshark: drop 3.6.13, 3.6.14, 4.0.5

Bug: https://bugs.gentoo.org/907133
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/wireshark/Manifest                |   3 -
 net-analyzer/wireshark/metadata.xml            |   1 -
 net-analyzer/wireshark/wireshark-3.6.13.ebuild | 276 ---------------------
 net-analyzer/wireshark/wireshark-3.6.14.ebuild | 276 ---------------------
 net-analyzer/wireshark/wireshark-4.0.5.ebuild  | 316 -------------------------
 5 files changed, 872 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 276e7cf51e5b..a0ff2cecd69e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1 @@
-DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447dddda8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
-DIST wireshark-3.6.14.tar.xz 40211952 BLAKE2B 
b22221e84e7072afc8547b6ed5f0094bfae60d77617c9eef7a1fa55696cc5563ba46b5f2793ba430040a170e7548d6258b44e9a5f99a00eb3b48c2a8890673d1
 SHA512 
b073b5903d12b730614a3751b23641445a517ef565836677c02623e47f1cbf43ff5245e575e650aee66577250512caae4849ce8311cf31823b8349a00f73889d
-DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 13b80f4910c7..5323edd20117 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -46,7 +46,6 @@
                <flag name="minizip">Build with zip file compression 
support</flag>
                <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
                <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network 
packet capturing (build dumpcap, rawshark)</flag>
-               <flag name="plugin-ifdemo">Install plugin interface demo</flag>
                <flag name="plugins">Install plugins</flag>
                <flag name="qt6">Build with Qt6 support instead of the default 
Qt5 for GUI support</flag>
                <flag name="randpkt">Install randpkt, a utility for creating 
pcap trace files full of random packets</flag>

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
deleted file mode 100644
index 5bcc3eef297d..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/";
-
-if [[ ${PV} == *9999* ]] ; 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="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv 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"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-       plugin-ifdemo? ( plugins qt5 )"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-       >=dev-libs/glib-2.38: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:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-       dev-lang/perl
-       sys-devel/flex
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? (
-               app-doc/doxygen
-               dev-ruby/asciidoctor
-       )
-       qt5? (
-               dev-qt/linguist-tools:5
-       )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-                       dev-python/pytest-xdist[${PYTHON_USEDEP}]
-               ')
-       )"
-RDEPEND="${RDEPEND}
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-       "${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() {
-       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
-
-       ! use lto && filter-lto
-
-       python_setup
-
-       mycmakeargs+=(
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-
-               -DBUILD_androiddump=$(usex androiddump)
-               -DBUILD_capinfos=$(usex capinfos)
-               -DBUILD_captype=$(usex captype)
-               -DBUILD_ciscodump=$(usex ciscodump)
-               -DBUILD_dftest=$(usex dftest)
-               -DBUILD_dpauxmon=$(usex dpauxmon)
-               -DBUILD_dumpcap=$(usex dumpcap)
-               -DBUILD_editcap=$(usex editcap)
-               -DBUILD_mergecap=$(usex mergecap)
-               -DBUILD_mmdbresolve=$(usex maxminddb)
-               -DBUILD_randpkt=$(usex randpkt)
-               -DBUILD_randpktdump=$(usex randpktdump)
-               -DBUILD_reordercap=$(usex reordercap)
-               -DBUILD_sdjournal=$(usex sdjournal)
-               -DBUILD_sharkd=$(usex sharkd)
-               -DBUILD_sshdump=$(usex sshdump)
-               -DBUILD_text2pcap=$(usex text2pcap)
-               -DBUILD_tfshark=$(usex tfshark)
-               -DBUILD_tshark=$(usex tshark)
-               -DBUILD_udpdump=$(usex udpdump)
-               -DBUILD_wireshark=$(usex qt5)
-               -DDISABLE_WERROR=ON
-               -DENABLE_BCG729=$(usex bcg729)
-               -DENABLE_BROTLI=$(usex brotli)
-               -DENABLE_CAP=$(usex filecaps caps)
-               -DENABLE_GNUTLS=$(usex ssl)
-               -DENABLE_ILBC=$(usex ilbc)
-               -DENABLE_KERBEROS=$(usex kerberos)
-               -DENABLE_LIBXML2=$(usex libxml2)
-               -DENABLE_LTO=$(usex lto)
-               -DENABLE_LUA=$(usex lua)
-               -DENABLE_LZ4=$(usex lz4)
-               -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)
-               -DENABLE_SBC=$(usex sbc)
-               -DENABLE_SMI=$(usex smi)
-               -DENABLE_SNAPPY=$(usex snappy)
-               -DENABLE_SPANDSP=$(usex spandsp)
-               -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_ZSTD=$(usex zstd)
-       )
-
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_build test-programs
-
-       # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-       epytest \
-               --disable-capture \
-               --skip-missing-programs=all \
-               --program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-       cmake_src_install
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-       # install headers
-       insinto /usr/include/wireshark
-       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.
-       local dir dirs=(
-               epan
-               epan/crypt
-               epan/dfilter
-               epan/dissectors
-               epan/ftypes
-               wiretap
-               wsutil
-               wsutil/wmem
-       )
-
-       for dir in "${dirs[@]}" ; do
-               insinto /usr/include/wireshark/${dir}
-               doins ${dir}/*.h
-       done
-
-       if use qt5 ; then
-               local s
-
-               for s in 16 32 48 64 128 256 512 1024 ; do
-                       insinto /usr/share/icons/hicolor/${s}x${s}/apps
-                       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 image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
-               done
-       fi
-
-       if [[ -d "${ED}"/usr/share/appdata ]] ; then
-               rm -r "${ED}"/usr/share/appdata || die
-       fi
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       # Add group for users allowed to sniff.
-       chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-       if use dumpcap && use pcap ; then
-               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 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.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
deleted file mode 100644
index 883f96d5450c..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/";
-
-if [[ ${PV} == *9999* ]] ; 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="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv 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"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-       plugin-ifdemo? ( plugins qt5 )"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-       >=dev-libs/glib-2.38: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:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-       dev-lang/perl
-       sys-devel/flex
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? (
-               app-doc/doxygen
-               dev-ruby/asciidoctor
-       )
-       qt5? (
-               dev-qt/linguist-tools:5
-       )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-                       dev-python/pytest-xdist[${PYTHON_USEDEP}]
-               ')
-       )"
-RDEPEND="${RDEPEND}
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-       "${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() {
-       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
-
-       ! use lto && filter-lto
-
-       python_setup
-
-       mycmakeargs+=(
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-
-               -DBUILD_androiddump=$(usex androiddump)
-               -DBUILD_capinfos=$(usex capinfos)
-               -DBUILD_captype=$(usex captype)
-               -DBUILD_ciscodump=$(usex ciscodump)
-               -DBUILD_dftest=$(usex dftest)
-               -DBUILD_dpauxmon=$(usex dpauxmon)
-               -DBUILD_dumpcap=$(usex dumpcap)
-               -DBUILD_editcap=$(usex editcap)
-               -DBUILD_mergecap=$(usex mergecap)
-               -DBUILD_mmdbresolve=$(usex maxminddb)
-               -DBUILD_randpkt=$(usex randpkt)
-               -DBUILD_randpktdump=$(usex randpktdump)
-               -DBUILD_reordercap=$(usex reordercap)
-               -DBUILD_sdjournal=$(usex sdjournal)
-               -DBUILD_sharkd=$(usex sharkd)
-               -DBUILD_sshdump=$(usex sshdump)
-               -DBUILD_text2pcap=$(usex text2pcap)
-               -DBUILD_tfshark=$(usex tfshark)
-               -DBUILD_tshark=$(usex tshark)
-               -DBUILD_udpdump=$(usex udpdump)
-               -DBUILD_wireshark=$(usex qt5)
-               -DDISABLE_WERROR=ON
-               -DENABLE_BCG729=$(usex bcg729)
-               -DENABLE_BROTLI=$(usex brotli)
-               -DENABLE_CAP=$(usex filecaps caps)
-               -DENABLE_GNUTLS=$(usex ssl)
-               -DENABLE_ILBC=$(usex ilbc)
-               -DENABLE_KERBEROS=$(usex kerberos)
-               -DENABLE_LIBXML2=$(usex libxml2)
-               -DENABLE_LTO=$(usex lto)
-               -DENABLE_LUA=$(usex lua)
-               -DENABLE_LZ4=$(usex lz4)
-               -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)
-               -DENABLE_SBC=$(usex sbc)
-               -DENABLE_SMI=$(usex smi)
-               -DENABLE_SNAPPY=$(usex snappy)
-               -DENABLE_SPANDSP=$(usex spandsp)
-               -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_ZSTD=$(usex zstd)
-       )
-
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_build test-programs
-
-       # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-       epytest \
-               --disable-capture \
-               --skip-missing-programs=all \
-               --program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-       cmake_src_install
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-       # install headers
-       insinto /usr/include/wireshark
-       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.
-       local dir dirs=(
-               epan
-               epan/crypt
-               epan/dfilter
-               epan/dissectors
-               epan/ftypes
-               wiretap
-               wsutil
-               wsutil/wmem
-       )
-
-       for dir in "${dirs[@]}" ; do
-               insinto /usr/include/wireshark/${dir}
-               doins ${dir}/*.h
-       done
-
-       if use qt5 ; then
-               local s
-
-               for s in 16 32 48 64 128 256 512 1024 ; do
-                       insinto /usr/share/icons/hicolor/${s}x${s}/apps
-                       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 image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
-               done
-       fi
-
-       if [[ -d "${ED}"/usr/share/appdata ]] ; then
-               rm -r "${ED}"/usr/share/appdata || die
-       fi
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       # Add group for users allowed to sniff.
-       chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-       if use dumpcap && use pcap ; then
-               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 pcap group. This security measure ensures"
-       ewarn "that only trusted users are allowed to sniff your traffic."
-}

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
deleted file mode 100644
index cd157e078c5f..000000000000
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/";
-
-if [[ ${PV} == *9999* ]] ; 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/_/}"
-
-       if [[ ${PV} != *_rc* ]] ; then
-               KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
-       fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="
-       acct-group/pcap
-       >=dev-libs/glib-2.50.0:2
-       dev-libs/libpcre2
-       >=net-dns/c-ares-1.13.0:=
-       >=dev-libs/libgcrypt-1.8.0:=
-       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-1.11.0:= )
-       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 )
-       gui? (
-               x11-misc/xdg-utils
-               qt6? (
-                       dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-                       dev-qt/qt5compat:6
-                       dev-qt/qtmultimedia:6
-               )
-               !qt6? (
-                       dev-qt/qtcore:5
-                       dev-qt/qtconcurrent:5
-                       dev-qt/qtgui:5
-                       dev-qt/qtmultimedia:5
-                       dev-qt/qtprintsupport:5
-                       dev-qt/qtwidgets:5
-               )
-       )
-       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-3.5.8:= )
-       wifi? ( >=net-libs/libssh-0.6:= )
-       zlib? ( sys-libs/zlib )
-       zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-       ${RDEPEND}
-       gui? (
-               !qt6? (
-                       dev-qt/qtdeclarative:5
-               )
-       )
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build 
some source code files and run code analysis checks."
-BDEPEND="
-       ${PYTHON_DEPS}
-       dev-lang/perl
-       sys-devel/flex
-       sys-devel/gettext
-       virtual/pkgconfig
-       doc? (
-               app-doc/doxygen
-               dev-ruby/asciidoctor
-       )
-       gui? (
-               qt6? (
-                       dev-qt/qttools:6[linguist]
-               )
-               !qt6? (
-                       dev-qt/linguist-tools:5
-               )
-       )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/pytest[${PYTHON_USEDEP}]
-                       dev-python/pytest-xdist[${PYTHON_USEDEP}]
-               ')
-       )
-"
-RDEPEND="
-       ${RDEPEND}
-       gui? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-       "${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() {
-       local mycmakeargs
-
-       python_setup
-
-       # 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 gui ; then
-               append-cxxflags -fPIC -DPIC
-       fi
-
-       ! use lto && filter-lto
-
-       mycmakeargs+=(
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-               $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
-               $(usex gui MOC=$(qt5_get_bindir)/moc '')
-               $(usex gui RCC=$(qt5_get_bindir)/rcc '')
-               $(usex gui UIC=$(qt5_get_bindir)/uic '')
-
-               -DBUILD_androiddump=$(usex androiddump)
-               -DBUILD_capinfos=$(usex capinfos)
-               -DBUILD_captype=$(usex captype)
-               -DBUILD_ciscodump=$(usex ciscodump)
-               -DBUILD_dftest=$(usex dftest)
-               -DBUILD_dpauxmon=$(usex dpauxmon)
-               -DBUILD_dumpcap=$(usex dumpcap)
-               -DBUILD_editcap=$(usex editcap)
-               -DBUILD_mergecap=$(usex mergecap)
-               -DBUILD_mmdbresolve=$(usex maxminddb)
-               -DBUILD_randpkt=$(usex randpkt)
-               -DBUILD_randpktdump=$(usex randpktdump)
-               -DBUILD_reordercap=$(usex reordercap)
-               -DBUILD_sdjournal=$(usex sdjournal)
-               -DBUILD_sharkd=$(usex sharkd)
-               -DBUILD_sshdump=$(usex sshdump)
-               -DBUILD_text2pcap=$(usex text2pcap)
-               -DBUILD_tfshark=$(usex tfshark)
-               -DBUILD_tshark=$(usex tshark)
-               -DBUILD_udpdump=$(usex udpdump)
-
-               -DBUILD_wireshark=$(usex gui)
-               -DUSE_qt6=$(usex qt6)
-
-               -DENABLE_WERROR=OFF
-               -DENABLE_BCG729=$(usex bcg729)
-               -DENABLE_BROTLI=$(usex brotli)
-               -DENABLE_CAP=$(usex filecaps caps)
-               -DENABLE_GNUTLS=$(usex ssl)
-               -DENABLE_ILBC=$(usex ilbc)
-               -DENABLE_KERBEROS=$(usex kerberos)
-               -DENABLE_LIBXML2=$(usex libxml2)
-               -DENABLE_LTO=$(usex lto)
-               -DENABLE_LUA=$(usex lua)
-               -DENABLE_LZ4=$(usex lz4)
-               -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=OFF
-               -DENABLE_SBC=$(usex sbc)
-               -DENABLE_SMI=$(usex smi)
-               -DENABLE_SNAPPY=$(usex snappy)
-               -DENABLE_SPANDSP=$(usex spandsp)
-               -DBUILD_wifidump=$(usex wifi)
-               -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_ZSTD=$(usex zstd)
-       )
-
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_build test-programs
-
-       EPYTEST_DESELECT=(
-               # TODO: investigate
-               
suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-       )
-
-       # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-       epytest \
-               --disable-capture \
-               --skip-missing-programs=all \
-               --program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-       cmake_src_install
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-       # install headers
-       insinto /usr/include/wireshark
-       doins "${BUILD_DIR}"/config.h
-
-       # If trying to remove this, try build e.g. libvirt first!
-       # At last check, Fedora is still doing this too.
-       local dir dirs=(
-               epan
-               epan/crypt
-               epan/dfilter
-               epan/dissectors
-               epan/ftypes
-               wiretap
-               wsutil
-               wsutil/wmem
-       )
-
-       for dir in "${dirs[@]}" ; do
-               insinto /usr/include/wireshark/${dir}
-               doins ${dir}/*.h
-       done
-
-       if use gui ; then
-               local s
-
-               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
-               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
-               done
-       fi
-
-       if [[ -d "${ED}"/usr/share/appdata ]] ; then
-               rm -r "${ED}"/usr/share/appdata || die
-       fi
-
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       # Add group for users allowed to sniff.
-       chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-       if use dumpcap && use pcap ; then
-               fcaps -o 0 -g pcap -m 4710 -M 0710 \
-                       cap_dac_read_search,cap_net_raw,cap_net_admin \
-                       "${EROOT}"/usr/bin/dumpcap
-       fi
-
-       readme.gentoo_print_elog
-}

Reply via email to