Updated -ck patch to -ck7; this should solve bug #22796.

3 files changed, 12 insertions, 8 deletions

diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog
index a8f1eafdc27f..70bdc6ebef68 100644
--- a/sys-kernel/gaming-sources/ChangeLog
+++ b/sys-kernel/gaming-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gaming-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.14 2004/01/08 06:33:31 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.15 2004/01/21 15:53:00 plasmaroo Exp $
+
+  21 Jan 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild:
+  Changed the CK patch to -ck7; this should solve any problems for those
+  getting packet writing problems. Closes bug #22796.
 
 *gaming-sources-2.4.20-r7 (06 Jan 2004)
 
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7
index f579357cc013..bb133846e255 100644
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7
+++ b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7
@@ -1,3 +1,3 @@
 MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
 MD5 b8d7ca0e2c2df2642e919b03e266cdeb patches-2.4.20-gaming-r5.tar.bz2 381905
-MD5 711f2443fb471404077403bfe3253f9b ck4_2.4.20.patch.bz2 1429780
+MD5 0b0472793f452cd2e8c468eee44dca36 linux-2.4.20-ck7.patch.bz2 1308575
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild
index b410f792ffd1..fece64bccc70 100644
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild,v 1.1 2004/01/06 18:57:32 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild,v 1.2 2004/01/21 15:53:00 plasmaroo Exp $
 
 IUSE="build"
 
@@ -14,11 +14,11 @@ OKV="2.4.20"
 EXTRAVERSION="-gaming-r7"
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
-CKV=4_2.4.20
+CKV="2.4.20-ck7"
 
 DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/7/5}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${CKV}.patch.bz2"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/7/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
 
 KEYWORDS="-* ~x86"
 SLOT="${KV}"
@@ -26,14 +26,14 @@ SLOT="${KV}"
 src_unpack() {
 
 	unpack linux-${OKV}.tar.bz2 patches-${KV/7/5}.tar.bz2
-	bzcat ${DISTDIR}/ck${CKV}.patch.bz2 | patch -p0 || die "-patch failed"
+	bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed"
 
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/7/5} || die #enter the patch directory and go!
+	cd ${KV/7/5} || die
+	rm 98_nforce2_agp.patch # In -ck7
 	kernel_src_unpack
 
-	epatch ${FILESDIR}/gaming-sources-2.4.20-gcc33.patch
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"