net-analyzer/wireshark: Version 2.5.0.
authorJeroen Roovers <jer@gentoo.org>
Wed, 7 Feb 2018 21:12:47 +0000 (22:12 +0100)
committerJeroen Roovers <jer@gentoo.org>
Wed, 7 Feb 2018 21:14:03 +0000 (22:14 +0100)
Package-Manager: Portage-2.3.24, Repoman-2.3.6

net-analyzer/wireshark/Manifest
net-analyzer/wireshark/metadata.xml
net-analyzer/wireshark/wireshark-2.5.0.ebuild [new file with mode: 0644]
net-analyzer/wireshark/wireshark-99999999.ebuild

index c1eff3b0239bade595633ecfea48a40483acfa7d..0f73f429f212243e40f0399720d4d419e6ffc332 100644 (file)
@@ -1,3 +1,4 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
+DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
index 1dcbdb4e4770810a02ffb14994185b92b7579691..9801f150cc4c4170b7eed92bef93424c8beaa094 100644 (file)
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <maintainer type="project">
-               <email>netmon@gentoo.org</email>
-               <name>Gentoo network monitoring and analysis project</name>
-       </maintainer>
-       <longdescription>
-       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 
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+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.
 </longdescription>
-       <use>
-               <flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-               <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
-               <flag name="capinfos">Install capinfos, to print information about capture files</flag>
-               <flag name="captype">Install captype, to print the file types of capture files</flag>
-               <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
-               <flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
-               <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
-               <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
-               <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
-               <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
-               <flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
-               <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
-               <flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
-               <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
-               <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-               <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
-               <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-               <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
-               <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
-               <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
-               <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
-               <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
-               <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-               <flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
-               <flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
-               <flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
-               <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
-               <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
-               <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
-               <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
-       </use>
+<use>
+<flag name="adns">Use <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
+<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+<flag name="bcg729">Use <pkg>media-plugins/mediastreamer-bcg729</pkg> to play G.729 codec</flag>
+<flag name="capinfos">Install capinfos, to print information about capture files</flag>
+<flag name="captype">Install captype, to print the file types of capture files</flag>
+<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
+<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
+<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
+<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
+<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
+<flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
+<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
+<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
+<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
+<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
+<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
+<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
+<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
+<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
+<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
new file mode 100644 (file)
index 0000000..b3cf7e2
--- /dev/null
@@ -0,0 +1,285 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="
+       adns androiddump bcg729 +capinfos +caps +captype ciscodump
+       cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
+       kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio
+       +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
+       spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+       ciscodump? ( libssh )
+       sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+       >=dev-libs/glib-2.14:2
+       dev-libs/libgcrypt:0
+       netlink? ( dev-libs/libnl:3 )
+       adns? ( >=net-dns/c-ares-1.5 )
+       bcg729? ( media-libs/bcg729 )
+       caps? ( sys-libs/libcap )
+       geoip? ( dev-libs/geoip )
+       gtk? (
+               x11-libs/gdk-pixbuf
+               x11-libs/gtk+:3
+               x11-libs/pango
+               x11-misc/xdg-utils
+       )
+       kerberos? ( virtual/krb5 )
+       libssh? ( >=net-libs/libssh-0.6 )
+       libxml2? ( dev-libs/libxml2 )
+       lua? ( >=dev-lang/lua-5.1:* )
+       lz4? ( app-arch/lz4 )
+       nghttp2? ( net-libs/nghttp2 )
+       pcap? ( net-libs/libpcap )
+       portaudio? ( media-libs/portaudio )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtmultimedia:5
+               dev-qt/qtprintsupport:5
+               dev-qt/qtwidgets:5
+               || (
+                       media-libs/speexdsp
+                       <media-libs/speex-1.2.0
+               )
+               x11-misc/xdg-utils
+       )
+       sbc? ( media-libs/sbc )
+       smi? ( net-libs/libsmi )
+       snappy? ( app-arch/snappy )
+       spandsp? ( media-libs/spandsp )
+       ssl? ( net-libs/gnutls:= )
+       zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+       ${CDEPEND}
+       dev-lang/perl
+       !<virtual/perl-Pod-Simple-3.170
+       !<perl-core/Pod-Simple-3.170
+       doc? (
+               app-doc/doxygen
+               app-text/asciidoc
+               dev-libs/libxml2
+               dev-libs/libxslt
+               doc-pdf? ( dev-java/fop )
+               www-client/lynx
+       )
+       qt5? (
+               dev-qt/linguist-tools:5
+       )
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+"
+RDEPEND="
+       ${CDEPEND}
+       gtk? ( virtual/freedesktop-icon-theme )
+       qt5? ( virtual/freedesktop-icon-theme )
+       selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+       "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+       "${FILESDIR}"/${PN}-2.4-androiddump.patch
+       "${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+       enewgroup wireshark
+}
+
+src_prepare() {
+       default
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       # 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."
+                               myconf+=( "--with-ssl" )
+                               ;;
+               esac
+       fi
+
+       # Enable wireshark binary with any supported GUI toolkit (bug #473188)
+       if use gtk || use qt5; then
+               myconf+=( "--enable-wireshark" )
+       else
+               myconf+=( "--disable-wireshark" )
+       fi
+
+       if ! use qt5; then
+               myconf+=( "--with-qt=no" )
+       fi
+
+       if use qt5; then
+               export QT_MIN_VERSION=5.3.0
+               append-cxxflags -fPIC -DPIC
+       fi
+
+       # Hack around inability to disable doxygen/fop doc generation
+       use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+       use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+       econf \
+               $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+               $(use dumpcap && use_with pcap dumpcap-group wireshark) \
+               $(use_enable androiddump) \
+               $(use_enable capinfos) \
+               $(use_enable captype) \
+               $(use_enable ciscodump) \
+               $(use_enable dftest) \
+               $(use_enable dumpcap) \
+               $(use_enable editcap) \
+               $(use_enable mergecap) \
+               $(use_enable randpkt) \
+               $(use_enable randpktdump) \
+               $(use_enable reordercap) \
+               $(use_enable sharkd) \
+               $(use_enable sshdump) \
+               $(use_enable text2pcap) \
+               $(use_enable tfshark) \
+               $(use_enable tshark) \
+               $(use_enable udpdump) \
+               $(use_with adns c-ares) \
+               $(use_with bcg729) \
+               $(use_with caps libcap) \
+               $(use_with geoip) \
+               $(use_with gtk gtk 3) \
+               $(use_with kerberos krb5) \
+               $(use_with libssh) \
+               $(use_with libxml2) \
+               $(use_with lua) \
+               $(use_with lz4) \
+               $(use_with nghttp2) \
+               $(use_with pcap) \
+               $(use_with portaudio) \
+               $(use_with sbc) \
+               $(use_with smi libsmi) \
+               $(use_with snappy) \
+               $(use_with spandsp) \
+               $(use_with ssl gnutls) \
+               $(use_with zlib) \
+               $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+               $(usex netlink --with-libnl=3 --without-libnl) \
+               $(usex qt5 --with-qt=5 '') \
+               $(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 '') \
+               --disable-warnings-as-errors \
+               --sysconfdir="${EPREFIX}"/etc/wireshark \
+               ${myconf[@]}
+}
+
+src_compile() {
+       default
+
+       if use doc; then
+               emake -j1 -C docbook
+               if use doc-pdf; then
+                       addpredict "/root/.java"
+                       emake -C docbook all-pdf
+               fi
+       fi
+}
+
+src_install() {
+       default
+
+       # FAQ is not required as is installed from help/faq.txt
+       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+       if use doc-pdf; then
+               docinto /usr/share/doc/${PF}/pdf/
+               dodoc docbook/{developer,user}-guide.pdf
+       fi
+
+       # install headers
+       local wsheader
+       for wsheader in \
+               config.h \
+               epan/*.h \
+               epan/crypt/*.h \
+               epan/dfilter/*.h \
+               epan/dissectors/*.h \
+               epan/ftypes/*.h \
+               epan/wmem/*.h \
+               wiretap/*.h \
+               ws_diag_control.h \
+               ws_symbol_export.h \
+               wsutil/*.h
+       do
+               insinto /usr/include/wireshark/$( dirname ${wsheader} )
+               doins ${wsheader}
+       done
+
+       #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+       insinto /usr/include/wiretap
+       doins wiretap/wtap.h
+
+       if use gtk || 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
+
+       prune_libtool_files
+}
+
+pkg_postinst() {
+       gnome2_icon_cache_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+
+       # Add group for users allowed to sniff.
+       enewgroup wireshark
+
+       if use pcap; then
+               fcaps -o 0 -g wireshark -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 "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+}
index 9d9fca8d8a032835b2c09596fb3353e52238ef71..bb1724389ab47ba33a21df433302d1166f7bd116 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-       adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
-       +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-       lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
-       +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
-       tfshark +tshark +udpdump zlib
+       adns androiddump bcg729 +capinfos +caps +captype ciscodump
+       cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
+       kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio
+       +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
+       spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
 "
 REQUIRED_USE="
        ciscodump? ( libssh )
@@ -30,6 +30,7 @@ CDEPEND="
        dev-libs/libgcrypt:0
        netlink? ( dev-libs/libnl:3 )
        adns? ( >=net-dns/c-ares-1.5 )
+       bcg729? ( media-libs/bcg729 )
        caps? ( sys-libs/libcap )
        geoip? ( dev-libs/geoip )
        gtk? (
@@ -171,6 +172,7 @@ src_configure() {
                $(use_enable tshark) \
                $(use_enable udpdump) \
                $(use_with adns c-ares) \
+               $(use_with bcg729) \
                $(use_with caps libcap) \
                $(use_with geoip) \
                $(use_with gtk gtk 3) \
@@ -216,16 +218,11 @@ src_install() {
        default
 
        # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README.* \
-               doc/{randpkt.txt,README*}
+       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
 
-       if use doc; then
-               docinto /usr/share/doc/${PF}/html
-               dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-               if use doc-pdf; then
-                       docinto /usr/share/doc/${PF}/pdf/
-                       dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-               fi
+       if use doc-pdf; then
+               docinto /usr/share/doc/${PF}/pdf/
+               dodoc docbook/{developer,user}-guide.pdf
        fi
 
        # install headers
@@ -252,16 +249,14 @@ src_install() {
        doins wiretap/wtap.h
 
        if use gtk || use qt5; then
-               local c d
-               for c in hi lo; do
-                       for d in 16 32 48; do
-                               insinto /usr/share/icons/${c}color/${d}x${d}/apps
-                               newins image/${c}${d}-app-wireshark.png wireshark.png
-                       done
+               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 d in 16 24 32 48 64 128 256 ; do
-                       insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-                       newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+               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