version bump

Package-Manager: portage-2.0.51.22-r2

7 files changed, 34 insertions, 84 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index fed899d125db..96f88260e0a5 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.110 2005/07/30 05:39:50 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.111 2005/08/07 21:39:05 marineam Exp $
+
+*ck-sources-2.6.12_p5 (07 Aug 2005)
+
+  07 Aug 2005; Michael Marineau <marineam@gentoo.org>
+  -ck-sources-2.6.12_p3-r1.ebuild, -ck-sources-2.6.12_p4.ebuild,
+  +ck-sources-2.6.12_p5.ebuild:
+  Bump to ck6 and genpatches 11. Closes bug #101504 and thanks go to Kerin
+  Millar for fixing the patch conflicts so I didn't have to. :-)
 
   30 Jul 2005; Michael Marineau <marineam@gentoo.org>
   -files/digest-ck-sources-2.6.11_p10:
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index b7202cf84a9c..6ae8b19123a5 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0697ef6c88d727f61f73df5e944897d5 ck-sources-2.6.12_p4.ebuild 1645
-MD5 43f194b4933a7e4b162d4a92e4d4c77a ChangeLog 24809
+MD5 0f90da5698fa8cb145a217f51c7e65c1 ck-sources-2.6.12_p5.ebuild 1581
+MD5 e9d59fbebe91965324ad9fc3d5d1cd89 ChangeLog 25138
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
-MD5 f43a24f403782cc93bfca447107c0022 ck-sources-2.6.12_p3-r1.ebuild 1641
-MD5 7626a3114d307c0453628dd62a8a87f8 files/digest-ck-sources-2.6.12_p3-r1 279
-MD5 c302bdbf2a41cf9ede7fd86ba69485f9 files/digest-ck-sources-2.6.12_p4 279
+MD5 3efb7d411e4d8c57e1a74ded35af486f files/digest-ck-sources-2.6.12_p5 279
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC6xLJnVkA0cTr1F4RAlM8AJ9CuoP5NrapOLrs1iUui8iQkfdO/wCeLlXN
-U13Y2+YaxvkyMhB/6U7nndo=
-=Fgvw
+iD8DBQFC9n+GnVkA0cTr1F4RAlDEAJ98rA+sQFNezMgFd3+pFDIGB55WkQCdHZub
+4sUcLd/l0uicrTolHI66JEs=
+=ZGnD
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild
deleted file mode 100644
index 50d9712c4938..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild
+++ /dev/null
@@ -1,56 +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.12_p4.ebuild,v 1.1 2005/07/30 02:27:37 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}-server.bz2"
-else
-	CK_PATCH="patch-${KV_CK}.bz2"
-fi
-
-UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
-#UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-#	1900_pci-driver-typo.patch
-#	2100_e1000-spinlock.patch
-#	2300_qla2xxx-initialization.patch
-#	10" #All of the 2.6.x.y patches (in ck or manual edit) start with 10
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-	1001
-	1002
-	1003"
-
-DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance 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 )"
-
-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.12_p3-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p5.ebuild
index 3eb8a692c99f..6d2fdf778d0e 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.12_p3-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.12_p5.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_p3-r1.ebuild,v 1.2 2005/07/25 11:50:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p5.ebuild,v 1.1 2005/08/07 21:39:05 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="11"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -28,16 +28,20 @@ else
 fi
 
 UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
-#UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-#	1900_pci-driver-typo.patch
-#	2100_e1000-spinlock.patch
-#	2300_qla2xxx-initialization.patch
-#	10" #All of the 2.6.x.y patches (in ck or manual edit) start with 10
+# Note: 2.6.x.y updates in genpatches begin with 10 but are included in -ck
 UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-	1001
-	1002"
-
-DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
+	10
+	1305
+	1310
+	1905
+	2100
+	2110
+	2115
+	2120
+	2125
+	2320"
+
+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 )
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p3-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p3-r1
deleted file mode 100644
index 76071216fa0a..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 f63017b130a37704894b14f8cf7695ad genpatches-2.6.12-10.base.tar.bz2 29871
-MD5 d38dcdb132d78237137fef197b898950 patch-2.6.12-ck3-server.bz2 44508
-MD5 453c44315e270f73cce210e85bcfbda1 patch-2.6.12-ck3.bz2 44665
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4
deleted file mode 100644
index c6353d3b8126..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 f63017b130a37704894b14f8cf7695ad genpatches-2.6.12-10.base.tar.bz2 29871
-MD5 49dd492ef86080655d03b4bf4a00dfa8 patch-2.6.12-ck4-server.bz2 49831
-MD5 acfab10749980226fe222c70679c238c patch-2.6.12-ck4.bz2 49981
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p5 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p5
new file mode 100644
index 000000000000..4d367295e600
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p5
@@ -0,0 +1,4 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 e691055686f00a6a8e7ca30e0a11a7f9 genpatches-2.6.12-11.base.tar.bz2 39237
+MD5 c73bda040a0f7cc2b6a50a7b9256483d patch-2.6.12-ck5-server.bz2 51573
+MD5 4906518a9bf0a2d2b6037b852b0aff53 patch-2.6.12-ck5.bz2 51305