Old.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 12 insertions, 917 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 6724413d4cc8..9e1a515513f8 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.644 2014/08/10 17:27:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.645 2014/08/12 09:59:34 jer Exp $
+
+  12 Aug 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.8.15.ebuild,
+  -wireshark-1.8.15-r1.ebuild, -wireshark-1.10.8.ebuild,
+  -wireshark-1.10.8-r1.ebuild,
+  -files/wireshark-1.8.12-gtk-deprecated-warnings.patch, metadata.xml:
+  Old.
 
   10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.9.ebuild:
   Stable for sparc, wrt bug #519014
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 808ec58bc4a6..81625828781f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,33 +6,16 @@ AUX wireshark-1.10.6-gtk-deprecated-warnings.patch 1011 SHA256 8942ead656bc59995
 AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
 AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
-AUX wireshark-1.8.12-gtk-deprecated-warnings.patch 940 SHA256 9969d68caeb0277ef78b4fa2078aafe6ffb2452de68b17bea5882a1b474ccf00 SHA512 e4bb971475ed019d6231179213f6fc9641d0ea91bac89ae0871e351b4def31741c6d3a9e0ff45fbc741e82804d1db5b1ff3f902d9aa22f598292009716a2f3b0 WHIRLPOOL d482ee4e9c74867e01104a1f85804535e791350006ad90e64c51887904c389d684223c3de1569e0261372e7cb3fa186b0d9cdc75831246644761f170751fca73
-DIST wireshark-1.10.8.tar.bz2 26715025 SHA256 27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763 SHA512 4a892f04b6864033dd95f574c26c6fb414517a660d2c726953cef2a36884aba59ec87d65908eda38175013ea2af44f29cbbcdffab17390763da13bdb4f8e4221 WHIRLPOOL f92bb4dcc91bf870efad4eb4cfb456be092713e4e21b03302d8f99e1b7014ab4a4bbc5d56e48e826d031e594e4f09b6e2ae1262c53f8788bc72a8a5330e8f70e
 DIST wireshark-1.10.9.tar.bz2 26769965 SHA256 7f985db5ea99f4b285ae2eceab42327058f7ba5272d22338152dd79e7601441c SHA512 c4ad324263649c45e220728beb8cf2bd06e7beac38f43b73d5786b08ee82d29616843e0aaac0e92bfcec42d345906b2ba559e82eebf7835bf84d6e557e3375f7 WHIRLPOOL 41da17d3e3bdd322193a03aee4722ecd2c0118195ab22360aabf5294c0d7927a311f16749fa7f56fa4db693f5a63bbd32cdba60788909b550517c363965b3b5e
 DIST wireshark-1.12.0.tar.bz2 29033823 SHA256 0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7 SHA512 03c55106e2b4d5690d0b5fe74b2f4723f07ea9f9a6ca0f54b006045ec4bda47cb31dd3aa8c1879375844f6e6b49f1ffd4a6bb2e34564d43d6e0a25a08302b902 WHIRLPOOL fb7bcc6f7abddce04b37ef1ce4e3e0475e2574672876835464b9a98edca753ac708a0d5b238e6a679948fe0388e11d5c95f723ccd20bc16cef14a2b08e0ecc1e
