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.

7 files changed, 67 insertions, 29 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 5857fb7172c0..8e9a023b58a0 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.38 2003/11/17 16:35:12 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.39 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  gentoo-sources-2.4.19-r10.ebuild, gentoo-sources-2.4.20-r5.ebuild,
+  gentoo-sources-2.4.20-r6.ebuild, gentoo-sources-2.4.20-r7.ebuild,
+  gentoo-sources-2.4.20-r8.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   17 Nov 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r8.ebuild,
   files/gentoo-sources-2.4.20-ipt-route.patch: Added the new ROUTE patch 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index e886b62a6923..6b00d0b05ef0 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,27 +1,27 @@
-MD5 5fd75194ed98d9aa7ed96a96809fa563 ChangeLog 10960
+MD5 3a6d9560fad506f18739cf7467669fb1 gentoo-sources-2.4.19-r10.ebuild 2324
+MD5 c13ef42a84c18d8a553f4fe71b22fdb4 gentoo-sources-2.4.20-r6.ebuild 4923
+MD5 a97b1b605f4744a54d254f1e3ce3df3d gentoo-sources-2.4.20-r8.ebuild 5525
+MD5 75741736f5e66d8e668a27e5ecce3e56 gentoo-sources-2.4.20-r5.ebuild 4769
+MD5 07c2e8928e8cf89ecc9978a25fa932bf ChangeLog 11269
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 df486e3dd2b5ed63bb861d644bb05cd5 gentoo-sources-2.4.20-r8.ebuild 5329
-MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113
-MD5 401c0e324d9c0a514bf972a76db6b554 gentoo-sources-2.4.20-r7.ebuild 5149
-MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571
-MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725
-MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
+MD5 fc6ee4ccf23c279730ab75eb72a6a248 gentoo-sources-2.4.20-r7.ebuild 5345
+MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
+MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
+MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
+MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
-MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
+MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
-MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
-MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
-MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r8 145
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r5 145
-MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
-MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
 MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r10 146
-MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r5 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r8 145
+MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
+MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild
index 659bc1746809..cd38fba77e9b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild,v 1.12 2003/09/07 18:54:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild,v 1.13 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -23,6 +23,13 @@ ETYPE="sources"
 
 inherit kernel
 
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild
index d64249b94cb1..520d970ae770 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild,v 1.3 2003/09/07 18:54:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -18,7 +18,13 @@ IUSE="build crypt evms2 aavm usagi"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.20"
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild
index 8e06b03a195e..ba0583f4c5d2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild,v 1.4 2003/09/07 18:54:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -18,7 +18,13 @@ IUSE="build crypt evms2 aavm usagi"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.20"
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
index c50656545c1e..7db2af2405d0 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.7 2003/10/19 12:20:38 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -18,7 +18,13 @@ IUSE="build crypt evms2 aavm usagi"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.20"
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild
index 9e20c37a15a5..167badde8e03 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild,v 1.2 2003/11/17 16:35:12 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -18,7 +18,13 @@ IUSE="build crypt evms2 aavm usagi"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.20"
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz