commit:     c18666624deb29b36aab08897e7201e5bfd0bd98
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 06:04:33 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 06:06:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1866662

net-analyzer/wireshark: Old.

Package-Manager: portage-2.2.27

 net-analyzer/wireshark/Manifest                    |   2 -
 .../files/wireshark-1.12.5-cross-compile.patch     |  51 ----
 .../wireshark/files/wireshark-1.12.6-rcc.patch     |  52 ----
 .../wireshark-1.12.8-gtk-deprecated-warnings.patch |  28 ---
 .../wireshark/files/wireshark-1.99.0-qt5.patch     |  88 -------
 .../files/wireshark-1.99.0.1975-sse4_2.patch       |  20 --
 .../wireshark/files/wireshark-1.99.1-sbc.patch     |  18 --
 .../wireshark/files/wireshark-1.99.7-qt-pie.patch  |  11 -
 net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild  | 266 --------------------
 net-analyzer/wireshark/wireshark-1.12.8.ebuild     | 258 -------------------
 net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild   | 279 ---------------------
 net-analyzer/wireshark/wireshark-2.0.0.ebuild      | 274 --------------------
 12 files changed, 1347 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index effdccf..6bf61e7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 
357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 
24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5
 WHIRLPOOL 
ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
-DIST wireshark-2.0.0.tar.bz2 30976957 SHA256 
90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd SHA512 
ba3b8b5fa7b441c0494e833da887566c70ec30c20a161bcb6a77ec1deff0503e00f9cf6cf7d892f2cbb189dcf21b548844abe8106dfd29c565868944c10aa7c0
 WHIRLPOOL 
82d6563fdc40680bb4b79af779e844cb76524305350f19c0ea85892ceaf9db4cf9383ac9f46e0033fcfc1782b02ba7ceb8307bfc84759f9e60be6f0b57fbaf15
 DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 
c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 
fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca
 WHIRLPOOL 
45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789

