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.

117 files changed, 714 insertions, 327 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index 95e10f9e3a38..1f4b726b87e5 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/alpha-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.9 2003/07/21 22:56:22 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.10 2003/11/20 07:43:38 lostlogic Exp $
+
+  19 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  alpha-sources-2.4.21-r1.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   21 Jul 2003; Will Woods <wwoods@gentoo.org> alpha-sources-2.4.21-r1.ebuild:
   Marked stable.
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index 753b1ee5ddb1..b7f9a868e11e 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,9 +1,9 @@
-MD5 be0a5c0e9034e85144facb9179eef5cb ChangeLog 1268
-MD5 8331c9ad803bf59b847f46fe436d523e alpha-sources-2.4.19-r1.ebuild 3112
-MD5 b0dda1e7fa9b452cec085cd4c2b5f682 alpha-sources-2.4.19-r2.ebuild 3137
 MD5 a601f2b8bf73c2eaa0b310445eacdfb4 alpha-sources-2.4.20-r1.ebuild 3096
+MD5 b0dda1e7fa9b452cec085cd4c2b5f682 alpha-sources-2.4.19-r2.ebuild 3137
+MD5 8331c9ad803bf59b847f46fe436d523e alpha-sources-2.4.19-r1.ebuild 3112
 MD5 80c78321af8ca53e1fed99f477ddf533 alpha-sources-2.4.20-r2.ebuild 2975
-MD5 d93ac8f7b0c016bfb4fcb72faa6f848a alpha-sources-2.4.21-r1.ebuild 1544
+MD5 9ad5980d630a1c5176f9a8a6b438dadb ChangeLog 1443
+MD5 0e35040b6454417e46c362fb429665c7 alpha-sources-2.4.21-r1.ebuild 1757
 MD5 16670f1bb65727ad1fe9fe73fc73e5be files/digest-alpha-sources-2.4.19-r1 149
 MD5 ef1326d11a9e944b46ded8ed8cd13556 files/digest-alpha-sources-2.4.19-r2 150
 MD5 460dfb4e575d23adc1229940ebcac3b8 files/digest-alpha-sources-2.4.20-r1 150
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild
index fbe8941330f5..96f6dec49541 100644
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild
@@ -1,12 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild,v 1.6 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.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.
 
 IUSE="build crypt usagi"
 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}
 
 DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index add099e844dc..a109db18ac3c 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.3 2003/11/04 22:00:44 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  gentoo-dev-sources-2.6.0_beta9.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   04 Nov 2003; John Mylchreest <johnm@gentoo.org>;
   gentoo-dev-sources-2.6.0_beta9.ebuild:
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 2de202f461a9..9c0e22514ab7 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 c8d61c77df2f54c77e1badbdcebf8b44 gentoo-dev-sources-2.6.0_beta9.ebuild 2322
-MD5 922f991d6c4c174c24f7366cbe3df05e ChangeLog 1002
+MD5 6f63cb99dc8533aeca57408321c91cd1 gentoo-dev-sources-2.6.0_beta9.ebuild 2352
+MD5 6117d00979bd06cbf24498ae80251adb ChangeLog 1184
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 2c930a031439b36d073cdbadc16a5bbc files/digest-gentoo-dev-sources-2.6.0_beta9 142
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
index b6482defd432..d1ffb8f44e63 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
@@ -1,8 +1,11 @@
 # 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-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild,v 1.3 2003/11/04 22:00:44 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild,v 1.4 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
+
 #Original Kernel Version before Patches
 # eg: 2.6.0-test8
 OKV=${PV/_beta/-test}
