New patch from Debian, fixes compile issues. Going to unmask -r4.

Package-Manager: portage-2.1.4.4

3 files changed, 88 insertions, 3 deletions

diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index f0a33950488b..27b2832cc118 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/driftnet
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.31 2007/07/22 07:45:55 pva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.32 2008/02/16 02:24:07 steev Exp $
+
+*driftnet-0.1.6-r4 (16 Feb 2008)
+
+  16 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  +driftnet-0.1.6-r4.ebuild:
+  New patch from Debian, fixes compile issues.  Going to unmask -r4.
 
   22 Jul 2007; <pva@gentoo.org> driftnet-0.1.6-r3.ebuild:
   Removed virtual/x11 dependency.
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 52ef1e3cc83f..ca9d41d98605 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,7 @@
 DIST driftnet_0.1.6-4.diff.gz 5844 RMD160 36e3a753f0b93a6c954c01049ff97c590d582d2a SHA1 86f1fb73a2db567c141b153ed2871d2289c3f09b SHA256 c9ecabcf5062c1a5d7b670fcc4edf856c8390d8d199b2702d9987f6faa73bb78
+DIST driftnet_0.1.6-8.diff.gz 6343 RMD160 86efe61f62c727ea1cceaabfdd7ec5aaf9f4a28a SHA1 a8c79bed181549a06c5e2f13e1e4dab2d698332f SHA256 16b2ad387d3a06f2a00699b66e99de4b9c4a8636127d303d1f148862a1d65215
 DIST driftnet_0.1.6.orig.tar.gz 36700 RMD160 d33e8538b9cc985cbf90e92d4000b77b51d1ec87 SHA1 eaf1501e85b010e1f4600e2b0a173ff509df0e68 SHA256 d3cb92ce27e36c3bd7225f01e893f51a6deb04ad3235d79f5e92e17941d7511b
 EBUILD driftnet-0.1.6-r3.ebuild 2037 RMD160 421a55c105ab13674f84695588d21d383341c9d0 SHA1 0458ff43270e5b5ed0621afb7b3f97d878b67fcc SHA256 84df91f41d0589dc8ec9e45469c229181453522c07d5a438b25f72355d318dac
-MISC ChangeLog 3987 RMD160 c5e7f2962f943f7068526f1078e7de65358001a7 SHA1 6ad0337858deb1849385d93ed148f3de718c4249 SHA256 30e7740d4526bc8609966f7107e20fa9b9729fd4b6a1cda76b130cc2aec33d66
+EBUILD driftnet-0.1.6-r4.ebuild 1952 RMD160 83769e4db02bed76315977732fac742a004cfc5d SHA1 337618415942ab5832d209eede7ba69cb5c3dad9 SHA256 2c273645936614bc7bcdb12dc26f248fbdc2a6747af9dda4c5772027588c1e58
+MISC ChangeLog 4175 RMD160 0d8e0fa80a5012d00e2d30523e62c560f8ded914 SHA1 12b0ca41a11c81737724b8873e87e4ec8044265f SHA256 127790aefd0eef5f432d22ff674da4e533dc678e76d19d75cd5a90c3569c6c72
 MISC metadata.xml 287 RMD160 f5a05509893b609f9bc3c7b0ccc73d037656b15b SHA1 d13e9a26c5d26ded3f1e936b99bf37b912a184b4 SHA256 0132f6f9154547c2766f5ad9598aeed4c9ddddd70acf9ba1b333dda556a2f994
diff --git a/net-analyzer/driftnet/driftnet-0.1.6-r4.ebuild b/net-analyzer/driftnet/driftnet-0.1.6-r4.ebuild
new file mode 100644
index 000000000000..ac6082c7a417
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-0.1.6-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 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-r4.ebuild,v 1.1 2008/02/16 02:24:07 steev 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}-8.diff.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+SLOT="0"
+IUSE="gtk"
+
+RDEPEND="media-libs/jpeg
+	media-libs/giflib
+	media-libs/libpng
+	net-libs/libpcap
+	gtk? ( >=x11-libs/gtk+-2.0.0 )"
+
+DEPEND="${RDEPEND}
+	>=x11-misc/makedepend-1.0.0
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P}.orig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${DISTDIR}"/${MY_P}-8.diff.gz
+
+	# 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"
+
+	elog "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"
+}
+
+pkg_postinst() {
+	if ! has_version 'virtual/mpg123' ; then
+		elog
+		elog "In case you want driftnet to be able to play"
+		elog "audio files found on the streams, you need to do:"
+		elog " # emerge mpg123"
+		elog
+	fi
+}