Use Debian patchset. Most notably, it adds png support.

(Portage version: 2.0.54 on steroids)

4 files changed, 85 insertions, 15 deletions

diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index 1a84fc5071fa..8e196d01bcb0 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2006/02/15 22:02:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.21 2006/02/18 18:00:35 vanquirius Exp $
+
+*driftnet-0.1.6-r2 (18 Feb 2006)
+
+  18 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +driftnet-0.1.6-r2.ebuild:
+  Use Debian patchset. Most notably, it adds png support.
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> driftnet-0.1.6.ebuild,
   driftnet-0.1.6-r1.ebuild:
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index d29ea72b6207..f6302cff80ef 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,21 +1,9 @@
 MD5 200aa57dfeb5bc3dfd17b913872243cb ChangeLog 2308
-RMD160 4727f1636bd22174fe073cb47b5dfd4efed6f9fb ChangeLog 2308
-SHA256 a147f9d8da29906c3357f04246d56c78c44e9484109610efd2fc78c933b0bbb1 ChangeLog 2308
 MD5 8d0a51db0a19d57014de6babefd1205a driftnet-0.1.6-r1.ebuild 1771
-RMD160 d10fbdcbf2c094938843bb3a30461f6bd7195b1f driftnet-0.1.6-r1.ebuild 1771
-SHA256 c0565591ecfb98c6aa71b5a6c8d00d88c551f4e17e4ea89d74e363b8fedfb2bd driftnet-0.1.6-r1.ebuild 1771
+MD5 4bb34172a29edad53b4196c9b5c7238e driftnet-0.1.6-r2.ebuild 1891
 MD5 9430e0effe2265e9590f1882b5242763 driftnet-0.1.6.ebuild 1747
-RMD160 860979d26143a71b5fe815374ea5eea81ebadcd8 driftnet-0.1.6.ebuild 1747
-SHA256 a0eaf7582a7f3a1d4bf98f2a436cc46ad425d738694ecbafc6770539e024844e driftnet-0.1.6.ebuild 1747
 MD5 c0c08c9836402b53a0eb51c3b6c6201a files/digest-driftnet-0.1.6 65
-RMD160 73cf9c973e8defe244f77f0af600662d9562fdd6 files/digest-driftnet-0.1.6 65
-SHA256 49bab5bd4fbabd9f1e0103cfe3fed7774321181964fa7955cdcf826f451031de files/digest-driftnet-0.1.6 65
 MD5 c0c08c9836402b53a0eb51c3b6c6201a files/digest-driftnet-0.1.6-r1 65
-RMD160 73cf9c973e8defe244f77f0af600662d9562fdd6 files/digest-driftnet-0.1.6-r1 65
-SHA256 49bab5bd4fbabd9f1e0103cfe3fed7774321181964fa7955cdcf826f451031de files/digest-driftnet-0.1.6-r1 65
+MD5 b4c568f613429f5cffb9e7d3cf7cbd58 files/digest-driftnet-0.1.6-r2 137
 MD5 197d8c21e7593ec2c40a08c80e5b9808 files/driftnet-0.1.6-tmpnam-is-bad.diff 2096
-RMD160 93605857f246cbeb87690beb4e49055a5fff69b9 files/driftnet-0.1.6-tmpnam-is-bad.diff 2096
-SHA256 9920eb429a018f459d786635d0957185a3edf7a10bbe6d5148fcf55798bf5748 files/driftnet-0.1.6-tmpnam-is-bad.diff 2096
 MD5 fe5d2611299b3a390d7681e92ff4d5c5 metadata.xml 287
-RMD160 f5a05509893b609f9bc3c7b0ccc73d037656b15b metadata.xml 287
-SHA256 0132f6f9154547c2766f5ad9598aeed4c9ddddd70acf9ba1b333dda556a2f994 metadata.xml 287
diff --git a/net-analyzer/driftnet/driftnet-0.1.6-r2.ebuild b/net-analyzer/driftnet/driftnet-0.1.6-r2.ebuild
new file mode 100644
index 000000000000..ac0fce8ddf42
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-0.1.6-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-r2.ebuild,v 1.1 2006/02/18 18:00:35 vanquirius Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${PN}_${PV}"
+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="mirror://debian/pool/main/d/driftnet/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/d/driftnet/${MY_P}-4.diff.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="gtk"
+
+DEPEND="media-libs/jpeg
+	media-libs/giflib
+	media-libs/libpng
+	net-libs/libpcap
+	gtk? ( <x11-libs/gtk+-1.3.0 )
+	|| (
+	( >=x11-misc/makedepend-1.0.0 )
+	virtual/x11
+	)"
+
+# Note: x11 is necessary because of makedepend
+
+RDEPEND="${DEPEND}
+	virtual/mpg123"
+
+S="${WORKDIR}/${P}.orig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${DISTDIR}"/${MY_P}-4.diff.gz
+
+	# 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"
+}
+
+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-r2 b/net-analyzer/driftnet/files/digest-driftnet-0.1.6-r2
new file mode 100644
index 000000000000..eaaf4b298d99
--- /dev/null
+++ b/net-analyzer/driftnet/files/digest-driftnet-0.1.6-r2
@@ -0,0 +1,2 @@
+MD5 b9e776d649c5d51624958da35d2e9b41 driftnet_0.1.6-4.diff.gz 5844
+MD5 041663e29bd393fb136c9a1e7025fd81 driftnet_0.1.6.orig.tar.gz 36700