Bump to 3.4.9. Remove old ebuilds. Bug #434106

(Portage version: 2.1.11.18/cvs/Linux x86_64)

6 files changed, 32 insertions, 124 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 095bc9498069..36284d9daebd 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.206 2012/09/22 17:26:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.207 2012/09/22 17:31:25 hwoarang Exp $
+
+*ck-sources-3.4.9 (22 Sep 2012)
+
+  22 Sep 2012; Markos Chandras <hwoarang@gentoo.org> +ck-sources-3.4.9.ebuild,
+  +files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch,
+  -ck-sources-3.2.1.ebuild, -ck-sources-3.2.5.ebuild, -ck-sources-3.3.1.ebuild,
+  -ck-sources-3.3.4.ebuild:
+  Bump to 3.4.9. Remove old ebuilds. Bug #434106
 
 *ck-sources-3.5.3 (22 Sep 2012)
 
diff --git a/sys-kernel/ck-sources/ck-sources-3.2.5.ebuild b/sys-kernel/ck-sources/ck-sources-3.2.5.ebuild
deleted file mode 100644
index 71fe40f1f829..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.2.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.2.5.ebuild,v 1.1 2012/02/11 19:00:45 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-BASE_VERSION="$(get_version_component_range 1-2)"
-CK_VERSION="1"
-
-CK_URI="http://ck.kolivas.org/patches/3.0/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-UNIPATCH_LIST="${DISTDIR}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	# Comment out EXTRAVERSION added by CK patch:
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-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-3.3.1.ebuild b/sys-kernel/ck-sources/ck-sources-3.3.1.ebuild
deleted file mode 100644
index 3bd2f2ff8993..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.3.1.ebuild,v 1.1 2012/04/30 09:01:40 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-BASE_VERSION="$(get_version_component_range 1-2)"
-CK_VERSION="1"
-
-CK_URI="http://ck.kolivas.org/patches/3.0/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-UNIPATCH_LIST="${DISTDIR}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	# Comment out EXTRAVERSION added by CK patch:
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-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-3.3.4.ebuild b/sys-kernel/ck-sources/ck-sources-3.3.4.ebuild
deleted file mode 100644
index 11bac1ca559d..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.3.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.3.4.ebuild,v 1.1 2012/04/30 09:01:40 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-BASE_VERSION="$(get_version_component_range 1-2)"
-CK_VERSION="1"
-
-CK_URI="http://ck.kolivas.org/patches/3.0/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-UNIPATCH_LIST="${DISTDIR}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	# Comment out EXTRAVERSION added by CK patch:
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-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-3.2.1.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.9.ebuild
index ab3cfc080029..ff0f08568a76 100644
--- a/sys-kernel/ck-sources/ck-sources-3.2.1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.4.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.2.1.ebuild,v 1.1 2012/01/30 20:26:58 nelchael Exp $
+# $Header:
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
+K_GENPATCHES_VER="10"
 K_SECURITY_UNSUPPORTED="1"
 
 inherit kernel-2 versionator
@@ -16,7 +16,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://users.on.net/~ckolivas/kernel/"
 
 BASE_VERSION="$(get_version_component_range 1-2)"
-CK_VERSION="1"
+CK_VERSION="3"
 
 CK_URI="http://ck.kolivas.org/patches/3.0/${BASE_VERSION}/${BASE_VERSION}-ck${CK_VERSION}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
 UNIPATCH_LIST="${DISTDIR}/patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
@@ -31,6 +31,7 @@ src_unpack() {
 
 	# Comment out EXTRAVERSION added by CK patch:
 	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+	epatch "${FILESDIR}"/${P}-calc_load_idle-aCOSwt_P3.patch
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch b/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch
new file mode 100644
index 000000000000..f3de9292dfdc
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch
@@ -0,0 +1,19 @@
+--- kernel/sched/bfs.c.000	2012-09-06 09:05:05.000000000 +0200
++++ kernel/sched/bfs.c	2012-09-06 09:06:07.000000000 +0200
+@@ -2591,6 +2591,16 @@
+ {
+ }
+ 
++#ifdef CONFIG_NO_HZ
++void calc_load_enter_idle(void)
++{
++}
++
++void calc_load_exit_idle(void)
++{
++}
++#endif /* CONFIG_NO_HZ */
++
+ /*
+  * Account guest cpu time to a process.
+  * @p: the process that the cpu time gets accounted to