Check for Linux 2.6 the new way, and try to support cross compiling

(Portage version: 1.589-cvs)

3 files changed, 15 insertions, 18 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 8d851b503ec8..df5554dee598 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.5 2005/07/29 17:50:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.6 2005/07/29 18:01:27 dsd Exp $
+
+  29 Jul 2005; Daniel Drake <dsd@gentoo.org> openafs-kernel-1.2.13.ebuild,
+  openafs-kernel-1.3.85.ebuild:
+  Check for Linux 2.6 the new way, and try to support cross compiling
 
   29 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
   openafs-kernel-1.2.13.ebuild:
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
index 32d040792330..2b4d085b90a3 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild,v 1.4 2005/07/29 17:50:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.2.13.ebuild,v 1.5 2005/07/29 18:01:27 dsd Exp $
 
-inherit eutils linux-mod versionator check-kernel
+inherit eutils linux-mod versionator toolchain-funcs
 
 PATCHVER=0.1
 MY_PN=${PN/-kernel}
@@ -18,14 +18,13 @@ LICENSE="IPL-1"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~ia64"
 
-DEPEND="virtual/linux-sources"
-
 PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)/kernel
 
 pkg_setup() {
-	if is_2_5_kernel || is_2_6_kernel
-	then
-		die "Linux 2.6 kernels do not use this version of openafs.  Use the 1.3 series"
+	if kernel_is gt 2 4; then
+		eerror "openafs-1.2 does not support kernels newer than Linux 2.4."
+		einfo "Please try the openafs-1.3 series"
+		die "Kernel is too new!"
 	fi
 	linux-mod_pkg_setup
 }
@@ -38,9 +37,7 @@ src_unpack() {
 
 src_compile() {
 	econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
-	# unset ARCH, because else it will be used as an incent to start
-	# cross-compiling the kernel module
-	env -u ARCH make only_libafs || die "Failed: make"
+	ARCH="$(tc-arch-kernel)" make only_libafs || die "Failed: make"
 }
 
 src_install() {
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild
index 69517775d099..5cab9ae75c13 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild,v 1.4 2005/07/29 17:32:06 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.3.85.ebuild,v 1.5 2005/07/29 18:01:27 dsd Exp $
 
-inherit eutils linux-mod versionator
+inherit eutils linux-mod versionator toolchain-funcs
 
 MY_PN=${PN/-kernel}
 MY_P=${MY_PN}-${PV}
@@ -18,8 +18,6 @@ LICENSE="IPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
-DEPEND="virtual/linux-sources"
-
 PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)/kernel
 
 pkg_setup() {
@@ -34,9 +32,7 @@ src_unpack() {
 
 src_compile() {
 	econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
-	# unset ARCH, because else it will be used as an incent to start
-	# cross-compiling the kernel module
-	env -u ARCH make only_libafs || die "Failed: make"
+	ARCH="$(tc-arch-kernel)" make only_libafs || die "Failed: make"
 }
 
 src_install() {