@@ -14,8 +17,7 @@ GPV=0.3
 [ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
 KV=${OKV}${EXTRAVERSION}
 
-ETYPE="sources"
-inherit kernel
+S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
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
 
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
 
diff --git a/sys-kernel/ia64-sources/ChangeLog b/sys-kernel/ia64-sources/ChangeLog
index 68c1cee6836f..796a5f38527e 100644
--- a/sys-kernel/ia64-sources/ChangeLog
+++ b/sys-kernel/ia64-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ia64-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.2 2003/10/02 19:58:36 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org> ia64-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   02 Oct 2003; Jon Portnoy <avenj@gentoo.org>
   ia64-sources-2.4.22.ebuild :
diff --git a/sys-kernel/ia64-sources/Manifest b/sys-kernel/ia64-sources/Manifest
index c12043c34998..6a6eb09efbef 100644
--- a/sys-kernel/ia64-sources/Manifest
+++ b/sys-kernel/ia64-sources/Manifest
@@ -1,3 +1,3 @@
-MD5 9da5a4ff84f973189f3408d635a1aeac ChangeLog 520
-MD5 48cc6828977e0788456b9bae5bc0561c ia64-sources-2.4.22.ebuild 1927
+MD5 7956ed59d308469b2e902b297e9c1c78 ia64-sources-2.4.22.ebuild 2111
+MD5 7c1770ecd0d2da051e193357cd04c73c ChangeLog 689
 MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22 145
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
index bc9272fbd6c1..d882aa50d51d 100644
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
+++ b/sys-kernel/ia64-sources/ia64-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/ia64-sources/ia64-sources-2.4.22.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -18,8 +18,13 @@ IUSE=""
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.22"
-KV="${KV/-r0//}"
+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/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index ba5a8846f3fa..27ecd8755542 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.29 2003/11/16 23:31:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.30 2003/11/20 07:43:38 lostlogic Exp $
 
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  linux-headers-2.4.21-r1.ebuild, linux-headers-2.4.21.ebuild,
+  linux-headers-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *linux-headers-2.4.21-r1 (16 Nov 2003)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 09edb5078713..b4855e40a1e2 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,36 +1,36 @@
-MD5 3a75585a4fa7ea56fb7c157042cf9058 ChangeLog 6558
+MD5 5c17aece95a57713fa9ea390d5f48647 linux-headers-2.4.21-r1.ebuild 3888
+MD5 31da8038eb4b2bc66d90c142a82e2d00 linux-headers-2.4.18-r1.ebuild 4513
+MD5 8fce445b444fa63701f28edeeb788b51 linux-headers-2.4.17-r4.ebuild 4666
 MD5 90a3df79392bb9607250e45e608472b3 linux-headers-2.2.20.ebuild 3924
-MD5 7289ac3b900fe7136758fdae230e74fb linux-headers-2.2.21_pre3.ebuild 4095
+MD5 52ea010100f44ee2bbd65e33f4961a8f linux-headers-2.4.21.ebuild 3588
+MD5 d0a25ca6955eb14a8baa4fee38cfc0f0 linux-headers-2.4.19.ebuild 4625
+MD5 ea481355984ca2e128e80faa559701a0 linux-headers-2.4.17-r3.ebuild 4413
 MD5 b970d40b6384eb86cbeb120e6e0a5f0c linux-headers-2.4.16-r1.ebuild 5052
-MD5 ee5561cbc33b06969cf7f5b536f2276b linux-headers-2.4.16-r3.ebuild 6103
 MD5 fdaaef337a276f85be262ebff08d5e30 linux-headers-2.4.16.ebuild 4781
-MD5 ea481355984ca2e128e80faa559701a0 linux-headers-2.4.17-r3.ebuild 4413
-MD5 8fce445b444fa63701f28edeeb788b51 linux-headers-2.4.17-r4.ebuild 4666
-MD5 62126ba21a7532dd004a5c6e72b4b39e linux-headers-2.4.17-r5.ebuild 4254
-MD5 31da8038eb4b2bc66d90c142a82e2d00 linux-headers-2.4.18-r1.ebuild 4513
 MD5 b854072fd0ae0ea776038247474d5fe5 linux-headers-2.4.18-r2.ebuild 4555
-MD5 ebb37a4bbba2124565be7130173a6f34 linux-headers-2.4.18.ebuild 3176
+MD5 62126ba21a7532dd004a5c6e72b4b39e linux-headers-2.4.17-r5.ebuild 4254
+MD5 4f29e61038a3d027e3117a9354ebaf21 ChangeLog 6792
+MD5 ee5561cbc33b06969cf7f5b536f2276b linux-headers-2.4.16-r3.ebuild 6103
 MD5 db99dd305dd1be1b71632047b4e6f80c linux-headers-2.4.19-r1.ebuild 4794
-MD5 d0a25ca6955eb14a8baa4fee38cfc0f0 linux-headers-2.4.19.ebuild 4625
-MD5 6d0c55bb040556f20b5554801522d70c linux-headers-2.4.21.ebuild 3585
-MD5 b52af2026b8c4d68bbcd08871ba3474a linux-headers-2.4.22.ebuild 3858
-MD5 03c77065764f536c4d5b833e3b06b05f linux-headers-2.4.21-r1.ebuild 3885
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
-MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
-MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
+MD5 732a9212e5a370154579a03d5838dfcb linux-headers-2.4.22.ebuild 3863
+MD5 ebb37a4bbba2124565be7130173a6f34 linux-headers-2.4.18.ebuild 3176
+MD5 7289ac3b900fe7136758fdae230e74fb linux-headers-2.2.21_pre3.ebuild 4095
 MD5 4bb39400b782c620a61abff4b8abd627 files/digest-linux-headers-2.4.16-r1 348
 MD5 d0ff4105ca806cb26f3f990422722cfb files/digest-linux-headers-2.4.16-r3 429
 MD5 6db03bb67f89f2fb55870bcdba4c24e5 files/digest-linux-headers-2.4.17-r3 145
 MD5 700dfcb704ed5987434f84006e39787e files/digest-linux-headers-2.4.17-r4 144
 MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r1 67
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r2 67
-MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
 MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19-r1 67
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
+MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
+MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
+MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
+MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
+MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
 MD5 ffa757e9d7c7d84df85fc94aa5387af8 files/linux-headers-strict-ansi-fix.patch 636
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
index 3186a3c36857..dca5dc62ddeb 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.2 2003/11/16 23:31:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=" "
-ETYPE="headers"
-inherit kernel
+EXTRAVERSION=""
 
 # What's in this kernel?
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index 1af24365a5c0..efe6841ffc64 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.14 2003/11/16 23:31:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.15 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=" "
-ETYPE="headers"
-inherit kernel
+EXTRAVERSION=""
 
 # What's in this kernel?
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
index a4c4ffdc5e6c..ba22f91ffa01 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.7 2003/11/16 23:31:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
-OKV=${PV/_/-}
+OKV="${PV/_/-}"
 KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=" "
-ETYPE="headers"
-inherit kernel
+EXTRAVERSION=""
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index 280c5e101821..bfd56fbed7b2 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,7 +1,12 @@
 # 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.13 2003/11/16 11:20:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.14 2003/11/20 07:43:38 lostlogic Exp $
 
+  20 Nov 2003; Brandon Low <lostlogic@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:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *mips-headers-2.4.21-r3 (15 Oct 2003)
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 6c681e317a52..eab094e1f797 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,13 +1,13 @@
-MD5 a906a70ef2f8d235e74f54b1ce6d0664 ChangeLog 3066
+MD5 0303fae4ab926c616fced4f24325ec13 mips-headers-2.4.21-r3.ebuild 1446
+MD5 d879452948c7f8611184a301561957cc mips-headers-2.4.21-r2.ebuild 1261
+MD5 5f42fb8fd9de114bf445491ac80a7d17 mips-headers-2.4.22-r1.ebuild 1269
+MD5 141083b4e148ef90b88f47db8076219f mips-headers-2.4.21-r1.ebuild 1359
+MD5 265f7bb2d02087b32cac1f6878bcf238 ChangeLog 3334
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 72c6d97993767b267229cec92c7d292e mips-headers-2.4.21-r1.ebuild 1356
-MD5 4f67e85eadb9361f048cc3af5ccca37a mips-headers-2.4.21-r2.ebuild 1257
-MD5 0e0cbb7162e6fbadf1ca4639a5c77f76 mips-headers-2.4.21-r3.ebuild 1434
-MD5 c091aa58772aac0d42f3408c2e97f734 mips-headers-2.4.22-r1.ebuild 1265
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
+MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r3 145
 MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-headers-2.4.22-r1 144
-MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
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 552d8d7f0a76..26d52c0c4efc 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,16 +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.7 2003/11/16 11:20:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030705
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
-ETYPE="headers"
-inherit kernel
-
 
 # What's in this kernel?
 
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 23706ddef833..51e9bfd72131 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.7 2003/11/16 11:20:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030803
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
-ETYPE="headers"
-inherit kernel
 
 # What's in this kernel?
 
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 d350b3a0ed0b..0476efd1564d 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,16 +1,17 @@
 # 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.4 2003/11/16 11:20:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030803
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
-ETYPE="headers"
-inherit kernel eutils
 
+inherit eutils
 
 # What's in this kernel?
 
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 45615188c6da..ca16549addcc 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.7 2003/11/16 11:20:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="headers"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030825
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
-ETYPE="headers"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mips-prepatch-sources/ChangeLog b/sys-kernel/mips-prepatch-sources/ChangeLog
index 4af93194875c..af71a840da41 100644
--- a/sys-kernel/mips-prepatch-sources/ChangeLog
+++ b/sys-kernel/mips-prepatch-sources/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-kernel/mips-prepatch-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.2 2003/09/10 04:39:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  mips-prepatch-sources-2.4.22_rc2-r1.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *mips-prepatch-sources-2.4.22_rc2-r1 (14 Aug 2003)
 
diff --git a/sys-kernel/mips-prepatch-sources/Manifest b/sys-kernel/mips-prepatch-sources/Manifest
index 6a440f2bfaeb..d0d579c1fc19 100644
--- a/sys-kernel/mips-prepatch-sources/Manifest
+++ b/sys-kernel/mips-prepatch-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 b31d5d260fbee635fdf463db807c47fc ChangeLog 816
+MD5 984d33e35efcd2935f20b72683995263 mips-prepatch-sources-2.4.22_rc2-r1.ebuild 1737
+MD5 c26a2bcace91cb62462307b140076ddb ChangeLog 1002
 MD5 0bfb6b59036d1fe3e8075bc8879e772b metadata.xml 412
-MD5 4b8c8c0d32a13f3494c980dd23f27204 mips-prepatch-sources-2.4.22_rc2-r1.ebuild 1709
 MD5 7383fb7245357cea3b46d07e372fc89a files/digest-mips-prepatch-sources-2.4.22_rc2-r1 215
 MD5 b73a606d05e184a8af27c8f9b7a9c9ca files/mips-gcc-makefile-fix-20030813.patch 906
diff --git a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild
index 2c3cc88e0b74..08ac846495e5 100644
--- a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild
+++ b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.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/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.22_rc2-r1.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
 
 # Eclass Stuff
@@ -12,6 +12,7 @@ OKV=${PV/_/-}
 CVSDATE=20030813
 EXTRAVERSION=-$(echo ${OKV} | cut -d- -f2)-mipscvs-${CVSDATE}
 STABLEVERSION=2.4.21
+KV="${OKV}${EXTRAVERSION}"
 
 # Miscellaneous
 S=${WORKDIR}/linux-${OKV}
diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index b7d0c30cfae0..f8f86153e976 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.14 2003/11/16 18:15:05 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.15 2003/11/20 07:43:38 lostlogic Exp $
 
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  mips-sources-2.4.21-r2.ebuild, mips-sources-2.4.22-r1.ebuild,
+  mips-sources-2.4.22-r2.ebuild, mips-sources-2.4.22-r3.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *mips-sources-2.4.22-r3 (15 Oct 2003)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 0b10252ee498..7e9f7ee708eb 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,15 +1,15 @@
-MD5 9b12be36c4adb66d64104cc45561c0b4 ChangeLog 4073
+MD5 6c9456fbe030515d00129b41fc836041 mips-sources-2.4.22-r2.ebuild 1431
+MD5 6da5f81a05c46d33adb143722ccc7133 mips-sources-2.4.21-r2.ebuild 1235
+MD5 58035ab7b937a519fbf84fbeb83c0de6 mips-sources-2.4.22-r1.ebuild 1430
+MD5 f81b9d07a79b4ca14780b6400f3a8434 mips-sources-2.4.22-r3.ebuild 1608
+MD5 dc524c8ad7dcb14e523224bfd08757cb ChangeLog 4341
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 a3e21f7a2377c10feb96851de52fb7ff mips-sources-2.4.21-r2.ebuild 1231
-MD5 c54ba785a3d4d3db2733bde2bc672686 mips-sources-2.4.22-r1.ebuild 1426
-MD5 8e94f52c7163eaed6520ca8c64ac8516 mips-sources-2.4.22-r2.ebuild 1427
-MD5 91989cac5bd439246fc5ecd2fd51cd73 mips-sources-2.4.22-r3.ebuild 1596
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 e40e67b089d55da6d5aeb91ae63a81cb files/mipscvs-2.4.22-sgiwd-fix.patch 1256
+MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-makefile-fix.patch 1344
+MD5 5b060a7bbac28c36788a02e99721db97 files/mipscvs-2.4.22-makefile-mips64-tweak.patch 529
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r2 145
 MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-sources-2.4.22-r1 144
 MD5 4115e49b895cdd9dfcb7b02520e162ae files/digest-mips-sources-2.4.22-r2 144
 MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r3 144
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-makefile-fix.patch 1344
-MD5 5b060a7bbac28c36788a02e99721db97 files/mipscvs-2.4.22-makefile-mips64-tweak.patch 529
-MD5 e40e67b089d55da6d5aeb91ae63a81cb files/mipscvs-2.4.22-sgiwd-fix.patch 1256
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild
index c293286339cb..9f6dabe49440 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-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-sources/mips-sources-2.4.21-r2.ebuild,v 1.4 2003/11/16 18:15:05 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030803
 S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r1.ebuild
index dca74c5b8572..0c454cc2700b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-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-sources/mips-sources-2.4.22-r1.ebuild,v 1.5 2003/11/16 18:15:05 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r1.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030825
 S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r2.ebuild
index 4f38540c3ff6..5e431ea1ed65 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-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-sources/mips-sources-2.4.22-r2.ebuild,v 1.2 2003/11/16 18:15:05 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r2.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20030925
 S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
-ETYPE="sources"
-inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r3.ebuild
index ffb3e3de598b..24db57a0df23 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r3.ebuild
@@ -1,16 +1,17 @@
 # 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-sources/mips-sources-2.4.22-r3.ebuild,v 1.2 2003/11/16 18:15:05 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r3.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
+ETYPE="sources"
+inherit kernel
 
 OKV=${PV/_/-}
 CVSDATE=20031015
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
-ETYPE="sources"
-inherit kernel eutils
 
+inherit eutils
 
 # What's in this kernel?
 
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?
 
diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index f745f0875c03..41bda10f0e9e 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.24 2003/09/27 14:05:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.25 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  openmosix-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   27 Sep 2003; Michael Imhof <tantive@gentoo.org> openmosix-sources-2.4.21.ebuild:
   Unmasked
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 6e0ffcdc2120..6643d3f08167 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 9a87d852d2e7b74dee27a5ad96e7ca0d ChangeLog 1709
-MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 aeffb211657db7d5ed148366554d6b0d openmosix-sources-2.4.20-r6.ebuild 3178
+MD5 1c2d518bda2cced343322a4b873f0454 openmosix-sources-2.4.22.ebuild 1259
 MD5 1f70eea38e29bd7e41a686340dfc19d1 openmosix-sources-2.4.21.ebuild 3178
-MD5 bd245509970f7aeb0947c43c7d4062b6 openmosix-sources-2.4.22.ebuild 1264
+MD5 9f93ddd5d1263f2abb847ded50f44c53 ChangeLog 1883
+MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r6 133
 MD5 f5cf28ccf74eccc21f96d399b429420b files/digest-openmosix-sources-2.4.21 134
 MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22 134
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
index 6f6feb280cc7..12312dae7613 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild,v 1.4 2003/09/27 14:05:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-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"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
 EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
 BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
 S=${WORKDIR}/linux-${KV}
 
-ETYPE="sources"
-inherit kernel || die
-
 # What's in this kernel?
 
 # INCLUDED:
diff --git a/sys-kernel/pfeifer-sources/ChangeLog b/sys-kernel/pfeifer-sources/ChangeLog
index fba7e79a5664..086e35a9ec78 100644
--- a/sys-kernel/pfeifer-sources/ChangeLog
+++ b/sys-kernel/pfeifer-sources/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for sys-kernel/pfeifer-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/ChangeLog,v 1.18 2003/10/17 19:20:06 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/ChangeLog,v 1.19 2003/11/20 07:43:38 lostlogic Exp $
 
   TODO:
 	update FreeSWAN, aic7xxx
 	update some of the docs
 
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  pfeifer-sources-2.4.20.1_pre11.ebuild,
+  pfeifer-sources-2.4.20.1_pre12.ebuild, pfeifer-sources-2.4.21.1_pre4.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
+
 *pfeifer-sources-2.4.22-r1 (17 Oct 2003)
 
   17 Oct 2003; <iggy@gentoo.org> pfeifer-sources-2.4.22-r0.ebuild,
diff --git a/sys-kernel/pfeifer-sources/Manifest b/sys-kernel/pfeifer-sources/Manifest
index 6f585bf2668d..a056b90b916b 100644
--- a/sys-kernel/pfeifer-sources/Manifest
+++ b/sys-kernel/pfeifer-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 6182bf9fe22c4eb215e4b1bb71d8d6fc ChangeLog 7309
-MD5 b25223b35990abcc93ba4e5576ed5df7 pfeifer-sources-2.4.21.1_pre4.ebuild 4387
-MD5 79cb12c186774c18d73f6cbe68c43e81 pfeifer-sources-2.4.20.1_pre11.ebuild 4550
-MD5 61074b7f0605bc49e1883bab68bf8d70 pfeifer-sources-2.4.20.1_pre12.ebuild 4589
-MD5 31a37f6216dd3d883c38e0701ccf686e files/digest-pfeifer-sources-2.4.20.1_pre12 152
+MD5 cbe5cc456565470b42751b2ab1db9f14 pfeifer-sources-2.4.21.1_pre4.ebuild 4588
+MD5 f5ddae837992e060bc870a50b7c1c472 pfeifer-sources-2.4.20.1_pre12.ebuild 4790
+MD5 7a5a162b4db8146f7787b2eab8fc6235 pfeifer-sources-2.4.20.1_pre11.ebuild 4751
+MD5 c38ede42d9de40317772d5cbd445e614 ChangeLog 7571
 MD5 1ada6b5466d035f65ce80c2cd3ed060e files/digest-pfeifer-sources-2.4.20.1_pre11 152
+MD5 31a37f6216dd3d883c38e0701ccf686e files/digest-pfeifer-sources-2.4.20.1_pre12 152
 MD5 a99cf43863da90ebcf117de912c70ee6 files/digest-pfeifer-sources-2.4.21.1_pre4 151
diff --git a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.ebuild
index dfc88b8f99cc..d0ba1b5c2e64 100644
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.ebuild
+++ b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.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/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.ebuild,v 1.4 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre11.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/pfeifer-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.ebuild
index b406ec407bc2..95ac3990f22a 100644
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.ebuild
+++ b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.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/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre12.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/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.ebuild
index 8310e14bc8a1..a2723b634f24 100644
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.ebuild
+++ b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.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/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre4.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.21"
+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/ppc-development-sources/ChangeLog b/sys-kernel/ppc-development-sources/ChangeLog
index 2e881b2efa7b..fe37ecaccaf5 100644
--- a/sys-kernel/ppc-development-sources/ChangeLog
+++ b/sys-kernel/ppc-development-sources/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-kernel/ppc-development-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ChangeLog,v 1.5 2003/11/20 07:33:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ChangeLog,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
   20 Nov 2003; Bartosch Pixa <darkspecter@gentoo.org> :
   minor fix in the r5 patch
 
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  ppc-development-sources-2.6.0_beta9-r3.ebuild,
+  ppc-development-sources-2.6.0_beta9-r4.ebuild,
+  ppc-development-sources-2.6.0_beta9-r5.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
+
 *ppc-development-sources-2.6.0_beta9-r5 (19 Nov 2003)
 
   19 Nov 2003; Bartosch Pixa <darkspecter@gentoo.org>
diff --git a/sys-kernel/ppc-development-sources/Manifest b/sys-kernel/ppc-development-sources/Manifest
index 3dd3cb5277ea..34cb66e8d848 100644
--- a/sys-kernel/ppc-development-sources/Manifest
+++ b/sys-kernel/ppc-development-sources/Manifest
@@ -1,8 +1,8 @@
+MD5 7db2e7683742a7c80cb723a88f3a94f4 ppc-development-sources-2.6.0_beta9-r4.ebuild 3003
+MD5 87fe5938b88c4497715b7af67cb58f01 ppc-development-sources-2.6.0_beta9-r3.ebuild 3003
+MD5 25107a6e72f6f07245c3b41022a68a40 ppc-development-sources-2.6.0_beta9-r5.ebuild 3003
+MD5 4090a5cee428b6c9947d6094edb17891 ChangeLog 1384
 MD5 1c052e00eb39506aa1b54ec02045995a metadata.xml 504
-MD5 468c3ca0beea5473b5c69dcc83e0a4ba ppc-development-sources-2.6.0_beta9-r3.ebuild 2971
-MD5 a82cac4830e249222b9d6aa506a6117e ppc-development-sources-2.6.0_beta9-r4.ebuild 2971
-MD5 ec3289a0eaf9bfffa8cb5bee597faa1e ppc-development-sources-2.6.0_beta9-r5.ebuild 2971
-MD5 e139b20b455daa76e9519f00c221f729 ChangeLog 1102
 MD5 82c462ec939a497add3a635d399298d9 files/digest-ppc-development-sources-2.6.0_beta9-r3 146
 MD5 23355c925f3ea8c119c6dda82d6c8a68 files/digest-ppc-development-sources-2.6.0_beta9-r4 146
 MD5 67b76c684bfe83b8eebe1e76defbbb8a files/digest-ppc-development-sources-2.6.0_beta9-r5 146
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild
index 57db5d689fac..5f34631c6965 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.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/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild,v 1.3 2003/11/14 21:36:10 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild,v 1.4 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/benh} | \
 
 KV=${OKV}-${PR/r/benh}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild
