From e761f3c48feacbeac52329124073a5372613a955 Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Fri, 28 Sep 2012 14:08:39 +0400
Subject: [PATCH] ipt_netflow: QA fixes and fixes for build process

---
 net-analyzer/ipt_netflow/Manifest             |  4 +-
 .../ipt_netflow/ipt_netflow-1.7.1.ebuild      | 40 +++++++------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/net-analyzer/ipt_netflow/Manifest b/net-analyzer/ipt_netflow/Manifest
index 261635a..55edf46 100644
--- a/net-analyzer/ipt_netflow/Manifest
+++ b/net-analyzer/ipt_netflow/Manifest
@@ -1,2 +1,2 @@
-DIST ipt_netflow-1.7.1.tgz 21263 RMD160 ae53cd9374d2419482efa789186dc7c631c6cfd3 SHA1 f244b2595aa39fb5a4100a3df6473b41832cdecb SHA256 d208dec7401404c21950c3d5db286649e17fbf7414d720d9dab7d9a6a88aba4a
-EBUILD ipt_netflow-1.7.1.ebuild 1560 RMD160 da93a66907b632c2103c19b51e3645464c8f9f7a SHA1 8fd3d7c97bb4e0f1b2ba52214544f038e0e20e02 SHA256 2ba19d7bfcc8ca6bbd2de0b10ebd6072a85b2254f3a9b0254839dd23affc514a
+DIST ipt_netflow-1.7.1.tgz 21263 SHA256 d208dec7401404c21950c3d5db286649e17fbf7414d720d9dab7d9a6a88aba4a SHA512 031574a7bc3b36885e255c5d2c585cecff2de3921ae04a42a6ba219dfb873246c04c26f0ef41e629dc69825546c7058cf6786d216ec5cdd86d97817817017b7d WHIRLPOOL 3b39897dc407999918ddbbaa3fa34c5581e704f8458962c9c5fb01d799add02bc36719f11d7942d9f4237b4d5e025fc9eb4d89a07193bd1fa4c0cab3015a45b4
+EBUILD ipt_netflow-1.7.1.ebuild 1328 SHA256 212741a7c1155ff0a44410aa18f1e0af82ed80db5cadf82ee44a6074e4b9cf06 SHA512 eb12ff8285a32049720024b2b8f43f1e1d8538e6da89c0f806c82c3d05e35d67ea73ea091ebe7efd375e2c721f4a431640d781457922e1bac09adfc43b74a426 WHIRLPOOL 6df3b36c6284e4931d19b75f2afa356dc177f977fc157d192f1c149383e487ebffb8248d249c877b039e1ff39485900634fd9013f5545d82194c05fa5f10227f
diff --git a/net-analyzer/ipt_netflow/ipt_netflow-1.7.1.ebuild b/net-analyzer/ipt_netflow/ipt_netflow-1.7.1.ebuild
index 3054c71..8f5dd4d 100644
--- a/net-analyzer/ipt_netflow/ipt_netflow-1.7.1.ebuild
+++ b/net-analyzer/ipt_netflow/ipt_netflow-1.7.1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild,v 1.1 2009/07/27 13:57:06 dang Exp $
+# $Header: $
 
 EAPI="2"
 
-inherit eutils linux-mod multilib
+inherit linux-info linux-mod multilib toolchain-funcs
+
+MY_PN="ipt-netflow"
 
 DESCRIPTION="Netflow iptables module"
 HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
-
-MY_PN=${PN/_/-}
 SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tgz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~ia64"
@@ -21,42 +20,33 @@ RDEPEND="net-firewall/iptables"
 DEPEND="${RDEPEND}
 	 virtual/linux-sources"
 
-#S=${WORKDIR}/${PN}
-
 BUILD_TARGETS="all"
-ARCH=$(tc-arch-kernel)
+CONFIG_CHECK="IP_NF_IPTABLES"
 MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="IP_NF_IPTABLES"
-	linux-mod_pkg_setup
-}
+IPT_LIB=/usr/$(get_libdir)/xtables
 
 src_prepare() {
-	# OK, let's deal with this mess...
-	sed -i 's:-I$(KDIR)/include::' Makefile.in || die "sed failed"
-	sed -i 's:gcc -O2:$(CC) $(LDFLAGS) $(CFLAGS):' Makefile.in || die "sed failed!"
-	sed -i 's:gcc:$(CC) $(LDFLAGS) $(CFLAGS):' Makefile.in || die "sed failed!"
-	cp "${S}"/Makefile{.in,}
+	sed -i 's:-I$(KDIR)/include::' Makefile.in || die "sed 1 failed"
+	sed -i 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die "sed 2 failed"
+	sed -i 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die "sed 3 failed"
 }
 
 src_configure() {
-	cd ${S}
 	./configure
 }
 
 src_compile() {
-	local IPT_VERSION=`pkg-config --modversion xtables`
-	local IPT_LIB=/usr/$(get_libdir)/xtables
-	MAKEOPTS="-j1"
-	emake KDIR="${KV_DIR}" KVERSION="${KV_FULL}" IPTABLES_VERSION="${IPT_VERSION}" \
+        local IPT_VERSION=`pkg-config --modversion xtables`
+	local ARCH=$(tc-arch-kernel)
+	emake CC="$(tc-getCC)" \
+	KDIR="${KV_DIR}" KVERSION="${KV_FULL}" IPTABLES_VERSION="${IPT_VERSION}" \
 	IPTABLES_MODULES="${IPT_LIB}" IPTSRC="" all || die "emake failed"
 }
 
 src_install() {
 	linux-mod_src_install
-	exeinto /usr/$(get_libdir)/xtables
+	exeinto "${IPT_LIB}"
 	doexe libipt_NETFLOW.so
 	insinto /usr/include
 	doins ipt_NETFLOW.h