Version bump.

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

4 files changed, 93 insertions, 5 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index c028178e6035..9281212db47d 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2014/07/18 12:41:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.15 2014/08/09 09:58:09 jer Exp $
+
+*ipt_netflow-2.0 (09 Aug 2014)
+
+  09 Aug 2014; Jeroen Roovers <jer@gentoo.org> +ipt_netflow-2.0.ebuild,
+  +files/ipt_netflow-2.0-configure.patch:
+  Version bump.
 
   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,
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index e5a3e71ebcc7..96bf1fcd8053 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -5,14 +5,17 @@ AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe
 AUX ipt_netflow-1.8-numphyspages-fix.patch 678 SHA256 1c6a7afc6fd56f9b89dea947b953220cbe2634f85a4471d445d1f9f9b2cc78bb SHA512 32c3611413b3d18e607698ad048ae47ba89d4d3262480732cc2967762bb98223848e253dd2caf475cac887c9e31e820a28bc0216d40a8a0a89117a360497149a WHIRLPOOL e9841ce6620f8c0b54734a406d19f903d86ae23d93a5058f47c7e26aab8815fbbd340a1daa308f40d9645516ff8997f4fe7bcb066bdbc053ef55b5ddc6b91d3b
 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
+AUX ipt_netflow-2.0-configure.patch 276 SHA256 cf24753f0075b8015b8832799d993fcc1671ab001033f40f7d0ee12ba469de50 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0 WHIRLPOOL ca45617b098c4e57756b5aeacef9c638444c12cbbd3dea38de457fca9be89592e854c3b9bd70d36250dce4becee28fee94ecd321c857786dc93e92ff5316ab16
 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
+DIST ipt_netflow-2.0.tgz 46456 SHA256 547ca6c2e8d82fc7d3d113d2ab3f602106d1efa7739167f8c7850a43e5bbe46e SHA512 7bf330ac665180218ea4cc42fe6ac6d365b45632039ff9601559f7a4675738c409853433b15dd431dba68cfe36269d6992754154411e2761041fec021e19bf8d WHIRLPOOL 1d54d2b1386f50e98cfaa082356559ec044f9b2088c70c024bc030482cc57ae5fac6de3e691f155f80fd6647b97c0f50f3292625511fe3c9ced404cfd4cff63c
 EBUILD ipt_netflow-1.8-r4.ebuild 1942 SHA256 6d4a5350a2412eb77cb065eb020eea1071bb8e4f9ff8c93f68dd640d241643df SHA512 ce0a8a9acd579150c85b9b35b46284a64fcc7209bbbcb596faf027c6770c8a6e1fdfd56304d076ca02a0f7ad88d030ca825a3543a513b338acc82cf041369779 WHIRLPOOL 3f550bb39453034fa8e42dc805e60a8f885ef9cad8fa1f9d8ab4a033c878f2199f836445d47e4e6d288c2fbda40e43dc54b7de1147e91256e08fc249dad665e0
-MISC ChangeLog 2919 SHA256 5c175fe2eb3d9b550ddcc27f3e9349fe88155db580d1c0ff95003faef058facc SHA512 e6e20595b6cf634c50077c19aa6f75709c394cd1326939f756575d10dbd21fe056c1719dc03a62a3bbe7882030c887115d499592bea441a9099bce93987dbd72 WHIRLPOOL 3215e13925a2bae3968b8ffe5997ab1c86414166e254166af85f31b8d0bed1d66709034bb6efc840b76c76e2f0da37c650451894b7e15d2feeec9a4f14aab1cc
+EBUILD ipt_netflow-2.0.ebuild 1632 SHA256 6682a5c2100caa34c89d86a469d064a81d9856e9c98fcd794f39baf990738d4e SHA512 ae7af702f896d24049875cced6ec3ca5cc9fe6024db243f915984a0ede3f25132bbde2642f2397398b3ed88dc3dc5e8894bbe4e5beb338d038e5b3e7519d530d WHIRLPOOL 82caf1a6d8c6c1ab39244a24472b28a898a354a1bb504bdc65a091f65bf578ddbcb266f861615dbdd70b38663e0066afa9848a94705dfd7af47fe640505beeca
+MISC ChangeLog 3082 SHA256 2306c51a08b31f87f5b937d5629441cc8d75f98178ddac89b46664d86c7dc966 SHA512 ad3fefb69226a9d902f6e71142f525635a820f742d98347f5ff96074b645a6bb480b469ad13e7fd0890be1402beb82f6100045c903498abed9d7ddd00260589a WHIRLPOOL 23831dfb9057eb3f440c05c236e8d56a1e1c353545fc5a0437eba66feecd5a23ace2532e2f6abffc7f56ccf7304bc3ce59ad15cf58bc6761d03734566906059c
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPJFfsACgkQVWmRsqeSphMHrQCeOtkM436rwZHR5aHZeSXSe6+l
-XYIAn1Rd0l7bh0Iq92veCKfiXXDF30ir
-=MlQF
+iEYEAREIAAYFAlPl8LMACgkQVWmRsqeSphNOrQCfaiKPJaSHPdntx7cAqRVbEVNQ
+KNgAni6FN/y0nJjZOIHQ+MKSVWcllUUA
+=kv9u
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.0-configure.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.0-configure.patch
new file mode 100644
index 000000000000..f6b3a005ba21
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.0-configure.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -421,7 +421,6 @@
+ iptables_find_version	#IPTVER
+ iptables_try_pkgconfig	#try to configure from pkg-config
+ iptables_find_src	#IPTSRC
+-iptables_src_version	#check that IPTSRC match to IPTVER
+ iptables_inc		#IPTINC
+ iptables_modules	#IPTLIB
+ 
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.0.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.0.ebuild
new file mode 100644
index 000000000000..0612b60c6c3c
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.0.ebuild
@@ -0,0 +1,69 @@
+# 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-2.0.ebuild,v 1.1 2014/08/09 09:58:09 jer 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
+"
+
+# set S before MODULE_NAMES
+S=${WORKDIR}/${PN/_/-}-${PV}
+
+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:make -C:$(MAKE) -C:g' \
+		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+		Makefile.in || die
+
+	# bug #455984
+	epatch "${FILESDIR}"/${PN}-2.0-configure.patch
+
+	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() {
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+}
+
+src_install() {
+	linux-mod_src_install
+	exeinto "${IPT_LIB}"
+	doexe libipt_NETFLOW.so
+	doheader ipt_NETFLOW.h
+	dodoc README*
+}