Version Bump

(Portage version: 2.0.54)

7 files changed, 19 insertions, 80 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index f4a64d65aad0..5fce3550ce48 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.133 2006/02/07 21:05:51 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.134 2006/03/07 07:46:39 marineam Exp $
+
+*ck-sources-2.6.15_p5 (06 Mar 2006)
+
+  06 Mar 2006; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.14_p8-r2.ebuild, -ck-sources-2.6.15_p3-r1.ebuild,
+  +ck-sources-2.6.15_p5.ebuild:
+  Version bump to ck5 and genpatches-10, includes a few security fixes, etc.
+  Closes bug #123167
 
 *ck-sources-2.6.15_p3-r1 (07 Feb 2006)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 66fb82197f5a..6862ce8ad021 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 092bd21a3c502d20630801b7d33676ca ck-sources-2.6.15_p3-r1.ebuild 1538
-MD5 2c894b163d0b96ac24bfda8ea701eeca ck-sources-2.6.14_p8-r2.ebuild 1518
-MD5 0703f7cb30a4b79cda6aca53004b4f89 ChangeLog 30316
+MD5 7702265056b382e23b33c6d7a19228c0 ChangeLog 30606
+MD5 44b6c2267cea192a49808031b28a7611 ck-sources-2.6.15_p5.ebuild 1555
+MD5 b5cab6844d523b6fb8336f86f5837986 files/digest-ck-sources-2.6.15_p5 273
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
-MD5 50e0574a6fcdd054ba51bed7738c222c files/digest-ck-sources-2.6.14_p8-r2 273
-MD5 656712099b6181ff062281051a3049ce files/digest-ck-sources-2.6.15_p3-r1 272
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD6Qu8iP+LossGzjARAq33AJ96oK/PhFlJ+aGbtIQBC+EPFZzKvQCggIYV
-NMzZdK3HHP8uif0OTlyREPg=
-=X6et
------END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r2.ebuild
deleted file mode 100644
index c19d375f7fd1..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 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.14_p8-r2.ebuild,v 1.1 2006/02/04 02:23:59 marineam Exp $
-
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-# A few hacks to set ck version via _p instead of -r
-MY_P=${P/_p*/}
-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*/}
-detect_version
-
-IUSE="ck-server"
-if use ck-server; then
-	CK_PATCH="patch-${KV_CK/ck/cks}.bz2"
-else
-	CK_PATCH="patch-${KV_CK}.bz2"
-fi
-
-UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
-# Note: 2.6.x.y are included in -ck
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 11??_1_ 11??_2_ 11??_3_ 11??_4_ 11??_5_"
-
-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/"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
-	ck-server? (
-	http://ck.kolivas.org/patches/cks/patch-${KV_CK/ck/cks}.bz2
-	)
-	!ck-server? (
-	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-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.15_p3-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.15_p5.ebuild
index 291c20795869..141e8449ad8d 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.15_p3-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.15_p5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 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.15_p3-r1.ebuild,v 1.1 2006/02/07 21:05:51 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.15_p5.ebuild,v 1.1 2006/03/07 07:46:39 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
+K_GENPATCHES_VER="10"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -29,7 +29,7 @@ fi
 
 UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
 # Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10??_1_ 10??_2_ 2305"
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10??_1_ 10??_2_ 10??_3_ 10??_4_ 1054"
 
 DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high
 performance patchset and Gentoo's basic patchset."
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r2
deleted file mode 100644
index aff4ce007388..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 40fd03c7c6746aada2cb8f47d0780b6b genpatches-2.6.14-10.base.tar.bz2 68373
-MD5 72237aff0f784d2a97aa4415032a068e patch-2.6.14-cks8.bz2 48831
-MD5 83ce46bbff5f0c3f984afa013c334f83 patch-2.6.14-ck8.bz2 48802
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3-r1
deleted file mode 100644
index 91885d00edae..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
-MD5 ed9b9a2a8974d0ee2d3be045c3872396 genpatches-2.6.15-7.base.tar.bz2 29372
-MD5 e9e0ce49704c2782211c1c7bb27b9484 patch-2.6.15-cks3.bz2 36011
-MD5 9d218c8178a9cee0ed4cd473fab17b1e patch-2.6.15-ck3.bz2 49232
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p5 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p5
new file mode 100644
index 000000000000..c9fd022d5bdc
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p5
@@ -0,0 +1,4 @@
+MD5 28047fe5abc9132245301152fa12d49e genpatches-2.6.15-10.base.tar.bz2 52567
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 824bb89d3b309da8465abbc7c0242a10 patch-2.6.15-ck5.bz2 66343
+MD5 9f9aed4632c15c654092e995f960d061 patch-2.6.15-cks5.bz2 53133