Include linux/if_addr.h so we compile on 2.6.19 kernels, thanks to

  AlexExtreme.
Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 35 insertions, 11 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 5943552e8f7d..dd2331ae83d9 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.116 2006/12/03 23:24:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.117 2006/12/04 10:06:04 uberlord Exp $
+
+  04 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-3.0.2-if_addr.patch, dhcpcd-3.0.2.ebuild:
+  Include linux/if_addr.h so we compile on 2.6.19 kernels, thanks to
+  AlexExtreme.
 
   03 Dec 2006; Tim Yamin <plasmaroo@gentoo.org> dhcpcd-3.0.1.ebuild:
   Keyword ~ia64; bug #156446.
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index de0344c19186..6175efcacb7e 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -18,6 +18,10 @@ AUX dhcpcd-2.0.8-no_resolve_hostname.patch 469 RMD160 14216b14dcf5499842d0a837ce
 MD5 56afc76092c3c2ecb7abe181cd6e09a2 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
 RMD160 14216b14dcf5499842d0a837ce03b8f9c80dd9c5 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
 SHA256 adaa5323811e44a334de429bfe8361b0c1c39666b18fdc9d6e35dc22d9098e61 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
+AUX dhcpcd-3.0.2-if_addr.patch 375 RMD160 fef43d57a715a6dfda55971ecdfeb10af3f1e019 SHA1 744f8711b958ad244335ca1c4791ac8430f349e8 SHA256 1783c1a5ba932424b15ad78b910cadf758b381f8fa35cf2229ead0d393fa3069
+MD5 89e7d0eb06760348702a05ec79d95889 files/dhcpcd-3.0.2-if_addr.patch 375
+RMD160 fef43d57a715a6dfda55971ecdfeb10af3f1e019 files/dhcpcd-3.0.2-if_addr.patch 375
+SHA256 1783c1a5ba932424b15ad78b910cadf758b381f8fa35cf2229ead0d393fa3069 files/dhcpcd-3.0.2-if_addr.patch 375
 DIST dhcpcd-2.0.0.tar.bz2 122497 RMD160 0b5b766fad5e1c1f2a82d5ed850b4569ada04854 SHA1 83f5905ed73953d995d1dc0eca318003f4ea95e0 SHA256 f8c79e6a72a2b34ab05a5370fda582ea1ceb436924c911a09a8c69850b4cd673
 DIST dhcpcd-2.0.3.tar.bz2 123176 RMD160 f66d1017b193c409dde624618cdfcd95d0b34429 SHA1 dec7254ce08114f1ced5e3c37bf528f33bf1ea96 SHA256 9dd7358f1f7e6a72ba218860abd9f44535cacf6084f34dbb8da15963a62ddcc4
 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411
@@ -49,14 +53,14 @@ EBUILD dhcpcd-3.0.1.ebuild 881 RMD160 a454845662946b78034672b3f22b5bfeaaffdc81 S
 MD5 38c938097473dfcec5dbecc77638fb98 dhcpcd-3.0.1.ebuild 881
 RMD160 a454845662946b78034672b3f22b5bfeaaffdc81 dhcpcd-3.0.1.ebuild 881
 SHA256 7946610d171e8dd2cfd6a500841952face1cd6c9c370395aa9faaa21f6bda0ce dhcpcd-3.0.1.ebuild 881
-EBUILD dhcpcd-3.0.2.ebuild 888 RMD160 5fd3c755de28f093775f64496aebb2aae0f7503c SHA1 967cc6152953e60aba7298af6c0290bf1e1ff789 SHA256 e95af7dd405b5598e9e5c446f61a7e85ea1feda1378fd89d4514f0c573962106
-MD5 0ccda395d5b6c1923db864edc05643f7 dhcpcd-3.0.2.ebuild 888
-RMD160 5fd3c755de28f093775f64496aebb2aae0f7503c dhcpcd-3.0.2.ebuild 888
-SHA256 e95af7dd405b5598e9e5c446f61a7e85ea1feda1378fd89d4514f0c573962106 dhcpcd-3.0.2.ebuild 888
-MISC ChangeLog 17356 RMD160 0b3623680e1b2548396c1ff0e1bdb8d42e643362 SHA1 e833105bbbc74a47bb1a06af549aa47f944c0413 SHA256 c676e9786e2d405859dfc2402a68dbd9f3d99b63606439827fc2e927292e88ac
-MD5 d101c75d5ca7eb3f599f31dc82a0a2d5 ChangeLog 17356
-RMD160 0b3623680e1b2548396c1ff0e1bdb8d42e643362 ChangeLog 17356
-SHA256 c676e9786e2d405859dfc2402a68dbd9f3d99b63606439827fc2e927292e88ac ChangeLog 17356
+EBUILD dhcpcd-3.0.2.ebuild 976 RMD160 4040f5e8a4d031da5e043dc275a2af24858c5343 SHA1 a16e35098ba1cdc94f8e24a53517832f770f43e9 SHA256 fd28db0c76056134cd31f0fc3eaa8be50e29da1e9eef0824ccb2cb4501d0a192
+MD5 815139a48229a13c03d73022206b67cb dhcpcd-3.0.2.ebuild 976
+RMD160 4040f5e8a4d031da5e043dc275a2af24858c5343 dhcpcd-3.0.2.ebuild 976
+SHA256 fd28db0c76056134cd31f0fc3eaa8be50e29da1e9eef0824ccb2cb4501d0a192 dhcpcd-3.0.2.ebuild 976
+MISC ChangeLog 17547 RMD160 acc03a7d74833707775967d3b28a2a5fe113128c SHA1 a151f67b58d08807c298902f2bd96dc972b77121 SHA256 64069c5dc76c1253c2f882d58da57881ec39c9e99a40fc32e5c914200c2f4667
+MD5 1b3b84ea024cbe0f0cc040861ef60da8 ChangeLog 17547
+RMD160 acc03a7d74833707775967d3b28a2a5fe113128c ChangeLog 17547
+SHA256 64069c5dc76c1253c2f882d58da57881ec39c9e99a40fc32e5c914200c2f4667 ChangeLog 17547
 MISC metadata.xml 387 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b SHA1 0c5e906b77e4bdcb49309098599d1af03fd984b2 SHA256 1a92884e5ea54c2b54b068a428431fb720e9456a62b0a2506700c80c43e94c18
 MD5 d162dd0282805d591f68cfc5d4e36901 metadata.xml 387
 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b metadata.xml 387
diff --git a/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild
index 9dddb51fc3d8..717f4bbae2ef 100644
--- a/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild,v 1.1 2006/12/03 10:43:02 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.2.ebuild,v 1.2 2006/12/04 10:06:04 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
@@ -20,6 +20,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Compile against 2.6.19 linux headers
+	epatch "${FILESDIR}/${P}-if_addr.patch"
+
 	# Redefine the location of ntp.drift
 	sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \
 		pathnames.h || die "sed failed"
diff --git a/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch b/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch
new file mode 100644
index 000000000000..bb9e041aec32
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch
@@ -0,0 +1,12 @@
+Index: interface.c
+===================================================================
+--- interface.c	(revision 91)
++++ interface.c	(working copy)
+@@ -30,6 +30,7 @@
+ #ifdef __linux__ 
+ #include <asm/types.h> /* Needed for 2.4 kernels */
+ #include <features.h>
++#include <linux/if_addr.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ #include <netinet/ether.h>