Add patch from Aurélien Francillon <aurelien dot francillon at inrialpes dot fr> to fix build failure with newer headers, bug #236177, x86 stable

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 32 insertions, 11 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index b633e27e1ad1..053d0bf4d329 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/commoncpp2
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.42 2008/05/07 05:32:39 dev-zero Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.43 2009/03/07 14:57:13 armin76 Exp $
+
+  07 Mar 2009; Raúl Porcel <armin76@gentoo.org>
+  +files/1.6.2-configure_detect_netfilter.patch, commoncpp2-1.6.1.ebuild,
+  commoncpp2-1.6.2.ebuild:
+  Add patch from Aurélien Francillon <aurelien dot francillon at inrialpes
+  dot fr> to fix build failure with newer headers, bug #236177, x86 stable
 
 *commoncpp2-1.6.2 (07 May 2008)
 
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
index c634c42063e1..615d2751852f 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild,v 1.7 2008/05/07 05:32:39 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild,v 1.8 2009/03/07 14:57:13 armin76 Exp $
 
 inherit eutils autotools
 
@@ -23,8 +23,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PV}-gcc42_atomicity.patch" \
-		"${FILESDIR}/${PV}-autoconf.patch"
+	epatch "${FILESDIR}/${PV}-gcc42_atomicity.patch"
+	epatch "${FILESDIR}/${PV}-autoconf.patch"
+	epatch "${FILESDIR}/1.6.2-configure_detect_netfilter.patch"
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
index 2f9e5166bddd..d5f54a8d382a 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild,v 1.1 2008/05/07 05:32:39 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild,v 1.2 2009/03/07 14:57:13 armin76 Exp $
 
 inherit eutils autotools
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="debug doc examples ipv6 gnutls"
 
 RDEPEND="gnutls? ( dev-libs/libgcrypt
@@ -23,8 +23,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/1.6.1-gcc42_atomicity.patch" \
-		"${FILESDIR}/${PV}-autoconf.patch"
+	epatch "${FILESDIR}/1.6.1-gcc42_atomicity.patch"
+	epatch "${FILESDIR}/${PV}-autoconf.patch"
+	epatch "${FILESDIR}/${PV}-configure_detect_netfilter.patch" # bug 236177
+		
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch
new file mode 100644
index 000000000000..de532b51c3cf
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch
@@ -0,0 +1,12 @@
+--- m4/ost_socket.m4-orig	2008-11-16 15:24:05.000000000 +0100
++++ m4/ost_socket.m4	2008-11-16 15:24:10.000000000 +0100
+@@ -95,6 +95,9 @@
+ 				AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
+ 					[#ifdef HAVE_LIMITS_H
+ 					#include <limits.h>
++					#endif
++					#ifdef HAVE_NETINET_IN_H
++					#include <netinet/in.h>
+ 					#endif])
+ 				if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" && 
+ 				   [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&