diff --git a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch 
b/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
deleted file mode 100644
index 3118178..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://code.wireshark.org/review/8481
-
-From edefd74591d8f7010024a31576c2cb51eb1526ad Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@chromium.org>
-Date: Sat, 16 May 2015 05:08:53 -0400
-Subject: [PATCH] switch to AC_PATH_TOOL
-
-The TOOL variant will automatically search for host prefixed scripts
-(e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back
-to the default (i.e. pcap-config).  This makes cross-compiling a bit
-simpler.
-
-Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c
----
- acinclude.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index ffb1cac..c79c427 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -380,7 +380,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
-         # The user didn't specify a directory in which libpcap resides.
-         # First, look for a pcap-config script.
-         #
--        AC_PATH_PROG(PCAP_CONFIG, pcap-config)
-+        AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
- 
-         if test -n "$PCAP_CONFIG" ; then
-           #
-@@ -1217,7 +1217,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
-           AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
-         fi
-       else
--        AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-+        AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
-         if test -x "$KRB5_CONFIG"
-         then
-           KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-@@ -2033,7 +2033,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
- [
-       no_qt=""
- 
--      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+      AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
- 
-       if test x$PKG_CONFIG != xno ; then
-               if pkg-config --atleast-pkgconfig-version 0.7 ; then
--- 
-2.4.0
-

diff --git a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch 
b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
deleted file mode 100644
index b8290d0..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1609,11 +1609,37 @@
-                       # we don't know whether they'll be doing that,
-                       # so this is the best we can do.
-                       #
--                      MIC=moc
-+                      MOC=moc
-               fi
-       fi
- fi
- AC_SUBST(MOC)
-+AC_PATH_PROG(RCC, rcc)
-+if test "x$RCC" = x
-+then
-+      AC_PATH_PROG(RCC, rcc-qt4)
-+      if test "x$RCC" = x
-+      then
-+              if test "x$have_qt" = "xyes"; then
-+                      #
-+                      # If you want to build with Qt, you'd better
-+                      # have rcc.
-+                      #
-+                      AC_MSG_ERROR(I couldn't find moc or rcc-qt4; make sure 
it's installed and in your path)
-+              else
-+                      #
-+                      # We shouldn't fail here, as the user's not
-+                      # building with Qt, and we shouldn't force them
-+                      # to have Qt installed if they're not doing so.
-+                      # "make dist" will fail if they do that, but
-+                      # we don't know whether they'll be doing that,
-+                      # so this is the best we can do.
-+                      #
-+                      RCC=rcc
-+              fi
-+      fi
-+fi
-+AC_SUBST(RCC)
- 
- # Error out if a glib header other than a "top level" header
- #  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
---- a/ui/qt/Makefile.am
-+++ b/ui/qt/Makefile.am
-@@ -116,7 +116,7 @@
- 
- .qrc.rcc.cpp:
-       $(MKDIR_P) $(@D)
--      $(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $<
-+      $(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $<
- 
- ui_%.h: %.ui
-       $(AM_V_UIC)$(UIC) $< -o $@

diff --git 
a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch 
b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
deleted file mode 100644
index 24ecf9f..0000000
--- 
a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1536,25 +1536,6 @@
-       wireshark_man=""
- fi
- 
--if test "$have_gtk" = "yes" ; then
--      # If we have GTK then add flags for it.
--
--      CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
--      if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version 
-ge 10 \) ; then
--              ## Allow use of deprecated & disable deprecated warnings if Gtk 
>= 3.10;
--              ##  The deprecations in Gtk 3.10 will not be fixed ...
--              CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
--      else
--              CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
--      fi
--      CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
--      if test ! \( $gtk_config_major_version -eq 2 -a 
$gtk_config_minor_version -lt 20 \) ; then
--              # Enable GSEAL when building with GTK > 2.20
--              # (Versions prior to 2.22 lacked some necessary accessors.)
--              CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
--      fi
--fi
--
- # XXX - Is this really necessary?  When we build with both Gtk+ and Qt it 
works...
- if test "$use_glib_cflags" = "true"; then
-       # Use GLIB_CFLAGS

diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch 
b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
deleted file mode 100644
index be1343d..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2043,21 +2043,23 @@
-       # Try the Qt 5 version first.
-       # (And be prepared to add Qt6 at some point....)
-       #
--      for modprefix in Qt5 Qt
--      do
--              pkg_config_module="${modprefix}$1"
--              AC_MSG_CHECKING(for $pkg_config_module - version >= 
$min_qt_version)
--              if $PKG_CONFIG --atleast-version $min_qt_version 
$pkg_config_module; then
--                      mod_version=`$PKG_CONFIG --modversion 
$pkg_config_module`
--                      AC_MSG_RESULT(yes (version $mod_version))
--                      Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags 
$pkg_config_module`"
--                      Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs 
$pkg_config_module`"
--                      found_$1=yes
--                      break
--              else
--                      AC_MSG_RESULT(no)
--              fi
--      done
-+      if test "$with_qt5" = yes; then
-+              modprefix=Qt5
-+      else
-+              modprefix=Qt
-+      fi
-+      pkg_config_module="${modprefix}$1"
-+      AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version)
-+      if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; 
then
-+              mod_version=`$PKG_CONFIG --modversion $pkg_config_module`
-+              AC_MSG_RESULT(yes (version $mod_version))
-+              Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`"
-+              Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`"
-+              found_$1=yes
-+              break
-+      else
-+              AC_MSG_RESULT(no)
-+      fi
- 
-       if test "x$found_$1" = "xyes"; then
-               # Run Action-If-Found
---- a/configure.ac
-+++ b/configure.ac
-@@ -456,10 +456,15 @@
- #
- # GUI toolkit options
- #
--AC_ARG_WITH([qt],
--  AC_HELP_STRING( [--with-qt=@<:@yes/no@:>@],
-+AC_ARG_WITH([qt4],
-+  AC_HELP_STRING( [--with-qt4=@<:@yes/no@:>@],
-+                                [use Qt @<:@default=yes@:>@]),
-+  with_qt4="$withval", with_qt4="unspecified")
-+
-+AC_ARG_WITH([qt5],
-+  AC_HELP_STRING( [--with-qt5=@<:@yes/no@:>@],
-                   [use Qt @<:@default=yes@:>@]),
--  with_qt="$withval", with_qt="unspecified")
-+  with_qt5="$withval", with_qt5="unspecified")
- 
- AC_ARG_WITH([gtk2],
-   AC_HELP_STRING( [--with-gtk2=@<:@yes/no@:>@],
-@@ -1373,7 +1378,6 @@
- AC_SUBST(GTK2_MIN_VERSION)
- GTK3_MIN_VERSION=3.0.0
- AC_SUBST(GTK3_MIN_VERSION)
--QT_MIN_VERSION=4.6.0
- AC_SUBST(QT_MIN_VERSION)
- # GTK+ and Qt checks; we require GTK+ $GTK2_MIN_VERSION or later or
- # GTK3_MIN_VERSION or later or Qt $QT_MIN_VERSION or later.
-@@ -1417,14 +1421,15 @@
- if test "x$enable_wireshark" = "xyes"; then
-       if test "x$with_gtk2" = "xunspecified" -a \
-               "x$with_gtk3" = "xunspecified" -a \
--              "x$with_qt" = "xunspecified"; then
-+              "x$with_qt4" = "xunspecified" -a \
-+              "x$with_qt5" = "xunspecified"; then
-               #
-               # No GUI toolkit was explicitly specified; pick Qt and GTK+ 3.
-               #
-               with_qt=yes
-               with_gtk3=yes
-       fi
--      if test "x$with_qt" = "xyes"; then
-+      if test "x$with_qt" = "xyes" || test "x$with_qt4" = "xyes" || test 
"x$with_qt5" = "xyes"; then
-               #
-               # Qt was specified; Make sure we have a C++ compiler.
-               #

diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch 
b/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
deleted file mode 100644
index ba61de6..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -985,6 +985,7 @@
- AC_SUBST(PIE_CFLAGS)
- AC_SUBST(PIE_LDFLAGS)
- 
-+AC_ARG_ENABLE(sse4_2,[  --enable-sse4_2         Support SSE4.2 (Streaming 
SIMD Extensions 4.2) instructions],[
- CFLAGS_before_simd="$CFLAGS"
- AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
- if test "x$CFLAGS" != "x$CFLAGS_before_simd"
-@@ -1011,6 +1012,9 @@
- else
-       have_sse42=no
- fi
-+],[
-+AC_MSG_RESULT(no)
-+])
- dnl build libwsutil_sse42 only if there is SSE4.2
- AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes")
- AC_SUBST(CFLAGS_SSE42)

diff --git a/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch 
b/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
deleted file mode 100644
index adda8fe..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2731,7 +2731,14 @@
- 
- # Check Bluetooth SBC codec for RTP Player
- # git://git.kernel.org/pub/scm/bluetooth/sbc.git
--PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
-+AC_ARG_WITH(sbc,
-+    AC_HELP_STRING( [--with-sbc],
-+                    [add support for playing SBC]),
-+      [if test "x$withval" = "xyes"; then
-+        PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
-+    else
-+        have_sbc=no
-+    fi])
- if (test "${have_sbc}" = "yes"); then
-     AC_DEFINE(HAVE_SBC, 1, [Define to support playing SBC by standalone BlueZ 
SBC library])
-     CFLAGS="$CFLAGS $(pkg-config sbc --cflags)"

diff --git a/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch 
b/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
deleted file mode 100644
index 445fe10..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ui/qt/Makefile.am
-+++ b/ui/qt/Makefile.am
-@@ -84,7 +84,7 @@
- 
- # Common headers
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
--      $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
-+      $(LIBGNUTLS_CFLAGS)
- 
- AM_CXXFLAGS = $(AM_CLEAN_CFLAGS)
- 

diff --git a/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild 
b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
deleted file mode 100644
index 730e6ee..0000000
--- a/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/";
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="
-       adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink 
+pcap
-       portaudio +qt4 qt5 sbc selinux smi ssl zlib
-"
-REQUIRED_USE="
-       ssl? ( crypt )
-       ?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       x11-misc/xdg-utils
-"
-CDEPEND="
-       >=dev-libs/glib-2.14:2
-       netlink? ( dev-libs/libnl:3 )
-       adns? ( >=net-dns/c-ares-1.5 )
-       crypt? ( dev-libs/libgcrypt:0 )
-       caps? ( sys-libs/libcap )
-       geoip? ( dev-libs/geoip )
-       gtk3? (
-               ${GTK_COMMON_DEPEND}
-               x11-libs/gtk+:3
-       )
-       kerberos? ( virtual/krb5 )
-       lua? ( >=dev-lang/lua-5.1:* )
-       pcap? ( net-libs/libpcap )
-       portaudio? ( media-libs/portaudio )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4[accessibility]
-               x11-misc/xdg-utils
-               )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               x11-misc/xdg-utils
-       )
-       sbc? ( media-libs/sbc )
-       smi? ( net-libs/libsmi )
-       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
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-"
-RDEPEND="
-       ${CDEPEND}
-       gtk3? ( virtual/freedesktop-icon-theme )
-       qt4? ( virtual/freedesktop-icon-theme )
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-       enewgroup wireshark
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-               "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-               "${FILESDIR}"/${PN}-1.12.8-gtk-deprecated-warnings.patch \
-               "${FILESDIR}"/${PN}-1.99.0-qt5.patch \
-               "${FILESDIR}"/${PN}-1.99.1-sbc.patch \
-               "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
-               "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
-               "${FILESDIR}"/${PN}-1.12.6-rcc.patch
-
-       epatch_user
-
-       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 gtk3 || use qt4 || use qt5; then
-               myconf+=( "--enable-wireshark" )
-       else
-               myconf+=( "--disable-wireshark" )
-       fi
-
-       use qt4 && export QT_MIN_VERSION=4.6.0
-
-       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
-
-       # dumpcap requires libcap
-       # --disable-profile-build bugs #215806, #292991, #479602
-       econf \
-               $(use_enable ipv6) \
-               $(use_with adns c-ares) \
-               $(use_with caps libcap) \
-               $(use_with crypt gcrypt) \
-               $(use_with geoip) \
-               $(use_with gtk3) \
-               $(use_with kerberos krb5) \
-               $(use_with lua) \
-               $(use_with pcap dumpcap-group wireshark) \
-               $(use_with pcap) \
-               $(use_with portaudio) \
-               $(use_with qt4) \
-               $(use_with qt5) \
-               $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-               $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-               $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-               $(use_with sbc) \
-               $(use_with smi libsmi) \
-               $(use_with ssl gnutls) \
-               $(use_with zlib) \
-               $(usex netlink --with-libnl=3 --without-libnl) \
-               --disable-profile-build \
-               --disable-usr-local \
-               --disable-warnings-as-errors \
-               --sysconfdir="${EPREFIX}"/etc/wireshark \
-               --without-adns \
-               ${myconf[@]}
-}
-
-src_compile() {
-       default
-       if use doc; then
-               use doc-pdf && addpredict "/root/.java"
-               emake -j1 -C docbook
-       fi
-}
-
-src_install() {
-       default
-       if use doc; then
-               dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-               if use doc-pdf; then
-                       insinto /usr/share/doc/${PF}/pdf/
-                       doins 
docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
-               fi
-       fi
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-               doc/{randpkt.txt,README*}
-
-       # install headers
-       local wsheader
-       for wsheader in \
-               color.h \
-               config.h \
-               epan/*.h \
-               epan/crypt/*.h \
-               epan/dfilter/*.h \
-               epan/dissectors/*.h \
-               epan/ftypes/*.h \
-               epan/wmem/*.h \
-               register.h \
-               wiretap/*.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 gtk3 || use qt4 || 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
-               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
-               done
-       fi
-
-       if use gtk3; then
-               domenu wireshark.desktop
-       fi
-
-       if use qt4 || use qt5; then
-               sed \
-                       -e '/Exec=/s|wireshark|&-qt|g' \
-                       -e 's|^Name.*=Wireshark|& (Qt)|g' \
-                       wireshark.desktop > wireshark-qt.desktop \
-                       || die
-               domenu wireshark-qt.desktop
-       fi
-
-       prune_libtool_files
-}
-
-pkg_postinst() {
-       # 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."
-}

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild 
b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
deleted file mode 100644
index 14f4796..0000000
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/";
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-       adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink 
+pcap
-       portaudio +qt4 qt5 sbc selinux smi ssl zlib
-"
-REQUIRED_USE="
-       ssl? ( crypt )
-       ?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       x11-misc/xdg-utils
-"
-CDEPEND="
-       >=dev-libs/glib-2.14:2
-       netlink? ( dev-libs/libnl:3 )
-       adns? ( >=net-dns/c-ares-1.5 )
-       crypt? ( dev-libs/libgcrypt:0 )
-       caps? ( sys-libs/libcap )
-       geoip? ( dev-libs/geoip )
-       gtk3? (
-               ${GTK_COMMON_DEPEND}
-               x11-libs/gtk+:3
-       )
-       kerberos? ( virtual/krb5 )
-       lua? ( >=dev-lang/lua-5.1:* )
-       pcap? ( net-libs/libpcap )
-       portaudio? ( media-libs/portaudio )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4[accessibility]
-               x11-misc/xdg-utils
-               )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               x11-misc/xdg-utils
-       )
-       sbc? ( media-libs/sbc )
-       smi? ( net-libs/libsmi )
-       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
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-"
-RDEPEND="
-       ${CDEPEND}
-       gtk3? ( virtual/freedesktop-icon-theme )
-       qt4? ( virtual/freedesktop-icon-theme )
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-       enewgroup wireshark
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-               "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-               "${FILESDIR}"/${PN}-1.12.8-gtk-deprecated-warnings.patch \
-               "${FILESDIR}"/${PN}-1.99.0-qt5.patch \
-               "${FILESDIR}"/${PN}-1.99.1-sbc.patch \
-               "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
-               "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
-               "${FILESDIR}"/${PN}-1.12.6-rcc.patch
-
-       epatch_user
-
-       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 gtk3 || use qt4 || use qt5; then
-               myconf+=( "--enable-wireshark" )
-       else
-               myconf+=( "--disable-wireshark" )
-       fi
-
-       use qt4 && export QT_MIN_VERSION=4.6.0
-
-       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
-
-       # dumpcap requires libcap
-       # --disable-profile-build bugs #215806, #292991, #479602
-       econf \
-               $(use_enable ipv6) \
-               $(use_with adns c-ares) \
-               $(use_with caps libcap) \
-               $(use_with crypt gcrypt) \
-               $(use_with geoip) \
-               $(use_with gtk3) \
-               $(use_with kerberos krb5) \
-               $(use_with lua) \
-               $(use_with pcap dumpcap-group wireshark) \
-               $(use_with pcap) \
-               $(use_with portaudio) \
-               $(use_with qt4) \
-               $(use_with qt5) \
-               $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-               $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-               $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-               $(use_with sbc) \
-               $(use_with smi libsmi) \
-               $(use_with ssl gnutls) \
-               $(use_with zlib) \
-               $(usex netlink --with-libnl=3 --without-libnl) \
-               --disable-profile-build \
-               --disable-usr-local \
-               --disable-warnings-as-errors \
-               --sysconfdir="${EPREFIX}"/etc/wireshark \
-               --without-adns \
-               ${myconf[@]}
-}
-
-src_compile() {
-       default
-       if use doc; then
-               use doc-pdf && addpredict "/root/.java"
-               emake -j1 -C docbook
-       fi
-}
-
-src_install() {
-       default
-       if use doc; then
-               dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-               if use doc-pdf; then
-                       insinto /usr/share/doc/${PF}/pdf/
-                       doins 
docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
-               fi
-       fi
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-               doc/{randpkt.txt,README*}
-
-       # install headers
-       local wsheader
-       for wsheader in \
-               color.h \
-               config.h \
-               epan/*.h \
-               epan/crypt/*.h \
-               epan/dfilter/*.h \
-               epan/dissectors/*.h \
-               epan/ftypes/*.h \
-               epan/wmem/*.h \
-               register.h \
-               wiretap/*.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 gtk3 || use qt4 || 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
-               done
-       fi
-
-       if use gtk3; then
-               domenu wireshark.desktop
-       fi
-
-       if use qt4 || use qt5; then
-               sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > 
wireshark-qt.desktop || die
-               domenu wireshark-qt.desktop
-       fi
-
-       prune_libtool_files
-}
-
-pkg_postinst() {
-       # 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."
-}

diff --git a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
deleted file mode 100644
index 7d7f825..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/";
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="
-       adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-       +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-       cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-       ssl? ( crypt )
-       ?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-GTK_COMMON_DEPEND="
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       x11-misc/xdg-utils
-"
-CDEPEND="
-       >=dev-libs/glib-2.14:2
-       netlink? ( dev-libs/libnl:3 )
-       adns? ( >=net-dns/c-ares-1.5 )
-       crypt? ( dev-libs/libgcrypt:0 )
-       caps? ( sys-libs/libcap )
-       geoip? ( dev-libs/geoip )
-       gtk3? (
-               ${GTK_COMMON_DEPEND}
-               x11-libs/gtk+:3
-       )
-       kerberos? ( virtual/krb5 )
-       lua? ( >=dev-lang/lua-5.1:* )
-       pcap? ( net-libs/libpcap )
-       portaudio? ( media-libs/portaudio )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4[accessibility]
-               x11-misc/xdg-utils
-               )
-       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 )
-       smi? ( net-libs/libsmi )
-       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
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-"
-RDEPEND="
-       ${CDEPEND}
-       gtk3? ( virtual/freedesktop-icon-theme )
-       qt4? ( virtual/freedesktop-icon-theme )
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-       enewgroup wireshark
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-               "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-               "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
-               "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-               "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-               "${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch
-
-       epatch_user
-
-       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 gtk3 || use qt4 || use qt5; then
-               myconf+=( "--enable-wireshark" )
-       else
-               myconf+=( "--disable-wireshark" )
-       fi
-
-       if ! use qt4 && ! use qt5; then
-               myconf+=( "--with-qt=no" )
-       fi
-
-       if use qt4; then
-               export QT_MIN_VERSION=4.6.0
-       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
-
-       # dumpcap requires libcap
-       # --disable-profile-build bugs #215806, #292991, #479602
-       econf \
-               $(use androiddump && use pcap && echo 
--enable-androiddump-use-libpcap=yes) \
-               $(use_enable androiddump) \
-               $(use_enable ipv6) \
-               $(use_enable tfshark) \
-               $(use_with adns c-ares) \
-               $(use_with caps libcap) \
-               $(use_with crypt gcrypt) \
-               $(use_with geoip) \
-               $(use_with gtk3) \
-               $(use_with kerberos krb5) \
-               $(use_with lua) \
-               $(use_with pcap dumpcap-group wireshark) \
-               $(use_with pcap) \
-               $(use_with portaudio) \
-               $(usex qt4 --with-qt=4 '') \
-               $(usex qt5 --with-qt=5 '') \
-               $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-               $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-               $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-               $(use_with sbc) \
-               $(use_with smi libsmi) \
-               $(use_with ssl gnutls) \
-               $(use_with zlib) \
-               $(usex netlink --with-libnl=3 --without-libnl) \
-               $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-               --disable-profile-build \
-               --disable-usr-local \
-               --disable-warnings-as-errors \
-               --sysconfdir="${EPREFIX}"/etc/wireshark \
-               --without-adns \
-               ${myconf[@]}
-}
-
-src_compile() {
-       default
-       if use doc; then
-               use doc-pdf && addpredict "/root/.java"
-               emake -j1 -C docbook
-       fi
-}
-
-src_install() {
-       default
-
-       if use doc; then
-               dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-               if use doc-pdf; then
-                       insinto /usr/share/doc/${PF}/pdf/
-                       doins docbook/{developer,user}-guide-{a4,us}.pdf 
docbook/release-notes.pdf
-               fi
-       fi
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-               doc/{randpkt.txt,README*}
-
-       # install headers
-       local wsheader
-       for wsheader in \
-               color.h \
-               config.h \
-               epan/*.h \
-               epan/crypt/*.h \
-               epan/dfilter/*.h \
-               epan/dissectors/*.h \
-               epan/ftypes/*.h \
-               epan/wmem/*.h \
-               register.h \
-               wiretap/*.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 gtk3 || use qt4 || 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
-               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
-               done
-       fi
-
-       if use gtk3; then
-               domenu wireshark.desktop
-       fi
-
-       if use qt4 || use qt5; then
-               sed \
-                       -e '/Exec=/s|wireshark|&-qt|g' \
-                       -e 's|^Name.*=Wireshark|& (Qt)|g' \
-                       wireshark.desktop > wireshark-qt.desktop \
-                       || die
-               domenu wireshark-qt.desktop
-       fi
-
-       prune_libtool_files
-}
-
-pkg_postinst() {
-       # 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."
-}

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild 
b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
deleted file mode 100644
index f0bae7c..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/";
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-       adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink 
+pcap
-       portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-       ssl? ( crypt )
-       ?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-GTK_COMMON_DEPEND="
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       x11-misc/xdg-utils
-"
-CDEPEND="
-       >=dev-libs/glib-2.14:2
-       netlink? ( dev-libs/libnl:3 )
-       adns? ( >=net-dns/c-ares-1.5 )
-       crypt? ( dev-libs/libgcrypt:0 )
-       caps? ( sys-libs/libcap )
-       geoip? ( dev-libs/geoip )
-       gtk3? (
-               ${GTK_COMMON_DEPEND}
-               x11-libs/gtk+:3
-       )
-       kerberos? ( virtual/krb5 )
-       lua? ( >=dev-lang/lua-5.1:* )
-       pcap? ( net-libs/libpcap )
-       portaudio? ( media-libs/portaudio )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4[accessibility]
-               x11-misc/xdg-utils
-               )
-       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 )
-       smi? ( net-libs/libsmi )
-       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
-       )
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-"
-RDEPEND="
-       ${CDEPEND}
-       gtk3? ( virtual/freedesktop-icon-theme )
-       qt4? ( virtual/freedesktop-icon-theme )
-       qt5? ( virtual/freedesktop-icon-theme )
-       selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-       enewgroup wireshark
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-               "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-               "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
-               "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-               "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-
-       epatch_user
-
-       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 gtk3 || use qt4 || use qt5; then
-               myconf+=( "--enable-wireshark" )
-       else
-               myconf+=( "--disable-wireshark" )
-       fi
-
-       if ! use qt4 && ! use qt5; then
-               myconf+=( "--with-qt=no" )
-       fi
-
-       if use qt4; then
-               export QT_MIN_VERSION=4.6.0
-       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
-
-       # dumpcap requires libcap
-       # --disable-profile-build bugs #215806, #292991, #479602
-       econf \
-               $(use_enable ipv6) \
-               $(use_with adns c-ares) \
-               $(use_with caps libcap) \
-               $(use_with crypt gcrypt) \
-               $(use_with geoip) \
-               $(use_with gtk3) \
-               $(use_with kerberos krb5) \
-               $(use_with lua) \
-               $(use_with pcap dumpcap-group wireshark) \
-               $(use_with pcap) \
-               $(use_with portaudio) \
-               $(usex qt4 --with-qt=4 '') \
-               $(usex qt5 --with-qt=5 '') \
-               $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-               $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-               $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-               $(use_with sbc) \
-               $(use_with smi libsmi) \
-               $(use_with ssl gnutls) \
-               $(use_with zlib) \
-               $(usex netlink --with-libnl=3 --without-libnl) \
-               $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-               --disable-profile-build \
-               --disable-usr-local \
-               --disable-warnings-as-errors \
-               --sysconfdir="${EPREFIX}"/etc/wireshark \
-               --without-adns \
-               ${myconf[@]}
-}
-
-src_compile() {
-       default
-       if use doc; then
-               use doc-pdf && addpredict "/root/.java"
-               emake -j1 -C docbook
-       fi
-}
-
-src_install() {
-       default
-
-       if use doc; then
-               dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-               if use doc-pdf; then
-                       insinto /usr/share/doc/${PF}/pdf/
-                       doins docbook/{developer,user}-guide-{a4,us}.pdf 
docbook/release-notes.pdf
-               fi
-       fi
-
-       # FAQ is not required as is installed from help/faq.txt
-       dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-               doc/{randpkt.txt,README*}
-
-       # install headers
-       local wsheader
-       for wsheader in \
-               color.h \
-               config.h \
-               epan/*.h \
-               epan/crypt/*.h \
-               epan/dfilter/*.h \
-               epan/dissectors/*.h \
-               epan/ftypes/*.h \
-               epan/wmem/*.h \
-               register.h \
-               wiretap/*.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 gtk3 || use qt4 || 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
-               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
-               done
-       fi
-
-       if use gtk3; then
-               domenu wireshark.desktop
-       fi
-
-       if use qt4 || use qt5; then
-               sed \
-                       -e '/Exec=/s|wireshark|&-qt|g' \
-                       -e 's|^Name.*=Wireshark|& (Qt)|g' \
-                       wireshark.desktop > wireshark-qt.desktop \
-                       || die
-               domenu wireshark-qt.desktop
-       fi
-
-       prune_libtool_files
-}
-
-pkg_postinst() {
-       # 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."
-}

Reply via email to