index 312a17bb88e6..cb75fe9cdb45 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.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/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild,v 1.2 2003/11/14 21:36:10 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.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=${PV/_beta/-test}
 
@@ -12,7 +13,9 @@ EXTRAVERSION="`echo ${OKV}-${PR/r/benh} | \
 
 KV=${OKV}-${PR/r/benh}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild
index 90ca7d19da3b..e4aecae530a2 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.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/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild,v 1.1 2003/11/19 16:14:13 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.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/benh} | \
 
 KV=${OKV}-${PR/r/benh}
 
-inherit kernel eutils
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
 
 # What's in this kernel?
 
diff --git a/sys-kernel/ppc-headers/ChangeLog b/sys-kernel/ppc-headers/ChangeLog
index 2c4f9f12dfa8..a246abf96d80 100644
--- a/sys-kernel/ppc-headers/ChangeLog
+++ b/sys-kernel/ppc-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ppc-headers
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ChangeLog,v 1.2 2003/07/19 03:27:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ChangeLog,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  ppc-headers-2.4.21-r1.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   19 Jul 2003; Luca Barbato <lu_zero@gentoo.org> ppc-headers-2.4.21-r1.ebuild:
   Added the required PROVIDEs
diff --git a/sys-kernel/ppc-headers/Manifest b/sys-kernel/ppc-headers/Manifest
index 8da591d81803..0d3cf26c6fda 100644
--- a/sys-kernel/ppc-headers/Manifest
+++ b/sys-kernel/ppc-headers/Manifest
@@ -1,3 +1,3 @@
-MD5 dac991f9dcb92efd9ae3bee3b1ebabae ChangeLog 491
-MD5 950928c179d88fe0e1d089662a5eb2b6 ppc-headers-2.4.21-r1.ebuild 2067
+MD5 fa2dfc519bfe21244280ab621efa7c63 ppc-headers-2.4.21-r1.ebuild 2281
+MD5 cea2e019f70953c70a4fb11a8e79d115 ChangeLog 662
 MD5 7e495d102909604f1af87a10949ee8ae files/digest-ppc-headers-2.4.21-r1 142
