Version bump thanks to Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>. Remove old. Bug #469686

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 112 insertions, 22 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index cd149132789f..89e2531bfb67 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.219 2013/05/06 10:33:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.220 2013/05/15 18:58:00 hwoarang Exp $
+
+*ck-sources-3.9.2 (15 May 2013)
+*ck-sources-3.8.13 (15 May 2013)
+
+  15 May 2013; Markos Chandras <hwoarang@gentoo.org> +ck-sources-3.8.13.ebuild,
+  +ck-sources-3.9.2.ebuild, -ck-sources-3.8.3.ebuild:
+  Version bump thanks to Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>. Remove
+  old. Bug #469686
 
 *ck-sources-3.8.11 (06 May 2013)
 *ck-sources-3.4.43 (06 May 2013)
diff --git a/sys-kernel/ck-sources/ck-sources-3.8.3.ebuild b/sys-kernel/ck-sources/ck-sources-3.8.13.ebuild
index 13eeb9ab2d22..1f1d89870fba 100644
--- a/sys-kernel/ck-sources/ck-sources-3.8.3.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.8.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.3.ebuild,v 1.1 2013/03/18 20:43:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.8.13.ebuild,v 1.1 2013/05/15 18:58:00 hwoarang Exp $
 
 EAPI="5"
 ETYPE="sources"
@@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
 	http://users.on.net/~ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="6"
+K_GENPATCHES_VER="16"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -21,7 +21,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches."
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
@@ -35,15 +35,11 @@ BFS_VERSION="428"
 
 CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
 BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
-XPR_2_FILE="urw-locks.patch"
 
 CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
 CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
 CK_URI="${CK_LVER_URL}/${CK_FILE}"
 BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
-XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_FILE}"
 
 #-- Build extra incremental patches list --------------------------------------
 
@@ -58,7 +54,7 @@ if [ -n "${XTRA_INCP_MIN}" ]; then
 	done
 fi
 
-#-- CK needs sometimes to patch itself... (4.7)--------------------------------
+#-- CK needs sometimes to patch itself... (3.7)--------------------------------
 
 CK_INCP_URI=""
 CK_INCP_LIST=""
@@ -74,11 +70,6 @@ SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_UR
 	!bfsonly? ( ${CK_URI} )
 	bfsonly? ( ${BFS_URI} )"
 
-#-- The urw-locks experimental patch is not available for 3.8 yet -------------
-
-#	experimental? (
-#		urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
-
 UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
 
 if ! use bfsonly ; then
@@ -89,14 +80,6 @@ fi
 
 UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
-#-- The urw-locks experimental patch is not available for 3.8 yet -------------
-
-#if use experimental ; then
-#	if use urwlocks ; then
-#		UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
-#	fi
-#fi
-
 UNIPATCH_STRICTORDER="yes"
 
 src_prepare() {
diff --git a/sys-kernel/ck-sources/ck-sources-3.9.2.ebuild b/sys-kernel/ck-sources/ck-sources-3.9.2.ebuild
new file mode 100644
index 000000000000..d5f17dc7b28a
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.9.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 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.9.2.ebuild,v 1.1 2013/05/15 18:58:00 hwoarang Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="5"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="430"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7)--------------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}