cleanup

(Portage version: 2.1.2-r1)

5 files changed, 11 insertions, 147 deletions

diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index e462340cf22c..469eec545877 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/driftnet
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.28 2006/11/08 16:57:03 gustavoz Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.29 2007/02/01 21:39:00 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/driftnet-0.1.6-tmpnam-is-bad.diff, -driftnet-0.1.6.ebuild,
+  driftnet-0.1.6-r3.ebuild:
+  cleanup
 
   08 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> driftnet-0.1.6.ebuild,
   driftnet-0.1.6-r3.ebuild:
diff --git a/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild b/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild
index d1992320a813..c8c94e97a894 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild,v 1.5 2006/11/08 16:57:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6-r3.ebuild,v 1.6 2007/02/01 21:39:00 jokey Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,8 +23,8 @@ RDEPEND="media-libs/jpeg
 
 DEPEND="${RDEPEND}
 	|| (
-	( >=x11-misc/makedepend-1.0.0 )
-	virtual/x11
+		>=x11-misc/makedepend-1.0.0
+		virtual/x11
 	)
 	dev-util/pkgconfig"
 
diff --git a/net-analyzer/driftnet/driftnet-0.1.6.ebuild b/net-analyzer/driftnet/driftnet-0.1.6.ebuild
deleted file mode 100644
index c91398864635..000000000000
--- a/net-analyzer/driftnet/driftnet-0.1.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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.22 2006/11/08 16:57:03 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-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"
-KEYWORDS="~amd64 ppc -sparc x86"
-SLOT="0"
-IUSE="gtk"
-
-DEPEND="media-libs/jpeg
-	media-libs/giflib
-	net-libs/libpcap
-	gtk? ( <x11-libs/gtk+-1.3.0 )
-	|| ( x11-misc/makedepend virtual/x11 )"
-
-# Note: x11 is necessary because of makedepend
-
-RDEPEND="${DEPEND}
-	virtual/mpg123"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# use giflib - bug 85720
-	sed -i 's/-lungif/-lgif/' Makefile || die "sed giflib failed"
-	# don't use gtk+ by default
-	sed -i 's:^\(.*gtk-config.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
-
-	epatch ${FILESDIR}/${P}-tmpnam-is-bad.diff
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-
-	if use gtk; then
-		sed -i 's:^#\(.*gtk-config.*\)$:\1:g' Makefile || die "sed enable gtk failed"
-		emake || die "gtk+ build failed"
-		mv driftnet driftnet-gtk
-		make clean || die
-	else
-		append-flags -DNO_DISPLAY_WINDOW
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	dobin driftnet || die "dobin failed"
-	doman driftnet.1 || die "doman failed"
-
-	use gtk && { dobin driftnet-gtk || die "dobin failed (gtk)" ; }
-
-	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"
-}
diff --git a/net-analyzer/driftnet/files/digest-driftnet-0.1.6 b/net-analyzer/driftnet/files/digest-driftnet-0.1.6
deleted file mode 100644
index 0f35a83af42e..000000000000
--- a/net-analyzer/driftnet/files/digest-driftnet-0.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e11d77770452f97bb3c23f510489815 driftnet-0.1.6.tar.gz 36989
-RMD160 01057f3cb992faa537a8b188e116c6f21016cfac driftnet-0.1.6.tar.gz 36989
-SHA256 dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d driftnet-0.1.6.tar.gz 36989
diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-tmpnam-is-bad.diff b/net-analyzer/driftnet/files/driftnet-0.1.6-tmpnam-is-bad.diff
deleted file mode 100644
index 8bb9565e8a07..000000000000
--- a/net-analyzer/driftnet/files/driftnet-0.1.6-tmpnam-is-bad.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --exclude='*~' -urN driftnet-0.1.6.orig/display.c driftnet-0.1.6/display.c
---- driftnet-0.1.6.orig/display.c	2005-03-18 07:55:41.000000000 -0500
-+++ driftnet-0.1.6/display.c	2005-03-18 09:03:59.000000000 -0500
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <errno.h>
-+#include <time.h>
- 
- #include <sys/stat.h>
- 
-@@ -297,7 +298,7 @@
- gboolean pipe_event(GIOChannel chan, GIOCondition cond, gpointer data) {
-     static char *path;
-     char name[TMPNAMELEN];
--    ssize_t rr;
-+    ssize_t rr = 0;
-     int nimgs = 0;
- 
-     if (!path)
-diff --exclude='*~' -urN driftnet-0.1.6.orig/driftnet.c driftnet-0.1.6/driftnet.c
---- driftnet-0.1.6.orig/driftnet.c	2005-03-18 07:55:41.000000000 -0500
-+++ driftnet-0.1.6/driftnet.c	2005-03-18 09:07:43.000000000 -0500
-@@ -50,6 +50,7 @@
- int verbose, adjunct;
- int tmpdir_specified;
- char *tmpdir;
-+char tmpdir_template[] = "driftnet-XXXXXX";
- int max_tmpfiles;
- 
- enum mediatype extract_type = m_image;
-@@ -474,6 +475,8 @@
-     int mpeg_player_specified = 0;
-     pthread_t packetth;
- 
-+    tmpdir = NULL;
-+
-     /* Handle command-line options. */
-     opterr = 0;
-     while ((c = getopt(argc, argv, optstring)) != -1) {
-@@ -584,12 +587,10 @@
-         }
-     } else {
-         /* need to make a temporary directory. */
--        for (;;) {
--            tmpdir = strdup(tmpnam(NULL));
--            if (mkdir(tmpdir, 0700) == 0)
--                break;
--            free(tmpdir);
--        }
-+	if (!(tmpdir = mkdtemp(tmpdir_template))) {
-+	    fprintf(stderr, PROGNAME": mkdtemp: %s\n", strerror(errno));
-+	    return -1;
-+	}
-     }
- 
-     if (verbose) 
-diff --exclude='*~' -urN driftnet-0.1.6.orig/playaudio.c driftnet-0.1.6/playaudio.c
---- driftnet-0.1.6.orig/playaudio.c	2005-03-18 07:55:41.000000000 -0500
-+++ driftnet-0.1.6/playaudio.c	2005-03-18 09:03:59.000000000 -0500
-@@ -167,7 +167,7 @@
- static void mpeg_player_manager(void) {
-     extern sig_atomic_t foad; /* in driftnet.c */
-     struct sigaction sa = {0};
--    pid_t mpeg_pid;
-+    pid_t mpeg_pid = -1;
- 
-     sa.sa_handler = SIG_DFL;
-     sigaction(SIGCHLD, &sa, NULL);