version bump

(Portage version: 2.0.51.22-r2)

9 files changed, 26 insertions, 166 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index ec4e68666e68..943f6e11cf6e 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.115 2005/09/05 22:25:37 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.116 2005/09/12 04:13:32 marineam Exp $
+
+*ck-sources-2.6.13_p3 (12 Sep 2005)
+
+  12 Sep 2005; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.12_p6.ebuild, -ck-sources-2.6.13_p1.ebuild,
+  -ck-sources-2.6.13_p2.ebuild, +ck-sources-2.6.13_p3.ebuild:
+  Version bump to 2.6.13.1, ck3, genpatches 2, and clean out old versions.
 
 *ck-sources-2.6.13_p2 (05 Sep 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 428d0aa9f9f1..dfcfbd966998 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 89a13ca4435b8e323bc5a15decc08068 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 a378a98b41a207ee10eb8cb106fb2795 ChangeLog 26214
+MD5 9dbaa62d9be1a58d9b8e132ab3503747 ck-sources-2.6.13_p3.ebuild 1528
+MD5 663d982b44d4499fca29fb69e4c88812 ChangeLog 26505
 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
-MD5 3075ae54a85b843d392e80f24612094c files/digest-ck-sources-2.6.13_p2 278
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHMXviP+LossGzjARAjM6AKCFU3Y3+BH4jDDhtUQULcB37DVTSACgifPN
-Cahoq9mpVBLwrVPS3+h/nlY=
-=dgzG
------END PGP SIGNATURE-----
+MD5 e04e152b62fad64696624144573cd28a files/digest-ck-sources-2.6.13_p3 278
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.13_p1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.13_p1.ebuild
deleted file mode 100644
index 355a37d21aa2..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.13_p1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_p1.ebuild,v 1.1 2005/08/31 16:52:34 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 ck-plus"
-if use ck-server; then
-	CK_PATCH="patch-${KV_CK}-server.bz2"
-else
-	CK_PATCH="patch-${KV_CK}.bz2"
-fi
-
-if use ck-plus; then
-	UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}
-		${DISTDIR}/sched-staircase12_tweak.patch
-		${DISTDIR}/vm-swap-prefetch.patch"
-else
-	UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
-fi
-# 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-${KV_CK}-server.bz2 )
-	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )
-	ck-plus? (
-	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patches/sched-staircase12_tweak.patch
-	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patches/vm-swap-prefetch.patch
-	)"
-
-KEYWORDS="~amd64 ~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.13_p2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.13_p2.ebuild
deleted file mode 100644
index 221e3abe4053..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.13_p2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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/ck-sources-2.6.12_p6.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.13_p3.ebuild
index de9427bd87d6..a5f4793e9e27 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.12_p6.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.13_p3.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.12_p6.ebuild,v 1.1 2005/08/20 19:07:48 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.13_p3.ebuild,v 1.1 2005/09/12 04:13:32 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
+K_GENPATCHES_VER="2"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -29,18 +29,17 @@ 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}
-	1001
-	1002
-	1003
-	1004
-	1005"
-
-DESCRIPTION="Full sources for the Linux kernel with Con Kolivas' high performance patchset and Gentoo's basic patchset."
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 10"
+
+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 )
-	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+	ck-server? (
+	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2
+	)
+	!ck-server? (
+	http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
 
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p6 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p6
deleted file mode 100644
index a8c4071ff792..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 41af3b58c0fce0f3ab186c713d6fbdce genpatches-2.6.12-13.base.tar.bz2 49335
-MD5 722792b7428e0741cc0168247c3fd8a8 patch-2.6.12-ck6-server.bz2 54411
-MD5 a6b132e2f61da6a0655399d56f030897 patch-2.6.12-ck6.bz2 54167
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p1
deleted file mode 100644
index a5ab72da8ead..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p1
+++ /dev/null
@@ -1,6 +0,0 @@
-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 ad98bab28acb512bc7cfdd92dbdc7027 patch-2.6.13-ck1.bz2 21376
-MD5 0f8c2699384e84a972c366aa4b93b9d1 sched-staircase12_tweak.patch 1003
-MD5 cea9536392a0bc5bdc164a1c622a9d29 vm-swap-prefetch.patch 9677
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
deleted file mode 100644
index b04fe6442480..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p2
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p3 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p3
new file mode 100644
index 000000000000..dd5e387cb820
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.13_p3
@@ -0,0 +1,4 @@
+MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
+MD5 eb50f5eb60247dd01e24a6854ab31979 genpatches-2.6.13-2.base.tar.bz2 31281
+MD5 55ccec6112aa5585b171b7a29c6a3fc4 patch-2.6.13-ck3-server.bz2 28706
+MD5 51aee636eea5b92f85ee7d1b9252512e patch-2.6.13-ck3.bz2 28658