make -> $(MAKE). Clean up patches.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 29 insertions, 101 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index d08ab8c55809..c028178e6035 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipt_netflow
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.13 2014/02/28 11:24:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.14 2014/07/18 12:41:29 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -ipt_netflow-1.8-r3.ebuild,
+  ipt_netflow-1.8-r4.ebuild, files/ipt_netflow-1.8-pax-const.patch,
+  files/ipt_netflow-1.8-procfs-fix.patch:
+  make -> $(MAKE). Clean up patches.
 
   28 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> ipt_netflow-1.8-r4.ebuild:
   Stable on amd64 and x86, wrt bug #502872
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 11f0896daaee..e5a3e71ebcc7 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -3,21 +3,16 @@ Hash: SHA256
 
 AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe6d4cab0c68c5cc6e7ee870bad76b3de SHA512 7e00aee7837a0806a39c5367451a140cd7e7e789d30cce72b1a000db0c6b8d97f5d9ff90616dad3bdf2054227628dae4dce693c3eb56d80c670ff589244cdd6c WHIRLPOOL 7f12720b71889af947ce73bdae838a70f171e801955b30c62d30b86a5abf6ceed1bbe5e29145c6c455a95c1e08757816e5eedccec2a993da0dae1525d24a9517
 AUX ipt_netflow-1.8-numphyspages-fix.patch 678 SHA256 1c6a7afc6fd56f9b89dea947b953220cbe2634f85a4471d445d1f9f9b2cc78bb SHA512 32c3611413b3d18e607698ad048ae47ba89d4d3262480732cc2967762bb98223848e253dd2caf475cac887c9e31e820a28bc0216d40a8a0a89117a360497149a WHIRLPOOL e9841ce6620f8c0b54734a406d19f903d86ae23d93a5058f47c7e26aab8815fbbd340a1daa308f40d9645516ff8997f4fe7bcb066bdbc053ef55b5ddc6b91d3b
-AUX ipt_netflow-1.8-pax-const.patch 1620 SHA256 9d891ef8239cb467cdb0d6cdb4fd5649080c56ec58bb2a8f081bd20f1ea89c0f SHA512 c2a4c5e0c6e31cb78535c6e0a11281f742f4a5c5a6fd20cae18906add03efc65c817803c93cbf1deb91095eb77a4d9172de4920cca040a11e95f6b3932a99d74 WHIRLPOOL a18b1b524a7ac0f0f31b4c4cd267cb40721e1818e58f16671a2d9eee8e769f9b1152d4f40019a4ffe55ae5f2971f17aba6a102058df7e9cff65e8e6aa665e94e
-AUX ipt_netflow-1.8-procfs-fix.patch 1391 SHA256 4470af7b65de7f0dbb3e3af1e0a1ab5a9df5bf35bacd81d84a00e03f7f895653 SHA512 adfd66ca34de96753311d1447d5385c146abe9378c72810ebd1967c092252146cc94f785951be1a1939d8b35a3891d145edeca28e9d757d6aa689fb54621a151 WHIRLPOOL db5696fa73db8d5240b9fe874bbe853a8738803168e1c9b09dc8f30635c20909931c95c9793624cc0a8731595637ff3e0d092a81f237349888ba48ea9d4b3c2a
+AUX ipt_netflow-1.8-pax-const.patch 1547 SHA256 c03e8dc5ff0f18b0ccf86e0c674ac2bbd04a803a8670a05ca8a19d867d7d92af SHA512 b269af88d9de3fb2d1b82c5f3cd3b2450c102476f52a8156328850d943ae99a5f1a2e52a9ec87ec354e079124ec9aebeec303091a88f9f86aec05f54c7d53df8 WHIRLPOOL 969a5c8f96e28e3a44a11cb008387e71f8b31b9a54226d6ac6bec90312cbd52b79503f1c13210b348dbfd8daf4534b7df05e00ccd992d88d23fe0a65d9123426
+AUX ipt_netflow-1.8-procfs-fix.patch 1318 SHA256 bdfed9dc128df52bd9bc5a007c4dba3e1b96e83bf70ac785b32b60c7d581c530 SHA512 66e8ee572f811e008653d87324cdb9a167591af17053e5fda14827c44a5ac5ea26e035c42b3261d249a9a0a5d5e4f532d57a64bd636db80522e832fd4f5c2b0b WHIRLPOOL 6077e3addc781e0b61f5f0a9ff7bce67c1a92db67b13388844397b8c3748ab5b78566c1d1fb6087ff13ff19c380d847a2b23a8e83b93529ee09e58474b3702b0
 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
