Stable on alpha + ia64, bug 90539. Cleaned out old ebuild + patches.

(Portage version: 2.0.51.21-r1)

18 files changed, 11 insertions, 673 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index b7c5eda43397..c58d631fa5f6 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.122 2005/05/06 08:32:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.123 2005/05/06 16:24:58 kloeri Exp $
+
+  06 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -files/ethereal-0.10.9-mate.h-gcc2.patch, -files/0.10.4-gcc34.patch,
+  -ethereal-0.10.5.ebuild, -ethereal-0.10.5-r1.ebuild,
+  -ethereal-0.10.6.ebuild, -ethereal-0.10.8.ebuild, -ethereal-0.10.9.ebuild,
+  -ethereal-0.10.10.ebuild, -ethereal-0.10.9-r1.ebuild,
+  ethereal-0.10.11.ebuild:
+  Stable on alpha + ia64, bug 90539. Cleaned out all ebuild + patches.
 
   06 May 2005; Daniel Black <dragonheart@gentoo.org>
   ethereal-0.10.11.ebuild:
diff --git a/net-analyzer/ethereal/ethereal-0.10.10.ebuild b/net-analyzer/ethereal/ethereal-0.10.10.ebuild
deleted file mode 100644
index c3ff58f5e28b..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.10.ebuild,v 1.7 2005/03/17 23:55:53 ka0ttic Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ~ia64 ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-RDEPEND="virtual/libpcap
-	dev-libs/elfutils
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/libpcre-4.2
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	>=dev-util/pkgconfig-0.15.0"
-
-src_compile() {
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-
-	# Fix gcc-3.4 segfault #49238
-	#[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf
-
-	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
-	else
-		myconf="${myconf} --disable-gtk2"
-
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_enable ipv6) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	# fixes an access violation caused by libnetsnmp - see bug 79068
-	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins ${S}/image/hi16-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins ${S}/image/hi32-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins ${S}/image/hi48-app-ethereal.png ethereal.png
-	make_desktop_entry ethereal "Ethereal" ethereal
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.11.ebuild b/net-analyzer/ethereal/ethereal-0.10.11.ebuild
index 940bdfcb5cfb..ce066bd9b99e 100644
--- a/net-analyzer/ethereal/ethereal-0.10.11.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.11.ebuild,v 1.8 2005/05/06 08:54:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.11.ebuild,v 1.9 2005/05/06 16:24:58 kloeri Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc ~alpha amd64 ~ia64 ppc64"
+KEYWORDS="x86 sparc ppc alpha amd64 ia64 ppc64"
 IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
 
 # if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
