From f73153f8ad08aea708d0f452c4e19bde42704c50 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Thu, 25 Apr 2013 13:31:57 +0000
Subject: Fix libnetfilter_conntrack version check.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)
---
 net-firewall/conntrack-tools/ChangeLog                        |  6 +++++-
 net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild     | 10 +++++++---
 .../conntrack-tools/files/conntrack-tools-1.4.1-version.patch | 11 +++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch

(limited to 'net-firewall')

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 16596e43849e..1e5edbc47178 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.54 2013/04/25 13:22:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.55 2013/04/25 13:31:57 jer Exp $
+
+  25 Apr 2013; Jeroen Roovers <jer@gentoo.org> conntrack-tools-1.4.1.ebuild,
+  +files/conntrack-tools-1.4.1-version.patch:
+  Fix libnetfilter_conntrack version check.
 
 *conntrack-tools-1.4.1 (25 Apr 2013)
 
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
index e7d8234778c0..da96317279a9 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild,v 1.1 2013/04/25 13:22:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild,v 1.2 2013/04/25 13:31:57 jer Exp $
 
 EAPI=5
-
-inherit linux-info
+inherit autotools eutils linux-info
 
 DESCRIPTION="Connection tracking userspace tools"
 HOMEPAGE="http://conntrack-tools.netfilter.org"
@@ -54,6 +53,11 @@ pkg_setup() {
 			"are not set when one at least should be."
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-version.patch
+	eautoreconf
+}
+
 src_compile() {
 	default
 	use doc && emake -C doc/manual
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch
new file mode 100644
index 000000000000..b49d16657051
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@
+ 
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
+ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+-PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2])
++PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_CTTIMEOUT], [libnetfilter_cttimeout >= 1.0.0])
+ PKG_CHECK_MODULES([LIBNETFILTER_CTHELPER], [libnetfilter_cthelper >= 1.0.0])
+ PKG_CHECK_MODULES([LIBNETFILTER_QUEUE], [libnetfilter_queue >= 1.0.2])
-- 
cgit v1.2.3-65-gdbad