diff --git a/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild b/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild
index 0b3e9272c562..61a4bef6a1c8 100644
--- a/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.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/ppc-headers/ppc-headers-2.4.21-r1.ebuild,v 1.4 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -18,7 +18,14 @@ IUSE="build crypt"
 ETYPE="headers"
 
 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}"
 OKV="2.4.20"
+
+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/ppc-sources-benh/ChangeLog b/sys-kernel/ppc-sources-benh/ChangeLog
index be35e877afb2..6cdb34a5700d 100644
--- a/sys-kernel/ppc-sources-benh/ChangeLog
+++ b/sys-kernel/ppc-sources-benh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/ppc-sources-benh
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ChangeLog,v 1.10 2003/09/01 16:03:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ChangeLog,v 1.11 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  ppc-sources-benh-2.4.20-r10.ebuild, ppc-sources-benh-2.4.20-r5.ebuild,
+  ppc-sources-benh-2.4.20-r6.ebuild, ppc-sources-benh-2.4.20-r7.ebuild,
+  ppc-sources-benh-2.4.20-r8.ebuild, ppc-sources-benh-2.4.20-r9.ebuild,
+  ppc-sources-benh-2.4.21-r2.ebuild, ppc-sources-benh-2.4.22-r1.ebuild,
+  ppc-sources-benh-2.4.22-r2.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *ppc-sources-benh-2.4.22-r2 (01 Sep 2003)
 
diff --git a/sys-kernel/ppc-sources-benh/Manifest b/sys-kernel/ppc-sources-benh/Manifest
index 9822b4f8a301..32701e1f299f 100644
--- a/sys-kernel/ppc-sources-benh/Manifest
+++ b/sys-kernel/ppc-sources-benh/Manifest
@@ -1,15 +1,14 @@
-MD5 9f4e58b62623d5fc7a3c2bb4c53a7cf6 ChangeLog 1990
+MD5 526b16992b8d354aca6ba745be87c096 ppc-sources-benh-2.4.20-r9.ebuild 1483
+MD5 faa511fe9cd825920adf97ec1a0fb1d9 ppc-sources-benh-2.4.20-r10.ebuild 1484
+MD5 380b80209f503498418a004d5f5f5c38 ppc-sources-benh-2.4.20-r6.ebuild 1482
+MD5 0bdad2a6a487fb92b86f95ab384574eb ppc-sources-benh-2.4.22-r2.ebuild 1482
+MD5 bc81894b81dfea86937f62769e401eca ppc-sources-benh-2.4.20-r8.ebuild 1483
+MD5 2f80854f407dc0470af6c04781f050ef ppc-sources-benh-2.4.21-r2.ebuild 1483
+MD5 7642e6f121e6602ab832e52dd3005bdc ppc-sources-benh-2.4.20-r5.ebuild 1483
+MD5 ab9c1d59b98f1e108fc4fda38064c8a3 ppc-sources-benh-2.4.22-r1.ebuild 1483
+MD5 e797294a09c1df74ebeaa444a0331dfe ChangeLog 2455
 MD5 cfcc65dbc3d71d308d0b10faf4eb5615 metadata.xml 344
