Version bump

(Portage version: 2.0.51.22-r2)

4 files changed, 78 insertions, 11 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index b40c9e6d6d83..ec4e68666e68 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.114 2005/08/31 16:52:34 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.115 2005/09/05 22:25:37 marineam Exp $
+
+*ck-sources-2.6.13_p2 (05 Sep 2005)
+
+  05 Sep 2005; Michael Marineau <marineam@gentoo.org>
+  +ck-sources-2.6.13_p2.ebuild:
+  Version bump to ck2, for ck-server users ck2 == ck1 so don't bother with the
+  upgrade if you are already using ck-server 2.6.13-ck1. For other users ck2
+  is just ck1+ with a updated swap-prefetch patch. No ck-plus for this version.
 
 *ck-sources-2.6.13_p1 (31 Aug 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3ab6d16ee73b..e3540f902343 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5095444c58ae06e9dd09220ecef04a77 ck-sources-2.6.13_p2.ebuild 1815
 MD5 83041bdb45d5c43280088444defdcf3f ck-sources-2.6.13_p1.ebuild 1866
 MD5 02d0e0b30a6dd845213638e80d436dcd ck-sources-2.6.12_p6.ebuild 1553
 MD5 2f902f7c71cfea80439614976da3d8e2 ChangeLog 25854
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 07ddcfdd8965da5814e2c964973baf58 files/digest-ck-sources-2.6.12_p6 279
 MD5 34c34364ad71a43bdabb94b187652ae7 files/digest-ck-sources-2.6.13_p1 415
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDFeBuiP+LossGzjARAnVzAJ4wGQn53OfQSyCdhpcI9YTDpmdofgCgqK/A
-q284N30gZTZXvYVqqTBEa10=
-=QZ7i
------END PGP SIGNATURE-----
+MD5 3075ae54a85b843d392e80f24612094c files/digest-ck-sources-2.6.13_p2 278
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.13_p2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.13_p2.ebuild
new file mode 100644
index 000000000000..221e3abe4053
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.13_p2.ebuild
@@ -0,0 +1,63 @@
+# 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.13_p2.ebuild,v 1.1 2005/09/05 22:25:37 marineam Exp $
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="1"
+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}-server.bz2"
+	CK_PATCH="patch-2.6.13-ck1-server.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}"
+
+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-2.6.13-ck1-server.bz2
+	)
+	!ck-server? (
+	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+pkg_setup() {
+	if use ck-server; then
+		einfo "There have been no changes to ck-server since ck1."
+		einfo "If you are already happily using 2.6.13-ck1-server there is"
+		einfo "no point upgrade, so	just ctrl-C this install :-P"
+		sleep 3
+	fi
+}
+
+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/files/digest-ck-sources-2.6.13_p2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p2
new file mode 100644
index 000000000000..b04fe6442480
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p2
@@ -0,0 +1,4 @@
+MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
+MD5 ac43582ec7a1280eee78eabb9c416662 genpatches-2.6.13-1.base.tar.bz2 16013
+MD5 3ba7062e23a5c7b7317bd50e0f001f35 patch-2.6.13-ck1-server.bz2 21357
+MD5 156073334691500ea4eac086877c81a3 patch-2.6.13-ck2.bz2 24601