version bump, plus fixes

3 files changed, 76 insertions, 2 deletions

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index fbec2723fba9..b61afde6fef3 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,10 +1,10 @@
 MD5 0b7f9a5318e694927391420694234ec6 ck-sources-2.4.20-r4.ebuild 985
 MD5 f6f1ae2b786965eb643f873aa6f30964 ck-sources-2.4.20-r6.ebuild 985
 MD5 0ab8ab0cb4615f4b22ef264c43223843 ck-sources-2.4.20-r1.ebuild 956
-MD5 7463ed2d4438829a94b35d810647a27b ck-sources-2.4.22-r2.ebuild 2449
+MD5 a903c19e29286fc313b8e6c30bad14b0 ck-sources-2.4.22-r2.ebuild 2445
 MD5 d31c5d619a510f188dd03aa513ec7a92 ck-sources-2.4.20-r3.ebuild 985
 MD5 16539b0295e3dd53f34ea8ad05121933 ck-sources-2.4.22-r1.ebuild 2114
-MD5 63e6167db62e85396e7ca586b999fe38 ChangeLog 1452
+MD5 6b3627e556e519904339a17b330aa711 ChangeLog 1580
 MD5 588c69b65a865a74a515f59708397f64 ck-sources-2.4.20-r2.ebuild 985
 MD5 b158b725603472e30e52f216600e5101 files/digest-ck-sources-2.4.20-r1 133
 MD5 fc91f35cb1ab07c4283c4f9876dafe27 files/digest-ck-sources-2.4.20-r2 133
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild
new file mode 100644
index 000000000000..0b0808d24f28
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild,v 1.1 2003/09/20 23:12:18 iggy Exp $
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  
+
+ETYPE="sources"
+
+inherit kernel
+
+# CKV=con kolivas release version
+CKV=ck${PR/r/}
+# KV=patched kernel version
+KV="${PV/_/-}-${CKV}"
+# OKV=original kernel version as provided by ebuild
+OKV="`echo ${KV} | cut -d- -f1`"
+# OKVLAST=(working) last digit of OKV
+OKVLAST="`echo ${OKV} | cut -d. -f3`"
+# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release)
+OKVLASTPR="`expr ${OKVLAST} - 1`"
+# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac
+PRERC="`echo ${PV}|grep \_`"
+
+# Other working variables
+S=${WORKDIR}/linux-${KV}
+EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
+BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
+
+# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently
+# ourkernel is the stable kernel we'll be working with (previous or current)
+if [ ${PRERC} ]; then
+	OURKERNEL="2.4.${OKVLASTPR}"
+	SRC_URI="mirror:/kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2
+		mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
+else
+	OURKERNEL="2.4.${OKVLAST}"
+##### Fix Me : grossness until these showstopper bugs are in a full -ck patch
+	SRC_URI="mirror:/kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2.4.22-ck2-fix.patch
+		http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736
+		http://ck.kolivas.org/patches/2.4/${BASE}/${KV}/patch-${KV}.bz2"
+		#http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2"
+fi
+
+DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+
+KEYWORDS="x86 -ppc"
+SLOT="${KV}"
+
+src_unpack() {
+	sleep 1
+	unpack linux-${OURKERNEL}.tar.bz2
+	mv linux-${OURKERNEL} linux-${KV} || die
+
+	cd linux-${KV}
+
+	# if we need a pre/rc patch, then use it
+	if [ ${PRERC} ]; then
+		bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
+	fi
+
+	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-aa patch failed"
+
+	kernel_universal_unpack
+}
+
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2
new file mode 100644
index 000000000000..0fc27b988908
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2
@@ -0,0 +1,4 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 ca3a289c94b170aa0f559f18dffc00a8 patch-2.4.22-ck2-fix.patch 2267
+MD5 76983144a5d010166f6b1f5d18ec258e patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 4355
+MD5 3d67f41ed121ebb2a4f71945ae9cfd55 patch-2.4.22-ck2.bz2 813552