Revision bump: EAPI 5, fix for pkgconfig 0.28 support via patch for configure script. Thanks to Jeroen Roovers for patch

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 101 insertions, 3 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index a71e4b54a97d..324e5dfda61d 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ipt_netflow
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.1 2012/10/14 11:26:44 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.2 2013/02/07 15:29:37 pinkbyte Exp $
+
+*ipt_netflow-1.8-r1 (07 Feb 2013)
+
+  07 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +ipt_netflow-1.8-r1.ebuild,
+  +files/ipt_netflow-1.8-configure.patch:
+  Revision bump: EAPI 5, fix for pkgconfig 0.28 support via patch for configure
+  script. Thanks to Jeroen Roovers for patch
 
 *ipt_netflow-1.8 (14 Oct 2012)
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 833bc8fc8b57..c78ee2b5a754 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,4 +1,6 @@
+AUX ipt_netflow-1.8-configure.patch 890 SHA256 cc567d3b96183db2db92a196dd27774e761e9992a5a139567b0c063db94bc7bb SHA512 09a9018482de4ce9cced1a66bc18b1ca4992e11471e0b9a19431f5b746a5b7cf4c942ca1ac695459ae389e9a1e485e75d271226142023148f8c03c76b2523093 WHIRLPOOL cb2cfa8ad7b4a4a21a1214e5ef786d419187ad1edf67d36f50d31e262b8ae30767babf2d849f14f87674ea670708c164511971505c6b36ad7a4227e3c320a330
 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
+EBUILD ipt_netflow-1.8-r1.ebuild 1698 SHA256 bf2767283684fabaac8ce8de651e1bf49a424384c1afdacd21195f2649fb2f17 SHA512 8110465100335d8d692a7dcb0e058738223ed9008d931befde5c08ba654b974ed119777b9511e8111457650f8f8d4889ab41f988efdbf4f6770719bdfc27498e WHIRLPOOL 332473ee66d68533f91a865b7b1a9eba49dbe0bfd2022f89b2485395a2d0537afe8398a0a6ba3639fe90c32ea1a657417a25607327c275955a270e20c6430f48
 EBUILD ipt_netflow-1.8.ebuild 1556 SHA256 361029c134aa68b4d535b56f7d7facd0ee882ca8aedc6a9593e1c54dde1938d3 SHA512 d06576e17b629170469e8d199034095fa7800466c853b9a80f39c54eec1fc379007aec224a76cc7f05697259c70cba09018fca5e37efa99212b25d7be0fb6c48 WHIRLPOOL 13ac027e8615ecf2365edfeaf8fc1ddb4c1cb39109fc9ec841a131270d4c9c83213acf98a7d703862f7644a7f6c5070b36a86d0ccd21d287d53774436b79d64b
-MISC ChangeLog 381 SHA256 c60cfe2ca8ea6478127dddd9a3f5f871d0cae2dc03524c2e133d529ba19f0863 SHA512 9bdef4631a074624c92b3735232187ded80ba988ac47b8780b1e76bc64e1ac6abf118339d26bf9ad82d10f01225f3fb849e8efb73727c880aabc8ccf03385c23 WHIRLPOOL dd80e0a432ef961d3aa096419f94dbc452bb13c1a1476eb39c60db399f1c4b8f394d99c1c185d6647eb15a3692893107ff03b45ac1c1cea540508ffa100f0dab
+MISC ChangeLog 662 SHA256 d0244d753fdcc03cf8bb558c8f3ca39feb4775d59379faf81b65d0c8958878c8 SHA512 af8d0cef67cb9b24f5c455235fe7d59e2c8dd8266bb23e6e84195fcd131d2ee56b9dd51b591a4ab0e346d1ab5908432e8a84c2c31714f98721dfc469ad3a262c WHIRLPOOL d6dd192009939ef6cc1143f4b7549e1e6d2409c49cabee52304246360fa6235fcd51f45906e6bb235678a431e0dda24a0c520d1285ceff8a48f8e24233202c29
 MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch
new file mode 100644
index 000000000000..bb3820a17e94
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch
@@ -0,0 +1,26 @@
+Patch by Jeroen Roovers from https://bugs.gentoo.org/show_bug.cgi?id=455984
+
+Fixes failure on configure stage with pkgconfig 0.28
+--- a/configure
++++ b/configure
+@@ -11,10 +11,7 @@
+   test "$IPTSRC" || return 1
+ 
+   echo -n "Checking iptables sources version: "
+-  SRC="$IPTSRC/Makefile"
+-  test -s "$SRC" || error "Please build iptables first."
+-  VER=`sed -n 's/^\(IPTABLES_\)\?VERSION[ :]= \?//p' "$SRC"`
+-  test "$VER" || error "Unknown version of iptables."
++  VER=`pkg-config --modversion xtables`
+   if [ "$VER" = "$IPTVER" ]; then
+     echo "$VER (ok)"
+   else
+@@ -155,7 +152,7 @@
+ iptables_pkg_config() {
+   if [ ! "$PKGVER" ]; then
+     echo -n "pkg-config for version $IPTVER exists: "
+-    PKGVER=`pkg-config --exact-version=$IPTVER --modversion xtables 2>/dev/null`
++    PKGVER=`pkg-config --modversion xtables 2>/dev/null`
+     if [ $? = 0 ]; then
+       echo "Yes"
+     else
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild
new file mode 100644
index 000000000000..a4cd7db8b14b
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild
@@ -0,0 +1,63 @@
+# 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-r1.ebuild,v 1.1 2013/02/07 15:29:37 pinkbyte Exp $
+
+EAPI="5"
+
+inherit eutils linux-info linux-mod multilib toolchain-funcs
+
+MY_PN="ipt-netflow"
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
+SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+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'
+	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
+}
+
+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
+	insinto /usr/include
+	doins ipt_NETFLOW.h
+	dodoc README*
+}