-MD5 5db2106cc8e28cef79ff1507f726d83f ppc-sources-benh-2.4.20-r10.ebuild 1272
-MD5 678cca9f236ac9aba9a142612414ad1a ppc-sources-benh-2.4.20-r5.ebuild 1273
-MD5 21009c010c208d55e9c2fa5a11930585 ppc-sources-benh-2.4.20-r6.ebuild 1273
-MD5 a30d5ab169332093bdcfef35e3fa6e3e ppc-sources-benh-2.4.20-r7.ebuild 1336
-MD5 62dbeaf8273ac6f9eba2fa89284b958b ppc-sources-benh-2.4.20-r8.ebuild 1274
-MD5 25de1be9725a85084bc0c9cd8a499635 ppc-sources-benh-2.4.20-r9.ebuild 1274
-MD5 8b694eff396db487233ee4603bf127e8 ppc-sources-benh-2.4.21-r2.ebuild 1273
-MD5 27581dfd0a292fa8a804a4e2233bbf41 ppc-sources-benh-2.4.22-r1.ebuild 1273
-MD5 168f2dbe4fc5b13f31188a8d9a6dad9c ppc-sources-benh-2.4.22-r2.ebuild 1273
-MD5 a519dd89b0f3e8c61682551315d9c46d files/digest-ppc-sources-benh-2.4.20-r10 212
+MD5 301400beeda5e8a020d80afde835bf30 ppc-sources-benh-2.4.20-r7.ebuild 1545
 MD5 36cf6976ec33f3d449ecd186ce7903e7 files/digest-ppc-sources-benh-2.4.20-r5 133
 MD5 2af745b267f5e078a7b10bf02256fb02 files/digest-ppc-sources-benh-2.4.20-r6 133
 MD5 bb1eb09e6487dea757b24c190fa535a1 files/digest-ppc-sources-benh-2.4.20-r7 135
@@ -18,3 +17,4 @@ MD5 21f3dffa82381b48dae6c85502642da0 files/digest-ppc-sources-benh-2.4.20-r9 133
 MD5 2f9a9c2485f343bd18574b9ba5aee730 files/digest-ppc-sources-benh-2.4.21-r2 133
 MD5 d401640feba334b89b7426dc145901ee files/digest-ppc-sources-benh-2.4.22-r1 133
 MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-benh-2.4.22-r2 133
+MD5 a519dd89b0f3e8c61682551315d9c46d files/digest-ppc-sources-benh-2.4.20-r10 212
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild
index eca78dbd4f6b..7c69445540f9 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-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/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild,v 1.1 2003/04/08 01:30:19 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild
index ea4b04607b23..548dd574501b 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-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/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild,v 1.9 2003/03/24 23:34:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild,v 1.10 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{r} versioning"
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild
index 1eb0be5d60f6..3732d79b3ae0 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-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/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild,v 1.5 2003/03/24 23:34:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{r} versioning"
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild
index 937875436071..1ac4c6763d4d 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-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/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild,v 1.5 2003/03/24 23:34:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 #bad hack for wierd rev number on this patch
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild
index d98608ca0f15..375e3384fd54 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-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/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild,v 1.4 2003/03/24 23:34:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild
index 5feafcaf0721..cc6101a0432f 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.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/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild,v 1.3 2003/03/24 23:34:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild
index c227ff9851ea..ace41cf83eb6 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.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/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild,v 1.1 2003/07/01 15:40:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild
index 88ca269f1ef0..d97ac579790d 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.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/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild,v 1.1 2003/08/30 19:02:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild
index 13cdf619b990..d21dcbd38bcc 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.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/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild,v 1.4 2003/11/10 20:27:27 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources-dev/ChangeLog b/sys-kernel/ppc-sources-dev/ChangeLog
index 01c35c1be83f..60c9c66c27ba 100644
--- a/sys-kernel/ppc-sources-dev/ChangeLog
+++ b/sys-kernel/ppc-sources-dev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ppc-sources-dev
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.13 2003/10/26 12:44:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.14 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  ppc-sources-dev-2.4.21.ebuild, ppc-sources-dev-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   26 Oct 2003; David Holm <dholm@gentoo.org> ppc-sources-dev-2.4.22.ebuild,
   files/ppc-sources-dev-2.4.22-r1.via-pmu.diff:
diff --git a/sys-kernel/ppc-sources-dev/Manifest b/sys-kernel/ppc-sources-dev/Manifest
index 93151ee13ccf..9bf774019ff4 100644
--- a/sys-kernel/ppc-sources-dev/Manifest
+++ b/sys-kernel/ppc-sources-dev/Manifest
@@ -1,9 +1,9 @@
-MD5 b79808e8b7d16bb750257cd8ac6cb323 ChangeLog 1926
-MD5 4b1f93b2fca55d2bfdd961a517eb5611 metadata.xml 347
-MD5 e2f59a030362de30b2a6d52526510e97 ppc-sources-dev-2.4.19.ebuild 2249
 MD5 5520a14adf9f0f89ff26e42db18c7ab6 ppc-sources-dev-2.4.20.ebuild 2491
-MD5 4dedb221be5ebb37aa9d9f8557e0e379 ppc-sources-dev-2.4.21.ebuild 1719
-MD5 b1466f18e8e8395947dd76796919f7ea ppc-sources-dev-2.4.22.ebuild 1911
+MD5 80e6f13f4d6febe129da9d3d19f43804 ppc-sources-dev-2.4.22.ebuild 2064
+MD5 703bd606e2b9234cdf7b055cec49a82d ppc-sources-dev-2.4.21.ebuild 1872
+MD5 3904057f44ee1d22e4cb2fb60838b295 ChangeLog 2131
+MD5 e2f59a030362de30b2a6d52526510e97 ppc-sources-dev-2.4.19.ebuild 2249
+MD5 4b1f93b2fca55d2bfdd961a517eb5611 metadata.xml 347
 MD5 660f16218c08735d9c1e9e0e5b292a23 files/digest-ppc-sources-dev-2.4.19 68
 MD5 c45b2bb6026a8726c5932c0778879a21 files/digest-ppc-sources-dev-2.4.20 70
 MD5 91cdf75820acd5ac4942bab12e5ceb5a files/digest-ppc-sources-dev-2.4.21 143
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
index 4406108e208f..47d08808ef56 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild,v 1.2 2003/09/02 12:46:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.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"
+IUSE="build crypt"
 
 inherit kernel
-OKV="2.4.21"
-KV=2.4.21-ppc-dev
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-ppc-dev"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
 
 
@@ -39,7 +42,6 @@ HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
 KEYWORDS="~ppc -x86 -sparc -mips -hppa -alpha -arm"
