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.

4 files changed, 25 insertions, 8 deletions

diff --git a/sys-kernel/gentoo-test-sources/ChangeLog b/sys-kernel/gentoo-test-sources/ChangeLog
index dc9e99018269..44547d892d7d 100644
--- a/sys-kernel/gentoo-test-sources/ChangeLog
+++ b/sys-kernel/gentoo-test-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-test-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/ChangeLog,v 1.2 2003/11/19 20:16:16 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/ChangeLog,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  gentoo-test-sources-2.4.22-r1.ebuild, gentoo-test-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *gentoo-test-sources-2.4.22-r1 (19 Nov 2003)
 
diff --git a/sys-kernel/gentoo-test-sources/Manifest b/sys-kernel/gentoo-test-sources/Manifest
index 20c0692d2b8d..0662d06bddd3 100644
--- a/sys-kernel/gentoo-test-sources/Manifest
+++ b/sys-kernel/gentoo-test-sources/Manifest
@@ -1,6 +1,6 @@
-MD5 568251f2466757f8530017dc0df875b5 gentoo-test-sources-2.4.22-r1.ebuild 1685
-MD5 d712f395993739058a09be5555b41c5f gentoo-test-sources-2.4.22.ebuild 2054
-MD5 328ebb1b5c9f3bb369e7e2145d9f7187 ChangeLog 754
+MD5 d3c37d28098d21a2f2ac9000f7676272 gentoo-test-sources-2.4.22-r1.ebuild 1886
+MD5 c574b05520a64d37a36e958543bf9159 gentoo-test-sources-2.4.22.ebuild 2255
+MD5 8c50801c1f417f04f7070b8c059da0d3 ChangeLog 971
 MD5 1b80ca9e6de4c327e48871e1c446e54a metadata.xml 402
 MD5 2be721ee04aa311a89ddfe1f3eab2cc0 files/digest-gentoo-test-sources-2.4.22 149
 MD5 7d9ee7da8217d527e59789279837d94a files/digest-gentoo-test-sources-2.4.22-r1 152
diff --git a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild
index b464354bf7d2..d9d2c8c0ca8a 100644
--- a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild
@@ -1,13 +1,19 @@
 # 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-test-sources/gentoo-test-sources-2.4.22-r1.ebuild,v 1.2 2003/11/19 20:56:16 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild,v 1.3 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"
+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-test-sources/gentoo-test-sources-2.4.22.ebuild b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild
index b42606a47cef..49ab3cbed4be 100644
--- a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild
+++ b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.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-test-sources/gentoo-test-sources-2.4.22.ebuild,v 1.2 2003/10/12 23:12:42 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -16,7 +16,13 @@
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.22"
+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