-EBUILD ipt_netflow-1.8-r3.ebuild 1884 SHA256 6acea68da4dc3d791416fbb6e45c38b117ea6ef8fba63aeda55f8c2bb9ecfb2b SHA512 832c69bfebb61b1de1e5a3a503d29f9dde688d8564016f303fc3bacf84e6ab5645aef7c534362b06dabad3af9cf5a4b67b1bcd380c7cc93b1af62659897ec8ea WHIRLPOOL e203e007e2d2026f8ae0f02af68914d0989d73b1d3bd2720b36c53dfae00f31e91f5eb939033c8e5696e2f54de7ff568c76ffd59bba599e29a558661effb0801
-EBUILD ipt_netflow-1.8-r4.ebuild 1974 SHA256 9f7c0f50c1b8afd8e7a39466d118bd49993cfa01bc768d6196473bbb7058d5d5 SHA512 7d9f993c8c6d7924ebf63c1e84c329b8c0fef0b20326d7ed969ab3d9cd3aae4c641ae9860e8b3289d0761a633c71c44b947f8a908b998d1b412211af3e0f5455 WHIRLPOOL 9247496c923902510d5d658a43bd5461b3045b4885ed3f9b705508cb0593d7ef83264f88dcce24040f22e5614fc8870f6d8fe8f6f8b0b017e13e1e53be810857
-MISC ChangeLog 2701 SHA256 c303c56e68e598653eed45dda64d6a41fe0c0805d3c37b8d8b11c4c1a2d6fe8d SHA512 747835f35e24141efe7151bd6ee24a8254fc6899012daef3295cab3fd56ca58c797b8032271c92602ef59a65390525c1df04e5ad2e2c81855ac5ce1611d6a204 WHIRLPOOL ac0f95f9b1614fe20e4107f85d8f24cc5e9a6ae2d2e6366f71373ec18128ab70a5fc68e56f46ed11822e79889773a2ef2da6832d0f3912491afe7531885d4691
+EBUILD ipt_netflow-1.8-r4.ebuild 1942 SHA256 6d4a5350a2412eb77cb065eb020eea1071bb8e4f9ff8c93f68dd640d241643df SHA512 ce0a8a9acd579150c85b9b35b46284a64fcc7209bbbcb596faf027c6770c8a6e1fdfd56304d076ca02a0f7ad88d030ca825a3543a513b338acc82cf041369779 WHIRLPOOL 3f550bb39453034fa8e42dc805e60a8f885ef9cad8fa1f9d8ab4a033c878f2199f836445d47e4e6d288c2fbda40e43dc54b7de1147e91256e08fc249dad665e0
+MISC ChangeLog 2919 SHA256 5c175fe2eb3d9b550ddcc27f3e9349fe88155db580d1c0ff95003faef058facc SHA512 e6e20595b6cf634c50077c19aa6f75709c394cd1326939f756575d10dbd21fe056c1719dc03a62a3bbe7882030c887115d499592bea441a9099bce93987dbd72 WHIRLPOOL 3215e13925a2bae3968b8ffe5997ab1c86414166e254166af85f31b8d0bed1d66709034bb6efc840b76c76e2f0da37c650451894b7e15d2feeec9a4f14aab1cc
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTEHHPAAoJECo/aRed9267pHEIAKOXmQpnDkCxcyzIRgqDo1BP
-uTlmlG1WnyX3wzlDfC+WsvDFMmYPxniENs/nuDMxI1LvHP6eAFf1x4mwDuMPgzzu
-uaNJRlnQDpOxZK62IhiR6MzrrWQVGk8jnxPelvSCkNzmWcorLj+8GKPZbuzdqq99
-ARi0/WGZHoSokFM+afcIP/f+uEcPbIEprztQsIqWSwWb5HHL+GwNXvFtUqh9wSDF
-JemvIJmIxznmwmBA70IUGR7ElTOz8trvhu1G268zy9IhPEOCtKUVf1fcpsY7qy1M
-E4HJVaRZBZLJ68M4Tvbd+MMLL/e/TC+WSrEvGGSIyHLyjY6oTqe4oWi2UGc18lA=
-=qSU0
+iEYEAREIAAYFAlPJFfsACgkQVWmRsqeSphMHrQCeOtkM436rwZHR5aHZeSXSe6+l
+XYIAn1Rd0l7bh0Iq92veCKfiXXDF30ir
+=MlQF
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
index 792b68279d0f..b3e4b5f687a5 100644
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
@@ -2,8 +2,8 @@ Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430
 
 Adds support for building with PaX hardened kernel
 
