X -> gtk, ~x86 -> x86

4 files changed, 10 insertions, 89 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 5e03b9f3ef02..655d2c3de06a 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,9 +1,12 @@
 # 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.13 2002/10/11 21:20:52 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.14 2002/11/06 06:41:17 blocke Exp $
 
 *ethereal-0.9.7 (11 Oct 2002)
 
+  06 Nov 2002; Bruce A. Locke <blocke@shivan.org> ethereal-0.9.7.ebuild:
+  Change 'X' USE to 'gtk' (bug #10122) and marking as stable
+
   11 Oct 2002; Brad Cowan <bcowan@gentoo.org> ethereal-0.9.7.ebuild,
   files/digest-ethereal-0.9.7 :
   
diff --git a/net-analyzer/ethereal/ethereal-0.9.5-r2.ebuild b/net-analyzer/ethereal/ethereal-0.9.5-r2.ebuild
deleted file mode 100644
index ed710636c3b7..000000000000
--- a/net-analyzer/ethereal/ethereal-0.9.5-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.5-r2.ebuild,v 1.6 2002/10/05 05:39:17 drobbins Exp $
-
-IUSE="X snmp ssl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A commercial-quality network protocol analyzer"
-SRC_URI="http://www.ethereal.com/distribution/${P}.tar.gz"
-HOMEPAGE="http://www.ethereal.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/zlib-1.1.4
-	=dev-libs/glib-1.2*
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.5 )
-	X? ( virtual/x11 =x11-libs/gtk+-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-DEPEND="${RDEPEND}
-	sys-devel/perl
-	sys-devel/bison
-	sys-devel/flex
-	>=net-libs/libpcap-0.7.1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-        #This is a new hack for gcc-3.1 compatibility
-        sed -e "1961,1962d;3358,3359d;3382,3383d" configure \
-		>configure.hacked
-        mv configure.hacked configure
-        chmod +x configure
-
-}
-
-src_compile() {
-	local myconf
-	use X || myconf="${myconf} --disable-ethereal"
-	use ssl || myconf="${myconf} --without-ssl"
-	use snmp || myconf="${myconf} --without-ucdsnmp"
-
-	./configure \
-		--prefix=/usr \
-		--enable-pcap \
-		--enable-zlib \
-		--enable-ipv6 \
-		--enable-tethereal \
-		--enable-editcap \
-		--enable-mergecap \
-		--enable-text2cap \
-		--enable-idl2eth \
-		--enable-dftest \
-		--enable-randpkt \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/ethereal \
-		--with-plugindir=/usr/lib/ethereal/plugins/${PV} \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-                #this was an old hack for gcc-3 compatibility
-                #--includedir="" \
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/lib/ethereal/plugins/${PV}
-
-	make install \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		sysconfdir=${D}/etc/ethereal \
-		plugindir=${D}/usr/lib/ethereal/plugins/${PV} || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO
-}
diff --git a/net-analyzer/ethereal/ethereal-0.9.7.ebuild b/net-analyzer/ethereal/ethereal-0.9.7.ebuild
index 33bc340f2596..7685cccb682f 100644
--- a/net-analyzer/ethereal/ethereal-0.9.7.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.9.7.ebuild
@@ -1,8 +1,8 @@
 # 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.7.ebuild,v 1.1 2002/10/11 21:20:52 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.7.ebuild,v 1.2 2002/11/06 06:41:17 blocke Exp $
 
-IUSE="X ipv6 snmp ssl"
+IUSE="gtk ipv6 snmp ssl"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A commercial-quality network protocol analyzer"
@@ -11,13 +11,13 @@ HOMEPAGE="http://www.ethereal.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	=dev-libs/glib-1.2*
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.5 )
-	X? ( virtual/x11 =x11-libs/gtk+-1.2* )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+	ssl? ( >=dev-libs/openssl-0.9.6e )"
 
 DEPEND="${RDEPEND}
 	sys-devel/perl
@@ -39,7 +39,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use X || myconf="${myconf} --disable-ethereal"
+	use gtk || myconf="${myconf} --disable-ethereal"
 	use ssl || myconf="${myconf} --without-ssl"
 	use snmp || myconf="${myconf} --without-ucdsnmp"
 	use ipv6 && myconf="${myconf} --enable-ipv6"
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.9.5-r2 b/net-analyzer/ethereal/files/digest-ethereal-0.9.5-r2
deleted file mode 100644
index 08d48ba93256..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.9.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7a02706c0f22e56a45bd8999dbb35e3 ethereal-0.9.5.tar.gz 3384282