Bump ck-sources to 2.6.21, patch based on 2.6.21-rc7-ck3

(Portage version: 2.1.2.2)

7 files changed, 45 insertions, 125 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 917396331ea5..384599a3da8c 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.158 2007/02/17 19:41:32 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.159 2007/04/29 02:13:36 marineam Exp $
+
+*ck-sources-2.6.21 (29 Apr 2007)
+
+  29 Apr 2007; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.19_p2-r5.ebuild, -ck-sources-2.6.20_p1.ebuild,
+  +ck-sources-2.6.21.ebuild:
+  Bump to 2.6.21, patchset based on 2.6.21-rc7-ck3. Remove old kernels w/
+  security issues.
 
   17 Feb 2007; Michael Marineau <marineam@gentoo.org> ChangeLog:
   -ck-sources-2.6.19_p2-r3.ebuild, -ck-sources-2.6.19_p2-r4.ebuild,
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.19_p2-r5.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.19_p2-r5.ebuild
deleted file mode 100644
index 18b3421790df..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.19_p2-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.19_p2-r5.ebuild,v 1.1 2007/02/17 19:37:10 marineam Exp $
-
-DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high performance patchset and Gentoo's basic patchset."
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-IUSE="ck-server"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-K_NOUSENAME="yes"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
-UNIPATCH_STRICTORDER="1"
-ETYPE="sources"
-inherit kernel-2
-
-detect_version
-# A few hacks to set ck version via _p instead of -r
-MY_PR=${PR/r/-r}
-MY_PR=${MY_PR/-r0/}
-EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
-KV_FULL=${OKV}${EXTRAVERSION}
-KV_CK=${KV_FULL/-r*/}
-
-CKPATCH="patch-${KV_CK}.bz2"
-
-if use ck-server; then
-	UNIPATCH_LIST="${DISTDIR}/${CKPATCH/ck/cks}"
-else
-	UNIPATCH_LIST="${DISTDIR}/${CKPATCH}"
-fi
-
-# Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
-#UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
-	ck-server? (
-	mirror://kernel/linux/kernel/people/ck/patches/cks/${CKPATCH/ck/cks}
-	)
-	!ck-server? (
-	mirror://kernel/linux/kernel/people/ck/patches/2.6/${OKV}/${KV_CK}/${CKPATCH} )"
-
-
-pkg_postinst() {
-	postinst_sources
-
-	einfo "The ck patchset is tuned for desktop usage."
-	einfo "To better tune the kernel for server applications add"
-	einfo "ck-server to your use flags and reemerge ck-sources"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.20_p1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.20_p1.ebuild
deleted file mode 100644
index f2ae52a10372..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.20_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.20_p1.ebuild,v 1.1 2007/02/17 19:37:10 marineam Exp $
-
-DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high performance patchset and Gentoo's basic patchset."
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-IUSE="ck-server"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-K_NOUSENAME="yes"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
-UNIPATCH_STRICTORDER="1"
-ETYPE="sources"
-inherit kernel-2
-
-detect_version
-# A few hacks to set ck version via _p instead of -r
-MY_PR=${PR/r/-r}
-MY_PR=${MY_PR/-r0/}
-EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
-KV_FULL=${OKV}${EXTRAVERSION}
-KV_CK=${KV_FULL/-r*/}
-
-CKPATCH="patch-${KV_CK}.bz2"
-
-if use ck-server; then
-	UNIPATCH_LIST="${DISTDIR}/${CKPATCH/ck/cks}"
-else
-	UNIPATCH_LIST="${DISTDIR}/${CKPATCH}"
-fi
-
-# Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
-#UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
-	ck-server? (
-	mirror://kernel/linux/kernel/people/ck/patches/cks/${CKPATCH/ck/cks}
-	)
-	!ck-server? (
-	mirror://kernel/linux/kernel/people/ck/patches/2.6/${OKV}/${KV_CK}/${CKPATCH} )"
-
-
-pkg_postinst() {
-	postinst_sources
-
-	einfo "The ck patchset is tuned for desktop usage."
-	einfo "To better tune the kernel for server applications add"
-	einfo "ck-server to your use flags and reemerge ck-sources"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.21.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.21.ebuild
new file mode 100644
index 000000000000..9febe3a20bc0
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.21.ebuild,v 1.1 2007/04/29 02:13:36 marineam Exp $
+
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="1"
+UNIPATCH_STRICTORDER="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high performance patchset and Gentoo's basic patchset."
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CK_PATCH="patch-2.6.21-ck.bz2"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} mirror://gentoo/${CK_PATCH}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	einfo "This kernel is based on 2.6.21-rc7-ck3."
+	einfo "There has not yet ben a ck server release yet."
+}
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.19_p2-r5 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.19_p2-r5
deleted file mode 100644
index 08552a2896d0..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.19_p2-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 613939a77a6fe3c426d0be13f7ac6ba5 genpatches-2.6.19-7.base.tar.bz2 53619
-RMD160 6281b30ef2d7805555fecd1566d91d445f418301 genpatches-2.6.19-7.base.tar.bz2 53619
-SHA256 c0d20d01440b67d91bfe6bc08b979eb9ed56076f3cab7a41c9055edfd5346fdf genpatches-2.6.19-7.base.tar.bz2 53619
-MD5 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 42733268
-RMD160 75dc65b15cf9cdb359b1abe7084907982c19088b linux-2.6.19.tar.bz2 42733268
-SHA256 c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 linux-2.6.19.tar.bz2 42733268
-MD5 dae93e5dddac8649b2f5d6d2c0664cc7 patch-2.6.19-ck2.bz2 32437
-RMD160 af911bbe6c011f776400933e05aff6fdee6257c3 patch-2.6.19-ck2.bz2 32437
-SHA256 a1e810cca7ec4eb0f0d735e965f6ec9e3b83a799b1289c5d77e7f6a56e70304e patch-2.6.19-ck2.bz2 32437
-MD5 658f049e1bb972eabed5151867a4a9d2 patch-2.6.19-cks2.bz2 32766
-RMD160 9b779f6fe617c1b594a1ab3f6e8b1e5b4963c70e patch-2.6.19-cks2.bz2 32766
-SHA256 0c2d19ff4c83cafa54d519e7f69705b2ab7c0c53a81ddc71ea0e625db1be61f4 patch-2.6.19-cks2.bz2 32766
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.20_p1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.20_p1
deleted file mode 100644
index c14066bf6d51..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.20_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e03b3c5be8d0705e515e68249e4d8d10 genpatches-2.6.20-1.base.tar.bz2 1152
-RMD160 6b9711102f469e4f0db23fb7f3b3aec6a19ce4c3 genpatches-2.6.20-1.base.tar.bz2 1152
-SHA256 410c6bf55696c13833ed2d7b7745b6eb127d73ae8a9573e66df7169de3261ae5 genpatches-2.6.20-1.base.tar.bz2 1152
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 e63ae5dfa77af6c8d520644d61f22946 patch-2.6.20-ck1.bz2 31981
-RMD160 2e8c258cfd988574de01118543bd167fe2832c60 patch-2.6.20-ck1.bz2 31981
-SHA256 c9609d99872ecd27b93859919a41378ad920563acc55088cc1f3896407f89baf patch-2.6.20-ck1.bz2 31981
-MD5 96030d3b4395c2d0c23102d090f6a964 patch-2.6.20-cks1.bz2 32161
-RMD160 81edb12d97e1ba0ccbf13790e63c5cf0094443e9 patch-2.6.20-cks1.bz2 32161
-SHA256 bcbbbd8d8eec12fb00a01279fccb404bcd40efb4f288e5ae3a6b78622382ff34 patch-2.6.20-cks1.bz2 32161
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.21 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.21
new file mode 100644
index 000000000000..999cbddd435a
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.21
@@ -0,0 +1,9 @@
+MD5 5831fd3adc21152fbd8dcebe12f2e52f genpatches-2.6.21-1.base.tar.bz2 1050
+RMD160 da561dd019aea7c4b4b33e1afce1004ba93f504f genpatches-2.6.21-1.base.tar.bz2 1050
+SHA256 4d9d263d4c3916a68526a7b6ec4208afce071aaf541aa884f5bd78e0654e063a genpatches-2.6.21-1.base.tar.bz2 1050
+MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
+RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
+SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
+MD5 db6fd450943a00974845fb2b16acc8f1 patch-2.6.21-ck.bz2 61647
+RMD160 714aa290cfb86b5648fed3525fdc81fda772480d patch-2.6.21-ck.bz2 61647
+SHA256 afb4262d2dee9645b6e6746486a58f9d891b9b5ee080fbe1d09884c18a57c7a4 patch-2.6.21-ck.bz2 61647