Newer ebuilds are cleaned up to look similar between each other, contain newer cobalt patches, and some other reorganization. Older ebuilds w/ cobalt patches have been deleted.

12 files changed, 154 insertions, 111 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 3c08b9c0422f..a6886df77328 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.23 2004/02/01 10:32:30 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.24 2004/02/10 06:44:36 kumba Exp $
+
+*mips-sources-2.4.23-r5 (10 Feb 2004)
+
+  10 Feb 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r5.ebuild,
+  mips-sources-2.4.21-r6.ebuild, mips-sources-2.4.22-r8.ebuild,
+  mips-sources-2.4.22-r9.ebuild, mips-sources-2.4.23-r4.ebuild,
+  mips-sources-2.4.23-r5.ebuild, files/mipscvs-2.4.22-makefile-fix.patch,
+  files/mipscvs-2.4.22-makefile-mips64-tweak.patch,
+  files/mipscvs-2.4.22-sgiwd-fix.patch,
+  files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch:
+  Newer ebuilds are cleaned up to look similar between each other, contain newer
+  cobalt patches, and some other reorganization.  Older ebuilds w/ cobalt patches
+  have been deleted.
 
 *mips-sources-2.4.22-r8 (01 Feb 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index bbe97bfcdec6..213c6e9f01b0 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,23 +1,22 @@
-MD5 1e1084865dc197bf977710ba9abe5e34 ChangeLog 6651
+MD5 ff06070ccea0fe0c356e139a4f03d835 ChangeLog 7303
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
+MD5 23b912302aea43054894e182cec02a87 mips-sources-2.4.21-r4.ebuild 1557
+MD5 6b4c962015d60235a2dfe99db5a8ef5e mips-sources-2.4.21-r6.ebuild 2208
 MD5 5a31123b52f6c5449127eaed8033786e mips-sources-2.4.22-r7.ebuild 1793
+MD5 f91954bdd0e623993836ad7f197f1073 mips-sources-2.4.22-r9.ebuild 2054
 MD5 f6dbc2ee8201ee63b6fbeb8eb3394374 mips-sources-2.4.23-r3.ebuild 2210
-MD5 d51220ebeece8c9eee31bc2c70770616 mips-sources-2.4.22-r8.ebuild 1980
-MD5 23b912302aea43054894e182cec02a87 mips-sources-2.4.21-r4.ebuild 1557
-MD5 03237e00419d7cde6ea79d935dfd0ad9 mips-sources-2.4.21-r5.ebuild 1744
-MD5 8c263696bb57137c91cb1bc92bcd39e2 mips-sources-2.4.23-r4.ebuild 2396
+MD5 de7fe7384f1ae64a06568116ec558c68 mips-sources-2.4.23-r5.ebuild 2780
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 4f20f6878d4223d3f443ee92b01e1061 files/digest-mips-sources-2.4.22-r8 213
-MD5 96b7bafa413779c26bcde0d06e93e9c6 files/digest-mips-sources-2.4.23-r4 421
-MD5 0ebda2bfc3ea952048f2c1e0ca2d8a45 files/digest-mips-sources-2.4.21-r5 214
+MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r4 145
+MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r6 219
+MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r7 144
+MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r9 218
+MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r3 352
+MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r5 426
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-makefile-fix.patch 1344
-MD5 5b060a7bbac28c36788a02e99721db97 files/mipscvs-2.4.22-makefile-mips64-tweak.patch 529
-MD5 e40e67b089d55da6d5aeb91ae63a81cb files/mipscvs-2.4.22-sgiwd-fix.patch 1256
+MD5 1d8857f9bf884fc661beb87cc9d043d1 files/mipscvs-2.4.22-makefile-fix.patch 1873
+MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch 1314
 MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
-MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
 MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/mremap-fix-try2.patch 414
-MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r4 145
-MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r7 144
-MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r3 352
+MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r6
index 78cf8a619821..3f39217453fa 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r6
@@ -1,3 +1,3 @@
 MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
 MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
-MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
+MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r9
index 659ceba724aa..3183414cbd71 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r9
@@ -1,3 +1,3 @@
 MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
 MD5 d82efc4684e5b4f1b64092d9adaac7e8 mipscvs-2.4.22-20031015.diff.bz2 239716
-MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
+MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r5
index c65a4cee19a1..57d39098851a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r5
@@ -1,6 +1,6 @@
 MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
 MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
-MD5 e8590fd851dc563e2e5d57478198c99b cobalt-patches-2.4.tar.bz2 5899
+MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
 MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
 MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
 MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch
index a3f009e0dc86..bf3acafad4df 100644
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch
@@ -41,3 +41,14 @@
  endif
  ifdef CONFIG_CPU_NEVADA
  GCCFLAGS	+= -mcpu=r8000 -mips3 -mmad
+--- arch/mips64/Makefile.orig	2003-10-15 05:37:01.000000000 -0400
++++ arch/mips64/Makefile	2003-10-15 05:37:44.000000000 -0400
+@@ -288,7 +288,7 @@ endif
+ # convert to ECOFF using elf2ecoff.
+ #
+ ifdef CONFIG_BOOT_ELF32
+-GCCFLAGS += -Wa,-32 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
++GCCFLAGS += -Wa,-mabi=o64 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
+ LINKFLAGS += -T arch/mips64/ld.script.elf32
+ endif
+ #
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-mips64-tweak.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-mips64-tweak.patch
deleted file mode 100644
index 08a8e791a672..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-mips64-tweak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- arch/mips64/Makefile.orig	2003-10-15 05:37:01.000000000 -0400
-+++ arch/mips64/Makefile	2003-10-15 05:37:44.000000000 -0400
-@@ -288,7 +288,7 @@ endif
- # convert to ECOFF using elf2ecoff.
- #
- ifdef CONFIG_BOOT_ELF32
--GCCFLAGS += -Wa,-32 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
-+GCCFLAGS += -Wa,-mabi=o64 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- endif
- #
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.22-sgiwd-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.22-sgiwd-fix.patch
deleted file mode 100644
index 37b13c8f9d8b..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.22-sgiwd-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: drivers/scsi/sgiwd93.c
-===================================================================
-RCS file: /home/cvs/linux/drivers/scsi/sgiwd93.c,v
-retrieving revision 1.28.2.8
-diff -u -r1.28.2.8 sgiwd93.c
---- drivers/scsi/sgiwd93.c	14 Aug 2003 15:32:13 -0000	1.28.2.8
-+++ drivers/scsi/sgiwd93.c	20 Aug 2003 16:08:59 -0000
-@@ -92,7 +92,7 @@
- 	unsigned long physaddr;
- 	unsigned long count;
- 	
--	physaddr = virt_to_bus(addr);
-+	physaddr = PHYSADDR(addr);
- 	while (len) {
- 		/*
- 		 * even cntinfo could be up to 16383, without
-@@ -141,7 +141,7 @@
- 	DPRINTK(" HPCGO\n");
- 
- 	/* Start up the HPC. */
--	hregs->ndptr = virt_to_bus(hdata->dma_bounce_buffer);
-+	hregs->ndptr = PHYSADDR(hdata->dma_bounce_buffer);
- 	if (datainp) {
- 		dma_cache_inv((unsigned long) cmd->SCp.ptr,
- 		              cmd->SCp.this_residual);
-@@ -197,13 +197,13 @@
- 	start = (unsigned long) buf;
- 	end = start + PAGE_SIZE;
- 	while (start < end) {
--		hcp->desc.pnext = virt_to_bus(hcp + 1);
-+		hcp->desc.pnext = PHYSADDR(hcp + 1);
- 		hcp->desc.cntinfo = HPCDMA_EOX;
- 		hcp++;
- 		start += sizeof(struct hpc_chunk);
- 	};
- 	hcp--;
--	hcp->desc.pnext = virt_to_bus(buf);
-+	hcp->desc.pnext = PHYSADDR(buf);
- 
- 	/* Force flush to memory */
- 	dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE);
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch
new file mode 100644
index 000000000000..1519f803b994
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch
@@ -0,0 +1,35 @@
+--- arch/mips/Makefile.orig	2004-02-09 23:36:46.057901728 -0500
++++ arch/mips/Makefile	2004-02-09 23:38:33.666542728 -0500
+@@ -682,5 +682,6 @@ archmrproper:
+ archdep:
+ 	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
+ 		touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
++		$(MAKE) -C arch/mips/tools clean; \
+ 	fi;
+ 	@$(MAKEBOOT) dep
+--- arch/mips64/Makefile.orig	2004-02-09 23:36:51.882016328 -0500
++++ arch/mips64/Makefile	2004-02-09 23:38:02.482283456 -0500
+@@ -24,6 +24,8 @@ ifdef CONFIG_CROSSCOMPILE
+ CROSS_COMPILE	= $(tool-prefix)
+ endif
+ 
++check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
++
+ #
+ # The ELF GCC uses -G 0 -mabicalls -fpic as default.  We don't need PIC
+ # code in the kernel since it only slows down the whole thing.  For the
+@@ -47,7 +49,6 @@ GCCFLAGS	+= -mno-sched-prolog -fno-omit-
+ endif
+ endif
+ 
+-check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
+ 
+ #
+ # CPU-dependent compiler/assembler options for optimization.
+@@ -367,5 +368,6 @@ archmrproper:
+ archdep:
+ 	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
+ 		touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
++		$(MAKE) -C arch/mips/tools clean; \
+ 	fi;
+ 	@$(MAKEBOOT) dep
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild
index 28cace043f48..c3e7be8f096b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild
@@ -1,34 +1,47 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r5.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
 
-ETYPE="sources"
-inherit kernel
 
+# Version Data
 OKV=${PV/_/-}
-CVSDATE=20030803
-S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=-mipscvs-${CVSDATE}
+CVSDATE="20030803"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.0"
+
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
 
-# What's in this kernel?
 
 # INCLUDED:
 # 1) linux sources from kernel.org
 # 2) linux-mips.org CVS snapshot diff from 03 Aug 2003
-# 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) Fix for headers on big-endian machines
+# 5) do_brk fix
+# 6) mremap fix
+# 7) RTC fixes
+# 8) Patches for Cobalt support
+
 
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines"
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-2.4.tar.bz2"
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* ~mips"
 
+
 src_unpack() {
 	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
@@ -51,9 +64,12 @@ src_unpack() {
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
 			epatch ${x}
 		done
+		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
 	fi
 
 	kernel_universal_unpack
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild
index 2a810c074f1f..3cf6c1bace19 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild
@@ -1,36 +1,43 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r8.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
 
-ETYPE="sources"
-inherit kernel
 
+# Version Data
 OKV=${PV/_/-}
-CVSDATE=20031015
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-EXTRAVERSION=-mipscvs-${CVSDATE}
+CVSDATE="20031015"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.0"
 
-inherit eutils
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
 
-# What's in this kernel?
 
 # INCLUDED:
 # 1) linux sources from kernel.org
 # 2) linux-mips.org CVS snapshot diff from 15 Oct 2003
 # 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to tweak arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
+# 4) do_brk fix
+# 5) mremap fix
+# 6) RTC fixes
+# 7) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-2.4.tar.bz2"
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* ~mips"
 
+
 src_unpack() {
 	unpack ${A}
 	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -42,9 +49,6 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
-	# Patch arch/mips64/Makefile to pass -Wa,mabi=o64 (Allows building of mips64 kernels)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-mips64-tweak.patch
-
 	# do_brk fix (Fixes exploit that hit several debian servers)
 	epatch ${FILESDIR}/do_brk_fix.patch
 
@@ -56,9 +60,12 @@ src_unpack() {
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
 			epatch ${x}
 		done
+		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
 	fi
 
 	kernel_universal_unpack
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild
index 5d1256b53f95..37b0a4c16ac9 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild
@@ -1,31 +1,38 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r4.ebuild,v 1.1 2004/02/01 10:32:30 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
 
-ETYPE="sources"
-inherit kernel
 
+# Version Data
 OKV=${PV/_/-}
-CVSDATE=20031128
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-EXTRAVERSION=-mipscvs-${CVSDATE}
+CVSDATE="20031128"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
+COBALTPATCHVER="1.0"
+
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
 
-inherit eutils
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
 
-# What's in this kernel?
 
 # INCLUDED:
 # 1) linux sources from kernel.org
 # 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS and 
-#	tweaks arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
 # 4) XFS Patches for basic XFS support (with ACL, but no DMAPI)
+# 5) do_brk fix
+# 6) mremap fix
+# 7) RTC fixes
+# 8) Patches for Cobalt support
+
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-2.4.tar.bz2
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2
 		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-only.bz2
 		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-kernel.bz2
 		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-acl.bz2"
@@ -34,6 +41,7 @@ SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* ~mips"
 
+
 src_unpack() {
 	unpack ${A}
 	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -45,6 +53,9 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
+	# Patch to fix mips64 Makefile so that -finline-limit=10000 gets added to CFLAGS
+	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-inlinelimit-fix.patch
+
 	# mremap fix (Possibly Exploitable)
 	epatch ${FILESDIR}/mremap-fix-try2.patch
 
@@ -55,16 +66,19 @@ src_unpack() {
 	# We don't use epatch here because something funny is messed up in the XFS patches,
 	# thus while they apply, they don't apply properly
 	ebegin "Applying XFS Patchset"
-	cat ${WORKDIR}/xfs-${PV}-split-only | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${PV}-split-kernel | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${PV}-split-acl | patch -p1 2>&1 >/dev/null
+		cat ${WORKDIR}/xfs-${PV}-split-only | patch -p1 2>&1 >/dev/null
+		cat ${WORKDIR}/xfs-${PV}-split-kernel | patch -p1 2>&1 >/dev/null
+		cat ${WORKDIR}/xfs-${PV}-split-acl | patch -p1 2>&1 >/dev/null
 	eend
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		for x in ${WORKDIR}/cobalt-patches-2.4/*.patch; do
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
 			epatch ${x}
 		done
+		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
 	fi
 
 	kernel_universal_unpack