Respect LDFLAGS (bug #335184). Call emake just once. Set -j1 because it does not matter. Add comments where needed.

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

3 files changed, 67 insertions, 12 deletions

diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index bc23e0558240..29304efb4938 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/p0f
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.43 2010/01/01 17:43:16 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.44 2010/08/30 04:00:14 jer Exp $
+
+*p0f-2.0.8-r2 (30 Aug 2010)
+
+  30 Aug 2010; Jeroen Roovers <jer@gentoo.org> +p0f-2.0.8-r2.ebuild:
+  Respect LDFLAGS (bug #335184). Call emake just once. Set -j1 because it
+  does not matter. Add comments where needed.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> p0f-2.0.8-r1.ebuild:
   Transfer Prefix keywords
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 55eb852584c8..741b9b257786 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX p0f.confd 66 RMD160 69e7a5a307986d818d1f45f447e392eaa8628aed SHA1 8879337caee72215897d5f17baf573b2c7b4b6af SHA256 6dbb67fcf77c4a38d5deefb9a8fec0f1435f6a26c53d682fe768c7a866d805b9
 AUX p0f.initd3 1411 RMD160 98ae569a7d0929400b99d66aec163e2ab1729795 SHA1 55f1880537424e9a24236b6352bf4a02344fb856 SHA256 d939c0203cf397d8c8a6edc18d2e3d3b32185d6a2c29391acc9286d59a79c2ce
 DIST p0f-2.0.8.tgz 136877 RMD160 87d5b30d2d5e156b9fdcb026160155f413ce13d3 SHA1 7b4d5b2f24af4b5a299979134bc7f6d7b1eaf875 SHA256 6c4d8745f04e59f2ba68d56fd1554551592f08a0497c9fc21b84498f47d1aee0
 EBUILD p0f-2.0.8-r1.ebuild 1509 RMD160 afbb414a0181e3555bcb440b069197a9de579a0b SHA1 4ba2985f2b28e60cae14d908f1945309bdd01cfc SHA256 d7f0b0f9a45483e7fdc5e09a0c693c8e53b04c9c707645f2a80554728f100840
-MISC ChangeLog 5126 RMD160 35f7b2d39255733426f768ad79614a50782c9230 SHA1 4c6ddf8f98626af24ec735aff4adee6826950ca1 SHA256 0abc3ad67bbd185bf101270ceb39e8fa6a94a16f5bb52e17fed4538b309a4488
+EBUILD p0f-2.0.8-r2.ebuild 1573 RMD160 447af2180bc5b027c36bca1ba53e5ae4845d2bd2 SHA1 7a35a0f1ec9557bd4cb56c8fc5273bd1f8eb4072 SHA256 9d8193a6e6473b7986d772e3c22387c009b68c690a4cbf46b2c15572cea37f41
+MISC ChangeLog 5343 RMD160 6fd00d0d8ef5dd10f0c523b16597095c4aa5087f SHA1 a66b5877cec9790a07b8354ffbcc3f2e95f8fb3f SHA256 33235de87b7a18b803b4d1dab41b32d5901151ab869894d4c5ac0fa22467ef44
 MISC metadata.xml 250 RMD160 244e47f4f0dbe86b30f0c2be619f9688d432b206 SHA1 793e58097eef73ea5c92619a45e2edf657052803 SHA256 587772f399b3e3226a324317d01c3dfa529110fd7f0135296fd2c5778f8cc2c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+NDoACgkQNQqtfCuFneMWMACfYSvoGe5zzrQSLhlMBDo9GzPk
-zgcAnRDdJElK0e6hU8LE8eUhFgYEDrRK
-=hvek
------END PGP SIGNATURE-----
diff --git a/net-analyzer/p0f/p0f-2.0.8-r2.ebuild b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..e901fafe6906
--- /dev/null
+++ b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.8-r2.ebuild,v 1.1 2010/08/30 04:00:14 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="p0f performs passive OS detection based on SYN packets."
+HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
+SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static"
+
+DEPEND="net-libs/libpcap"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i p0f.c -e 's;#include <net/bpf.h>;;' || die "sed p0f.c"
+
+	# The first script ensures only p0f is built
+	sed -i mk/* \
+		-e 's|^\(all: $(FILE)\).*$|\1|' \
+		-e 's|^CFLAGS.*=.*|CFLAGS += \\|g' \
+		-e '/$(CC).* -o /s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		|| die "sed makefiles"
+}
+
+src_compile() {
+	# Set -j1 to supress a warning that would not be useful in this case
+	emake -j1 CC=$(tc-getCC) \
+		$(use static && echo static || echo all) p0fq \
+		|| die "emake failed"
+}
+
+src_install () {
+	use static && mv p0f-static p0f
+	dosbin p0f p0frep test/p0fq || die
+
+	insinto /etc/p0f
+	doins p0f.fp p0fa.fp p0fr.fp
+
+	doman p0f.1 || die
+	cd doc
+	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed"
+	newinitd "${FILESDIR}"/${PN}.initd3 ${PN} || die "newinitd failed"
+}
+
+pkg_postinst(){
+	elog "Adjust /etc/conf.d/p0f to your liking before using the"
+	elog "init script. For more information on options, read man p0f."
+}