handle portage ARCH vs kernel ARCH properly

3 files changed, 38 insertions, 26 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 7a2415be4d2e..f40857078336 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.9 2004/07/18 12:27:51 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.10 2004/07/19 19:00:24 vapier Exp $
+
+  19 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  linux26-headers-2.6.7-r3.ebuild:
+  Stop running $(uname -m) to figure out what to set ARCH to. Use the functions
+  from kernel.eclass to translate portage ARCH to kernel ARCH.
 
   18 Jul 2004; <plasmaroo@gentoo.org>
   files/linux26-headers-2.6.7-appCompat.patch:
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index a3a616c688e0..142cb41e7855 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,28 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9cc09a95aedc500fc3d77f92721613de ChangeLog 3407
+MD5 870218f86efb44e8c56ecb360c7af9b4 linux26-headers-2.6.1.ebuild 4111
+MD5 b751725e8dcac2ef109557ec4826812e linux26-headers-2.6.3-r1.ebuild 4028
 MD5 26b9fb030b07a5a83e25ea025c17e8b3 linux26-headers-2.6.4.ebuild 4176
-MD5 549356166f1c223348add928c8e7da7f ChangeLog 3180
-MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
 MD5 35eda8dd7aa6785dae7c32d95f7fc47c linux26-headers-2.6.5.ebuild 4187
-MD5 b751725e8dcac2ef109557ec4826812e linux26-headers-2.6.3-r1.ebuild 4028
-MD5 e545ff6a66853894c5fcbc60f199f262 linux26-headers-2.6.6.ebuild 4062
-MD5 870218f86efb44e8c56ecb360c7af9b4 linux26-headers-2.6.1.ebuild 4111
 MD5 ab5655820a71561f697cf30229948a7f linux26-headers-2.6.6-r1.ebuild 4217
-MD5 880e1c3e913a6d8c73e696ff8ce32418 linux26-headers-2.6.7-r3.ebuild 3932
+MD5 e545ff6a66853894c5fcbc60f199f262 linux26-headers-2.6.6.ebuild 4062
+MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
+MD5 23b521f5fc6527d5c99179b8b5c40ead linux26-headers-2.6.7-r3.ebuild 3698
 MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux26-headers-2.6.1 66
-MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux26-headers-2.6.3-r1 66
-MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6 66
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
-MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux26-headers-2.6.3-appCompat.patch 17484
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r3 66
-MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
+MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
 MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux26-headers-2.6.0-appCompat.patch 17983
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
 MD5 537c756a05fe1a6819277938d570b70a files/linux26-headers-2.6.0-strict-ansi-fix.patch 1484
+MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
+MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux26-headers-2.6.3-appCompat.patch 17484
+MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
 MD5 2e7a6080afc1b2fea56740690790d878 files/linux26-headers-2.6.7-appCompat.patch 38862
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA/BpmHTu7gpaalycRAtWVAKDqFkJVvzkGBMCYzPRgyRSrKvnbngCbBsfx
+T/znmGtHKQY5Wh/6LGvuHNM=
+=+TEZ
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
index fdee4eca2fc2..36eed0660181 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.1 2004/07/15 19:42:15 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.2 2004/07/19 19:00:24 vapier Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -27,17 +27,12 @@ IUSE=""
 DEPEND="!virtual/os-headers"
 
 pkg_setup() {
-	# Figure out what architecture we are, and set ARCH appropriately
-	ARCH="$(uname -m)"
-	ARCH="$(echo ${ARCH} | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)"
-	[ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
-
 	# Archs which have their own separate header packages, add a check here
 	# and redirect the user to them
 	case "${ARCH}" in
-		mips|mips64)
+		mips)
 			eerror "These headers are not appropriate for your architecture."
-			eerror "Please use sys-kernel/${ARCH/64/}-headers instead."
+			eerror "Please use sys-kernel/mips-headers instead."
 			die
 		;;
 	esac
@@ -65,8 +60,10 @@ src_compile() {
 		touch ${S}/include/linux/autoconf.h
 	# if there arent any installed headers, then there also isnt an asm
 	# symlink in /usr/include/, and make defconfig will fail.
+	set_arch_to_kernel
 	ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
 	make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
+	set_arch_to_portage
 }
 
 src_install() {