-IUSE="build crypt"
 
 
 src_unpack() {
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
index 7ea052faa8a2..8dd65081494e 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.2 2003/10/26 12:44:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-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.
 
 ETYPE="sources"
+IUSE="build crypt"
 
 inherit kernel
-OKV="2.4.22"
-KV=2.4.22-ppc-dev
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-ppc-dev"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
 
 
@@ -38,7 +41,6 @@ HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
 KEYWORDS="~ppc -x86 -sparc -mips -hppa -alpha -arm"
-IUSE="build crypt"
 DEPEND=">=sys-devel/binutils-2.11.90.0.31"
 RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
 
diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index a4c16ee4127c..d94d38213d33 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/ppc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.27 2003/10/26 13:27:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.28 2003/11/20 07:43:38 lostlogic Exp $
+
+*ppc-sources-2.4.22-r2 (20 Nov 2003)
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  ppc-sources-2.4.20-r2.ebuild, ppc-sources-2.4.20-r3.ebuild,
+  ppc-sources-2.4.20-r4.ebuild, ppc-sources-2.4.21-r1.ebuild,
+  ppc-sources-2.4.21-r2.ebuild, ppc-sources-2.4.22-r1.ebuild,
+  ppc-sources-2.4.22-r2.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   26 Oct 2003; David Holm <dholm@gentoo.org> ppc-sources-2.4.22-r1.ebuild,
   files/ppc-sources-2.4.22-r1.via-pmu.diff:
diff --git a/sys-kernel/ppc-sources/Manifest b/sys-kernel/ppc-sources/Manifest
index e11c3ba136ea..8d0078e692f2 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,17 +1,18 @@
-MD5 5010520ad59d06c7f687aafdf630cd3e ChangeLog 4779
-MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
-MD5 a555cca52dd92b98a17a20e76214f0fc ppc-sources-2.4.19-r3.ebuild 3280
-MD5 15f531c3328380f23fcce66016551d75 ppc-sources-2.4.19-r4.ebuild 3436
-MD5 c911d93f4cc0093a0de5e4319f42826c ppc-sources-2.4.19-r5.ebuild 3279
+MD5 be010b901594e6a159aace3cf908e184 ppc-sources-2.4.22-r1.ebuild 1564
 MD5 fb30d166ce7dc00bb0c45ef23efc9c26 ppc-sources-2.4.19-r6.ebuild 3269
+MD5 ad26ce4616a2c6d9427716e82e948efd ppc-sources-2.4.20-r2.ebuild 1791
 MD5 de13a1e8ba902690df11b9e82bee0725 ppc-sources-2.4.19.ebuild 3208
+MD5 a555cca52dd92b98a17a20e76214f0fc ppc-sources-2.4.19-r3.ebuild 3280
+MD5 2409e63ae0fc8522190f13fed924dd03 ppc-sources-2.4.21-r1.ebuild 2237
+MD5 920ebba0f3c529b207ace5287a522fe7 ppc-sources-2.4.20-r4.ebuild 1801
+MD5 c911d93f4cc0093a0de5e4319f42826c ppc-sources-2.4.19-r5.ebuild 3279
 MD5 d4e537d571db846886f68041d2199526 ppc-sources-2.4.20-r1.ebuild 3114
-MD5 8c8aa1ea34934a391ace96d85d57089c ppc-sources-2.4.20-r2.ebuild 1581
-MD5 7281eb6df391f8df34468fc1ae5f362a ppc-sources-2.4.20-r3.ebuild 1581
-MD5 0c87455c7827d620c19866c42554e4c9 ppc-sources-2.4.20-r4.ebuild 1590
-MD5 c0937dd36a0967da72475b6edf610981 ppc-sources-2.4.21-r1.ebuild 2026
-MD5 be1f0b985321d007f26975518de6eef8 ppc-sources-2.4.21-r2.ebuild 2025
-MD5 c0bc7bc817540ac090a2a23bfd97dbe2 ppc-sources-2.4.22-r1.ebuild 1352
+MD5 c18b2ea325d13a53ce1b46720a3dc7ff ppc-sources-2.4.22-r2.ebuild 1472
+MD5 78bfdd74f5201435d7a5698a2ba47148 ppc-sources-2.4.20-r3.ebuild 1792
+MD5 2ced421f92b29c3ec521861ce41dc2e2 ChangeLog 5176
+MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
+MD5 15f531c3328380f23fcce66016551d75 ppc-sources-2.4.19-r4.ebuild 3436
+MD5 6e5cebaef9aa291ffd264f7142072906 ppc-sources-2.4.21-r2.ebuild 2223
 MD5 88a216bd55a77f58510b9a1c5c3767ce files/digest-ppc-sources-2.4.19 149
 MD5 6b15a062d96482772f860647c0088358 files/digest-ppc-sources-2.4.19-r3 149
 MD5 9cab1e75f8fcaef7441998de95c9b452 files/digest-ppc-sources-2.4.19-r4 149
@@ -24,4 +25,5 @@ MD5 33266b958177d39523bed77568596744 files/digest-ppc-sources-2.4.20-r4 142
 MD5 7e495d102909604f1af87a10949ee8ae files/digest-ppc-sources-2.4.21-r1 142
 MD5 a54eec24338bcac38c8801d23c526db0 files/digest-ppc-sources-2.4.21-r2 141
 MD5 d401640feba334b89b7426dc145901ee files/digest-ppc-sources-2.4.22-r1 133
+MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-2.4.22-r2 133
 MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r2.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r2.ebuild
index 6c4fa85c84d7..0d6848d43f84 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r2.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r2.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/ppc-sources/ppc-sources-2.4.20-r2.ebuild,v 1.7 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.20-r2.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -16,9 +16,15 @@ IUSE="build crypt"
 # similar situation.
 
 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/ppc-sources/ppc-sources-2.4.20-r3.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r3.ebuild
index b3b880c7ed0b..666c815be80a 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r3.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/ppc-sources/ppc-sources-2.4.20-r3.ebuild,v 1.6 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.20-r3.ebuild,v 1.7 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -18,6 +18,13 @@ IUSE="build crypt"
 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}
+
 SLOT="${KV}"
 
 # Documentation on the patches contained in this kernel will be installed
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild
index 3673fc83dc03..4b2dc38f4649 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.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/ppc-sources/ppc-sources-2.4.20-r4.ebuild,v 1.5 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -18,6 +18,13 @@ IUSE="build crypt"
 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}
+
 SLOT="${KV}"
 
 # Documentation on the patches contained in this kernel will be installed
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild
index 7d7455b73c69..a9fbc4a132c2 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.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/ppc-sources/ppc-sources-2.4.21-r1.ebuild,v 1.3 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -18,7 +18,14 @@ IUSE="build crypt"
 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}"
 OKV="2.4.20"
+
+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/ppc-sources/ppc-sources-2.4.21-r2.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild
index 00df211554b2..3ea671e5891e 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.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/ppc-sources/ppc-sources-2.4.21-r2.ebuild,v 1.4 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -18,7 +18,13 @@ IUSE="build crypt"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.21"
+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/ppc-sources/ppc-sources-2.4.22-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
index 31c4a6cc4a6a..eaa41945a879 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.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/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.3 2003/10/26 13:27:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild
index 15fdbd514a95..2c2acbd70af0 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.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/ppc-sources/ppc-sources-2.4.22-r2.ebuild,v 1.3 2003/11/13 09:15:27 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
@@ -8,6 +8,12 @@ ETYPE="sources"
 inherit kernel
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
+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}
 
 MY_R=`echo $PR | sed "s:r:ben:g"`
 
diff --git a/sys-kernel/selinux-sources/ChangeLog b/sys-kernel/selinux-sources/ChangeLog
index ac40e9eee6c4..b7f7b1eeb9cd 100644
--- a/sys-kernel/selinux-sources/ChangeLog
+++ b/sys-kernel/selinux-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/selinux-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.22 2003/10/26 21:52:21 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.23 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  selinux-sources-2.4.21-r4.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *selinux-sources-2.4.21-r4 (26 Oct 2003)
 
diff --git a/sys-kernel/selinux-sources/Manifest b/sys-kernel/selinux-sources/Manifest
index 3f09e4e8c78b..96dc82bd69f9 100644
--- a/sys-kernel/selinux-sources/Manifest
+++ b/sys-kernel/selinux-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 ad982d0ea39771bdc7e18dff7c3c71b2 ChangeLog 3388
+MD5 16942594b7604f1cb43d80fcfd2ba7a5 selinux-sources-2.4.21-r4.ebuild 986
+MD5 6b53befc1649d5517608c0754db91212 ChangeLog 3562
 MD5 f455fbb5d96167058282b93599457a4f metadata.xml 470
-MD5 ee9b48069bbf88ae62e3855245d67740 selinux-sources-2.4.21-r4.ebuild 824
 MD5 76ec5f9fe491fd7c166830604f3651e2 files/digest-selinux-sources-2.4.21-r4 145
