Version Bump

(Portage version: 2.0.51.22-r3)

5 files changed, 21 insertions, 23 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 072f3bbef551..78635c51050b 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.122 2005/10/28 21:51:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.123 2005/11/10 00:27:09 marineam Exp $
+
+*ck-sources-2.6.14_p4 (10 Nov 2005)
+
+  10 Nov 2005; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.14_p1.ebuild, +ck-sources-2.6.14_p4.ebuild:
+  Version bump to ck4 and genpatches 2. This includes 2.6.14.1
+  Closes bug #111785
 
 *ck-sources-2.6.14_p1 (28 Oct 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index f529c9ec560e..adc2927b164e 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 128931b5b37be09e8390a56e47257fa3 ck-sources-2.6.14_p1.ebuild 1528
+MD5 8c064324ddac191afcd36849e72194bf ck-sources-2.6.14_p4.ebuild 1543
 MD5 e7dd2e7295282d0e74feb7f3606c8fe5 ck-sources-2.6.13_p8.ebuild 1528
-MD5 db210287a9e5b91c64eb97e1b6dd4d87 ChangeLog 27651
+MD5 1a7d93167f488faeaa9e0dff245d1940 ChangeLog 27889
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 a457c5f0415080b6b16dad6f8d700fcf files/digest-ck-sources-2.6.13_p8 278
-MD5 9d104d63ce3d778a5bc9c5eb3fbe68eb files/digest-ck-sources-2.6.14_p1 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDYp18iP+LossGzjARAhEGAKCxN76ZepFo7/h6VnEsJLkPnuzWGACeLGAy
-W6q64IqTuN3VE6rigOcTZdg=
-=zc5Z
------END PGP SIGNATURE-----
+MD5 ec25098759ad716cc2f34da57e3f3a91 files/digest-ck-sources-2.6.14_p4 271
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.14_p1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.14_p4.ebuild
index f38d927a016b..c7b4cfd225fb 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.14_p1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.14_p4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 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_p1.ebuild,v 1.1 2005/10/28 21:51:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.14_p4.ebuild,v 1.1 2005/11/10 00:27:10 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="2"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -22,21 +22,22 @@ detect_version
 
 IUSE="ck-server"
 if use ck-server; then
-	CK_PATCH="patch-${KV_CK}-server.bz2"
+	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 updates in genpatches begin with 10 but are included in -ck
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10"
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10
+	2100_zero-size-datagram.patch"
 
 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/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2
+	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 )"
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p1
deleted file mode 100644
index 2d41cdef1ad1..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 aea18c4938456c90a32fc482ad901350 genpatches-2.6.14-1.base.tar.bz2 5500
-MD5 00eb543698c36950c3ab9025c94db583 patch-2.6.14-ck1-server.bz2 42593
-MD5 05600b20622be6deadb1038cf0488546 patch-2.6.14-ck1.bz2 42652
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p4 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p4
new file mode 100644
index 000000000000..0265c6e3b692
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.14_p4
@@ -0,0 +1,4 @@
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 f32831c3397bc9d07707984ed2ae0ff4 genpatches-2.6.14-2.base.tar.bz2 9310
+MD5 6457f858d1a0081cdf76d45109aeb5fa patch-2.6.14-cks4.bz2 29868
+MD5 683d905fadf1e97b6adde665cdf49129 patch-2.6.14-ck4.bz2 29928