Version Bump

(Portage version: 2.0.51.22-r3)

7 files changed, 26 insertions, 27 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 9c18c168586c..3c23aa1e0e2d 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,15 @@
 # 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.131 2006/01/15 18:09:16 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.132 2006/02/04 02:23:59 marineam Exp $
+
+*ck-sources-2.6.15_p3 (04 Feb 2006)
+*ck-sources-2.6.14_p8-r2 (04 Feb 2006)
+
+  04 Feb 2006; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.14_p8-r1.ebuild, +ck-sources-2.6.14_p8-r2.ebuild,
+  -ck-sources-2.6.15_p2.ebuild, +ck-sources-2.6.15_p3.ebuild:
+  Bump 2.6.15 to ck3+genpatches4 w/ 2.6.15.2 and bump 2.6.14 to genpatches10
+  w/ 2.6.14.7. Closes bug #121042
 
 *ck-sources-2.6.15_p2 (15 Jan 2006)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 1e1ae20bf9c1..f6dd60e26457 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 60393f94cc2a75fd785df0d9298e3576 ck-sources-2.6.14_p8-r1.ebuild 1557
-MD5 e293bf5116b6ad0830ea376454af72f1 ck-sources-2.6.15_p2.ebuild 1522
+MD5 b5552e9808c04fcaee3313c9ad64a421 ck-sources-2.6.15_p3.ebuild 1530
+MD5 49d64edfa40ba07fda3a8571177fcca4 ck-sources-2.6.14_p8-r2.ebuild 1518
 MD5 ea435c602742f862fd13c187cc2e4d12 ChangeLog 29748
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
-MD5 d64cba680b19b8948843c4fb7c853e42 files/digest-ck-sources-2.6.14_p8-r1 272
-MD5 df232a539512dc8548aec97d90fab3c6 files/digest-ck-sources-2.6.15_p2 272
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDyo/biP+LossGzjARAhzxAJ9wUVzd3spbOl3WCs32PbVtFufIPACfeAfp
-oRUA9hKdQDnjlYDr4Q0yZeg=
-=9hzv
------END PGP SIGNATURE-----
+MD5 50e0574a6fcdd054ba51bed7738c222c files/digest-ck-sources-2.6.14_p8-r2 273
+MD5 b4ed06fa589b04ea6a061b4d8e617ccf files/digest-ck-sources-2.6.15_p3 272
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r2.ebuild
index 19d60572d6bc..c19d375f7fd1 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.14_p8-r2.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.14_p8-r1.ebuild,v 1.1 2006/01/11 23:31:54 marineam Exp $
+# $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="9"
+K_GENPATCHES_VER="10"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -28,8 +28,8 @@ else
 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_ 10??_3_ 10??_4_ 10??_5_"
+# 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."
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.15_p2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.15_p3.ebuild
index edece06ebbbd..5fafd1f4a08d 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.15_p2.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.15_p3.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_p2.ebuild,v 1.1 2006/01/15 18:09:16 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.15_p3.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="3"
+K_GENPATCHES_VER="4"
 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_"
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10??_1_ 10??_2_"
 
 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-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r2
index de3b92b6689f..aff4ce007388 100644
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r1
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p8-r2
@@ -1,4 +1,4 @@
 MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 08e528f6c9cee0761713ad59e5ab2a0e genpatches-2.6.14-9.base.tar.bz2 59362
+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_p2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p2
deleted file mode 100644
index dea02b19aa1c..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
-MD5 1d5fbdacd817651e4ff4f8ec178ed2d2 genpatches-2.6.15-3.base.tar.bz2 16532
-MD5 fae45e736b5c78765b04673b7c3b2b7d patch-2.6.15-cks2.bz2 32243
-MD5 28ec186767158d76a9e527072dd4acc2 patch-2.6.15-ck2.bz2 45310
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3
new file mode 100644
index 000000000000..a79d0b828bf0
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.15_p3
@@ -0,0 +1,4 @@
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 dfe948ad15e69785c249ce1461ae7b89 genpatches-2.6.15-4.base.tar.bz2 23590
+MD5 e9e0ce49704c2782211c1c7bb27b9484 patch-2.6.15-cks3.bz2 36011
+MD5 9d218c8178a9cee0ed4cd473fab17b1e patch-2.6.15-ck3.bz2 49232