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

Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 36 insertions, 14 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/Manifest b/dev-cpp/commoncpp2/Manifest
index aa9824dc88c3..c3d4a94cf149 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,9 +1,10 @@
 AUX 1.6.1-autoconf.patch 247 RMD160 7a5754c6340f0b841bc38ebefcf54808d3aa766f SHA1 464d2c29bc0ad4c65344c206dba78d2dacab6d03 SHA256 dfd1953311e525e4fd9b0283397233c09e0fc7f1781acfcf76331a995993baec
 AUX 1.6.1-gcc42_atomicity.patch 2138 RMD160 1aab622488272235a14f7f866742df05b7cc4816 SHA1 5bf7d94c8256ceda13ab22fd73d4699146c4c430 SHA256 45eccbd6bf9a2db5491a9b6545a47d3ed3ff35f6735cee9dc47a6f09f014a7bb
 AUX 1.6.2-autoconf.patch 247 RMD160 3cf119e6c7f5cf482e83dc7a996a23e941640a12 SHA1 e0e5084f0c82b30399ad881c714cfaa2f44e52b0 SHA256 2ecefc39dab185473be409631517f7e71e5f5a8222b494ea1fe679b6150d85b1
+AUX 1.6.2-configure_detect_netfilter.patch 482 RMD160 63e650ff709c8d3b1254c62801c55c57fd5837c7 SHA1 e9369bd0ff885775e147b7fceee980fe5132d7af SHA256 64b372b48bd7ce91151ef932ede766a586a981509fb21b5403b3c089f5f6413c
 DIST commoncpp2-1.6.1.tar.gz 864006 RMD160 ed78367610464fc5cff488f29f9371636098b55c SHA1 f72956dee03c0b83dd6ef77b905ff6a98163c963 SHA256 54dd187608917fa7f3368b70e637c27fe2d0b2996463d6ef6373f1b9f99bbeb2
 DIST commoncpp2-1.6.2.tar.gz 871333 RMD160 baa7b98540b5d35f2179e3c253e96366e05c7ea9 SHA1 6291ff4182abef3fdf3b5f39cd306cdf24588cb6 SHA256 a8870aa2becf2d66740c50646f006c7188cc8236cc7393731079d9f4fbe79f8f
-EBUILD commoncpp2-1.6.1.ebuild 1954 RMD160 e09295acaf0dbb1e9ce90e8384a2c60dfb81ce7c SHA1 ffa9b059e92936dbfc72b429afe70e0bf883759c SHA256 a57b688da4ac4f084d98fe0bc37c39f04c1d5b3d2cdc6a605932631a59413cc0
-EBUILD commoncpp2-1.6.2.ebuild 1958 RMD160 c2cc7c202b9eb2dccf60c562de9cecaa1bc40084 SHA1 dd5bf0db40d698923c8bf5703cfc184487e975a2 SHA256 4b51e6beed5667c0dbbb48e3a6a6164e46d27e9ef15f132b3b489d1d34717801
-MISC ChangeLog 7244 RMD160 3e68ac9ba09b07fdfddecc08d86c433f55e458d8 SHA1 19e8fda0e21082ad08a80a69b667c768d8f749db SHA256 3ff561484fd09a295949a84682f8b6bb10301a46185990be00e35fc81b7170fd
+EBUILD commoncpp2-1.6.1.ebuild 2018 RMD160 d3814fa1898bb4553411fe898957382164940e6f SHA1 aa46b4d2923b882acc045e72b91fc33b4f7bdf6c SHA256 f63b8ad7ab047c612e3e41aca787d298ffc34dec6e0caa1b444e9cc7368636a1
+EBUILD commoncpp2-1.6.2.ebuild 2037 RMD160 a1c7fcdcef181573189c646246e2c931a0787780 SHA1 5511bf0acef63e78edc408b6e2bbb6d579c2e799 SHA256 e0c229236fefd3e874acc09248c82a282ec7cef387c535beacc96db519f60972
+MISC ChangeLog 7545 RMD160 4c1065bac4adc42a4bf1474d9c9f0e805ccb6319 SHA1 1c2a64321cd79532510f265c0e4b83bd867b95bd SHA256 aee5776fef5810a7cfa618e1afb02ea12ce3e6c1b01d473640115f4a729d0c72
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
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" &&