summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/ethereal/ChangeLog8
-rw-r--r--net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild23
2 files changed, 19 insertions, 12 deletions
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index b3893330d209..7ca946259a62 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for net-analyzer/ethereal
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.18 2002/12/30 02:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.19 2003/01/08 19:53:06 bcowan Exp $
*ethereal-0.9.8-r1 (29 Dec 2002)
-
+
+ 08 Jan 2003; Brad Cowan <bcowan@gentoo.org>:
+ Removed gtk+-2 support again as it is broken with our now marked stable version.
+ Fixes bug# 12926.
+
29 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: New rev -- re-enabled gtk2
support, as it works here. Added missing libpcap runtime dependency and
unmasked this ebuild as it fixes a malformed packet crash issue in 0.9.7 and
diff --git a/net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild b/net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild
index 2d6d61691837..d4e674a5c779 100644
--- a/net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 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.8-r1.ebuild,v 1.1 2002/12/30 02:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.8-r1.ebuild,v 1.2 2003/01/08 19:53:06 bcowan Exp $
IUSE="gtk ipv6 snmp ssl gtk2"
@@ -15,7 +15,8 @@ KEYWORDS="x86"
RDEPEND=">=sys-libs/zlib-1.1.4
snmp? ( >=net-analyzer/ucd-snmp-4.2.5 )
- gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2.0* ) : ( gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) )
+ #gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2.0* ) : ( 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"
@@ -37,17 +38,19 @@ src_unpack() {
src_compile() {
local myconf
- if [ "`use gtk2`" ]
- then
- myconf="--enable-gtk2"
- elif [ -z "`use gtk`" ]
- then
- myconf="--disable-ethereal"
- fi
+ #if [ "`use gtk2`" ]
+ #then
+ # myconf="--enable-gtk2"
+ #elif [ -z "`use gtk`" ]
+ #then
+ # myconf="--disable-ethereal"
+ #fi
+
use ssl || myconf="${myconf} --without-ssl"
use snmp || myconf="${myconf} --without-ucdsnmp"
use ipv6 && myconf="${myconf} --enable-ipv6"
-
+ use gtk || myconf="${myconf} --disable-ethereal"
+
if use snmp
then addwrite "/usr/share/snmp/mibs/"
fi