diff --git a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild
deleted file mode 100644
index ffbd2c1891ef..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild,v 1.8 2005/01/29 20:47:16 dragonheart Exp $
-
-inherit libtool flag-o-matic gcc eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc ~alpha ~amd64 ~ia64 ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/0.10.4-gcc34.patch
-
-	# running a full elibtoolize seems to break things in this
-	# package... see bug 41831 (17 Feb 2004 agriffis)
-	# elibtoolize --patch-only
-}
-
-src_compile() {
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)"
-
-	if use gtk; then
-		myconf="$(use_enable gtk2)"
-	else
-		myconf="--disable-gtk2"
-
-		# --disable-ethereal do not have an influence
-		#myconf="${myconf} --disable-ethereal"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	# if USE=snmp, then one of the snmp libraries will be available,
-	# thanks to virtual/snmp.  In that case, let Ethereal use
-	# whichever it finds.
-	if ! use snmp; then
-		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
-	fi
-
-	econf \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	addwrite "/usr/share/snmp/mibs/.index"
-	emake || die "compile problem"
-}
-
-src_install() {
-	addwrite "/usr/share/snmp/mibs/.index"
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.5.ebuild b/net-analyzer/ethereal/ethereal-0.10.5.ebuild
deleted file mode 100644
index e806eed161a7..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5.ebuild,v 1.11 2005/01/29 20:47:16 dragonheart Exp $
-
-inherit libtool flag-o-matic gcc eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ia64"
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/0.10.4-gcc34.patch
-
-	# running a full elibtoolize seems to break things in this
-	# package... see bug 41831 (17 Feb 2004 agriffis)
-	elibtoolize --patch-only
-}
-
-src_compile() {
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)"
-
-	if use gtk; then
-		myconf="$(use_enable gtk2)"
-	else
-		myconf="--disable-gtk2"
-
-		# --disable-ethereal do not have an influence
-		#myconf="${myconf} --disable-ethereal"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	# if USE=snmp, then one of the snmp libraries will be available,
-	# thanks to virtual/snmp.  In that case, let Ethereal use
-	# whichever it finds.
-	if ! use snmp; then
-		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
-	fi
-
-	econf \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	addwrite "/usr/share/snmp/mibs/.index"
-	emake || die "compile problem"
-}
-
-src_install() {
-	addwrite "/usr/share/snmp/mibs/.index"
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.6.ebuild b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
deleted file mode 100644
index e2abdae73583..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.11 2005/01/29 20:47:16 dragonheart Exp $
-
-inherit libtool flag-o-matic gcc eutils
-
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-#
-# THIS VERSION HAS SECURITY ISSUES. DO NOT STABLIZE ARCHS.
-#
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc alpha ~amd64 ~ia64"
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-src_compile() {
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)"
-
-	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
-	else
-		myconf="${myconf} --disable-gtk2"
-
-		# --disable-ethereal do not have an influence
-		#myconf="${myconf} --disable-ethereal"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	# if USE=snmp, then one of the snmp libraries will be available,
-	# thanks to virtual/snmp.  In that case, let Ethereal use
-	# whichever it finds.
-	if ! use snmp; then
-		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
-	fi
-
-	econf \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	addwrite "/usr/share/snmp/mibs/.index"
-	emake || die "compile problem"
-}
-
-src_install() {
-	addwrite "/usr/share/snmp/mibs/.index"
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.8.ebuild b/net-analyzer/ethereal/ethereal-0.10.8.ebuild
deleted file mode 100644
index 636bd12964f9..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.8.ebuild,v 1.9 2005/01/29 20:47:16 dragonheart Exp $
-
-inherit libtool flag-o-matic gcc eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ia64 ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-src_compile() {
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)"
-
-	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
-	else
-		myconf="${myconf} --disable-gtk2"
-
-		# --disable-ethereal do not have an influence
-		#myconf="${myconf} --disable-ethereal"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	# if USE=snmp, then one of the snmp libraries will be available,
-	# thanks to virtual/snmp.  In that case, let Ethereal use
-	# whichever it finds.
-	if ! use snmp; then
-		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
-	fi
-
-	econf \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	addwrite "/usr/share/snmp/mibs/.index"
-	emake || die "compile problem"
-}
-
-src_install() {
-	addwrite "/usr/share/snmp/mibs/.index"
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
deleted file mode 100644
index 422e279a627b..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild,v 1.7 2005/02/28 20:57:21 gustavoz Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~alpha ~amd64 ~ia64 ~ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-mate.h-gcc2.patch || die "patch failed"
-}
-src_compile() {
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-
-	# Fix gcc-3.4 segfault #49238
-	#[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf
-
-	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
-	else
-		myconf="${myconf} --disable-gtk2"
-
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_enable ipv6) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	# fixes an access violation caused by libnetsnmp - see bug 79068
-	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins ${S}/image/hi16-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins ${S}/image/hi32-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins ${S}/image/hi48-app-ethereal.png ethereal.png
-	make_desktop_entry ethereal "Ethereal" ethereal
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.9.ebuild b/net-analyzer/ethereal/ethereal-0.10.9.ebuild
deleted file mode 100644
index 0d53de7fcdd2..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9.ebuild,v 1.9 2005/02/21 16:43:27 agriffis Exp $
-
-inherit libtool flag-o-matic gcc eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ia64 ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6e )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-mate.h-gcc2.patch || die "patch failed"
-}
-
-src_compile() {
-
-	replace-flags -O3 -O
-	replace-flags -O2 -O
-
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)"
-
-	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
-	else
-		myconf="${myconf} --disable-gtk2"
-
-		# --disable-ethereal do not have an influence
-		#myconf="${myconf} --disable-ethereal"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	# if USE=snmp, then one of the snmp libraries will be available,
-	# thanks to virtual/snmp.  In that case, let Ethereal use
-	# whichever it finds.
-	if ! use snmp; then
-		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
-	fi
-
-	econf \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		${myconf} || die "bad ./configure"
-
-	addwrite "/usr/share/snmp/mibs/.index"
-	emake || die "compile problem"
-}
-
-src_install() {
-	addwrite "/usr/share/snmp/mibs/.index"
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
-}
diff --git a/net-analyzer/ethereal/files/0.10.4-gcc34.patch b/net-analyzer/ethereal/files/0.10.4-gcc34.patch
deleted file mode 100644
index 7f7a5d2451c2..000000000000
--- a/net-analyzer/ethereal/files/0.10.4-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- epan/Makefile.in.old	2004-03-26 04:05:56.000000000 +0000
-+++ epan/Makefile.in	2004-04-23 08:59:22.353604120 +0100
-@@ -1453,7 +1453,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-unroll-loops
- DIST_SOURCES = $(libethereal_la_SOURCES) $(EXTRA_libethereal_la_SOURCES)
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.10 b/net-analyzer/ethereal/files/digest-ethereal-0.10.10
deleted file mode 100644
index 9a9f18450d54..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5addaf1db088a8b51941e4db191b0ab0 ethereal-0.10.10.tar.bz2 5799231
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.5 b/net-analyzer/ethereal/files/digest-ethereal-0.10.5
deleted file mode 100644
index 3ef37a6aba43..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26d5672935ac8bd0793fcd2ad0b4833f ethereal-0.10.5.tar.bz2 4984584
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.5-r1 b/net-analyzer/ethereal/files/digest-ethereal-0.10.5-r1
deleted file mode 100644
index 3ef37a6aba43..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26d5672935ac8bd0793fcd2ad0b4833f ethereal-0.10.5.tar.bz2 4984584
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.6 b/net-analyzer/ethereal/files/digest-ethereal-0.10.6
deleted file mode 100644
index 88a452d4de59..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 722a2529c3a19b5b81c825bca444baea ethereal-0.10.6.tar.bz2 5046796
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.8 b/net-analyzer/ethereal/files/digest-ethereal-0.10.8
deleted file mode 100644
index 32934ab511b4..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa1f1470f7f8bd301c92dd199a4ae60e ethereal-0.10.8.tar.bz2 5351028
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.9 b/net-analyzer/ethereal/files/digest-ethereal-0.10.9
deleted file mode 100644
index e09698606b76..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8b7a2c2dcf273e7fd755f972167dacb ethereal-0.10.9.tar.bz2 5499000
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.9-r1 b/net-analyzer/ethereal/files/digest-ethereal-0.10.9-r1
deleted file mode 100644
index e09698606b76..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8b7a2c2dcf273e7fd755f972167dacb ethereal-0.10.9.tar.bz2 5499000
diff --git a/net-analyzer/ethereal/files/ethereal-0.10.9-mate.h-gcc2.patch b/net-analyzer/ethereal/files/ethereal-0.10.9-mate.h-gcc2.patch
deleted file mode 100644
index adb6dc28e3ed..000000000000
--- a/net-analyzer/ethereal/files/ethereal-0.10.9-mate.h-gcc2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ethereal-0.10.9/plugins/mate/mate.h~	2005-01-21 21:56:08 -0500
-+++ ethereal-0.10.9/plugins/mate/mate.h	2005-01-21 21:56:56 -0500
-@@ -324,7 +324,7 @@
- extern void initialize_mate_runtime(void);
- extern mate_pdu* mate_get_pdus(guint32 framenum);
- extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree);
--extern int mate_packet(void* _U_, packet_info* _U_, epan_dissect_t* _U_,const void* _U_);
-+extern int mate_packet(void *prs _U_, packet_info* tree _U_, epan_dissect_t *edt _U_, const void *dummy _U_);
- 
- /* from mate_setup.c */
- extern mate_config* mate_make_config(guint8* filename);