use epatch; more error checking/messages; tidy

3 files changed, 28 insertions, 27 deletions

diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index 61b7b4e29aa6..a8f6a49eab42 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/driftnet
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.6 2003/12/06 02:49:08 zul Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.7 2004/01/26 22:49:37 mr_bones_ Exp $
+
+  26 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> driftnet-0.1.6.ebuild:
+  use epatch; more error checking/messages; tidy
 
   05 Dec 2003; Chuck Short <zul@gentoo.org> driftnet-0.1.6.ebuild:
   Chown fixes.
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index e740c97f4477..ac01b578909d 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,4 +1,4 @@
-MD5 c65b3f88d68bf14865c16891a4542b21 driftnet-0.1.6.ebuild 1157
-MD5 92fb6fbfc2bbd247cf0e5553bca1e9f6 ChangeLog 496
-MD5 8768d05471c8332731ad3d51f7f18ff6 files/driftnet-0.1.6-nogtk.patch 996
+MD5 4a7bc2f67e21a9c97347b16069fc783c ChangeLog 630
+MD5 265e85f475d0a900696fe271d4df9fda driftnet-0.1.6.ebuild 1255
 MD5 c0c08c9836402b53a0eb51c3b6c6201a files/digest-driftnet-0.1.6 65
+MD5 8768d05471c8332731ad3d51f7f18ff6 files/driftnet-0.1.6-nogtk.patch 996
diff --git a/net-analyzer/driftnet/driftnet-0.1.6.ebuild b/net-analyzer/driftnet/driftnet-0.1.6.ebuild
index 349a746d13aa..3f4f103de7ef 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6.ebuild
@@ -1,46 +1,44 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6.ebuild,v 1.8 2003/12/06 02:49:08 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6.ebuild,v 1.9 2004/01/26 22:49:37 mr_bones_ Exp $
 
-IUSE="gtk"
+inherit eutils
 
-DESCRIPTION="Driftnet is a program which listens to network traffic and picks out images from TCP streams it observes."
+DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="http://www.ex-parrot.com/~chris/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 sparc "
-
+SLOT="0"
+IUSE="gtk"
 
 DEPEND="media-libs/jpeg
 		media-libs/libungif
 		net-libs/libpcap
 		gtk? ( <x11-libs/gtk+-1.3.0 )"
-
-
 RDEPEND="media-sound/mpg123"
-SRC_URI="http://www.ex-parrot.com/~chris/${PN}/${P}.tar.gz"
-
-S=${WORKDIR}/${P}
 
 src_compile() {
-	if [ `use gtk` ]
-	then
+	if [ `use gtk` ]; then
 		emake || die "gtk+ build failed"
 		mv driftnet driftnet-gtk
 		make clean || die
 	fi
-	patch -p1 <${FILESDIR}/${P}-nogtk.patch || die
-	emake || die
+	epatch "${FILESDIR}/${P}-nogtk.patch"
+	emake || die "emake failed"
 }
 
 src_install () {
-	dobin driftnet
-	doman driftnet.1
-	use gtk && dobin driftnet-gtk
-	dodoc CHANGES COPYING CREDITS README TODO
+	dobin driftnet || die "dobin failed"
+	doman driftnet.1 || die "doman failed"
+	if use gtk ; then
+		dobin driftnet-gtk || die "dobin failed (gtk)"
+	fi
+	dodoc CHANGES CREDITS README TODO || die "dodoc failed"
 
 	einfo "marking the no-display driftnet as setuid root."
-	chown root:wheel ${D}/usr/bin/driftnet
-	chmod 750 ${D}/usr/bin/driftnet
-	chmod u+s ${D}/usr/bin/driftnet
+	chown root:wheel "${D}/usr/bin/driftnet"
+	chmod 750 "${D}/usr/bin/driftnet"
+	chmod u+s "${D}/usr/bin/driftnet"
 }