-DIST wireshark-1.8.15.tar.bz2 24193769 SHA256 e71fab6909a67e6b1d5d21f93e731488fb0343e5206799105e5fdc34923d3e76 SHA512 38306d568017bf12f7db15507e209a74bdd600d4ae02fba63cc5f3639bcba5d07e5ef3dd50fcda3415d30647debdf3a63149a0ef8243898a789e14a8b456a667 WHIRLPOOL 121dc025ef198a6b60a710af370b97834c6b73feea8b314a320b94e47e14c199c76e247868b9be40852b26d8a9d726d3e0d5c85b671e3e71944f8f65f4916a9c
-EBUILD wireshark-1.10.8-r1.ebuild 5537 SHA256 1ad6046a4db23c409920fb54d5a173dc74dff20fd933a135424b229f58c9d4e9 SHA512 a9f13530f15e3602e97dda3e1572ae2453e3597c1554ea7e25364080ae053ed31916c3fc606b175073e7ed606d1d228dce1fb252ce2e2096dad34cac8c883490 WHIRLPOOL 6d0fe39ea4df48a7944ce7c4feeb98c452049a6eeaf81ca1f8d6134b82e17c64db386f64e357b3b8292ef53f45d0bb57d11c7772e72d539ec8f6db867bd69b15
-EBUILD wireshark-1.10.8.ebuild 5820 SHA256 d97445a9696d788ef023d66bd28b8e658df4e667d6d2b929fa6ec74239fb6b02 SHA512 91180c2c8e156ba42fb923166c107395593a85ac1a05aceda65e99f16b96c6b09965e65ab9196beec83316bf44667e920b0b74fc2338fd9e51181c472d37f350 WHIRLPOOL 9cbf92e589d10a0a050ce9e58ff23e1791c22a7d4f71ed64a4362140246221e5be86b03735fb6415f9d40857311c933c52c8f8c9d706518109718d177c37a7c2
 EBUILD wireshark-1.10.9.ebuild 5526 SHA256 2aa0358bfd9a482961b50b202d158e64c3737a31861eff43113140d551f18f83 SHA512 67bae899155c1e72bd3be7e9fd4e3e18fa31709e82b2497f27d8da41ee2e22bccf7c0455d2838b3b8a93c54a7fb9120111094e17d2499c993437d383aba5f78e WHIRLPOOL 2ae668bbb63dd5e6b3c8111e1bc8759e487ea897875cb2e766d49bf39f4c8ff85ff264c673be91942a6225e58937c09b454284560a2943b18d14d42b9e1bef03
 EBUILD wireshark-1.12.0.ebuild 5433 SHA256 51de9f490801733743b60da7081f22c171754c7daca351619b088e2558780d3d SHA512 0145b215dfee6855651d8b95a806cd5962261efb9a2217acc138bbd9fb9532b08b0ece53ec02e5b2ed5c972fc98634b3c8cce59917847ef81ad73cebf17dc0bc WHIRLPOOL 0a67c3d8830839ff58715624d929b378b029058c818eff4e139df92f5c8b7493481e4a42110041684a3799d0312383bf49cf0c2d7bc44b2776cac71afd0b56a0
