Changed ebuild variable ordering to skirt around kernel.eclass oddity

6 files changed, 37 insertions, 26 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index befeff28d275..d56e8c356092 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,9 +1,16 @@
 # 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.11 2003/10/23 21:15:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.12 2003/11/16 11:09:38 kumba Exp $
+
 
 *mips-headers-2.4.21-r3 (15 Oct 2003)
 
+  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.
+
   23 Oct 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:
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 21a6b2ecf055..8e5abd4a564a 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,9 +1,9 @@
-MD5 a8a815f189319ca1d99f48ff7169d107 ChangeLog 2796
+MD5 2747b5be41ebd535a4b4450feaef8992 ChangeLog 2796
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 b9250f7fe3c82f6b7d6d233df4c01a9a mips-headers-2.4.21-r1.ebuild 1324
-MD5 32b6f37b5bfea4f7c4a79022955a533b mips-headers-2.4.21-r2.ebuild 1225
-MD5 d40979caef5da79356ec58d8b4d7594d mips-headers-2.4.21-r3.ebuild 1402
-MD5 50d985f56aa07cbb11c5532f8de6c529 mips-headers-2.4.22-r1.ebuild 1233
+MD5 eb7f8912c35f2d0b59c9c00b56d2ba09 mips-headers-2.4.21-r1.ebuild 1324
+MD5 a332ad322bfc8e51e91718db0bb86aa5 mips-headers-2.4.21-r2.ebuild 1225
+MD5 61dc2500584c344932377e9113d5f613 mips-headers-2.4.21-r3.ebuild 1402
+MD5 dcf265de052191a98a565cdce86e8de2 mips-headers-2.4.22-r1.ebuild 1233
 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 5635686334c4..51c04b1904f8 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,15 +1,15 @@
 # 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.5 2003/10/23 21:15:28 kumba Exp $
+# $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 $
 
 
-ETYPE="headers"
-inherit kernel
 OKV=${PV/_/-}
 CVSDATE=20030705
 S=${WORKDIR}/linux-${OKV}
-PROVIDE="virtual/os-headers"
 EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+ETYPE="headers"
+inherit kernel
 
 
 # What's in this kernel?
@@ -23,8 +23,9 @@ DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
 SRC_URI="mirror://gentoo/linux-mips-${OKV}-${CVSDATE}.tar.bz2
 		mirror://gentoo/mips-patches-${OKV}-${CVSDATE}.tar.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
-KEYWORDS="-* mips"
 SLOT="0"
+PROVIDE="virtual/os-headers"
+KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
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 43c37e70a80e..5edd127d25e2 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,15 +1,15 @@
 # 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.5 2003/10/23 21:15:28 kumba Exp $
+# $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 $
 
 
-ETYPE="headers"
-inherit kernel
 OKV=${PV/_/-}
 CVSDATE=20030803
 S=${WORKDIR}/linux-${OKV}
-PROVIDE="virtual/os-headers"
 EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+ETYPE="headers"
+inherit kernel
 
 # What's in this kernel?
 
@@ -22,8 +22,9 @@ DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
-KEYWORDS="-* mips"
 SLOT="0"
+PROVIDE="virtual/os-headers"
+KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
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 9263b870449d..4a716bcab28c 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,15 +1,15 @@
 # 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.2 2003/10/23 21:15:28 kumba Exp $
+# $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 $
 
 
-ETYPE="headers"
-inherit kernel eutils
 OKV=${PV/_/-}
 CVSDATE=20030803
 S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
-PROVIDE="virtual/os-headers"
+KV="${OKV}${EXTRAVERSION}"
+ETYPE="headers"
+inherit kernel eutils
 
 
 # What's in this kernel?
@@ -24,8 +24,9 @@ DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
-KEYWORDS="-* mips"
 SLOT="0"
+PROVIDE="virtual/os-headers"
+KEYWORDS="-* mips"
 
 src_unpack() {
 	unpack ${A}
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 790a6ba39a53..38e13843dda2 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,15 +1,15 @@
 # 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.5 2003/10/23 21:15:28 kumba Exp $
+# $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 $
 
 
-ETYPE="headers"
-inherit kernel
 OKV=${PV/_/-}
 CVSDATE=20030825
 S=${WORKDIR}/linux-${OKV}
-PROVIDE="virtual/os-headers"
 EXTRAVERSION=-mipscvs-${CVSDATE}
+KV="${OKV}${EXTRAVERSION}"
+ETYPE="headers"
+inherit kernel
 
 # What's in this kernel?
 
@@ -22,8 +22,9 @@ DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
-KEYWORDS="-*"
 SLOT="0"
+PROVIDE="virtual/os-headers"
+KEYWORDS="-*"
 
 src_unpack() {
 	unpack ${A}