compile and path fixes, see changelog

8 files changed, 15 insertions, 119 deletions

diff --git a/net-analyzer/ettercap/ChangeLog b/net-analyzer/ettercap/ChangeLog
index e76b1c4ae136..8d7167d62f48 100644
--- a/net-analyzer/ettercap/ChangeLog
+++ b/net-analyzer/ettercap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ettercap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.14 2003/06/08 21:33:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.15 2003/06/12 08:56:37 liquidx Exp $
+
+*ettercap-0.6.10-r1 (12 Jun 2003)
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> ettercap-0.6.10-r1.ebuild:
+  disabled gtk check (#22642) and fixed ettercap DATADIR to point to /etc
+  (#22649)
 
   08 Jun 2003; Alastair Tse <liquidx@gentoo.org> ettercap-0.6.10.ebuild:
   added warning about needing to regenerate your SSL certificate
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 20f5e1ca8845..ad16626a5888 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,5 +1,5 @@
-MD5 fc0062246aeccfae82c3fadb1eee48d5 ChangeLog 2051
+MD5 da6b4ed233635f588f38ab7682493de5 ChangeLog 2051
 MD5 655f2beac8e5e928cb554e90faaa0a20 ettercap-0.6.7.ebuild 1105
-MD5 ddbb70b447c2599b704245372e5e9ed8 ettercap-0.6.10-r1.ebuild 1825
+MD5 27bfe31a73e8aa373541a0e8c4553920 ettercap-0.6.10-r1.ebuild 1828
 MD5 14c3d6292ca905f86f79d3e02eb27505 files/digest-ettercap-0.6.10-r1 66
 MD5 f27375ece48970341172a7b5605bd806 files/digest-ettercap-0.6.7 66
diff --git a/net-analyzer/ettercap/ettercap-0.6.10.ebuild b/net-analyzer/ettercap/ettercap-0.6.10-r1.ebuild
index 0ce7b337a3e5..e3b2444fa838 100644
--- a/net-analyzer/ettercap/ettercap-0.6.10.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.6.10-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/ettercap/ettercap-0.6.10.ebuild,v 1.3 2003/06/08 22:43:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.6.10-r1.ebuild,v 1.1 2003/06/12 08:56:37 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -33,12 +33,15 @@ src_compile() {
 		`use_with ssl openssl` \
 		`use_enable ssl https` \
 		--enable-plugins \
-		--disable-debug
+		--datadir=/etc \
+		--disable-debug \
+		--disable-gtk
 
 	sed -i	"s:/usr/share/ettercap/:/etc/ettercap/:; \
 		s:/usr/doc/${P}/:/usr/share/doc/${PF}/:" ettercap.8
 
-	append-flags "-funroll-loops -fomit-frame-pointer -Wall"
+	# not sure why someone put this in
+	# append-flags "-funroll-loops -fomit-frame-pointer -Wall"
 
 	emake CFLAG="${CFLAGS}" || die "failed to compile"
 	emake CFLAG="${CFLAGS}" plug-ins || die "failed to compile plugins"
@@ -63,12 +66,3 @@ pkg_postinst() {
 	einfo ""
 	einfo "and then follow the instructions."
 }
-
-pkg_preinst() {
-	prepalldocs
-	dosym /etc/ettercap /usr/share/ettercap
-}
-
-pkg_postrm() {
-	rm /usr/share/ettercap
-}
diff --git a/net-analyzer/ettercap/ettercap-0.6.6.6-r1.ebuild b/net-analyzer/ettercap/ettercap-0.6.6.6-r1.ebuild
deleted file mode 100644
index 9c5bbc90984a..000000000000
--- a/net-analyzer/ettercap/ettercap-0.6.6.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.6.6.6-r1.ebuild,v 1.9 2003/02/13 13:40:08 vapier Exp $
-
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Ettercap is a multipurpose sniffer/interceptor/logger for switched LAN."
-SRC_URI="http://ettercap.sourceforge.net/download/${P}.tar.gz"
-HOMEPAGE="http://ettercap.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND="sys-libs/ncurses
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --enable-https"
-
-	./configure --host=${CHOST} --prefix=/usr --enable-ncurses --enable-plugins ${myconf}
-	assert
-
-	make CFLAG="${CFLAGS} -funroll-loops -fomit-frame-pointer -Wall" || die
-	make CFLAG="${CFLAGS} -funroll-loops -fomit-frame-pointer -Wall" plug-ins || die
-}
-
-src_install() {                               
-
-	make prefix=${D}/usr MANDIR=${D}/usr/share/man complete_install || die
-	rm ${D}/usr/share/doc/${P}/ettercap.fr.8.in.gz
-	gzip ${D}/usr/share/doc/${P}/*
-
-}
-
-
-
diff --git a/net-analyzer/ettercap/ettercap-0.6.9.ebuild b/net-analyzer/ettercap/ettercap-0.6.9.ebuild
deleted file mode 100644
index 6aff518ee190..000000000000
--- a/net-analyzer/ettercap/ettercap-0.6.9.ebuild
+++ /dev/null
@@ -1,63 +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/ettercap/ettercap-0.6.9.ebuild,v 1.1 2003/02/28 16:49:23 mholzer Exp $
-
-inherit flag-o-matic
-
-IUSE="ssl ncurses"
-
-DESCRIPTION="Ettercap is a multipurpose sniffer/interceptor/logger for switched LAN."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://ettercap.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4.0.5
-	>=sys-apps/portage-2.0.45-r3
-	ncurses? ( sys-libs/ncurses )
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="virtual/glibc
-	ncurses? ( sys-libs/ncurses )
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	# NOTE: gtk support is still experimental code and has _NOT_ been included here
-
-	econf   `use_enable ncurses` \
-		`use_with ssl openssl` \
-		--enable-https \
-		--enable-plugins \
-		--disable-debug
-
-	sed -i	"s:/usr/share/ettercap/:/etc/ettercap/:; \
-		s:/usr/doc/${P}/:/usr/share/doc/${PF}/:" ettercap.8
-
-	append-flags "-funroll-loops -fomit-frame-pointer -Wall"
-
-	emake CFLAG="${CFLAGS}" || die "failed to compile"
-	emake CFLAG="${CFLAGS}" plug-ins || die "failed to compile plugins"
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		DATADIR=${D}/etc/ettercap \
-		DOCDIR=${D}/usr/share/doc/${PF} \
-		complete_install || die "make complete_install failed"
-
-	rm ${D}/usr/share/doc/${PF}/{ettercap.fr.8.in,COPYING,INSTALL} \
-	   ${D}/etc/ettercap/{AUTHORS,THANKS}
-}
-
-pkg_preinst() {
-	prepalldocs
-	dosym /etc/ettercap /usr/share/ettercap
-}
-
-pkg_postrm() {
-	rm /usr/share/ettercap
-}
diff --git a/net-analyzer/ettercap/files/digest-ettercap-0.6.10 b/net-analyzer/ettercap/files/digest-ettercap-0.6.10-r1
index 2566fad64851..2566fad64851 100644
--- a/net-analyzer/ettercap/files/digest-ettercap-0.6.10
+++ b/net-analyzer/ettercap/files/digest-ettercap-0.6.10-r1
diff --git a/net-analyzer/ettercap/files/digest-ettercap-0.6.6.6-r1 b/net-analyzer/ettercap/files/digest-ettercap-0.6.6.6-r1
deleted file mode 100644
index 7b8c17e7f96c..000000000000
--- a/net-analyzer/ettercap/files/digest-ettercap-0.6.6.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87ec7ad7b230e0ba89aa8b0cbc8d918e ettercap-0.6.6.6.tar.gz 558542
diff --git a/net-analyzer/ettercap/files/digest-ettercap-0.6.9 b/net-analyzer/ettercap/files/digest-ettercap-0.6.9
deleted file mode 100644
index a1ba64d8c6e4..000000000000
--- a/net-analyzer/ettercap/files/digest-ettercap-0.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7cd239755619e3388eb5870d366b6f6a ettercap-0.6.9.tar.gz 681245