Old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key A792A613)

9 files changed, 8 insertions, 1058 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 51f01fb8314a..6d0ecace4146 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.424 2012/12/15 17:44:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.425 2012/12/15 17:56:55 jer Exp $
+
+  15 Dec 2012; Jeroen Roovers <jer@gentoo.org> -wireshark-1.6.10-r2.ebuild,
+  -files/wireshark-1.6.10-CVE-2012-3548.patch, -wireshark-1.6.11.ebuild,
+  -files/wireshark-1.8.2-CVE-2012-3548.patch,
+  -files/wireshark-1.8.2-python3.patch, -wireshark-1.8.3.ebuild,
+  -wireshark-1.8.3-r2.ebuild, -files/wireshark-1.8.3-dtls-sctp.patch:
+  Old.
 
   15 Dec 2012; Raúl Porcel <armin76@gentoo.org> wireshark-1.6.12.ebuild,
   wireshark-1.8.4.ebuild:
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.10-CVE-2012-3548.patch b/net-analyzer/wireshark/files/wireshark-1.6.10-CVE-2012-3548.patch
deleted file mode 100644
index fa5c91dcce5c..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.6.10-CVE-2012-3548.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/epan/dissectors/packet-drda.c
-+++ b/epan/dissectors/packet-drda.c
-@@ -49,6 +49,7 @@
- #include <epan/packet.h>
- #include <epan/conversation.h>
- #include <epan/prefs.h>
-+#include <epan/expert.h>
- #include "packet-tcp.h"
- 
- static int proto_drda = -1;
-@@ -694,6 +695,10 @@
- 	{
- 		iCommand = tvb_get_ntohs(tvb, offset + 8);
- 		iLength = tvb_get_ntohs(tvb, offset + 0);
-+		if (iLength < 10) {
-+			expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength);
-+			break;
-+		}
- 		/* iCommandEnd is the length of the packet up to the end of the current command */
- 		iCommandEnd += iLength;
- 
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.2-CVE-2012-3548.patch b/net-analyzer/wireshark/files/wireshark-1.8.2-CVE-2012-3548.patch
deleted file mode 100644
index 756e86a53f79..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.2-CVE-2012-3548.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/epan/dissectors/packet-drda.c
-+++ b/epan/dissectors/packet-drda.c
-@@ -55,6 +55,7 @@
- #include <epan/packet.h>
- #include <epan/conversation.h>
- #include <epan/prefs.h>
-+#include <epan/expert.h>
- #include "packet-tcp.h"
- 
- static int proto_drda = -1;
-@@ -696,6 +697,10 @@
-     {
-         iCommand = tvb_get_ntohs(tvb, offset + 8);
-         iLength = tvb_get_ntohs(tvb, offset + 0);
-+        if (iLength < 10) {
-+            expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength);
-+            break;
-+        }
-         /* iCommandEnd is the length of the packet up to the end of the current command */
-         iCommandEnd += iLength;
- 
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch b/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch
deleted file mode 100644
index 380580e0216b..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-------------------------------------------------------------------------
-r43940 | morriss | 2012-07-23 13:04:37 -0400 (Mon, 23 Jul 2012) | 1 line
-
-Get rid of non-ASCII chars.  Also replace tabs with spaces and remove trailing white space.
-
-Index: epan/dissectors/packet-gtpv2.c
-===================================================================
---- epan/dissectors/packet-gtpv2.c	(revision 43939)
-+++ epan/dissectors/packet-gtpv2.c	(revision 43940)
-@@ -2233,7 +2233,7 @@
- static void
- dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_)
- {
--    int         offset = 0; 
-+    int         offset = 0;
-     tvbuff_t   *new_tvb;
-     proto_tree *grouped_tree;
- 
-@@ -5884,13 +5884,13 @@
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL}
-         },
--		/* Bit 1 – PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29], 
--		 * clause 5.3.47 Pre-emption-Vulnerability AVP.
--		 * 5.3.47 Pre-emption-Vulnerability AVP
--		 * The following values are defined:
--		 * PRE-EMPTION_VULNERABILITY_ENABLED (0)
--		 * PRE-EMPTION_VULNERABILITY_DISABLED (1)
--		 */
-+        /* Bit 1 - PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29],
-+         * clause 5.3.47 Pre-emption-Vulnerability AVP.
-+         * 5.3.47 Pre-emption-Vulnerability AVP
-+         * The following values are defined:
-+         * PRE-EMPTION_VULNERABILITY_ENABLED (0)
-+         * PRE-EMPTION_VULNERABILITY_DISABLED (1)
-+         */
-         {&hf_gtpv2_bearer_qos_pvi,
-          {"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi",
-           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
-@@ -5901,13 +5901,13 @@
-           FT_UINT8, BASE_DEC, NULL, 0x3c,
-           NULL, HFILL}
-         },
--		/* Bit 7 – PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP. 
--		 * clause 5.3.46 Pre-emption-Capability AVP.
--		 * 5.3.46 Pre-emption-Capability AVP
--		 * The following values are defined:
--		 * PRE-EMPTION_CAPABILITY_ENABLED (0)
--		 * PRE-EMPTION_CAPABILITY_DISABLED (1)
--		 */
-+        /* Bit 7 - PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP.
-+         * clause 5.3.46 Pre-emption-Capability AVP.
-+         * 5.3.46 Pre-emption-Capability AVP
-+         * The following values are defined:
-+         * PRE-EMPTION_CAPABILITY_ENABLED (0)
-+         * PRE-EMPTION_CAPABILITY_DISABLED (1)
-+         */
-         {&hf_gtpv2_bearer_qos_pci,
-          {"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci",
-           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
-
-------------------------------------------------------------------------
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch b/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch
deleted file mode 100644
index f5cfc9964dde..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/epan/dissectors/packet-dtls.c
-+++ b/epan/dissectors/packet-dtls.c
-@@ -2724,7 +2724,6 @@
- 
-   register_dissector("dtls", dissect_dtls, proto_dtls);
-   dtls_handle = find_dissector("dtls");
--  dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
-   dtls_associations = g_tree_new(ssl_association_cmp);
- 
-   register_init_routine(dtls_init);
-@@ -2750,8 +2749,10 @@
-   dtls_parse_uat();
-   dtls_parse_old_keys();
- 
--  if (initialized == FALSE)
-+  if (initialized == FALSE) {
-     heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
-+    dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
-+  }
- 
-   initialized = TRUE;
- }
diff --git a/net-analyzer/wireshark/wireshark-1.6.10-r2.ebuild b/net-analyzer/wireshark/wireshark-1.6.10-r2.ebuild
deleted file mode 100644
index 922e241dffd6..000000000000
--- a/net-analyzer/wireshark/wireshark-1.6.10-r2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r2.ebuild,v 1.7 2012/09/29 10:48:55 blueness Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs 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"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-	adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
-	+pcap portaudio python +caps selinux smi ssl threads zlib
-"
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
-	)
-	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-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_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.6.10-CVE-2012-3548.patch
-	sed -i -e 's|.png||g' ${PN}.desktop || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	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"
-		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
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_enable threads) \
-		$(use_with caps libcap) \
-		$(use_with gcrypt) \
-		$(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) \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && cd docbook && { emake; }
-}
-
-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*}
-
-	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
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_dac_read_search,cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.6.11.ebuild b/net-analyzer/wireshark/wireshark-1.6.11.ebuild
deleted file mode 100644
index 18032b1d2bb5..000000000000
--- a/net-analyzer/wireshark/wireshark-1.6.11.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.11.ebuild,v 1.1 2012/10/02 23:45:42 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs 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"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="
-	adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
-	+pcap portaudio python +caps selinux smi ssl threads zlib
-"
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
-	)
-	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-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_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
-	sed -i -e 's|.png||g' ${PN}.desktop || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	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"
-		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
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_enable threads) \
-		$(use_with caps libcap) \
-		$(use_with gcrypt) \
-		$(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) \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && cd docbook && { emake; }
-}
-
-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*}
-
-	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
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_dac_read_search,cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild b/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild
deleted file mode 100644
index 2dc4b3649447..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild,v 1.1 2012/10/08 18:21:54 jer Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs 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"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="
-	adns +caps doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap
-	portaudio profile python selinux smi ssl zlib
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	crypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
-	)
-	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-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_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.8.3-dtls-sctp.patch \
-		"${FILESDIR}"/${PN}-1.8.3-gnutls3.patch
-	sed -i -e 's|.png||g' ${PN}.desktop || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	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
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(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-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -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
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_dac_read_search,cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.8.3.ebuild b/net-analyzer/wireshark/wireshark-1.8.3.ebuild
deleted file mode 100644
index bbdb53240e66..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3.ebuild,v 1.7 2012/10/07 19:22:10 jer Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs 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"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-	adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
-	+pcap portaudio python +caps selinux smi ssl zlib
-"
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	adns? (
-		!libadns? ( >=net-dns/c-ares-1.5 )
-	)
-	libadns? ( net-libs/adns )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-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_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.8.3-dtls-sctp.patch
-	sed -i -e 's|.png||g' ${PN}.desktop || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	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
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_with caps libcap) \
-		$(use_with gcrypt) \
-		$(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-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -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*}
-
-	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
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_dac_read_search,cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}