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.

5 files changed, 23 insertions, 14 deletions

diff --git a/sys-kernel/vanilla-sources/ChangeLog b/sys-kernel/vanilla-sources/ChangeLog
index 67889e2d068b..c79c79657720 100644
--- a/sys-kernel/vanilla-sources/ChangeLog
+++ b/sys-kernel/vanilla-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/vanilla-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.15 2003/11/18 18:09:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.16 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  vanilla-sources-2.4.20.ebuild, vanilla-sources-2.4.21.ebuild,
+  vanilla-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   18 Nov 2003; Brian Jackson <iggy@gentoo.org> vanilla-sources-2.4.20.ebuild,
   vanilla-sources-2.4.21.ebuild, vanilla-sources-2.4.22.ebuild:
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b0199d39a6aa..de3f6b217b3f 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,10 +1,10 @@
 MD5 0cf19cc3ec7138bf81eb7b6bb3353fb0 vanilla-sources-2.0.39.ebuild 2748
-MD5 30db0d6c317c00740a91f54eb2c6c8ba vanilla-sources-2.4.20.ebuild 787
-MD5 5ed8d5f284edd5932d4a785a7981613e vanilla-sources-2.4.22.ebuild 793
+MD5 cf04cbc2971910471f2612fbd93c3209 vanilla-sources-2.4.20.ebuild 794
+MD5 692751ea8f5d1466756a8fa9c7cd9637 vanilla-sources-2.4.22.ebuild 799
 MD5 21a5e1ed5e13eb5399ec257020decf7f vanilla-sources-2.2.25.ebuild 2747
-MD5 2dfe2de64cd5abbb450877edd03a2300 vanilla-sources-2.4.21.ebuild 793
+MD5 88b20ff8dc6ae45d7e0be6932d9e0ee7 vanilla-sources-2.4.21.ebuild 799
 MD5 8cd9d3d154ad27b2c1e69cd16b32025b vanilla-sources-2.2.22.ebuild 2748
-MD5 e41e2bf7b0f6ee30bb2d4f5f407b0f2f ChangeLog 2140
+MD5 f11eb7c098f3b8f436398ec43ccd2d2e ChangeLog 2379
 MD5 17ded3e049cc5ea4571a590f031fd463 metadata.xml 449
 MD5 1d8193a0ded31699ec3b7bf85dd6cbfa files/digest-vanilla-sources-2.0.39 66
 MD5 7a3980ee687f27df3784c2bfb432ae67 files/digest-vanilla-sources-2.2.22 67
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
index aa3f8f42c12d..81fd625de20d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
@@ -1,14 +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/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.9 2003/11/18 18:09:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.10 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=2.4.20
 KV=2.4.20
 EXTRAVERSION=" "
 S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
index a5a89c5cf5ad..7a09d5e26846 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
@@ -1,14 +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/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.6 2003/11/18 18:09:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.7 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=2.4.21
 KV=2.4.21
 EXTRAVERSION=" "
 S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
index 8894f05a6544..e2f63c5e901f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
@@ -1,14 +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/vanilla-sources/vanilla-sources-2.4.22.ebuild,v 1.4 2003/11/18 18:09:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild,v 1.5 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=2.4.22
 KV=2.4.22
 EXTRAVERSION=" "
 S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?