Another bug in the ebuild needed to be dealt with

6 files changed, 24 insertions, 14 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index d56e8c356092..280c5e101821 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.12 2003/11/16 11:09:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.13 2003/11/16 11:20:24 kumba Exp $
 
 
 *mips-headers-2.4.21-r3 (15 Oct 2003)
@@ -8,6 +8,12 @@
   16 Nov 2003; Joshua Kinard <kumba@gentoo.org> mips-headers-2.4.21-r1.ebuild,
   mips-headers-2.4.21-r2.ebuild, mips-headers-2.4.21-r3.ebuild,
   mips-headers-2.4.22-r1.ebuild:
+  Tweaked the value of ${S} and tweaked src_compile() to rename the
+  work directory to ${S}
+
+  16 Nov 2003; Joshua Kinard <kumba@gentoo.org> mips-headers-2.4.21-r1.ebuild,
+  mips-headers-2.4.21-r2.ebuild, mips-headers-2.4.21-r3.ebuild,
+  mips-headers-2.4.22-r1.ebuild:
   Changed the order of variables in the ebuild to get around some very weird
   kernel.eclass quirks and added a KV variable as well.
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 80a6cfdfebc0..6c681e317a52 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,9 +1,9 @@
-MD5 e3d325822d592f54fde8c9f50f19bf63 ChangeLog 3066
+MD5 a906a70ef2f8d235e74f54b1ce6d0664 ChangeLog 3066
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 6b86137d4c8d0bd47e4bed2f213374fc mips-headers-2.4.21-r1.ebuild 1356
-MD5 47d1d506ea70da1d91f1fa0850889faf mips-headers-2.4.21-r2.ebuild 1257
-MD5 5e0356aa9d9effe40e0a20a292230e53 mips-headers-2.4.21-r3.ebuild 1434
-MD5 a023bd3f09bd561cd692044dd7435779 mips-headers-2.4.22-r1.ebuild 1265
+MD5 72c6d97993767b267229cec92c7d292e mips-headers-2.4.21-r1.ebuild 1356
+MD5 4f67e85eadb9361f048cc3af5ccca37a mips-headers-2.4.21-r2.ebuild 1257
+MD5 0e0cbb7162e6fbadf1ca4639a5c77f76 mips-headers-2.4.21-r3.ebuild 1434
+MD5 c091aa58772aac0d42f3408c2e97f734 mips-headers-2.4.22-r1.ebuild 1265
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
index 51c04b1904f8..552d8d7f0a76 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild,v 1.6 2003/11/16 11:09:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild,v 1.7 2003/11/16 11:20:24 kumba Exp $
 
 
 OKV=${PV/_/-}
 CVSDATE=20030705
-S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
 ETYPE="headers"
 inherit kernel
 
@@ -29,6 +29,7 @@ KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${S}
 	cd ${S}
 
 	# Fix R4K Cache Handling
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
index 5edd127d25e2..23706ddef833 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.6 2003/11/16 11:09:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.7 2003/11/16 11:20:24 kumba Exp $
 
 
 OKV=${PV/_/-}
 CVSDATE=20030803
-S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
 ETYPE="headers"
 inherit kernel
 
@@ -28,6 +28,7 @@ KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${S}
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
index 4a716bcab28c..d350b3a0ed0b 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild,v 1.3 2003/11/16 11:09:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild,v 1.4 2003/11/16 11:20:24 kumba Exp $
 
 
 OKV=${PV/_/-}
 CVSDATE=20030803
-S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
 ETYPE="headers"
 inherit kernel eutils
 
@@ -30,6 +30,7 @@ KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${S}
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
index 38e13843dda2..45615188c6da 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.6 2003/11/16 11:09:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.7 2003/11/16 11:20:24 kumba Exp $
 
 
 OKV=${PV/_/-}
 CVSDATE=20030825
-S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
 ETYPE="headers"
 inherit kernel
 
@@ -28,6 +28,7 @@ KEYWORDS="-*"
 
 src_unpack() {
 	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${S}
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes