Respect LDFLAGS (bug #337192), CC. Fix missing includes. Use $(MAKE) instead of make.

Package-Manager: portage-2.2_rc81/cvs/Linux i686

5 files changed, 84 insertions, 44 deletions

diff --git a/net-analyzer/ippl/ChangeLog b/net-analyzer/ippl/ChangeLog
index 59fde6ccf1be..fc01c4d20e6e 100644
--- a/net-analyzer/ippl/ChangeLog
+++ b/net-analyzer/ippl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ippl
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.16 2008/11/17 21:50:21 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.17 2010/09/15 00:29:43 jer Exp $
+
+*ippl-1.4.14-r2 (15 Sep 2010)
+
+  15 Sep 2010; Jeroen Roovers <jer@gentoo.org> -ippl-1.4.14.ebuild,
+  +ippl-1.4.14-r2.ebuild, +files/ippl-1.4.14-includes.patch:
+  Respect LDFLAGS (bug #337192), CC. Fix missing includes. Use $(MAKE)
+  instead of make.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/ippl-1.4.14-manpage.patch:
diff --git a/net-analyzer/ippl/Manifest b/net-analyzer/ippl/Manifest
index 3c235068b00f..0c2a1f9bec9f 100644
--- a/net-analyzer/ippl/Manifest
+++ b/net-analyzer/ippl/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ippl-1.4.14-includes.patch 518 RMD160 61493c018874a1264d198f44bd6a7f352a17e4e4 SHA1 02650a5847b46189508aa09875c89224e2efc575 SHA256 fc5f442e224adb4d889dc55bb4e88b90b0491495be407056e4e5536c2c488a2c
 AUX ippl-1.4.14-manpage.patch 378 RMD160 22ba7a5aad1d9b432a0eceec04a8e26cb0905cac SHA1 2b39b690f952db8e8b69b410b7b21c6c4e4fa0a6 SHA256 b084b1a1896b6c7315f595c727f743f1bd77f65a211dbd993abe26abae39ead6
 AUX ippl-1.4.14-noportresolve.patch 11186 RMD160 c84c7d07bbb8085e0349f1815072fe157d11b3d3 SHA1 89bd177a11d4f674422c4843d18271a737db9491 SHA256 723c6eb52793d38b162d459236c1f78127b02000166f0fd1e2d28d709b000e3a
 AUX ippl-1.4.14-privilege-drop.patch 4613 RMD160 3d9733b41f406fa728fbc907d1da769aa15af3d2 SHA1 d727b77ec2a43d50b3d354371c71c56c1bd4447c SHA256 2fd4f19568bb2c4724c14c164de87ceb345a49bd365b49ea7f5e2d6183a6698e
 AUX ippl.rc 779 RMD160 49f704cb72e6c947d9aa8c74862f220d530a7358 SHA1 be2e1a7c61b93177b9c6db3dcafc738186f58515 SHA256 72cd981edd5b3d578e2e4b0299b4cc0610d24aacef3436c1d5fb611a8cd773e9
 DIST ippl-1.4.14.tar.gz 54030 RMD160 f4f4610b2d9e774c27e7d2dfc7a35441f443e0da SHA1 1f851d418e17009123e24d67cf978a521846ad69 SHA256 e1808c65e498036de2529d053dbaa95ba3f6821e2c7196d4dcbb5039489cfeb4
 EBUILD ippl-1.4.14-r1.ebuild 1026 RMD160 b6d33b6a50cbf2a6ee8b9c374473f9c513137d48 SHA1 eb18c22673a3f487ab4235277c652a3b99b65154 SHA256 bba6669830a6d3acf629377e2caf29917d216008ef4521ca8ba7ff5ee6e066c7
-EBUILD ippl-1.4.14.ebuild 719 RMD160 6d8cbe15f2cbf02bc1adb627d901dfce7a4bbbfd SHA1 5707222236ee79b1b750317bc93dc513ec66a275 SHA256 0c2567051b5503319380871a0e49311cadc4cb785ea01cbc13fefef2fbccdcb8
-MISC ChangeLog 1890 RMD160 49b3c9ca800ecd847ba66f17a53a09ef97096446 SHA1 1605683fa09bec949c2ec0471171a5e2c32a9f8c SHA256 d5a29ec82296d7c3b6312664fd561ecf1d9e4d15ee926a21748df06d1abcca3b
+EBUILD ippl-1.4.14-r2.ebuild 1186 RMD160 4e3a5bf9804fc8e0fc19b2652bf5e7028ad6f5d0 SHA1 d67179302b5f4dc4311cbfa1ba171fe08a17acd0 SHA256 599750bb34ca7da64c2cc67fe04c64f32574581a28a7bd3f23ef75c2b6144a0c
+MISC ChangeLog 2135 RMD160 c62fcea95aaedfedee231afc89a09d8394eb1382 SHA1 e8336cebfff43a8a32c212a4293460a3ae301e1a SHA256 570a2898a3703de1e1239289088d27b1592126813ba9c3039f7598260f20332d
 MISC metadata.xml 235 RMD160 ca54e29635bef86f600ed59717d7d2b315258bf8 SHA1 f402dae103b80494da34e4230b3e9ca72e5e1401 SHA256 458c4936eaf4670e922eca2a6c8d114e634f80273d16cb3f30da158587c466a9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh5yIACgkQAiZjviIA2XhnoQCgwgbZe/ySrzDkMg4seXaDCxyK
-xgsAn06wMYNBKbT02vqiX4D8Fmb5zQTd
-=nHYE
------END PGP SIGNATURE-----
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-includes.patch b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
new file mode 100644
index 000000000000..d1883ee0883a
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
@@ -0,0 +1,20 @@
+--- a/Source/filter.c	2010-09-15 02:17:55.000000000 +0200
++++ b/Source/filter.c	2010-09-15 02:23:46.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <string.h> /* memcpy() */
+ 
+ #include <fnmatch.h>
+ 
+--- a/Source/main.c	2010-09-15 02:17:56.000000000 +0200
++++ b/Source/main.c	2010-09-15 02:24:00.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#include <grp.h> /* initgroups() */
+ 
+ #include "defines.h"
+ #include "configuration.h"
diff --git a/net-analyzer/ippl/ippl-1.4.14-r2.ebuild b/net-analyzer/ippl/ippl-1.4.14-r2.ebuild
new file mode 100644
index 000000000000..bda7fbfe3cdd
--- /dev/null
+++ b/net-analyzer/ippl/ippl-1.4.14-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14-r2.ebuild,v 1.1 2010/09/15 00:29:43 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
+HOMEPAGE="http://pltplp.net/ippl/"
+SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| ( sys-devel/bison >=dev-util/yacc-1.9.1-r1 )
+	>=sys-devel/flex-2.5.4a-r4"
+RDEPEND=""
+
+pkg_setup() {
+	enewuser ippl
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
+		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
+		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
+		"${FILESDIR}"/ippl-1.4.14-includes.patch
+	sed -i Source/Makefile.in \
+		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
+		|| die "sed Source/Makefile.in"
+	sed -i Makefile.in \
+		-e 's|make |$(MAKE) |g' \
+		|| die "sed Makefile.in"
+	tc-export CC
+}
+
+src_install() {
+	dosbin Source/ippl
+
+	insinto "/etc"
+	doins ippl.conf
+
+	doman Docs/{ippl.8,ippl.conf.5}
+
+	dodoc BUGS CREDITS HISTORY README TODO
+
+	newinitd "${FILESDIR}"/ippl.rc ippl
+}
diff --git a/net-analyzer/ippl/ippl-1.4.14.ebuild b/net-analyzer/ippl/ippl-1.4.14.ebuild
deleted file mode 100644
index b2491acf798b..000000000000
--- a/net-analyzer/ippl/ippl-1.4.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14.ebuild,v 1.11 2007/04/28 12:35:52 tove Exp $
-
-DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
-HOMEPAGE="http://pltplp.net/ippl/"
-SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=dev-util/yacc-1.9.1-r1
-	>=sys-devel/flex-2.5.4a-r4"
-RDEPEND=""
-
-src_install() {
-	dosbin Source/ippl
-
-	insinto "/etc"
-	doins ippl.conf
-
-	doman Docs/ippl.8 Docs/ippl.conf.5
-
-	dodoc BUGS CREDITS HISTORY README TODO
-	newdoc ippl.conf ippl.conf-sample
-
-	newinitd "${FILESDIR}"/ippl.rc ippl
-}