diff --git a/sys-kernel/selinux-sources/selinux-sources-2.4.21-r4.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r4.ebuild
index 16e0ee073b07..451a12a5d86d 100644
--- a/sys-kernel/selinux-sources/selinux-sources-2.4.21-r4.ebuild
+++ b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r4.ebuild
@@ -1,12 +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/selinux-sources/selinux-sources-2.4.21-r4.ebuild,v 1.1 2003/10/26 21:52:21 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.21-r4.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE=""
 
 ETYPE="sources"
 inherit kernel
-#KV="2.4.21-selinux"
+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}
 DESCRIPTION="LSM patched kernel with SELinux"
diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index 178f04558572..d68ecf693f3c 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.32 2003/10/19 18:28:05 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.33 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  sparc-sources-2.4.20-r8.ebuild, sparc-sources-2.4.21-r1.ebuild,
+  sparc-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   19 Oct 2003; Sven Blumenstein <bazik@gentoo.org>
   sparc-sources-2.4.22.ebuild:
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 4bbc8b37ffd5..13038e573f47 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 97c05b04a58370f989fe4f3a6270d82b ChangeLog 5778
+MD5 d8daaf8b1916aff1059e181071455c87 sparc-sources-2.4.21-r1.ebuild 2155
+MD5 a79bf1f2e01309da7f069b79696061bf sparc-sources-2.4.20-r8.ebuild 2321
+MD5 2c5c5fe6fdd340af6c64aeb0c59f6804 sparc-sources-2.4.22.ebuild 2152
+MD5 9b2de96620a4e9800f378c22847ba50e ChangeLog 6016
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
-MD5 d723d1b760391b6f78566b465ca52b01 sparc-sources-2.4.20-r8.ebuild 2123
-MD5 aeec9f7aea9ffd0cf3830441f9591362 sparc-sources-2.4.21-r1.ebuild 1957
-MD5 67a994ddafd9d38153f3b8caa12b8b76 sparc-sources-2.4.22.ebuild 1957
+MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
+MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 5cc2d0aaf480b0f39d42e04133d4138a files/digest-sparc-sources-2.4.20-r8 143
 MD5 78fb563990b579b7408f77a65ca176a0 files/digest-sparc-sources-2.4.21-r1 143
-MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
-MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
-MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
 MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
+MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
index 64091b9ccb7a..73e61bd96927 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/sparc-sources/sparc-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/sparc-sources/sparc-sources-2.4.20-r8.ebuild,v 1.7 2003/09/29 18:54:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build ultra1"
 
@@ -22,7 +22,13 @@ IUSE="build ultra1"
 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/sparc-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
index 85dc58f354a8..19542ffb99a3 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.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/sparc-sources/sparc-sources-2.4.21-r1.ebuild,v 1.5 2003/09/29 18:54:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build ultra1"
 
@@ -18,7 +18,13 @@ IUSE="build ultra1"
 ETYPE="sources"
 
 inherit kernel
-OKV="2.4.21"
+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/sparc-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
index b1446bc75118..a6dd3bcde3e0 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
+++ b/sys-kernel/sparc-sources/sparc-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/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.3 2003/10/19 18:28:05 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build ultra1"
 
@@ -18,7 +18,13 @@ IUSE="build ultra1"
 ETYPE="sources"
 
 inherit kernel
-KV="2.4.22-sparc"
+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/sparc-sources-${PV}/patches.txt.gz
 
diff --git a/sys-kernel/vanilla-prepatch-sources/ChangeLog b/sys-kernel/vanilla-prepatch-sources/ChangeLog
index 0024f3f4c2fb..a0c925e4f41b 100644
--- a/sys-kernel/vanilla-prepatch-sources/ChangeLog
+++ b/sys-kernel/vanilla-prepatch-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/vanilla-prepatch-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/ChangeLog,v 1.17 2003/11/15 17:07:27 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/ChangeLog,v 1.18 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  vanilla-prepatch-sources-2.4.23_rc1.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *vanilla-prepatch-sources-2.4.23_rc1 (15 Nov 2003)
 
diff --git a/sys-kernel/vanilla-prepatch-sources/Manifest b/sys-kernel/vanilla-prepatch-sources/Manifest
index 2609103e4fd4..a9dc09c8e51e 100644
--- a/sys-kernel/vanilla-prepatch-sources/Manifest
+++ b/sys-kernel/vanilla-prepatch-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 4a3019b0fd55e7e6d58aabd835e6e599 vanilla-prepatch-sources-2.4.23_pre9.ebuild 1456
 MD5 a221dfef18f0ecbd05008837267abba8 vanilla-prepatch-sources-2.4.23_pre6.ebuild 1459
 MD5 7d8454318f40a6f148395f04dd30dc85 vanilla-prepatch-sources-2.4.23_pre8.ebuild 1459
-MD5 b6fc9dab7c0942054b0c51513f6eb2d6 vanilla-prepatch-sources-2.4.23_rc1.ebuild 1453
-MD5 0616b833db10f0c6ade6e55c13767c1f ChangeLog 3007
+MD5 38f8026e5e6eae5fb87a8709781191a8 vanilla-prepatch-sources-2.4.23_rc1.ebuild 1451
+MD5 99726346f785f56c4469fbaaac7fc439 ChangeLog 3192
 MD5 17ded3e049cc5ea4571a590f031fd463 metadata.xml 449
 MD5 9f23105e250a0f3a0a6985f06ccfccc2 vanilla-prepatch-sources-2.4.23_pre7.ebuild 1456
 MD5 68df3480b2260b5067b1cf59827da29a files/digest-vanilla-prepatch-sources-2.4.23_rc1 133
diff --git a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild
index cd95a40aa74d..792ed175cf6a 100644
--- a/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild
+++ b/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild
@@ -1,9 +1,12 @@
 # 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-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild,v 1.2 2003/11/16 18:57:16 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-prepatch-sources/vanilla-prepatch-sources-2.4.23_rc1.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
+ETYPE="sources"
+inherit kernel
+
 # OKV=original kernel version, KV=patched kernel version.  
 OKV="2.4.22"
 KV="${PV/_/-}"
@@ -12,9 +15,6 @@ S=${WORKDIR}/linux-${KV}
 EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
 BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
 
-ETYPE="sources"
-inherit kernel || die
-
 DESCRIPTION="Full sources for the prerelease vanilla Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
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?
 
diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index cb4143b78084..07d65ae16e25 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.6 2003/10/28 21:31:33 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.7 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  win4lin-sources-2.4.20-r1.ebuild, win4lin-sources-2.4.22.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *win4lin-sources-2.4.22 (28 Oct 2003)
 
diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest
index 6dbd2405dc32..968479e342bd 100644
--- a/sys-kernel/win4lin-sources/Manifest
+++ b/sys-kernel/win4lin-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 7c1d2c2d11347e55f10a97dacee985ef ChangeLog 1099
-MD5 c482270c7d853e8f87d57a2a506028c3 win4lin-sources-2.4.22.ebuild 1032
-MD5 35480274ef9d4eba1fe85f748c6cdf07 win4lin-sources-2.4.20-r1.ebuild 1093
+MD5 68f9de1d13675485cdbd4ccbf9313d48 win4lin-sources-2.4.22.ebuild 1058
+MD5 4518a3a023a173c2d1fdb0441c53031e ChangeLog 1303
+MD5 212521ace71ca56e5fb5a6ad997efd43 win4lin-sources-2.4.20-r1.ebuild 1290
 MD5 a3ac6282b407aaef5e22644f04ce59ee files/digest-win4lin-sources-2.4.22 201
 MD5 ec72e31e51b6973ced56cfac1c6f0878 files/digest-win4lin-sources-2.4.20-r1 201
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
index 1621251d50b2..2f07571df3de 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.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/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild,v 1.6 2003/09/29 18:39:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild,v 1.7 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
@@ -10,7 +10,12 @@ 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}
 
 #add one of these in if this is for a pre or rc kernel
 #KERN_PATCH="patch-2.4.20-rc1.bz2"
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
index e48eb0838dc7..fdf247f2b966 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-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/win4lin-sources/win4lin-sources-2.4.22.ebuild,v 1.1 2003/10/28 21:31:33 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
@@ -14,6 +14,8 @@ OKV="2.4.22"
 KV="2.4.22-win4lin"
 EXTRAVERSION="-win4lin"
 
