Yet another overhaul. Removed all files except digests from FILESDIR and put them into a generic patches tarball pulled off the mirrors by the ebuilds. Also a brand-spankin' new ebuild for 2.6.8.1 that includes a bunch of patches and backports from linux-mips CVS (which will be in 2.6.9). Fixes for 2.6.8 include ip22zilog finally getting fixed, IP22 64-bit support available, statfs fixes useful for n32 userland, and patches to allow building of mips kernels w/ gcc-3.4.x (not for 2.4 kernels, that is forth-coming).

31 files changed, 297 insertions, 510 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 9df49a082d89..1c9ee0bba63b 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.54 2004/08/15 03:59:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.55 2004/09/29 09:46:15 kumba Exp $
+
+*mips-sources-2.4.26-r9 (29 Sep 2004)
+
+  29 Sep 2004; Joshua Kinard <kumba@gentoo.org>
+  -files/mipscvs-2.4.25-makefile-fix.patch,
+  -files/mipscvs-2.4.25-makefile-inlinelimit.patch,
+  -files/mipscvs-2.4.25-no-page-align.patch,
+  -files/mipscvs-2.4.26-makefile-fix.patch,
+  -files/mipscvs-2.4.27-makefile-fix.patch,
+  -files/mipscvs-2.6.5-swapbug-fix.patch,
+  -files/mipscvs-2.6.5-unistd-linkage.patch,
+  -files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch,
+  -files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch,
+  -files/mipscvs-2.6.x-no-page-align.patch,
+  -files/misc-2.6-compat_alloc_user_space.patch,
+  -files/misc-2.6-force_mouse_detection.patch,
+  -files/misc-2.6-iptables_headers.patch, -mips-sources-2.4.25-r8.ebuild,
+  +mips-sources-2.4.25-r9.ebuild, -mips-sources-2.4.26-r8.ebuild,
+  +mips-sources-2.4.26-r9.ebuild, +mips-sources-2.4.27-r1.ebuild,
+  -mips-sources-2.4.27.ebuild, -mips-sources-2.6.4-r8.ebuild,
+  +mips-sources-2.6.4-r9.ebuild, -mips-sources-2.6.6-r8.ebuild,
+  +mips-sources-2.6.6-r9.ebuild, -mips-sources-2.6.7-r6.ebuild,
+  +mips-sources-2.6.7-r7.ebuild, +mips-sources-2.6.8.1-r1.ebuild,
+  -mips-sources-2.6.8.1.ebuild:
+  Yet another overhaul. Removed all files except digests from FILESDIR and put
+  them into a generic patches tarball pulled off the mirrors by the ebuilds.
+  Also a brand-spankin' new ebuild for 2.6.8.1 that includes a bunch of patches
+  and backports from linux-mips CVS (which will be in 2.6.9). Fixes for 2.6.8
+  include ip22zilog finally getting fixed, IP22 64-bit support available, statfs
+  fixes useful for n32 userland, and patches to allow building of mips kernels
+  w/ gcc-3.4.x (not for 2.4 kernels, that is forth-coming).
 
 *mips-sources-2.6.8.1 (14 Aug 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index ca5395351d48..51b375efdced 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,29 +1,16 @@
-MD5 65cd0014e175bffc900f2365b9b0f69f ChangeLog 21724
+MD5 aa5abc0a3a47813c73cec575e68312f2 ChangeLog 23400
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 f389b6822fd8ee0618f3d178ea44c35c mips-sources-2.4.25-r8.ebuild 3258
-MD5 9a0ae8a9b5189133dd19b514545aad5b mips-sources-2.4.26-r8.ebuild 2568
-MD5 5816acb59a4df29ed0c7f56c0b1ed02e mips-sources-2.6.4-r8.ebuild 4081
-MD5 f0fad78236907bff7729ad2542e0b486 mips-sources-2.6.6-r8.ebuild 3715
-MD5 ca516f0e0cdf23676d758cab0fb145ff mips-sources-2.6.8.1.ebuild 3300
-MD5 569e9ab6bbefe38348145acf7c66b772 mips-sources-2.4.27.ebuild 2247
-MD5 4158a026f7c907eff52e073525211bc5 mips-sources-2.6.7-r6.ebuild 3851
-MD5 005c705111f504798dfba298ad86e544 files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch 645
-MD5 1a9b6f9118a7f6bf33b80a3b0341c160 files/misc-2.6-force_mouse_detection.patch 490
-MD5 784f11bea2f673b5f773f27b6a104aec files/digest-mips-sources-2.4.25-r8 302
-MD5 6c8cf0e72c9be329657b1a344636005d files/digest-mips-sources-2.4.26-r8 303
-MD5 10c17a7e31acda8bc6433570050b74a2 files/digest-mips-sources-2.6.4-r8 384
-MD5 5e58c3a100fcb48b74d9dac476cc818c files/digest-mips-sources-2.6.6-r8 384
-MD5 09a849bbe9c516658420632e9ddcbfc8 files/digest-mips-sources-2.6.7-r6 384
-MD5 2fc5d0e8a97a8d2e7c9e20552a795d96 files/misc-2.6-compat_alloc_user_space.patch 755
-MD5 d205ef18aaa52cfea67cd116df7e763c files/digest-mips-sources-2.4.27 303
-MD5 fa6b0c9324110b868df7cad2d83300ba files/digest-mips-sources-2.6.8.1 388
-MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.27-makefile-fix.patch 428
-MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
-MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
-MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
-MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
-MD5 008eff91c704bd23097666a1cd94ada3 files/mipscvs-2.6.5-swapbug-fix.patch 1329
-MD5 db1aaa77e691906f3857e54e363c4ff4 files/mipscvs-2.6.5-unistd-linkage.patch 515
-MD5 2802496e6b2dcc4e5ff19fac6826c7f7 files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch 339
-MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
-MD5 fd5b99bc2a9e4c7f9825c9aab6a76b52 files/misc-2.6-iptables_headers.patch 1786
+MD5 893517a6e0ac0aacc24a86edd1b1a30a mips-sources-2.4.25-r9.ebuild 3541
+MD5 934e335d3e0c5b3db9d0eedb85939a08 mips-sources-2.4.26-r9.ebuild 2826
+MD5 2bc3fe743615151aee229914be53ee7a mips-sources-2.4.27-r1.ebuild 2508
+MD5 71f1e5f2f6af33e5864642f03005e865 mips-sources-2.6.4-r9.ebuild 4193
+MD5 a7cea5c94f6572ad21d374d6cc1bc1f7 mips-sources-2.6.6-r9.ebuild 3827
+MD5 9fc3ac7b1ea25e3080ea3dc04e3bc28e mips-sources-2.6.7-r7.ebuild 4006
+MD5 0dd4c5d1e1e58c26c073d8ecbdbf14f2 mips-sources-2.6.8.1-r1.ebuild 4864
+MD5 78fa861fb27977a77c40bb56fe1a9ae4 files/digest-mips-sources-2.4.25-r9 386
+MD5 59a7ea73fd0d417be02d033a892f80a7 files/digest-mips-sources-2.4.26-r9 387
+MD5 189b09f9cd21ff2c298279c2a91be8f4 files/digest-mips-sources-2.4.27-r1 387
+MD5 9702a71d858fa96d68bf98b60777b6ff files/digest-mips-sources-2.6.4-r9 468
+MD5 504a5c390970d4da0c25c1eefa6a3958 files/digest-mips-sources-2.6.6-r9 468
+MD5 ec15aeb9b5f17b470c6080185ccf7dba files/digest-mips-sources-2.6.7-r7 468
+MD5 666046b65f46134e19982a15ea560454 files/digest-mips-sources-2.6.8.1-r1 389
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r9
index 41e588b9aad9..d45c7c8fb23d 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r9
@@ -1,4 +1,5 @@
 MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
 MD5 10b3bc2866a95e483f19093c980d9786 mipscvs-2.4.25-20040222.diff.bz2 89680
-MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r9
index 4185db52fb1b..249e42d54f5f 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r9
@@ -1,4 +1,5 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
-MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r1
index 0225f4264296..033dae1e7eb0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r1
@@ -1,4 +1,5 @@
 MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
 MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
-MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r9
index 8e146ed5ba6a..9a0007b7fdac 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r9
@@ -1,5 +1,6 @@
 MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
 MD5 99f597693cc1ea2f3fe162600405f32f mipscvs-2.6.4-20040311.diff.bz2 437306
-MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r9
index 7944aab46fdc..fcaedf5d445d 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r9
@@ -1,5 +1,6 @@
 MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
 MD5 28229f4685c0109735f7eceb3ea78f31 mipscvs-2.6.6-20040604.diff.bz2 418820
-MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r7
index aa7c4a78f9da..d7a89ed42fc8 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r7
@@ -1,5 +1,6 @@
 MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
-MD5 c66fffb69cbe68549df23066e95684d6 cobalt-patches-26xx-1.5.tar.bz2 7842
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
 MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 c66fffb69cbe68549df23066e95684d6 cobalt-patches-26xx-1.5.tar.bz2 7842
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1
deleted file mode 100644
index e85347e64ffc..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
-MD5 32ede06aa1be24008f703b5bb8016081 mipscvs-2.6.8.1-20040814.diff.bz2 277900
-MD5 95707c06f0f20e2d0775e2e687e98d07 cobalt-patches-26xx-1.6.tar.bz2 7485
-MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r1
new file mode 100644
index 000000000000..e928bf51ee76
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r1
@@ -0,0 +1,5 @@
+MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
+MD5 9a61fd7455debc01d0c450bb1af10fc7 mipscvs-2.6.8.1-20040822.diff.bz2 486866
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
+MD5 65881d9d5fd8a16a1efcf54944fa8c27 cobalt-patches-26xx-1.7.tar.bz2 7441
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-fix.patch
deleted file mode 100644
index 462c575b57ac..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- arch/mips64/Makefile.orig	2004-02-22 16:38:07.553362088 -0500
-+++ arch/mips64/Makefile	2004-02-22 16:41:35.328775424 -0500
-@@ -342,7 +342,7 @@ endif
- # ELF files from 32-bit files by conversion.
- #
- ifdef CONFIG_BOOT_ELF64
--GCCFLAGS += -Wa,-32 $(call check_gas,-Wa$(comma)-mgp64,)
-+GCCFLAGS += -Wa,-mabi=o64 $(call check_gas,-Wa$(comma)-mgp64,)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- #AS += -64
- #LD += -m elf64bmip
-
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-inlinelimit.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-inlinelimit.patch
deleted file mode 100644
index 527852b03e1c..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.25-makefile-inlinelimit.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- arch/mips/Makefile.orig	2004-02-22 16:37:51.641781016 -0500
-+++ arch/mips/Makefile	2004-02-22 16:38:27.264365560 -0500
-@@ -746,5 +746,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-22 16:38:07.553362088 -0500
-+++ arch/mips64/Makefile	2004-02-22 16:41:35.328775424 -0500
-@@ -26,6 +26,9 @@ 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)
-+check_gas = $(shell if $(CC) $(1) -Wa,-Z -c -o /dev/null -xassembler /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
-@@ -49,9 +52,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)
--check_gas = $(shell if $(CC) $(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
--
- #
- # Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>)
- #
-@@ -402,5 +402,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/files/mipscvs-2.4.25-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.25-no-page-align.patch
deleted file mode 100644
index d7f7710be7d3..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.25-no-page-align.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-===================================================================
-RCS file: /home/cvs/linux/arch/mips/Makefile,v
-retrieving revision 1.78.2.52
-retrieving revision 1.78.2.54
-diff -u -p -r1.78.2.52 -r1.78.2.54
---- linux/arch/mips/Makefile	2004/03/10 19:22:11	1.78.2.52
-+++ linux/arch/mips/Makefile	2004/03/24 17:07:34	1.78.2.54
-@@ -46,7 +46,7 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
- GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
- GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
- GCCFLAGS	+= $(call check_gcc, -finline-limit=100000,)
--LINKFLAGS	+= -G 0 -static # -N
-+LINKFLAGS	+= -G 0 -static -n
- MODFLAGS	+= -mlong-calls
- 
- ifdef CONFIG_DEBUG_INFO
-@@ -100,6 +100,11 @@ while :; do \
- 	gas_abi=; gas_opt=; gas_cpu=; gas_isa=; \
- 	break; \
- done; \
-+if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
-+	$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
-+		-xc /dev/null > /dev/null 2>&1 && \
-+		gcc_isa=; \
-+fi; \
- echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_isa)
- 
- #
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch
deleted file mode 100644
index 462c575b57ac..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.26-makefile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- arch/mips64/Makefile.orig	2004-02-22 16:38:07.553362088 -0500
-+++ arch/mips64/Makefile	2004-02-22 16:41:35.328775424 -0500
-@@ -342,7 +342,7 @@ endif
- # ELF files from 32-bit files by conversion.
- #
- ifdef CONFIG_BOOT_ELF64
--GCCFLAGS += -Wa,-32 $(call check_gas,-Wa$(comma)-mgp64,)
-+GCCFLAGS += -Wa,-mabi=o64 $(call check_gas,-Wa$(comma)-mgp64,)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- #AS += -64
- #LD += -m elf64bmip
-
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.27-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.27-makefile-fix.patch
deleted file mode 100644
index 462c575b57ac..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.27-makefile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- arch/mips64/Makefile.orig	2004-02-22 16:38:07.553362088 -0500
-+++ arch/mips64/Makefile	2004-02-22 16:41:35.328775424 -0500
-@@ -342,7 +342,7 @@ endif
- # ELF files from 32-bit files by conversion.
- #
- ifdef CONFIG_BOOT_ELF64
--GCCFLAGS += -Wa,-32 $(call check_gas,-Wa$(comma)-mgp64,)
-+GCCFLAGS += -Wa,-mabi=o64 $(call check_gas,-Wa$(comma)-mgp64,)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- #AS += -64
- #LD += -m elf64bmip
-
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
deleted file mode 100644
index 9a0452e41446..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN include/asm-mips/pgtable-32.h include/asm-mips/pgtable-32.h
---- include/asm-mips/pgtable-32.h	2004-03-11 16:46:57.000000000 +0000
-+++ include/asm-mips/pgtable-32.h	2004-04-17 09:06:02.000000000 +0100
-@@ -203,14 +203,18 @@
- /* Swap entries must have VALID and GLOBAL bits cleared. */
- #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
- 
--#define __swp_type(x)		(((x).val >> 1) & 0x7f)
--#define __swp_offset(x)		((x).val >> 10)
--#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 10) })
-+/* offset is limited to 17 bits (512MB @ 4K page) */
-+/* VALID & GLOBAL are bits 9 & 8 */
-+#define __swp_type(x)		(((x).val >> 10) & 0x1f)
-+#define __swp_offset(x)		((x).val >> 15)
-+#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 10) | ((offset) << 15) })
- #else
- 
--#define __swp_type(x)		(((x).val >> 1) & 0x1f)
--#define __swp_offset(x)		((x).val >> 8)
--#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
-+/* offset is limited to 19 bits (2GB @ 4K page) */
-+/* VALID & GLOBAL are bits 7 & 6 */
-+#define __swp_type(x)		(((x).val >> 8) & 0x1f)
-+#define __swp_offset(x)		((x).val >> 13)
-+#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 8) | ((offset) << 13) })
- #endif
- 
- #define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch
deleted file mode 100644
index bdb90b51abd9..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-===================================================================
-RCS file: /home/cvs/linux/include/asm-mips/unistd.h,v
-retrieving revision 1.59
-retrieving revision 1.60
-diff -u -p -r1.59 -r1.60
---- linux/include/asm-mips/unistd.h	2004/04/08 15:40:01	1.59
-+++ linux/include/asm-mips/unistd.h	2004/04/16 22:51:13	1.60
-@@ -1049,6 +1049,7 @@ type name (atype a,btype b,ctype c,dtype
- 
- #include <linux/compiler.h>
- #include <linux/types.h>
-+#include <linux/linkage.h>
- #include <asm/ptrace.h>
- #include <asm/sim.h>
-
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
deleted file mode 100644
index 098c9abfc88b..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/asm-mips/mach-ip32/mc146818rtc.h.orig	2004-06-21 00:47:35.931657976 -0400
-+++ include/asm-mips/mach-ip32/mc146818rtc.h	2004-06-21 00:47:50.704412176 -0400
-@@ -13,6 +13,7 @@
- 
- #include <asm/io.h>
- #include <asm/ip32/mace.h>
-+#include <asm/ip32/ip32_ints.h>
- 
- #define RTC_PORT(x)	(0x70 + (x))
- #define RTC_IRQ		MACEISA_RTC_IRQ
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
deleted file mode 100644
index 30d3246023e8..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- arch/mips/Makefile.orig	2004-08-02 01:14:02.612198384 -0400
-+++ arch/mips/Makefile	2004-08-02 01:14:46.300556744 -0400
-@@ -688,10 +688,16 @@ vmlinux.64: vmlinux
- 	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
- 		--change-addresses=0xc000000080000000 $< $@
- else
-+ifdef CONFIG_SGI_IP32
-+vmlinux.64: vmlinux
-+	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
-+		--change-addresses=0x9800000080000000 $< $@
-+else
- vmlinux.64: vmlinux
- 	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
- 		--change-addresses=0xa800000080000000 $< $@
- endif
-+endif
- 
- makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/mips/boot $(1)
- 
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch
deleted file mode 100644
index d51b0407026c..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- arch/mips/Makefile.orig	2004-04-15 18:40:42.630148968 -0400
-+++ arch/mips/Makefile	2004-04-15 18:40:52.934582456 -0400
-@@ -57,7 +57,7 @@ endif
- cflags-y			:= -I $(TOPDIR)/include/asm/gcc
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= $(call check_gcc, -finline-limit=100000,)
--LDFLAGS_vmlinux			+= -G 0 -static # -N
-+LDFLAGS_vmlinux			+= -G 0 -static -n
- MODFLAGS			+= -mlong-calls
- 
- cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer
diff --git a/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch b/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch
deleted file mode 100644
index 318e683d43f3..000000000000
--- a/sys-kernel/mips-sources/files/misc-2.6-compat_alloc_user_space.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-===================================================================
-RCS file: /home/cvs/linux/include/asm-mips/compat.h,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- linux/include/asm-mips/compat.h	2003/07/29 03:21:47	1.1
-+++ linux/include/asm-mips/compat.h	2004/08/12 17:37:53	1.2
-@@ -132,10 +132,10 @@ static inline void *compat_ptr(compat_up
- 
- static inline void *compat_alloc_user_space(long len)
- {
--	unsigned long sp = (unsigned long) current_thread_info() +
--	                    THREAD_SIZE - 32;
-+	struct pt_regs *regs = (struct pt_regs *)
-+		((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
- 
--	return (void *) (sp - len);
-+	return (void *) (regs->regs[29] - len);
- }
- 
- #endif /* _ASM_COMPAT_H */
diff --git a/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch b/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch
deleted file mode 100644
index 28a832b38f3c..000000000000
--- a/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- drivers/input/mouse/psmouse-base.c.ori	2004-01-10 05:59:52.000000000 +0100
-+++ drivers/input/mouse/psmouse-base.c	2004-04-09 17:36:01.000000000 +0200
-@@ -416,8 +416,10 @@
- 
- 	param[0] = param[1] = 0xa5;
- 
--	if (psmouse_command(psmouse, param, PSMOUSE_CMD_GETID))
--		return -1;
-+	if (psmouse_command(psmouse, param, PSMOUSE_CMD_GETID)) {
-+		printk(KERN_ERR "recognition forced !\n"); 
-+		/*return -1;*/
-+	}
- 
- 	if (param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04)
- 		return -1;
diff --git a/sys-kernel/mips-sources/files/misc-2.6-iptables_headers.patch b/sys-kernel/mips-sources/files/misc-2.6-iptables_headers.patch
deleted file mode 100644
index a0e392e5ce85..000000000000
--- a/sys-kernel/mips-sources/files/misc-2.6-iptables_headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- include/linux/netfilter.h	2004-06-07 12:15:03 +09:00
-+++ include/linux/netfilter.h	2004-06-19 02:10:55 +09:00
-@@ -10,6 +10,7 @@
- #include <linux/wait.h>
- #include <linux/list.h>
- #endif
-+#include <linux/compiler.h>
- 
- /* Responses from hook functions. */
- #define NF_DROP 0
---- include/linux/netfilter_arp/arp_tables.h	2004-06-04 09:52:00 +09:00
-+++ include/linux/netfilter_arp/arp_tables.h	2004-06-19 02:08:09 +09:00
-@@ -16,7 +16,7 @@
- #include <linux/if_arp.h>
- #include <linux/skbuff.h>
- #endif
--
-+#include <linux/compiler.h>
- #include <linux/netfilter_arp.h>
- 
- #define ARPT_FUNCTION_MAXNAMELEN 30
---- include/linux/netfilter_ipv4/ip_tables.h	2004-06-07 12:15:03 +09:00
-+++ include/linux/netfilter_ipv4/ip_tables.h	2004-06-19 02:08:39 +09:00
-@@ -22,6 +22,7 @@
- #include <linux/ip.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/compiler.h>
- #include <linux/netfilter_ipv4.h>
- 
- #define IPT_FUNCTION_MAXNAMELEN 30
-@@ -336,8 +337,8 @@
- /*
-  *	Main firewall chains definitions and global var's definitions.
-  */
--static DECLARE_MUTEX(ipt_mutex);
- #ifdef __KERNEL__
-+static DECLARE_MUTEX(ipt_mutex);
- 
- #include <linux/init.h>
- extern void ipt_init(void) __init;
---- include/linux/netfilter_ipv6/ip6_tables.h	2004-06-07 12:15:04 +09:00
-+++ include/linux/netfilter_ipv6/ip6_tables.h	2004-06-19 02:09:29 +09:00
-@@ -22,6 +22,7 @@
- #include <linux/ipv6.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/compiler.h>
- #include <linux/netfilter_ipv6.h>
- 
- #define IP6T_FUNCTION_MAXNAMELEN 30
-@@ -106,7 +107,9 @@
- 	u_int64_t pcnt, bcnt;			/* Packet and byte counters */
- };
- 
-+#ifdef __KERNEL__
- static DECLARE_MUTEX(ip6t_mutex);
-+#endif
- 
- /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
- #define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 
-
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild
index a5fb3c1762af..a21524cf5f3f 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040222"
+CVSDATE="20040222"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.4"
-SECPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-IUSE=""
 
 # Eclass stuff
 ETYPE="sources"
@@ -32,12 +32,15 @@ inherit kernel eutils
 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-24xx-${COBALTPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2 )"
+
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* mips"
+IUSE="cobalt"
 
 
 src_unpack() {
@@ -51,14 +54,14 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
+	epatch ${WORKDIR}/mips-patches/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.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-inlinelimit.patch
 
 	# Binutils-2.14.90.0.8 and does some magic with page alignment
 	# that prevents the kernel from booting.  This patch fixes it.
-	epatch ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-no-page-align.patch
 
 	# Security Fixes
 	echo -e ""
@@ -78,8 +81,9 @@ src_unpack() {
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
 	eend
 
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild
index 060c20ffaadb..eebd7b4cd8e7 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040712"
+CVSDATE="20040712"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.4"
-SECPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-IUSE=""
 
 # Eclass stuff
 ETYPE="sources"
@@ -32,13 +32,15 @@ inherit kernel eutils
 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-24xx-${COBALTPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2 )"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* mips"
+IUSE="cobalt"
 
 
 src_unpack() {
@@ -52,7 +54,7 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
 
 	# Security Fixes
 	echo -e ""
@@ -66,8 +68,9 @@ src_unpack() {
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
 	eend
 
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild
index e98b76f37286..56030df300bc 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040814"
+CVSDATE="20040814"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.4"
-SECPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-IUSE=""
 
 # Eclass stuff
 ETYPE="sources"
@@ -32,13 +32,15 @@ inherit kernel eutils
 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-24xx-${COBALTPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2 )"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* mips"
+IUSE="cobalt"
 
 
 src_unpack() {
@@ -52,7 +54,7 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
 
 	# Security Fixes
 	echo -e ""
@@ -61,8 +63,9 @@ src_unpack() {
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
 	eend
 
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild
index 6d6089388f5d..f0d7de80a786 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040311"
-COBALTPATCHVER="1.4"
-SECPATCHVER="1.2"
-IP32DIFFDATE="20040229"
+CVSDATE="20040311"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
+IP32DIFFDATE="20040229"			# Date of diff of iluxa's minpatchset
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -32,20 +33,21 @@ inherit kernel eutils
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
 		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
-IUSE=""
+IUSE="cobalt"
 
 
 pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
 		einfo "systems that are still using the old Cobalt bootloader.  In"
@@ -70,14 +72,10 @@ src_unpack() {
 	# that prevents the kernel from booting.  This patch fixes it.
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
-
-	# In order to use arcboot on IP32, the kernel entry address needs to be
-	# set to 0x98000000, not 0xa8000000.
-	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.x-no-page-align.patch
 
 	# Force detection of PS/2 mice on SGI Systems
-	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
 
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
@@ -101,8 +99,9 @@ src_unpack() {
 		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
 	eend
 
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild
index 24ed3f5808d4..854e3b30d917 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.6-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040604"
-COBALTPATCHVER="1.4"
-SECPATCHVER="1.2"
-IP32DIFFDATE="20040402"
+CVSDATE="20040604"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
+IP32DIFFDATE="20040402"			# Date of diff of iluxa's minpatchset
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -32,20 +33,21 @@ inherit kernel eutils
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
 		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
-IUSE=""
+IUSE="cobalt"
 
 
 pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
 		einfo "systems that are still using the old Cobalt bootloader.  In"
@@ -69,14 +71,10 @@ src_unpack() {
 	# Bug in 2.6.6 that triggers a kernel oops when swap is activated
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-2.6.5-swapbug-fix.patch
-
-	# In order to use arcboot on IP32, the kernel entry address needs to be
-	# set to 0x98000000, not 0xa8000000.
-	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.5-swapbug-fix.patch
 
 	# Force detection of PS/2 mice on SGI Systems
-	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
 
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
@@ -95,8 +93,9 @@ src_unpack() {
 		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
 	eend
 
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild
index a7e81dcef4c9..f41e7e936c21 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r6.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040621"
-COBALTPATCHVER="1.5"
-SECPATCHVER="1.2"
-IP32DIFFDATE="20040402"
+CVSDATE="20040621"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.5"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"                       # Tarball version for generic patches
+IP32DIFFDATE="20040402"			# Date of diff of iluxa's minpatchset
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -33,20 +34,21 @@ inherit kernel eutils
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
 		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
-IUSE=""
+IUSE="cobalt"
 
 
 pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
 		einfo "systems that are still using the old Cobalt bootloader.  In"
@@ -70,21 +72,17 @@ src_unpack() {
 	# Fix a compile glitch for SGI O2/IP32
 	echo -e ""
 	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
-
-	# In order to use arcboot on IP32, the kernel entry address needs to be
-	# set to 0x98000000, not 0xa8000000.
-	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
 
 	# Misc Fixes
-	epatch ${FILESDIR}/misc-2.6-iptables_headers.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6-iptables_headers.patch
 
 	# Force detection of PS/2 mice on SGI Systems
-	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
 
 	# Something happened to compat_alloc_user_space between 2.6.6 and 2.6.7 that
 	# Breaks ifconfig.
-	epatch ${FILESDIR}/misc-2.6-compat_alloc_user_space.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6-compat_alloc_user_space.patch
 
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
@@ -105,7 +103,7 @@ src_unpack() {
 
 
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+	if use cobalt; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
 		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
new file mode 100644
index 000000000000..a692fa16c7e4
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040822"			# Date of diff between kernel.org and lmo CVS
+#IP30DATE=""				# Date of diff for IP30 (Octane) patches - XXX - Not Implemented Yet
+COBALTPATCHVER="1.7"			# Tarball version for cobalt patches
+SECPATCHVER="1.2"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
+EXTRAVERSION=".$(echo ${OKV} | cut -d. -f4)-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+
+# Miscellaneous stuff
+S=${WORKDIR}/linux-${OKV}-${CVSDATE}
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 14 Aug 2004
+# 3) IP22, IP32 fixes
+# 6) Generic Fixes
+# 5) Security fixes
+# 6) Patches for Cobalt support
+
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-*"
+IUSE="cobalt"
+#IUSE="cobalt ip30 ip27"
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
+#		ip30? ( mirror://gentoo/ip30-patches-${IP30DATE}.tar.bz2 )			# IP30 Patches - XXX - Not Implemented
+#		ip27? ( mirror://lmoftp/blah.tar.bz2 )						# IP27 Patches - XXX - Not Implemented
+
+pkg_setup() {
+	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	if use cobalt; then
+		echo -e ""
+		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
+		einfo "systems that are still using the old Cobalt bootloader.  In"
+		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
+		einfo "Peter Horton's new bootloader, which does not have the kernel"
+		einfo "size limitation that the older bootloader has.  If you want"
+		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
+		einfo "installed and setup."
+		echo -e ""
+	fi
+
+#	# See if we're using IP30 (Octane) - XXX - Not Implemented
+#	if use ip30; then
+#		echo -e ""
+#		einfo ""
+#		echo -e ""
+#	fi
+
+#	# See if we're using IP27 (Origin) - XXX - Not Implemented
+#	if use ip27; then
+#		echo -e ""
+#		einfo ""
+#		echo -e ""
+#	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	cd ${S}
+
+	# Update the vanilla sources with linux-mips CVS changes
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+
+	# Generic patches we always include
+	echo -e ""
+	einfo ">>> Generic Patches"
+		# IP22 patches
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip22-fixes-backport.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip22-newport-fixes-backport.patch
+
+		# IP32 Patches
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip32-64b_only-backport.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.9-ip32-iluxa_minpatchset_bits.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-old.patch
+
+		# gcc-3.4.x fixes
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.9-gcc34x-rem_accum.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.9-gcc34x-save_static_func.patch
+
+		# Generic
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-better_mbind-backport.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-elim-sys_narg_table-backport.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ioctl32-rtc-backport.patch
+		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-statfs-fixes-backport.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch
+	eend
+
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+	eend
+
+
+	# Cobalt Patches
+	if use cobalt; then
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
+			epatch ${x}
+		done
+		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+
+#	# IP30 (Octane) Patch - XXX - Not Implemented
+#	if use ip30; then
+#		echo -e ""
+#		einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
+#	fi
+
+#	# IP27 (Origin) Hacks - XXX - Not Implemented
+#	if use ip27; then
+#		echo -e ""
+#		einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
+#	fi
+
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild
deleted file mode 100644
index a2661a865d24..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1.ebuild,v 1.1 2004/08/15 03:59:03 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040814"
-COBALTPATCHVER="1.6"
-SECPATCHVER="1.2"
-IP32DIFFDATE="20040402"
-EXTRAVERSION=".$(echo ${OKV} | cut -d. -f4)-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 14 Aug 2004
-# 3) Patch to fix an O2 compile-time error
-# 4) Iluxa's minimal O2 Patchset
-# 5) Security fixes
-# 6) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
-		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-IUSE=""
-
-
-pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		einfo "systems that are still using the old Cobalt bootloader.  In"
-		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		einfo "Peter Horton's new bootloader, which does not have the kernel"
-		einfo "size limitation that the older bootloader has.  If you want"
-		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
-		einfo "installed and setup."
-		echo -e ""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Fix a compile glitch for SGI O2/IP32
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
-
-	# In order to use arcboot on IP32, the kernel entry address needs to be
-	# set to 0x98000000, not 0xa8000000.
-	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
-
-	# Force detection of PS/2 mice on SGI Systems
-	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
-
-	# iluxa's minpatchset for SGI O2
-	echo -e ""
-	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
-	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
-
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
-	eend
-
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}