-EBUILD wireshark-1.8.15-r1.ebuild 5703 SHA256 ad944f5fb763ffe993681d084212a5d928145cc6e3d0da5969219cfe118b3464 SHA512 3aa3d24b28607967101308ff46e296fefc075277a6145207fbcefec13ddc02fa975f9624cb949e77f104bf89a5b0bcce219e6fe609d13c9bb8569d3a0ba2238e WHIRLPOOL f9468c8f47ee306005099c5adabd4c172e2f3c4feadd60fcac583483ed9eb88709613d9ee265206a048fe9a949514fbda0ce588230a16af785cad468395f9805
-EBUILD wireshark-1.8.15.ebuild 5987 SHA256 b86e571fe7a611ab97c800f25ba3b58bf7f6392c6ab8baf9ed0172dff061f6cd SHA512 72c593831cfe802f13ce2c205386a746b3ad1dd8dd798a4ec7245b091b0fd9cc8be0e91979d53660da745b9a02b93340bb2e3a6a2d8d92d20bcd5c3e5fc77504 WHIRLPOOL 4379e55c55d1dc532759ada08cf6213ed52475dc9161cfa58c2707469d50705c8687cfa86eef71c37db6f38c64fa1e6520553754d6644be57bb7248835632c38
-MISC ChangeLog 94095 SHA256 305d6c26b7815030c93fe7a54138e2b10fc1abb80a8b86ec400a442494138b2b SHA512 20f55a1bd992ce421d855f5b0e27ac4f4b475a15e0398d8964e3fe7970ec73446e6c2a98f808de77f19727ef4406a1441a9177ba881d22cc47648d242a906eca WHIRLPOOL 7cf82bb3929eb391af5a3d393f0e101da9759cf0d6c13a98bbcd7c0e295e7b0a8b16cad7deceea3e0854137eea584dfa39debcf817fbb4e098ab80314aa550a1
-MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
+MISC ChangeLog 94335 SHA256 0a6c0df268494e0bb934d5fe8ef08715167ce179f7d9e33fb952ac785aa8b74d SHA512 bc058ff5732b6e052442e173b4a57e831354d6085e54948647800a0456174d5eb821a43d823e2a569e3ab1136884fc4e153b597f88d0b50f73264c17b99f50af WHIRLPOOL 479fc2853857ebb2991e51021e010e31682869faabb165128c83267b1c4c62d4edf3e47e65a48fea0d16e1d55bbefddfbce8899594187ba668389d80ac3d5361
+MISC metadata.xml 2454 SHA256 848fc65f3278f0d2d8be10abdf128f2f43a19e6551f7d9f8cc069b7e256d12ea SHA512 dffae31522dfd37fb75c1985c2c098f5b4f5e47989e16c2b4d513eb4690c3a22a609b85459ecf8b91b536687138b0cf56823e3b5baa8435d924308ba4fe61524 WHIRLPOOL 16c1fb8cd0ee0990222843dd5c1271df36f68722babaa114e99bfd72bce133a782913de1611f106356314aac7cd4042c45da710e20da06af984598eb42fecba5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT56tvAAoJELp701BxlEWfmtcP/A04JC8QTb7ylZQbfMvNgr9W
-4OsffaoEhmtlBsBOidExfukq54UU/FTkXLlaUzQtkAnSI0/7CWpStUOiks7o40om
-FjsLoUS9mRuv/s/9KH2xyBkOdQRBWZ3MFNLjzwvfHvDYBq7HhlW+MfFVllasA9lu
-d7B8b8JUcuU5pMNxpREBi05SE8ihEONk/sXdq6W7Rl93vJSYNwrbjWBJFaAxJHRT
-RU2oCv1ERS2EtX2odZofkHp6830uz6JEx9T4QPC2cqr6pAJWs26G6LtT6jdUoSee
-Z+PXRGXkWcsgDvzCZ/QJp3bxj2wwaFhEs0JQFogOuCCNCgd8YD+tO50IbwMpHuT/
-bmE9Ep4zRFVLRbhuwKkZQAoTKaZMSiedWOxLsC0XbGB0QQ8FBnfpz3fWwZD3e0z9
-H5pcnmnVpkoe9eIjFv7U0K0h0tygxYQ/iZYIs92sg6kUu1Z5nIg7ZwT4VtSSJe7B
-CccIp9UuyAPwwx5AWqYEPMrz97CEOzHKQpLQZgIzMxpLVPPbvGOElAIdue0pCttR
-BT/hCtvIHeLyUkYGoVcg4jRJWb+GciPjpL2AFzOuhGmz5coph+ltYA9//0FYoWtr
-LosWUkp7GbaB17iMamlBHTTg5n5asSn2fiDhVFuEJvsmdoaI7tLmScbN98g3WNId
-pJf7wpmNI0x1tHgHA1t4
-=DYTP
+iEYEAREIAAYFAlPp5YcACgkQVWmRsqeSphPNdwCfUzbMS7jHXevdaXH6JxbUi96U
+RXcAn2Ip4zGJfTi8v8dWwPSggYEvUQc0
+=FZxi
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.12-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.8.12-gtk-deprecated-warnings.patch
deleted file mode 100644
index 6953e2a55635..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.12-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1091,19 +1091,6 @@
-         wireshark_SUBDIRS="codecs ui/gtk"
- 	# Don't use GLIB_CFLAGS
- 	AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
--
--	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
--	## Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2
--	## GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.
--	if test $gtk_config_major_version -eq 2 -o $gtk_config_minor_version -lt 2; then
--		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
--	fi
--	# CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
--	if test $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -ge 20; then
--		# Enable GSEAL when building with GTK > 2.20 and < 3.0
--		# (Versions prior to 2.22 lacked some necessary accessors.)
--		CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
--	fi
- fi
- 
- # Error out if a glib header other than a "top level" header
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index a0c3182c9526..6765c81613c8 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -28,10 +28,8 @@
 <flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 <flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name='gtk'>Build the wireshark executable with a GTK+ UI version 2.</flag>
 <flag name='gtk2'>Build the wireshark executable with a GTK+ UI version 2.</flag>
 <flag name='gtk3'>Build the wireshark executable with a GTK+ UI version 3.</flag>