+S=${WORKDIR}/linux-${KV}
+
 DESCRIPTION="Full sources for the linux kernel with win4lin support"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.netraverse.com/member/downloads/files/mki-adapter.patch
diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 4635f7078d50..c324f133af5b 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.24 2003/11/14 20:26:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.25 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org> wolk-sources-3.8.ebuild,
+  wolk-sources-4.0.ebuild, wolk-sources-4.10_pre7.ebuild,
+  wolk-sources-4.3.ebuild, wolk-sources-4.9-r1.ebuild,
+  wolk-sources-4.9.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
   14 Nov 2003; <nerdboy@gentoo.org> wolk-sources-4.10_pre7.ebuild,
   wolk-sources-4.9-r1.ebuild:
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index c62e18598980..885d78201b7a 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,10 +1,10 @@
-MD5 fe95d93f587f0c9f99903a394652cc21 wolk-sources-3.8.ebuild 979
-MD5 f905e929fa5cb2e410d7ff53a847dec2 wolk-sources-4.3.ebuild 1951
-MD5 a5dff68a0eed18886c58e9828c88a11b wolk-sources-4.10_pre7.ebuild 3811
-MD5 ae819677a635e75cd48aed972a6c6bd0 wolk-sources-4.9-r1.ebuild 3904
-MD5 39c0d8509a76469044a2e6e27ed58eda wolk-sources-4.0.ebuild 1512
-MD5 1baabb2e50aeea8e060170e4b0ab9a6f ChangeLog 10651
-MD5 c5e45dd59533359cd5fe9430a37b4110 wolk-sources-4.9.ebuild 1939
+MD5 8822b4b296f0d4835fc0ac46092b3738 wolk-sources-3.8.ebuild 984
+MD5 f9a0a7da673dbb625f5a66f65afcc2f1 wolk-sources-4.3.ebuild 1957
+MD5 e989540f27532b35553239df0391cd6b wolk-sources-4.10_pre7.ebuild 3852
+MD5 1d015abd6dd807986b6be983e494dd7c wolk-sources-4.9-r1.ebuild 3945
+MD5 15d98a9043bed7bb8dcdfffa4741b4b4 wolk-sources-4.0.ebuild 1517
+MD5 e2260a85651c7eca876b422a48204a02 ChangeLog 10955
+MD5 4e54e3da6bfe4c3b82011dc801883b0d wolk-sources-4.9.ebuild 1944
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
diff --git a/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild b/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild
index fc06418dd212..d82620787b24 100644
--- a/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild,v 1.8 2003/11/16 19:20:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild,v 1.9 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
+ETYPE="sources"
+inherit kernel
+
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 OKV=2.4.18
@@ -11,9 +14,6 @@ KV=${OKV}-wolk$(echo ${PV} | sed s:_:-:)
 EXTRAVERSION=-wolk$(echo ${PV} | sed s:_:-:)
 S=${WORKDIR}/linux-${KV}
 
-ETYPE="sources"
-inherit kernel
-
 DESCRIPTION="Working Overloaded Linux Kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://sourceforge/wolk/linux-${KV}-patchset.tar.bz2"
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild
index 108f0204c1cf..42d49483518b 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild,v 1.5 2003/11/16 19:20:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
+ETYPE="sources"
+inherit kernel
+
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 OKV=2.4.20
@@ -11,9 +14,6 @@ EXTRAVERSION=-wolk4.0s
 KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 
-ETYPE="sources"
-inherit kernel
-
 DESCRIPTION="Working Overloaded Linux Kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://sourceforge/wolk/linux-${KV}.patch.bz2"
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
index 93973b2801c7..64c86734ff06 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.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/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.5 2003/11/14 20:26:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
@@ -11,7 +11,9 @@ ETYPE="sources"
 inherit kernel || die
 
 OKV=2.4.20
-KV=${OKV}-wolk4.10s-pre7
+EXTRAVERSION="-${PN/-*/}4.10s-pre7"
+KV="${OKV}${EXTRAVERSION}"
+
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild
index 552b875f3bb8..d43ed3c97a82 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild,v 1.9 2003/11/16 19:20:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild,v 1.10 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
+ETYPE="sources"
+inherit kernel
+
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 OKV=2.4.20
@@ -12,9 +15,6 @@ BASE=-wolk4.0s
 KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 
-ETYPE="sources"
-inherit kernel
-
 DESCRIPTION="Working Overloaded Linux Kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://sourceforge/wolk/linux-${OKV}${BASE}.patch.bz2
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
index e80e7655f8ef..fff9ff23ff71 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r1.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/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.3 2003/11/14 20:26:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
@@ -11,7 +11,9 @@ ETYPE="sources"
 inherit kernel || die
 
 OKV=2.4.20
-KV=${OKV}-wolk4.9s
+EXTRAVERSION="-${PN/-*/}4.9s"
+KV="${OKV}${EXTRAVERSION}"
+
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
index 9113ee5264ea..300a9123410e 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild,v 1.3 2003/11/16 19:20:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build"
 
+ETYPE="sources"
+inherit kernel
+
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 OKV=2.4.20
@@ -14,9 +17,6 @@ BASE=-wolk${WOLK_MAJOR}.0s
 KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 
-ETYPE="sources"
-inherit kernel
-
 DESCRIPTION="Working Overloaded Linux Kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
 WOLK_PATCHLIST="linux-${OKV}${BASE}.patch.bz2"
diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 266a90a2a331..15254c46182f 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.27 2003/10/27 01:14:24 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.28 2003/11/20 07:43:38 lostlogic Exp $
+
+  20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  xfs-sources-2.4.19-r2.ebuild:
+  Move version handling logic to after inherit kernel, or insert it where
+  necessary
 
 *xfs-sources-2.4.22 (26 October 2003)
 
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 231c0a914f0c..e4724b6a52cb 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,15 +1,15 @@
-MD5 092b7d1cc0e327cfd548c6a2a6b58a07 ChangeLog 7778
 MD5 4daa3597c62a9676fad4a07e543be9c3 xfs-sources-2.4.20-r1.ebuild 2132
-MD5 4fa4fca3767bc89c7c258ac3c382fc18 xfs-sources-2.4.19-r2.ebuild 1844
+MD5 941206783cb2f1c40e0a2990975153d6 xfs-sources-2.4.19-r2.ebuild 2054
 MD5 b2fb282b21e82e7cac47f99c48017e54 xfs-sources-2.4.20.ebuild 2142
-MD5 03830a0019c2793faccebaf4de544435 xfs-sources-2.4.20-r2.ebuild 2131
 MD5 7721ef109f2d111f961afe47a3baa0d9 xfs-sources-2.4.20-r3.ebuild 2185
 MD5 8e0156afed80d85c166d9af22510592c xfs-sources-2.4.22.ebuild 2144
+MD5 03830a0019c2793faccebaf4de544435 xfs-sources-2.4.20-r2.ebuild 2131
+MD5 cc0a8291ce1326fedcdc03d9e28e3f24 ChangeLog 7948
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
+MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
+MD5 ec7765fb708912e448a36dc6cf7cdce9 files/xfs-sources-2.4.20-gcc33.patch 11801
+MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
+MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r2 142
 MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
 MD5 6c7dc3e61cee85185b45bc82e2982351 files/digest-xfs-sources-2.4.20-r2 142
-MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r2 142
 MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r3 142
-MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
-MD5 ec7765fb708912e448a36dc6cf7cdce9 files/xfs-sources-2.4.20-gcc33.patch 11801
-MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
index 37f7270d9c73..6de3b60d2071 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.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/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.8 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.9 2003/11/20 07:43:38 lostlogic Exp $
 
 IUSE="build crypt"
 
@@ -22,6 +22,12 @@ IUSE="build crypt"
 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/lolo-sources-${PV}/patches.txt.gz