All version setting for kernels is now handled by ebuilds on an individual basis, there were only about 15 which were doing none of it before, so this way we are consistent, the eclass will now simply utilize the variables as they are set in the kernel ebuilds.

6 files changed, 34 insertions, 16 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index a6276ff71e95..38a28e4a20ef 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.92 2003/11/06 23:13:34 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.93 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  mm-sources-2.6.0_beta7-r1.ebuild, mm-sources-2.6.0_beta8-r1.ebuild,
+  mm-sources-2.6.0_beta9-r1.ebuild, mm-sources-2.6.0_beta9-r2.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *mm-sources-2.6.0_beta9-r2 (06 Nov 2003)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 86a59f717205..9c6a46d4771d 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,13 +1,13 @@
-MD5 182b5875edba826ef7b1700f8f2d0fdf ChangeLog 15871
+MD5 6f14f01d4ac15ea7ff95f94b66c93ae7 mm-sources-2.6.0_beta9-r2.ebuild 3010
+MD5 f4c883a89f1c1440869339a008a745cf mm-sources-2.6.0_beta9-r1.ebuild 3010
+MD5 a4fa5e46323f3235eb7866a9568bc52a mm-sources-2.6.0_beta8-r1.ebuild 3010
+MD5 ab1de423eecee53da4f6923a09a6c3db ChangeLog 16152
 MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
-MD5 c5c62f6a0b2ac0b41966f76494c83bf4 mm-sources-2.6.0_beta7-r1.ebuild 2976
-MD5 e50b0576f85d8b97371e7d7920391134 mm-sources-2.6.0_beta8-r1.ebuild 2976
-MD5 d9aef1b38b6ba948a0a66dc022586c41 mm-sources-2.6.0_beta9-r1.ebuild 2976
-MD5 b801b8da799ba65c2ee4d982c2684a41 mm-sources-2.6.0_beta9-r2.ebuild 2972
+MD5 a90780133109581d62163ac759dcad8d mm-sources-2.6.0_beta7-r1.ebuild 3010
+MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 ed6f583c9a528322461a432cf8f0409c files/2.6.0-test5-mm4-devfsd-fix 594
 MD5 4aae70a680b271c0a649ffb4890c5bd4 files/digest-mm-sources-2.6.0_beta7-r1 136
 MD5 4178d67824f7d4cf5e79343b1abaf9b1 files/digest-mm-sources-2.6.0_beta8-r1 136
 MD5 94fc121371d523e8325787991b2fdc6e files/digest-mm-sources-2.6.0_beta9-r1 136
-MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
-MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 0d5c87030c2a839be9a8d8dbd2799e2d files/digest-mm-sources-2.6.0_beta9-r2 136
+MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild
index 88fac5761b7b..dcb7fce7cc13 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild,v 1.1 2003/10/17 03:18:14 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta7-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_beta/-test}
 
@@ -12,7 +13,9 @@ EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
 
 KV=${OKV}-${PR/r/mm}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild
index a154101ee38c..8849a09898cd 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild,v 1.1 2003/10/20 13:48:35 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta8-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_beta/-test}
 
@@ -12,7 +13,9 @@ EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
 
 KV=${OKV}-${PR/r/mm}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild
index cb2e97d5b6da..b927c0ff82d1 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild,v 1.1 2003/10/30 20:16:56 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_beta/-test}
 
@@ -12,7 +13,9 @@ EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
 
 KV=${OKV}-${PR/r/mm}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild
index c868e5b80b03..e872fc09b10b 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild,v 1.1 2003/11/06 23:13:34 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r2.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_beta/-test}
 
@@ -12,7 +13,9 @@ EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
 
 KV=${OKV}-${PR/r/mm}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?