Version bumped.

4 files changed, 80 insertions, 7 deletions

diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index c8816a09ffbc..75778a277b0d 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,6 +1,6 @@
-MD5 cc724c5459105f05c4e1132226c28280 ChangeLog 5715
-MD5 e0f9f32ef23112e512708bb51be62186 ethereal-0.9.14.ebuild 2131
-MD5 206d4321379d508d9caea98ca5f4914f ethereal-0.9.15.ebuild 2033
+MD5 779784a54ad5bde99fec8926f6acc7d8 ChangeLog 5865
+MD5 fbffd5111c567be992554eacb269ba64 ethereal-0.9.14.ebuild 2082
+MD5 b6023bbe427e0c405e8039d3542b15b8 ethereal-0.9.15.ebuild 2035
 MD5 dfba4396f60b494565bbfc3845e09cec ethereal-0.9.13.ebuild 2129
 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.9.14.ebuild b/net-analyzer/ethereal/ethereal-0.9.14.ebuild
index 5585134f787b..335cff3acf5c 100644
--- a/net-analyzer/ethereal/ethereal-0.9.14.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.14.ebuild,v 1.2 2003/07/31 20:26:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.14.ebuild,v 1.3 2003/09/25 20:28:46 mholzer Exp $
 
 IUSE="gtk ipv6 snmp ssl gtk2"
 inherit libtool
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ethereal.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc alpha"
+KEYWORDS="x86 ~sparc ~ppc alpha"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	snmp? ( virtual/snmp )
@@ -30,8 +30,7 @@ src_unpack() {
 	cd ${S}
 	elibtoolize
 	# gcc related configure script braindamage
-	mv configure configure.broken
-	sed "s|-I/usr/local/include||" configure.broken > configure
+	sed -i "s|-I/usr/local/include||" configure
 	chmod +x ./configure
 	mv Makefile.am Makefile.am.orig
 	sed "s|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@|" \
diff --git a/net-analyzer/ethereal/ethereal-0.9.15.ebuild b/net-analyzer/ethereal/ethereal-0.9.15.ebuild
new file mode 100644
index 000000000000..6a3a4ae00ed3
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.9.15.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.15.ebuild,v 1.1 2003/09/25 20:28:46 mholzer Exp $
+
+IUSE="gtk ipv6 snmp ssl gtk2"
+inherit libtool
+S=${WORKDIR}/${P}
+DESCRIPTION="A commercial-quality network protocol analyzer"
+SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
+HOMEPAGE="http://www.ethereal.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( virtual/snmp )
+	gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) : ( gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) )
+	gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )
+	ssl? ( >=dev-libs/openssl-0.9.6e )
+	>=net-libs/libpcap-0.7.1"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	elibtoolize
+	# gcc related configure script braindamage
+	sed -i "s|-I/usr/local/include||" configure
+	chmod +x ./configure
+	sed -i "s|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@|" \
+		Makefile.am
+}
+
+src_compile() {
+	local myconf
+
+	if [ -z "`use gtk`" ] && [ -z "`use gtk2`" ]; then
+		myconf="${myconf} --disable-ethereal"
+	fi
+
+	use gtk2 && myconf="${myconf} --enable-gtk2"
+	use ssl || myconf="${myconf} --without-ssl"
+	use snmp || myconf="${myconf} --without-ucdsnmp"
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	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
+}
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.9.15 b/net-analyzer/ethereal/files/digest-ethereal-0.9.15
new file mode 100644
index 000000000000..c4733e75068e
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.9.15
@@ -0,0 +1 @@
+MD5 4702c6ff619ff6e59d224688a118644c ethereal-0.9.15.tar.bz2 4019718