version bump

4 files changed, 106 insertions, 5 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index a462fd03214a..36e35e9a7c13 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.79 2004/08/10 12:57:50 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.80 2004/08/15 15:00:12 eldad Exp $
+
+*ethereal-0.10.6 (15 Aug 2004)
+
+  15 Aug 2004; Eldad Zack <eldad@gentoo.org> +ethereal-0.10.6.ebuild:
+  Version bump
 
   10 Aug 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5.ebuild:
   Changed dep on virtual/snmp to net-analyzer/net-snmp-5.1.1. Closes #56542.
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 6b10cc6e780d..d3c6f42248d9 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 MD5 0a42a2c2146a38e8b79a7ac03600f8a0 ethereal-0.10.5.ebuild 2580
-MD5 59de350beafebab3409ef02d5f2e36ec ChangeLog 11204
+MD5 edff37d433e950f8b0c4694942d7fc4e ethereal-0.10.6.ebuild 2587
+MD5 30d6f0fc1f39425a57361c8a940f4f6c ChangeLog 11322
 MD5 bb9946fe6df0695a2376909c6e3cbd2d ethereal-0.10.5-r1.ebuild 2595
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.3-gcc34.patch 458
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
+MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBGMWWT+MN7JbqCpMRArqEAKCHUhqbcNm9v7Ftn9ukcex+HUZ6YwCeJkE1
-l04oekfBnbumQYDJ/TxbeRA=
-=8aJq
+iD8DBQFBH3szT+MN7JbqCpMRAimAAJ9uJ1/oPcRheEvQ60vmxdEvTJWKUwCfRefb
+STwrcSKq5qgXoA30FXroAE4=
+=eEG1
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.6.ebuild b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
new file mode 100644
index 000000000000..9df491925f31
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 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.1 2004/08/15 15:00:12 eldad 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 )
+	>=net-libs/libpcap-0.7.1
+	>=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/files/digest-ethereal-0.10.6 b/net-analyzer/ethereal/files/digest-ethereal-0.10.6
new file mode 100644
index 000000000000..88a452d4de59
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.6
@@ -0,0 +1 @@
+MD5 722a2529c3a19b5b81c825bca444baea ethereal-0.10.6.tar.bz2 5046796