QA - fix use invocation and don't subshell epatch

15 files changed, 71 insertions, 55 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 2ee6458c5910..c7d2d2951b5d 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.78 2004/06/22 17:36:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.79 2004/06/23 22:49:16 agriffis Exp $
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> linux-headers-2.2.26.ebuild,
+  linux-headers-2.4.21-r1.ebuild, linux-headers-2.4.21.ebuild,
+  linux-headers-2.4.22.ebuild, linux-headers-2.4.23.ebuild,
+  linux-headers-2.4.25.ebuild, linux-headers-2.4.26.ebuild,
+  linux-headers-2.6.1.ebuild, linux-headers-2.6.3-r1.ebuild,
+  linux-headers-2.6.4.ebuild, linux-headers-2.6.5.ebuild,
+  linux-headers-2.6.6-r1.ebuild, linux-headers-2.6.6.ebuild,
+  linux-headers-2.6.7.ebuild:
+  QA - fix use invocation and don't subshell epatch
 
 *linux-headers-2.6.6-r1 (22 Jun 2004)
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild b/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild
index bea068746eb0..c4de50cb583c 100644
--- a/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild,v 1.2 2004/04/11 21:37:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.2.26.ebuild,v 1.3 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -63,7 +63,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
@@ -74,7 +74,7 @@ src_install() {
 	kernel_src_install
 
 	# If sparc32, make a symlink from asm to asm-sparc
-	if [ "`use sparc`" ]; then
+	if use sparc; then
 		mv ${D}/usr/include/asm ${D}/usr/include/asm-sparc
 		ln -sf ${D}/usr/include/asm-sparc ${D}/usr/include/asm
 	fi
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
index aa565a4e7fb2..3049fb607379 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.11 2004/04/14 22:01:01 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.12 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -51,7 +51,7 @@ src_unpack() {
 	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
 	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
 	# Closes Bug #26062
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 	fi
 
@@ -59,7 +59,7 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
 	fi
 
@@ -74,7 +74,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index 47e054d3bb8b..4d920f50d028 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.23 2004/04/14 22:01:01 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.24 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -51,7 +51,7 @@ src_unpack() {
 	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
 	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
 	# Closes Bug #26062
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 	fi
 
@@ -65,7 +65,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
@@ -76,7 +76,7 @@ src_install() {
 	kernel_src_install
 
 	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 
 		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
 		rm -Rf ${D}/usr/include/asm
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
index 21fc3412f044..c4fe18f91420 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.18 2004/04/14 22:01:01 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.19 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -51,7 +51,7 @@ src_unpack() {
 	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
 	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
 	# Closes Bug #26062
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 	fi
 
@@ -59,7 +59,7 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
 	fi
 
@@ -74,7 +74,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make dep ARCH=${ARCH} || die "Failed to run 'make dep'"
 	fi
 }
@@ -85,7 +85,7 @@ src_install() {
 	kernel_src_install
 
 	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 
 		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
 		rm -Rf ${D}/usr/include/asm
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
index 2188783854b4..40d195cbe7cb 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.14 2004/04/14 22:01:01 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.15 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -49,7 +49,7 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
 	fi
 
@@ -64,7 +64,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
index 39aad1f3986d..e80a383d21c5 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild,v 1.6 2004/04/27 22:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild,v 1.7 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -49,7 +49,7 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
 	fi
 
@@ -64,7 +64,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
index 84f1d55eb41b..ab7bfd837343 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild,v 1.3 2004/06/02 05:07:07 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild,v 1.4 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -49,7 +49,7 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
 	fi
 
@@ -64,7 +64,7 @@ src_compile() {
 	kernel_src_compile
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild
index 01e380cc9036..3b1b9b5ebf39 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild,v 1.7 2004/04/27 22:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.1.ebuild,v 1.8 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -67,7 +67,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
@@ -88,7 +88,7 @@ src_install() {
 	kernel_src_install
 
 	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 
 		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
 		rm -Rf ${D}/usr/include/asm
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild
index 87c1d5c3c61f..7e585b4ab3d4 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild,v 1.9 2004/04/27 22:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.3-r1.ebuild,v 1.10 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -67,7 +67,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
index dc95ff2fcfbb..5e9b31b72696 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild,v 1.9 2004/04/27 22:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild,v 1.10 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -57,9 +57,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
 	# Needed to compile NPTL on amd64
-	use amd64 && (cd ${S}/include/asm-x86_64/
-	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
-
+	if use amd64; then
+		cd ${S}/include/asm-x86_64/
+		epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch
+	fi
 }
 
 src_compile() {
@@ -71,7 +72,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
index 800fe29ea0cf..1aef65b63543 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild,v 1.8 2004/04/27 22:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild,v 1.9 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -57,10 +57,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
 	# Needed to compile NPTL on amd64
-	use amd64 && (cd ${S}/include/asm-x86_64/
-	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
-
-
+	if use amd64; then
+		cd ${S}/include/asm-x86_64/
+		epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch
+	fi
 }
 
 src_compile() {
@@ -72,7 +72,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild
index 69e902f643d7..c984584b836d 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild,v 1.1 2004/06/22 17:36:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild,v 1.2 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -55,8 +55,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
 	# Needed to compile NPTL on amd64
-	use amd64 && (cd ${S}/include/asm-x86_64/
-	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
+	if use amd64; then
+		cd ${S}/include/asm-x86_64/
+		epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch
+	fi
 
 	# 2.6.7 structure change backport to get iproute2 to compile on
 	# 2.6.6 headers
@@ -73,7 +75,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild
index 97a83900636e..5cd092da8392 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild,v 1.4 2004/06/19 13:16:08 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.6.ebuild,v 1.5 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -55,9 +55,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
 	# Needed to compile NPTL on amd64
-	use amd64 && (cd ${S}/include/asm-x86_64/
-	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
-
+	if use amd64; then
+		cd ${S}/include/asm-x86_64/
+		epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch
+	fi
 }
 
 src_compile() {
@@ -69,7 +70,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild
index 7cc619d17bbb..ebe1d0157ed5 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild,v 1.1 2004/06/19 22:48:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.7.ebuild,v 1.2 2004/06/23 22:49:16 agriffis Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -55,8 +55,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
 	# Needed to compile NPTL on amd64
-	use amd64 && (cd ${S}/include/asm-x86_64/
-	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
+	if use amd64; then
+		cd ${S}/include/asm-x86_64/
+		epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch
+	fi
 
 }
 
@@ -69,7 +71,7 @@ src_compile() {
 	ARCH=${MY_ARCH}
 
 	# If this is sparc, then generate asm_offsets.h
-	if [ -n "`use sparc`" ]; then
+	if use sparc; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi