Revision bump for new genpatches, add easy way to use resynced version of ck patch for given kernel. ck1-r1 for 2.6.34-r2 and 2.6.35-r2 is the same version as for base kernel with a small update so it applies cleanly on stable kernels (2.6.34.6 and 2.6.35.4).

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 59 insertions, 79 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 2c7efb436ceb..d6c38e6cef55 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.178 2010/08/19 13:28:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.179 2010/08/31 11:37:26 nelchael Exp $
+
+*ck-sources-2.6.35-r2 (31 Aug 2010)
+
+  31 Aug 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  -ck-sources-2.6.33.ebuild, -ck-sources-2.6.33-r1.ebuild,
+  -ck-sources-2.6.34.ebuild, ck-sources-2.6.34-r1.ebuild,
+  +ck-sources-2.6.34-r2.ebuild, -ck-sources-2.6.35.ebuild,
+  ck-sources-2.6.35-r1.ebuild, +ck-sources-2.6.35-r2.ebuild:
+  Revision bump for new genpatches, add easy way to use resynced version of
+  ck patch for given kernel. ck1-r1 for 2.6.34-r2 and 2.6.35-r2 is the same
+  version as for base kernel with a small update so it applies cleanly on
+  stable kernels (2.6.34.6 and 2.6.35.4).
 
 *ck-sources-2.6.35-r1 (19 Aug 2010)
 *ck-sources-2.6.35 (19 Aug 2010)
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.33-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.33-r1.ebuild
deleted file mode 100644
index ab6725f6438c..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.33-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 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.33-r1.ebuild,v 1.2 2010/05/26 18:26:33 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
-	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
-
-CK_VERSION="1"
-K_SECURITY_UNSUPPORTED="1"
-
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.33.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.33.ebuild
deleted file mode 100644
index 442d26311a22..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.33.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 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.33.ebuild,v 1.3 2010/05/26 18:26:33 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
-	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
-
-CK_VERSION="1"
-K_SECURITY_UNSUPPORTED="1"
-
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.34-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.34-r1.ebuild
index af015f6fbec5..5f7ff2cfbeb7 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.34-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.34-r1.ebuild,v 1.1 2010/06/23 19:17:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.34-r1.ebuild,v 1.2 2010/08/31 11:37:26 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -15,11 +15,19 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
 
 CK_VERSION="1"
+CK_REVISION=""
 K_SECURITY_UNSUPPORTED="1"
 
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+if [[ -z "${CK_REVISION}" ]]; then
+	CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
+else
+	# This is ck${CK_VERSION} but resynced to apply cleanly to stable kernel
+	# release:
+	CK_URI="mirror://gentoo/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+fi
 
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
 IUSE=""
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.34.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.34-r2.ebuild
index 4dfbdc2d329d..be6c86dee4d3 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.34.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.34-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.34.ebuild,v 1.1 2010/05/26 18:26:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.34-r2.ebuild,v 1.3 2010/08/31 11:37:26 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
+K_GENPATCHES_VER="9"
 
 inherit kernel-2
 detect_version
@@ -15,11 +15,19 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
 
 CK_VERSION="1"
+CK_REVISION="1"
 K_SECURITY_UNSUPPORTED="1"
 
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+if [[ -z "${CK_REVISION}" ]]; then
+	CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
+else
+	# This is ck${CK_VERSION} but resynced to apply cleanly to stable kernel
+	# release:
+	CK_URI="mirror://gentoo/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+fi
 
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
 IUSE=""
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.35-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.35-r1.ebuild
index a4580e94f3e6..fb080d1a3487 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.35-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.35-r1.ebuild,v 1.1 2010/08/19 13:28:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.35-r1.ebuild,v 1.2 2010/08/31 11:37:26 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -15,11 +15,19 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
 
 CK_VERSION="1"
+CK_REVISION=""
 K_SECURITY_UNSUPPORTED="1"
 
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+if [[ -z "${CK_REVISION}" ]]; then
+	CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
+else
+	# This is ck${CK_VERSION} but resynced to apply cleanly to stable kernel
+	# release:
+	CK_URI="mirror://gentoo/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+fi
 
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
 IUSE=""
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.35.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.35-r2.ebuild
index c25b6fc7309d..f82fc33a2b9d 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.35.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.35-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.35.ebuild,v 1.1 2010/08/19 13:28:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.35-r2.ebuild,v 1.1 2010/08/31 11:37:26 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="6"
 
 inherit kernel-2
 detect_version
@@ -15,11 +15,19 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/"
 
 CK_VERSION="1"
+CK_REVISION="1"
 K_SECURITY_UNSUPPORTED="1"
 
-CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+if [[ -z "${CK_REVISION}" ]]; then
+	CK_URI="mirror://kernel/linux/kernel/people/ck/patches/2.6/${PV}/${PV}-ck${CK_VERSION}/patch-${PV}-ck${CK_VERSION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
+else
+	# This is ck${CK_VERSION} but resynced to apply cleanly to stable kernel
+	# release:
+	CK_URI="mirror://gentoo/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+	UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}-r${CK_REVISION}.bz2"
+fi
 
-UNIPATCH_LIST="${DISTDIR}/patch-${PV}-ck${CK_VERSION}.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
 IUSE=""