Fix efibootmgr compilation on IA64.

Package-Manager: portage-2.0.51-r15

5 files changed, 21 insertions, 10 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index ebbd11e80701..0057238bab25 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.95 2005/01/22 00:18:05 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.96 2005/02/03 19:37:49 plasmaroo Exp $
+
+  03 Feb 2005; <plasmaroo@gentoo.org> linux-headers-2.6.8.1-r2.ebuild,
+  linux-headers-2.6.8.1-r4.ebuild,
+  files/linux-headers-2.6.8.1-appCompat.patch:
+  Fix efibootmgr compilation on IA64.
 
   22 Jan 2005; <plasmaroo@gentoo.org>
   files/linux-headers-2.6.8.1-appCompat.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 385945569e64..6a0302af0f40 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,13 +1,13 @@
-MD5 c8af91316841081bc6e9c7651de27491 ChangeLog 22410
+MD5 42e79346a91c8ac8aa873be6668aff78 ChangeLog 22602
 MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
 MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
-MD5 ef92269be437efc821d4923d9fadafc3 linux-headers-2.6.8.1-r2.ebuild 1230
+MD5 921f9a68d38778297cb92cb3aa61e428 linux-headers-2.6.8.1-r2.ebuild 1260
 MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945
 MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351
 MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029
-MD5 65069a9ddeb641ed596f5e2bdf22618c linux-headers-2.6.8.1-r4.ebuild 1236
+MD5 e34ea6646a79a131e226f316f77e4043 linux-headers-2.6.8.1-r4.ebuild 1266
 MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731
 MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
 MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
@@ -19,7 +19,7 @@ MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
-MD5 6e82c4e07788dae415bd53973eded377 files/linux-headers-2.6.8.1-appCompat.patch 59238
+MD5 73fc09c38977c1212cf0799dfff7e8fc files/linux-headers-2.6.8.1-appCompat.patch 59342
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
 MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
index d85d2251759c..b1559aeae7db 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
@@ -1670,23 +1670,27 @@ diff -ur linux-2.6.8.1/include/asm-sparc/signal.h linux-2.6.8.1-gentoo/include/a
 diff -ur linux-2.6.8.1/include/asm-ia64/fpu.h linux-2.6.8.1-gentoo/include/asm-ia64/fpu.h
 --- linux-2.6.8.1/include/asm-ia64/fpu.h	2004-10-31 14:20:01.000000000 -0700
 +++ linux-2.6.8.1-gentoo/include/asm-ia64/fpu.h	2004-11-01 12:04:54.202369190 -0700
-@@ -53,13 +53,20 @@
+@@ -53,13 +53,24 @@
  			 | FPSR_S3 (FPSF_DEFAULT | FPSF_TD))
  
  # ifndef __ASSEMBLY__
 +#   ifndef __KERNEL__
-+#     include <dlfcn.h>
++#     include <bits/posix1_lim.h>
 +      /* Versioning, newer glibc's declare ia64_fpreg without telling us
 +           -- plasmaroo */
 +#   endif
  
-+#   if !defined(RTLD_DEEPBIND) || !defined(_BITS_SIGCONTEXT_H) || defined(__KERNEL__)
++#   ifdef _FCNTL_H /* Userspace */
++#     include <signal.h>
++#   else
++#     if !defined(_POSIX_HOST_NAME_MAX) || !defined(_BITS_SIGCONTEXT_H) || defined(__KERNEL__)
  struct ia64_fpreg {
  	union {
  		unsigned long bits[2];
  		long double __dummy;	/* force 16-byte alignment */
  	} u;
  };
++#     endif
 +#   endif
  
  # endif /* __ASSEMBLY__ */
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild
index f482a33e2b23..cfff2cc69823 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild,v 1.3 2005/01/14 00:43:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild,v 1.4 2005/02/03 19:37:49 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc sh x86"
@@ -32,4 +32,5 @@ src_unpack() {
 	headers___fix asm-ppc64/*
 	mv iSeries asm-ppc64/
 	headers___fix asm-ppc64/iSeries/*
+	headers___fix linux/ethtool.h
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild
index 2161b6926a10..628eae6aef2b 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild,v 1.2 2005/01/14 00:43:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild,v 1.3 2005/02/03 19:37:49 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc sh x86"
@@ -32,4 +32,5 @@ src_unpack() {
 	headers___fix asm-ppc64/*
 	mv iSeries asm-ppc64/
 	headers___fix asm-ppc64/iSeries/*
+	headers___fix linux/ethtool.h
 }