Version bumped. Closes 36003 and 38124

3 files changed, 92 insertions, 2 deletions

diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index cbb1e5a69917..2139ae10da90 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,10 +1,10 @@
-MD5 63353bf2384949a5c8770d83eedbd251 ChangeLog 6816
 MD5 33ac707975a02a41518c887301ac7727 ethereal-0.9.13.ebuild 2127
 MD5 19ec1748e5528490a7427dd1334807be ethereal-0.9.14.ebuild 2080
 MD5 1da60f9c2cf08aaa5fca2cf91847c3ff ethereal-0.9.15.ebuild 1989
 MD5 2a7d48724259251f6e59f318777adde6 ethereal-0.9.16-r1.ebuild 2332
 MD5 165b419089a4932faed245b98058a1bf ethereal-0.9.16.ebuild 2260
-MD5 8bb64cf1cf22a10115e9265d62600408 ethereal-0.10.0a.ebuild 2402
+MD5 49b9464af079e99d70561e0aa53adb25 ChangeLog 6968
+MD5 6010ebca3f0b10398b0211cea866c215 ethereal-0.10.0a.ebuild 2510
 MD5 44dcde01bfc4b986a229fa28dee9f9e7 files/digest-ethereal-0.9.13 69
 MD5 380524e1a6116898080fe64bed810144 files/digest-ethereal-0.9.14 69
 MD5 cd9ac6e867607636581cf2e0c8652210 files/digest-ethereal-0.9.15 69
diff --git a/net-analyzer/ethereal/ethereal-0.10.0a.ebuild b/net-analyzer/ethereal/ethereal-0.10.0a.ebuild
new file mode 100644
index 000000000000..8cf373745918
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.0a.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.0a.ebuild,v 1.1 2004/01/18 13:54:13 mholzer Exp $
+
+IUSE="adns gtk ipv6 snmp ssl gtk2"
+inherit libtool
+S=${WORKDIR}/${P}
+DESCRIPTION="A commercial-quality network protocol analyzer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.ethereal.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( virtual/snmp )
+	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}
+	# re-declaring functions is no good idea
+	sed -i 's/getline/packet_giop_getline/g' packet-giop.c || sed failed
+	elibtoolize
+	# gcc related configure script braindamage
+	sed -i "s|-I/usr/local/include||" configure || sed failed
+	chmod +x ./configure
+	sed -i "s|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@|" \
+		Makefile.am || sed failed
+}
+
+src_compile() {
+	local myconf
+
+	if [ -z "`use gtk`" ] && [ -z "`use gtk2`" ]; then
+		myconf="${myconf} --disable-ethereal"
+		# the asn1 plugin needs gtk
+		sed -i -e '/plugins\/asn1/c\' Makefile.in || sed failed
+		sed -i -e 's/\(^SUBDIRS.*\)asn1\(.*\)/\1\2/' \
+			plugins/Makefile.in || sed failed
+	fi
+
+	use gtk2 && myconf="${myconf} --enable-gtk2"
+	use ssl || myconf="${myconf} --without-ssl"
+	use snmp || myconf="${myconf} --without-ucd-snmp --without-net-snmp"
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} $(use_with adns)"
+
+	econf \
+		--enable-pcap \
+		--enable-zlib \
+		--enable-tethereal \
+		--enable-editcap \
+		--enable-mergecap \
+		--enable-text2cap \
+		--enable-idl2eth \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/ethereal \
+		--with-plugindir=/usr/lib/ethereal/plugins/${PV} \
+		${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
+	dodoc AUTHORS COPYING 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.0a b/net-analyzer/ethereal/files/digest-ethereal-0.10.0a
new file mode 100644
index 000000000000..ad5491475faa
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.0a
@@ -0,0 +1 @@
+MD5 1e31508c5509272595fa237d074461b1 ethereal-0.10.0a.tar.bz2 4388176