-<flag name='libadns'>Use <pkg>net-lib/adns</pkg> (DEPRECATED) instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
 <flag name='netlink'>Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name='qt4'>Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
diff --git a/net-analyzer/wireshark/wireshark-1.10.8-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.8-r1.ebuild
deleted file mode 100644
index 02c737e6b2fb..000000000000
--- a/net-analyzer/wireshark/wireshark-1.10.8-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.8-r1.ebuild,v 1.1 2014/06/20 14:14:31 jer Exp $
-
-EAPI=5
-inherit autotools eutils fcaps user
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_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 gtk2 +gtk3 ipv6 kerberos lua +netlink
-	+pcap portaudio qt4 selinux smi ssl zlib
-"
-REQUIRED_USE="
-	?? ( gtk2 gtk3 qt4 )
-	ssl? ( crypt )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk2? (
-		${GTK_COMMON_DEPEND}
-		>=x11-libs/gtk+-2.4.0:2
-	)
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcap? ( net-libs/libpcap[-netlink] )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		x11-misc/xdg-utils
-		)
-	selinux? ( sec-policy/selinux-wireshark )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	>=virtual/perl-Pod-Simple-3.170.0
-	sys-devel/bison
-	sys-devel/flex
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-Local
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.10.6-gtk-deprecated-warnings.patch
-
-	sed -i -e 's|SvnVersion|GitVersion|g' docbook/*.xml || die
-
-	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 gtk2 || use gtk3 || use qt4 ; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	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, setuid-install requires dumpcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable ipv6) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with netlink libnl) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with qt4 qt) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex gtk3 --with-gtk3=yes --with-gtk3=no) \
-		--disable-extra-gcc-checks \
-		--disable-profile-build \
-		--disable-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -j1 -C docbook
-}
-
-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 $( echo $(< debian/wireshark-dev.header-files ) ); 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 gtk2 || use gtk3 || use qt4; 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
-		domenu wireshark.desktop
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	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 run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-1.10.8.ebuild b/net-analyzer/wireshark/wireshark-1.10.8.ebuild
deleted file mode 100644
index cad1e7317184..000000000000
--- a/net-analyzer/wireshark/wireshark-1.10.8.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.8.ebuild,v 1.8 2014/06/29 09:10:56 zlogene Exp $
-
-EAPI=5
-inherit autotools eutils fcaps user
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_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 gtk2 +gtk3 ipv6 kerberos libadns lua
-	+netlink +pcap portaudio qt4 selinux smi ssl zlib
-"
-REQUIRED_USE="
-	?? ( gtk2 gtk3 qt4 )
-	ssl? ( crypt )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl )
-	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
-	crypt? ( dev-libs/libgcrypt:0= )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk2? (
-		${GTK_COMMON_DEPEND}
-		>=x11-libs/gtk+-2.4.0:2
-	)
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	libadns? ( net-libs/adns )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcap? ( net-libs/libpcap[-netlink] )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		x11-misc/xdg-utils
-		)
-	selinux? ( sec-policy/selinux-wireshark )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	>=virtual/perl-Pod-Simple-3.170.0
-	sys-devel/bison
-	sys-devel/flex
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-Local
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.10.6-gtk-deprecated-warnings.patch
-
-	sed -i -e 's|SvnVersion|GitVersion|g' docbook/*.xml || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use adns; then
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --with-c-ares" )
-		fi
-	else
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --without-c-ares" )
-		fi
-	fi
-
-	# 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 gtk2 || use gtk3 || use qt4 ; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	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, setuid-install requires dumpcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable ipv6) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with netlink libnl) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with qt4 qt) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex gtk3 --with-gtk3=yes --with-gtk3=no) \
-		--disable-extra-gcc-checks \
-		--disable-profile-build \
-		--disable-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -j1 -C docbook
-}
-
-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 $( echo $(< debian/wireshark-dev.header-files ) ); 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 gtk2 || use gtk3 || use qt4; 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
-		domenu wireshark.desktop
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	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 run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-1.8.15-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.15-r1.ebuild
deleted file mode 100644
index f41d2ca3dc9a..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.15-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.15-r1.ebuild,v 1.1 2014/06/20 14:14:31 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils fcaps flag-o-matic python-single-r1 user
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_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 gtk ipv6 kerberos lua +pcap portaudio
-	python selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	adns? ( >=net-dns/c-ares-1.5 )
-	caps? ( sys-libs/libcap )
-	crypt? ( dev-libs/libgcrypt:0= )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0:2
-		dev-libs/atk
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( <dev-lang/lua-5.2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-wireshark )
-	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="
-	${RDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.8.12-gtk-deprecated-warnings.patch
-
-	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
-
-	sed -i -e 's|SvnVersion|GitVersion|g' docbook/*.xml || die
-
-	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
-
-	# 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, setuid-install requires dumpcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_with adns c-ares) \
-		$(use_with crypt gcrypt) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		--disable-extra-gcc-checks \
-		--disable-profile-build \
-		--disable-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -j1 -C docbook
-}
-
-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 $( echo $(< debian/wireshark-dev.header-files ) ); 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; then
-		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
-		domenu wireshark.desktop
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	if use python; then
-		python_optimize "${ED}"/usr/lib*/wireshark/python
-	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 run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-	ewarn
-	ewarn "DEPRECATED: ${CATEGORY}/${P} is the last release in the 1.8 branch."
-	ewarn "If you have not prepared your migration to 1.10 yet, now is the time to do so."
-	ewarn "http://www.wireshark.org/lists/wireshark-announce/201406/msg00001.html"
-}
diff --git a/net-analyzer/wireshark/wireshark-1.8.15.ebuild b/net-analyzer/wireshark/wireshark-1.8.15.ebuild
deleted file mode 100644
index 28839650cc64..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.15.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.15.ebuild,v 1.10 2014/06/29 09:10:56 zlogene Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils fcaps flag-o-matic python-single-r1 user
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_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 gtk ipv6 kerberos libadns lua +pcap
-	portaudio python selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
-	caps? ( sys-libs/libcap )
-	crypt? ( dev-libs/libgcrypt:0= )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0:2
-		dev-libs/atk
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libadns? ( net-libs/adns )
-	lua? ( <dev-lang/lua-5.2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-wireshark )
-	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="
-	${RDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.8.12-gtk-deprecated-warnings.patch
-
-	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
-
-	sed -i -e 's|SvnVersion|GitVersion|g' docbook/*.xml || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use adns; then
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --with-c-ares" )
-		fi
-	else
-		if use libadns; then
-			myconf+=( "--with-adns --without-c-ares" )
-		else
-			myconf+=( "--without-adns --without-c-ares" )
-		fi
-	fi
-
-	# 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
-
-	# 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, setuid-install requires dumpcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_with crypt gcrypt) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		--disable-extra-gcc-checks \
-		--disable-profile-build \
-		--disable-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -j1 -C docbook
-}
-
-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 $( echo $(< debian/wireshark-dev.header-files ) ); 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; then
-		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
-		domenu wireshark.desktop
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	if use python; then
-		python_optimize "${ED}"/usr/lib*/wireshark/python
-	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 run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-	ewarn
-	ewarn "DEPRECATED: ${CATEGORY}/${P} is the last release in the 1.8 branch."
-	ewarn "If you have not prepared your migration to 1.10 yet, now is the time to do so."
-	ewarn "http://www.wireshark.org/lists/wireshark-announce/201406/msg00001.html"
-}