---- ipt_NETFLOW.c.orig	2013-06-26 23:02:17.000000000 +0400
-+++ ipt_NETFLOW.c	2013-06-26 23:04:52.000000000 +0400
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
 @@ -371,14 +371,13 @@
  static int hsize_procctl(ctl_table *ctl, int write, BEFORE2632(struct file *filp,)
  			 void __user *buffer, size_t *lenp, loff_t *fpos)
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
index 18ab38b5aeef..011a5260162d 100644
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
@@ -1,7 +1,7 @@
 Patch from http://sourceforge.net/p/ipt-netflow/bugs-requests-patches/71/
 
---- ipt_NETFLOW.c.orig	2013-08-21 13:20:25.606323000 +0400
-+++ ipt_NETFLOW.c	2013-08-21 13:23:04.249323000 +0400
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
 @@ -854,9 +854,15 @@
  ipt_netflow_find(const struct ipt_netflow_tuple *tuple, unsigned int hash)
  {
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild
deleted file mode 100644
index 40556aa5f204..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild,v 1.2 2013/08/25 15:24:17 pinkbyte Exp $
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
-SRC_URI="mirror://sourceforge/ipt-netflow/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="pax_kernel"
-
-RDEPEND="net-firewall/iptables"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-CONFIG_CHECK="~IP_NF_IPTABLES"
-MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-
-IPT_LIB="/usr/$(get_libdir)/xtables"
-
-src_prepare() {
-	sed -i -e 's:-I$(KDIR)/include::' \
-		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die 'sed on Makefile.in failed'
-	sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die 'sed on ipt_NETFLOW.c failed'
-
-	# bug #455984
-	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
-
-	# compatibility with 3.10 kernel
-	epatch "${FILESDIR}"/${PN}-1.8-procfs-fix.patch
-
-	# bug #466430
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/${PN}-1.8-pax-const.patch
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# econf can not be used, cause configure script fails when see unknown parameter
-	# ipt-src need to be defined, see bug #455984
-	./configure \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-	|| die 'configure failed'
-}
-
-src_compile() {
-	local ARCH="$(tc-arch-kernel)"
-	emake CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
index f144623ff7ec..7e46e679ccd4 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v 1.2 2014/02/28 11:24:01 pinkbyte Exp $
-
-EAPI="5"
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v 1.3 2014/07/18 12:41:29 jer Exp $
 
+EAPI=5
 inherit eutils linux-info linux-mod multilib toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
@@ -19,7 +18,8 @@ IUSE="pax_kernel"
 RDEPEND="net-firewall/iptables"
 DEPEND="${RDEPEND}
 	virtual/linux-sources
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 BUILD_TARGETS="all"
 CONFIG_CHECK="~IP_NF_IPTABLES"
@@ -28,10 +28,13 @@ MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 IPT_LIB="/usr/$(get_libdir)/xtables"
 
 src_prepare() {
-	sed -i -e 's:-I$(KDIR)/include::' \
+	sed -i \
+		-e 's:-I$(KDIR)/include::' \
+		-e 's:make -C:$(MAKE) -C:g' \
 		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die 'sed on Makefile.in failed'
-	sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die 'sed on ipt_NETFLOW.c failed'
+		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+		Makefile.in || die
+	sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die
 
 	# bug #455984
 	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
@@ -64,8 +67,7 @@ src_configure() {
 }
 
 src_compile() {
-	local ARCH="$(tc-arch-kernel)"
-	emake CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
 }
 
 src_install() {