amd64 stable. Fixed build issue with >=linux-headers-2.6.27.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 39 insertions, 10 deletions

diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog
index 21e027be931e..3d8a8baa258d 100644
--- a/net-analyzer/ipcad/ChangeLog
+++ b/net-analyzer/ipcad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ipcad
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.28 2007/04/24 19:46:40 welp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.29 2008/11/15 18:27:08 pva Exp $
+
+  15 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/ipcad-3.7-linux-2.6.27.patch, ipcad-3.7.ebuild:
+  amd64 stable. Fixed build issue with >=linux-headers-2.6.27.
 
   24 Apr 2007; Peter Weller <welp@gentoo.org> ipcad-3.7.ebuild:
   Keyworded ~amd64 wrt bug 175728
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
index fee26fe96d1c..02981527c73f 100644
--- a/net-analyzer/ipcad/Manifest
+++ b/net-analyzer/ipcad/Manifest
@@ -1,7 +1,8 @@
 AUX ipcad-3.7-20060828-cvs.patch 20307 RMD160 84743fbb474ce9fb3d84c5b8ebc5f7ab8cc07768 SHA1 fac2c03b3b3dcd37035c66ce0529d512592689c5 SHA256 4025e114346ac0368907b79026b55e05fa34f6cce3fbaaa77f0e0eeab7dd2006
+AUX ipcad-3.7-linux-2.6.27.patch 521 RMD160 4a993f65332b7e078ac60538efec480a38e863a6 SHA1 456bede04a339c140fb2fe474583f2c4bc09468a SHA256 a1606dba9b31385751101add747b23e1efa49e16b753e449730b68b2d81f2d67
 AUX ipcad.conf.d 429 RMD160 02956a6386a7448501658705a95dcb7d97f7531b SHA1 9be3112424e3d1e49b6c626f5c035128496b8668 SHA256 7b802d54f968ab3797e49934b78ace247274326559bfece2792c2490a7f0339c
 AUX ipcad.init 924 RMD160 e75dd67de1aff64b5979415942f3afc96909ffee SHA1 dbde21c675f216f9eed9b3c8752e8e7dfb0c9473 SHA256 9b6234267f23b50a4959444f90fe318d26d0559121804a100017e17406ffbe93
 DIST ipcad-3.7.tar.gz 171814 RMD160 788f4b55bd7494bf7ea99a157a4efdcb4cdba71c SHA1 ef67a5313f672eb4cb7e9c2762d99d1e9d34fbc2 SHA256 3be5edebd7e8ce3a050c10f59b0c58619cae23f28d2c3daa38384dca01795352
-EBUILD ipcad-3.7.ebuild 1156 RMD160 24c204994657461c4cd63fb91011f21682893888 SHA1 2fcc89aa49838b6835268c67553cc927b97ba9e6 SHA256 58a156081326c1e421153a63b690d8c9b8fb87ba1c014c3ed84cba1aa8fce210
-MISC ChangeLog 4187 RMD160 dfe882df16fedd5bb413b0abe26dac8a055dbdee SHA1 7a46e682511267d88929262df8b0c16aa74bd468 SHA256 9c4ba34a06ef5ed1bba1fb6b91b6f1d92058552e319b6380d12d31497cfcf383
+EBUILD ipcad-3.7.ebuild 1227 RMD160 ee6a1999bfb988579e3e4fecfc25fafbd8a500bb SHA1 a5c468ff5641417bdb6d7a0641c5d107e9c69215 SHA256 33cf01d7ac8362a0916ddb69c54e868b4ddbb49ba2535a3fb9c325ceeb8b948b
+MISC ChangeLog 4352 RMD160 c9a3dcde170053e3d2699e6704fed42b871a9796 SHA1 4a8cc760dbe43c24fe577f6f5f6b1e23f4394168 SHA256 45329037dd165ecd78a054bfbb602e577bcc1fbd86371e0b2f8a2c09d7261fb2
 MISC metadata.xml 221 RMD160 9bf9934cf7def883af53fd96eb920842aeb5f10e SHA1 31d376e84b2e0b9793e1555038bb438a9167cc1a SHA256 26daf450814a6f339001173abdb07aa9c0bfae6a5432db67bf6a73c19c9fdd5e
diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
new file mode 100644
index 000000000000..2de1e185844a
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
@@ -0,0 +1,22 @@
+=== modified file 'configure.in'
+--- configure.in	2008-11-09 18:27:08 +0000
++++ configure.in	2008-11-09 18:28:02 +0000
+@@ -156,6 +156,7 @@
+ ])
+ 
+ AC_CHECK_HEADERS(asm/types.h)
++AC_CHECK_HEADERS(linux/in.h)
+ AC_CHECK_HEADERS(linux/socket.h)
+ AC_CHECK_HEADERS(linux/netlink.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+@@ -164,6 +165,9 @@
+ AC_CHECK_HEADERS(linux/netfilter.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+ #include <linux/socket.h>
++#endif
++#ifdef HAVE_LINUX_IN_H
++#include <linux/in.h>
+ #endif])
+ 
+ AC_CHECK_HEADERS(linux/if.h,,,
+
diff --git a/net-analyzer/ipcad/ipcad-3.7.ebuild b/net-analyzer/ipcad/ipcad-3.7.ebuild
index e094392fed00..c12dfb3d9297 100644
--- a/net-analyzer/ipcad/ipcad-3.7.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.7.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.ebuild,v 1.8 2007/04/24 19:46:40 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.ebuild,v 1.9 2008/11/15 18:27:08 pva Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="IP Cisco Accounting Daemon"
 HOMEPAGE="http://ipcad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="net-libs/libpcap
@@ -17,9 +17,11 @@ DEPEND="net-libs/libpcap
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-20060828-cvs.patch
+	epatch "${FILESDIR}/${P}-20060828-cvs.patch"
+	epatch "${FILESDIR}/${P}-linux-2.6.27.patch"
+	eautoreconf
 }
 
 src_install() {