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.

9 files changed, 78 insertions, 21 deletions

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"`