QA - fix use invocation and don't subshell epatch

16 files changed, 106 insertions, 90 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/Manifest b/sys-kernel/linux-headers/Manifest
index 177936591f92..cf34ba6ae655 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,46 +1,46 @@
-MD5 cd4e60b08676ffbfdbe304a936c3af2a ChangeLog 17741
-MD5 2b2ea0604dbacd94af1979eda8da4e87 linux-headers-2.6.4.ebuild 4176
-MD5 8a6645e983461e0063420dea2d31d067 linux-headers-2.2.26.ebuild 2495
-MD5 3a3f44f6dbe62879c57b15a6a06f13c5 linux-headers-2.4.23.ebuild 3439
-MD5 bade7ca70884ac5e1bed6744f9475c72 linux-headers-2.6.3-r1.ebuild 4022
+MD5 95a7e96a0af2bde1440e0a355dfde2bd linux-headers-2.6.6.ebuild 4182
+MD5 3c599c047f451564b13b1ecb7d72fe3c linux-headers-2.6.1.ebuild 4109
+MD5 190cb5cd91bd8dae53a98ec788a10733 linux-headers-2.6.6-r1.ebuild 4322
+MD5 7652df7c959571383a980223ebd1e8ad linux-headers-2.4.21-r1.ebuild 3881
+MD5 976e91cd539e8174dac046e7769e5c48 linux-headers-2.4.26.ebuild 3400
+MD5 2fc152551752943a285dbb6933cf5e2d linux-headers-2.4.21.ebuild 3667
+MD5 0f0012a3a807612abd58147bc2444ada linux-headers-2.6.5.ebuild 4185
+MD5 791793b413543b3249d2d710ef616572 linux-headers-2.4.23.ebuild 3419
+MD5 5c991a9dbf51a4698cbbf400efb6e9a5 linux-headers-2.6.7.ebuild 4173
+MD5 f5a2149351e004ecc51540b9567d973b linux-headers-2.4.25.ebuild 3393
+MD5 77676c4e044f3f4541426fe50f9a56e3 linux-headers-2.2.26.ebuild 2481
+MD5 6424a4ae7d68b712471aca13e8773c26 ChangeLog 18265
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 9bce162c7c7185b604c3b9afd7cc3617 linux-headers-2.6.5.ebuild 4188
-MD5 039460785234a6ab4fac673260b24fcb linux-headers-2.4.21-r1.ebuild 3912
-MD5 3077ae595eb7645b3aab5cdf4d33b8db linux-headers-2.6.6.ebuild 4179
-MD5 58bd3f7d12af32d47d63e4e39fbcb265 linux-headers-2.4.26.ebuild 3416
-MD5 e9a36585b73e8e93ce4ca4d056d16ecd linux-headers-2.4.22.ebuild 3990
-MD5 3f9120b3eae2755600a708a0928ce8da linux-headers-2.4.21.ebuild 3698
-MD5 e3cfc0d535561571835c127d340de787 linux-headers-2.4.25.ebuild 3416
-MD5 09c413a3e5b373bc6a3173bfd724ef1f linux-headers-2.6.1.ebuild 4132
-MD5 fd3f13163b8f014e745eb42b8c64aff6 linux-headers-2.6.7.ebuild 4174
-MD5 5bf9f7cdaef64b67395ef9cab3ed2e80 linux-headers-2.6.6-r1.ebuild 4323
-MD5 809c408ee5bef5f61c54835a26cecf30 linux-headers-2.0.40.ebuild 1790
+MD5 f87b4fc010d3c4eb19b50e508227803b linux-headers-2.6.4.ebuild 4175
+MD5 d50e976db4696e96d4f64ec953e73d4c linux-headers-2.6.3-r1.ebuild 4011
+MD5 c47cf1e9cfb351c28a99b1dd7857ab8d linux-headers-2.0.40.ebuild 1789
+MD5 9bf04e14b36346fb20fcc4294e713e83 linux-headers-2.4.22.ebuild 3948
+MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux-headers-2.6.6-tcp_info-DRS-backport.patch 288
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
-MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
-MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
-MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 cb8280b584baf48a15e342e96099eeb9 files/linux-headers-2.6.6-appCompat.patch 26265
-MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
-MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6 66
 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux-headers-2.6.7 66
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 fdddc53af65793602d2c14df57a2d970 files/linux-headers-2.6.7-appCompat.patch 28971
+MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux-headers-2.6.4-unistd-nptl-fix.patch 362
 MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
+MD5 fdddc53af65793602d2c14df57a2d970 files/linux-headers-2.6.7-appCompat.patch 28971
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
+MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6-r1 66
-MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux-headers-2.6.4-unistd-nptl-fix.patch 362
-MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
-MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
-MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
+MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
+MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
+MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
+MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6 66
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
-MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux-headers-2.6.6-tcp_info-DRS-backport.patch 288
+MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6-r1 66
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