commit:     215e64f3003a8bb8cffd402666cf44a9db85691a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 20:25:20 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon May 28 20:26:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=215e64f3

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 net-analyzer/wireshark/Manifest                  |   1 -
 net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild | 249 ----------------------
 net-analyzer/wireshark/wireshark-2.6.0.ebuild    | 259 -----------------------
 3 files changed, 509 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 23f169a8841..d946c88db42 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 
797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258
 SHA512 
2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 
19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a
 SHA512 
171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
-DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 
2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87
 SHA512 
a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B 
fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486
 SHA512 
e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444

diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild
deleted file mode 100644
index b2bdb6d5cf7..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune 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 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-       adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
-       +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap 
+netlink
-       nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc 
selinux
-       +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark 
+udpdump
-       zlib
-"
-
-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 )
-       filecaps? ( sys-libs/libcap )
-       gtk? (
-               x11-libs/gdk-pixbuf
-               x11-libs/gtk+:3
-               x11-libs/pango
-               x11-misc/xdg-utils
-       )
-       kerberos? ( virtual/krb5 )
-       sshdump? ( >=net-libs/libssh-0.6 )
-       ciscodump? ( >=net-libs/libssh-0.6 )
-       libxml2? ( dev-libs/libxml2 )
-       lua? ( >=dev-lang/lua-5.1:* )
-       lz4? ( app-arch/lz4 )
-       maxminddb? ( dev-libs/libmaxminddb )
-       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/speex-1.2.0
-               media-libs/speexdsp
-               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
-               dev-ruby/asciidoctor
-       )
-       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.4-androiddump.patch
-       "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-       "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
-       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
-       "${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-       enewgroup wireshark
-}
-
-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
-
-       mycmakeargs+=(
-               $(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_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_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)
-               -DBUILD_wireshark_gtk=$(usex gtk)
-               -DDISABLE_WERROR=yes
-               -DENABLE_BCG729=$(usex bcg729)
-               -DENABLE_CAP=no
-               -DENABLE_CARES=$(usex adns)
-               -DENABLE_GNUTLS=$(usex ssl)
-               -DENABLE_KERBEROS=$(usex kerberos)
-               -DENABLE_LIBXML2=$(usex libxml2)
-               -DENABLE_LUA=$(usex lua)
-               -DENABLE_LZ4=$(usex lz4)
-               -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
-               -DENABLE_PCAP=$(usex pcap)
-               -DENABLE_PORTAUDIO=$(usex portaudio)
-               -DENABLE_SBC=$(usex sbc)
-               -DENABLE_SMI=$(usex smi)
-               -DENABLE_SNAPPY=$(usex snappy)
-               -DENABLE_SPANDSP=$(usex spandsp)
-               -DENABLE_ZLIB=$(usex zlib)
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_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
-       local wsheader
-       for wsheader in \
-               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
-               echo "Installing ${wsheader}"
-               insinto /usr/include/wireshark/$( dirname ${wsheader} )
-               doins ${wsheader}
-       done
-
-       for wsheader in \
-               ../${P}_build/config.h \
-               ../${P}_build/version.h
-       do
-               echo "Installing ${wsheader}"
-               insinto /usr/include/wireshark
-               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
-       chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-       if use dumpcap && 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
-}

diff --git a/net-analyzer/wireshark/wireshark-2.6.0.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.0.ebuild
deleted file mode 100644
index 6af27d0f383..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.0.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# 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 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-       adns androiddump bcg729 +capinfos +caps +captype ciscodump
-       cpu_flags_x86_sse4_2 +dftest doc +dumpcap +editcap gtk kerberos libssh
-       libxml2 lua lz4 maxminddb +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 )
-       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 )
-       maxminddb? ( dev-libs/libmaxminddb )
-       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/speex-1.2.0
-               media-libs/speexdsp
-               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
-               dev-ruby/asciidoctor
-       )
-       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
-
-       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 doc guides) \
-               $(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 gtk gtk 3) \
-               $(use_with kerberos krb5) \
-               $(use_with libssh) \
-               $(use_with libxml2) \
-               $(use_with lua) \
-               $(use_with lz4) \
-               $(use_with maxminddb) \
-               $(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_install() {
-       default
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-       # 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 dumpcap && 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
-}

Reply via email to