From 99d04c388629415782a09c5fd4ddc1fb379c94d5 Mon Sep 17 00:00:00 2001
From: Joshua Kinard <kumba@gentoo.org>
Date: Thu, 2 Dec 2004 04:29:47 +0000
Subject: More security updates (yay).  Added patch to fix a kernel memory
 modification vuln (Bug #72317).  Bumped SECPATCHVER to 1.7.

---
 sys-kernel/mips-sources/ChangeLog                  |  13 +-
 sys-kernel/mips-sources/Manifest                   |  22 +--
 .../files/digest-mips-sources-2.4.26-r12           |   5 -
 .../files/digest-mips-sources-2.4.26-r13           |   5 +
 .../files/digest-mips-sources-2.4.27-r4            |   5 -
 .../files/digest-mips-sources-2.4.27-r5            |   5 +
 .../files/digest-mips-sources-2.6.7-r10            |   6 -
 .../files/digest-mips-sources-2.6.7-r11            |   6 +
 .../files/digest-mips-sources-2.6.8.1-r4           |   5 -
 .../files/digest-mips-sources-2.6.8.1-r5           |   5 +
 .../files/digest-mips-sources-2.6.9-r5             |   5 -
 .../files/digest-mips-sources-2.6.9-r6             |   5 +
 .../mips-sources/mips-sources-2.4.26-r12.ebuild    |  91 ------------
 .../mips-sources/mips-sources-2.4.26-r13.ebuild    |  92 ++++++++++++
 .../mips-sources/mips-sources-2.4.27-r4.ebuild     |  86 -----------
 .../mips-sources/mips-sources-2.4.27-r5.ebuild     |  87 +++++++++++
 .../mips-sources/mips-sources-2.6.7-r10.ebuild     | 125 ----------------
 .../mips-sources/mips-sources-2.6.7-r11.ebuild     | 126 ++++++++++++++++
 .../mips-sources/mips-sources-2.6.8.1-r4.ebuild    | 138 ------------------
 .../mips-sources/mips-sources-2.6.8.1-r5.ebuild    | 139 ++++++++++++++++++
 .../mips-sources/mips-sources-2.6.9-r5.ebuild      | 158 --------------------
 .../mips-sources/mips-sources-2.6.9-r6.ebuild      | 159 +++++++++++++++++++++
 22 files changed, 652 insertions(+), 636 deletions(-)
 delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r12
 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r13
 delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r4
 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r5
 delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r10
 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r11
 delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r4
 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r5
 delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r5
 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r6
 delete mode 100644 sys-kernel/mips-sources/mips-sources-2.4.26-r12.ebuild
 create mode 100644 sys-kernel/mips-sources/mips-sources-2.4.26-r13.ebuild
 delete mode 100644 sys-kernel/mips-sources/mips-sources-2.4.27-r4.ebuild
 create mode 100644 sys-kernel/mips-sources/mips-sources-2.4.27-r5.ebuild
 delete mode 100644 sys-kernel/mips-sources/mips-sources-2.6.7-r10.ebuild
 create mode 100644 sys-kernel/mips-sources/mips-sources-2.6.7-r11.ebuild
 delete mode 100644 sys-kernel/mips-sources/mips-sources-2.6.8.1-r4.ebuild
 create mode 100644 sys-kernel/mips-sources/mips-sources-2.6.8.1-r5.ebuild
 delete mode 100644 sys-kernel/mips-sources/mips-sources-2.6.9-r5.ebuild
 create mode 100644 sys-kernel/mips-sources/mips-sources-2.6.9-r6.ebuild

(limited to 'sys-kernel')

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index f9bf5a5223f8..65c5092ca2db 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,17 @@
 # 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.64 2004/12/01 11:15:23 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.65 2004/12/02 04:29:47 kumba Exp $
+
+*mips-sources-2.6.9-r6 (01 Dec 2004)
+
+  01 Dec 2004; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.26-r12.ebuild, +mips-sources-2.4.26-r13.ebuild,
+  -mips-sources-2.4.27-r4.ebuild, +mips-sources-2.4.27-r5.ebuild,
+  -mips-sources-2.6.7-r10.ebuild, +mips-sources-2.6.7-r11.ebuild,
+  -mips-sources-2.6.8.1-r4.ebuild, +mips-sources-2.6.8.1-r5.ebuild,
+  -mips-sources-2.6.9-r5.ebuild, +mips-sources-2.6.9-r6.ebuild:
+  More security updates (yay). Added patch to fix a kernel memory modification
+  vuln (Bug #72317). Bumped SECPATCHVER to 1.7.
 
 *mips-sources-2.4.27-r4 (01 Dec 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 44681f381a40..b16517a7bd21 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 313b4acfdf43ae18afe97da23d8e4896 ChangeLog 26846
+MD5 144cd5e19989386b60ed0f3f1940f5f5 ChangeLog 27392
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 304e6a0719d86303624384ab46827247 mips-sources-2.4.26-r12.ebuild 3164
-MD5 bd6e028eefb6d6c0df04290fb10b8bcd mips-sources-2.4.27-r4.ebuild 2845
-MD5 42edc99ab5514db718094653f516c8d7 mips-sources-2.6.7-r10.ebuild 4417
-MD5 6efb88355f14a95f4a6f04ce15f4494a mips-sources-2.6.8.1-r4.ebuild 4741
-MD5 1a65d981c519809ebf9bd0032f4f424d mips-sources-2.6.9-r5.ebuild 5541
-MD5 b9ec0b65dde1beeb058ee09b25732e83 files/digest-mips-sources-2.4.26-r12 387
-MD5 b841c8cf28e964569cfe8f9641afc326 files/digest-mips-sources-2.4.27-r4 387
-MD5 4a4007e0374685e89636b196fd061b32 files/digest-mips-sources-2.6.7-r10 468
-MD5 2296d5cb88d289a3079ecf3321846d98 files/digest-mips-sources-2.6.8.1-r4 389
-MD5 65e9331ac519d547fffb4e054fc534d2 files/digest-mips-sources-2.6.9-r5 385
+MD5 12fda8c876659b2d834ed678ca06db87 mips-sources-2.4.26-r13.ebuild 3229
+MD5 a2bb15865448adc03607e1e6f18297be mips-sources-2.4.27-r5.ebuild 2910
+MD5 2b3b23d4bf01445ed8983d6c84df3aa5 mips-sources-2.6.7-r11.ebuild 4482
+MD5 0c1f19760602f6f951c635d4fc6a793e mips-sources-2.6.8.1-r5.ebuild 4806
+MD5 1292ae144ea6979a396c9a7a9e432b89 mips-sources-2.6.9-r6.ebuild 5606
+MD5 31a1dea71d2f985deb57c3814cfac251 files/digest-mips-sources-2.4.26-r13 387
+MD5 7d13bef8c6ca7192ea7b0673cec6eccc files/digest-mips-sources-2.4.27-r5 387
+MD5 4258c40f70ef5efc37dc441fc2818ef1 files/digest-mips-sources-2.6.7-r11 468
+MD5 f85f9aac26456d6d7466d20217e57278 files/digest-mips-sources-2.6.8.1-r5 389
+MD5 54834ed6d1527ea7ff4710cfd2813061 files/digest-mips-sources-2.6.9-r6 385
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r12 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r12
deleted file mode 100644
index 95f04d60c03e..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r12
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
-MD5 d3c2e398b2f3bca4cbac073c1fd41f0c mips-sources-security_patches-1.6.tar.bz2 88704
-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-r13 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r13
new file mode 100644
index 000000000000..e64c1002708f
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r13
@@ -0,0 +1,5 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
+MD5 8621b0d9cb9495f4e258afd38c7e36bc mips-sources-security_patches-1.7.tar.bz2 89014
+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-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r4
deleted file mode 100644
index ce4abd70f027..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
-MD5 d3c2e398b2f3bca4cbac073c1fd41f0c mips-sources-security_patches-1.6.tar.bz2 88704
-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-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r5
new file mode 100644
index 000000000000..78da403a1cc6
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r5
@@ -0,0 +1,5 @@
+MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
+MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
+MD5 8621b0d9cb9495f4e258afd38c7e36bc mips-sources-security_patches-1.7.tar.bz2 89014
+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.7-r10 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r10
deleted file mode 100644
index f1a4d357c4ad..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
-MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
-MD5 d3c2e398b2f3bca4cbac073c1fd41f0c mips-sources-security_patches-1.6.tar.bz2 88704
-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.7-r11 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r11
new file mode 100644
index 000000000000..a554480a97ba
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r11
@@ -0,0 +1,6 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
+MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
+MD5 8621b0d9cb9495f4e258afd38c7e36bc mips-sources-security_patches-1.7.tar.bz2 89014
+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-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r4
deleted file mode 100644
index 851ae49da40a..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
-MD5 9a61fd7455debc01d0c450bb1af10fc7 mipscvs-2.6.8.1-20040822.diff.bz2 486866
-MD5 d3c2e398b2f3bca4cbac073c1fd41f0c mips-sources-security_patches-1.6.tar.bz2 88704
-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/digest-mips-sources-2.6.8.1-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r5
new file mode 100644
index 000000000000..5093fb414916
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r5
@@ -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 8621b0d9cb9495f4e258afd38c7e36bc mips-sources-security_patches-1.7.tar.bz2 89014
+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/digest-mips-sources-2.6.9-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r5
deleted file mode 100644
index f18a6adf8060..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r5
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
-MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768
-MD5 d3c2e398b2f3bca4cbac073c1fd41f0c mips-sources-security_patches-1.6.tar.bz2 88704
-MD5 e836202d84b4add5ad619df9ff0b289c mips-sources-generic_patches-1.4.tar.bz2 54375
-MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r6
new file mode 100644
index 000000000000..f78260743137
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r6
@@ -0,0 +1,5 @@
+MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
+MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768
+MD5 8621b0d9cb9495f4e258afd38c7e36bc mips-sources-security_patches-1.7.tar.bz2 89014
+MD5 e836202d84b4add5ad619df9ff0b289c mips-sources-generic_patches-1.4.tar.bz2 54375
+MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r12.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r12.ebuild
deleted file mode 100644
index 885a78111d2f..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r12.ebuild
+++ /dev/null
@@ -1,91 +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.4.26-r12.ebuild,v 1.1 2004/12/01 11:15:23 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040712"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.6"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-EXTRAVERSION="-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 12 Jul 2004
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
-# 5) iso9660 fix
-# 6) 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/${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() {
-	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
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
-		epatch ${WORKDIR}/security/CAN-2004-0415-2.4-file_offset_pointers.patch
-		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
-		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
-		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
-		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
-		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
-		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
-		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		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}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r13.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r13.ebuild
new file mode 100644
index 000000000000..0becb09421dc
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r13.ebuild
@@ -0,0 +1,92 @@
+# 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-r13.ebuild,v 1.1 2004/12/02 04:29:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040712"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.7"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
+EXTRAVERSION="-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 12 Jul 2004
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
+# 5) iso9660 fix
+# 6) 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/${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() {
+	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
+
+	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0415-2.4-file_offset_pointers.patch
+		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
+		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
+		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
+		epatch ${WORKDIR}/security/security-2.4-af_unix-kern-mem.patch
+	eend
+
+
+	# Cobalt Patches
+	if use cobalt; then
+		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}
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.27-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r4.ebuild
deleted file mode 100644
index 66c8f5f13cdb..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.27-r4.ebuild
+++ /dev/null
@@ -1,86 +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.4.27-r4.ebuild,v 1.1 2004/12/01 11:15:23 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040814"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.6"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-EXTRAVERSION="-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 12 Jul 2004
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
-# 5) iso9660 fix
-# 6) 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/${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() {
-	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
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
-		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
-		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
-		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		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}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.27-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r5.ebuild
new file mode 100644
index 000000000000..4a7e4cb1ce7b
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27-r5.ebuild
@@ -0,0 +1,87 @@
+# 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-r5.ebuild,v 1.1 2004/12/02 04:29:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040814"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
+SECPATCHVER="1.7"			# Tarball version for security patches
+GENPATCHVER="1.0"			# Tarball version for generic patches
+EXTRAVERSION="-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 12 Jul 2004
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
+# 5) iso9660 fix
+# 6) 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/${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() {
+	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
+
+	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
+		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
+		epatch ${WORKDIR}/security/security-2.4-af_unix-kern-mem.patch
+	eend
+
+
+	# Cobalt Patches
+	if use cobalt; then
+		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}
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r10.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r10.ebuild
deleted file mode 100644
index 893d27a3b600..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r10.ebuild
+++ /dev/null
@@ -1,125 +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.7-r10.ebuild,v 1.1 2004/12/01 11:15:23 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040621"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.5"			# Tarball version for cobalt patches
-SECPATCHVER="1.6"			# 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}"
-
-# 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 21 Jun 2004
-# 3) Patch to fix an O2 compile-time error
-# 4) Iluxa's minimal O2 Patchset
-# 5) Security fixes
-# 6) patch to fix iptables build failures
-# 7) 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.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 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-IUSE="cobalt"
-
-
-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
-}
-
-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 ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
-
-	# Misc Fixes
-	epatch ${WORKDIR}/mips-patches/misc-2.6-iptables_headers.patch
-
-	# Force detection of PS/2 mice on SGI Systems
-	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 ${WORKDIR}/mips-patches/misc-2.6-compat_alloc_user_space.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/CAN-2004-0415-2.6.7-file_offset_pointers.patch
-		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
-		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
-		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
-		epatch ${WORKDIR}/security/CAN-2004-0814-2.6.7-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0816-2.6-iptables_dos.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
-		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
-		epatch ${WORKDIR}/security/security-2.6.7-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
-		epatch ${WORKDIR}/security/security-2.6.7-mips-ptrace.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
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r11.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r11.ebuild
new file mode 100644
index 000000000000..9ce9551f156b
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r11.ebuild
@@ -0,0 +1,126 @@
+# 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-r11.ebuild,v 1.1 2004/12/02 04:29:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040621"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.5"			# Tarball version for cobalt patches
+SECPATCHVER="1.7"			# 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}"
+
+# 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 21 Jun 2004
+# 3) Patch to fix an O2 compile-time error
+# 4) Iluxa's minimal O2 Patchset
+# 5) Security fixes
+# 6) patch to fix iptables build failures
+# 7) 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.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 )"
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-*"
+IUSE="cobalt"
+
+
+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
+}
+
+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 ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+
+	# Misc Fixes
+	epatch ${WORKDIR}/mips-patches/misc-2.6-iptables_headers.patch
+
+	# Force detection of PS/2 mice on SGI Systems
+	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 ${WORKDIR}/mips-patches/misc-2.6-compat_alloc_user_space.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/CAN-2004-0415-2.6.7-file_offset_pointers.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
+		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.6.7-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0816-2.6-iptables_dos.patch
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.6.7-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
+		epatch ${WORKDIR}/security/security-2.6.7-mips-ptrace.patch
+		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.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
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r4.ebuild
deleted file mode 100644
index 40e0c78f75fa..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r4.ebuild
+++ /dev/null
@@ -1,138 +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-r4.ebuild,v 1.1 2004/12/01 11:15:23 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040822"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.7"			# Tarball version for cobalt patches
-SECPATCHVER="1.6"			# 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 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 )"
-#		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 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/CAN-2004-0814-2.6.8.1-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
-		epatch ${WORKDIR}/security/security-2.6.8.1-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
-		epatch ${WORKDIR}/security/security-2.6.8.1-mips-ptrace.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
-
-
-#	# 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-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r5.ebuild
new file mode 100644
index 000000000000..63db4cfe4730
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r5.ebuild
@@ -0,0 +1,139 @@
+# 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-r5.ebuild,v 1.1 2004/12/02 04:29:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20040822"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.7"			# Tarball version for cobalt patches
+SECPATCHVER="1.7"			# 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 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 )"
+#		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 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/CAN-2004-0814-2.6.8.1-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.6.8.1-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
+		epatch ${WORKDIR}/security/security-2.6.8.1-mips-ptrace.patch
+		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.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
+
+
+#	# 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.9-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r5.ebuild
deleted file mode 100644
index 339a26c60ceb..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.9-r5.ebuild
+++ /dev/null
@@ -1,158 +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.9-r5.ebuild,v 1.1 2004/12/01 11:15:23 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20041022"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.8"			# Tarball version for cobalt patches
-SECPATCHVER="1.6"			# Tarball version for security patches
-GENPATCHVER="1.4"			# Tarball version for generic patches
-EXTRAVERSION="-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) Generic Fixes
-# 4) Security fixes
-# 5) Patches for Cobalt support (http://www.colonel-panic.org/cobalt-mips/)
-# 6) Patch for IP30 Octane Support (http://helios.et.put.poznan.pl/~sskowron/ip30/)
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip30 livecd"
-#IUSE="cobalt ip30 ip27 livecd"
-
-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 )"
-#		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 "Octane Support is EXPERIMENTAL!  Note the use of caps and the word"
-		einfo "EXPERIMENTAL.  That said, while current tests of Octane support"
-		einfo "generally have worked well, there are some known drawbacks, including"
-		einfo "lack of an X driver (Octane only works in console framebuffer for"
-		einfo "now, but this will likely change).  Also, and this is important,"
-		einfo "but you can ONLY use ONE scsi disk in the Octane.  Use of a second or"
-		einfo "more disks will oops the kernel.  It is hoped the move to the qla1280"
-		einfo "scsi driver will resolve this bug, but that is in the future.  For now,"
-		einfo "the qlogicisp driver is the only thing available, and thus limits us to"
-		einfo "one scsi disk."
-		echo -e ""
-		einfo "Also, Octane can only be netbooted.  There is no support for disk-booting"
-		einfo "as of yet.  Disk-booting will require a 64bit Arcboot or an entirely new"
-		einfo "bootloader, and both are non-existant at this point in time."
-		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"
-		# IP32 Patches
-		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-20041029.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6.9-ths-ip32-misc.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-tweak-makefile.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-fix-rm7k.patch
-
-		# Generic
-		epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6-new-ramdisk-code.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6-kconfig-tweak
-	eend
-
-
-	# IP30 (Octane) Patch
-	if use ip30; then
-		echo -e ""
-		einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
-		epatch ${WORKDIR}/mips-patches/misc-2.6.9-ip30-octane-support.patch
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip30
-		S="${S}.ip30"
-	fi
-
-
-	# Patches used in building LiveCDs /* EXPERIMENTAL */
-	if use livecd; then
-		epatch ${WORKDIR}/mips-patches/misc-2.6-livecd-partitioned-cdroms.patch
-	fi
-
-
-	# 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}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/security-2.6.9-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.6.9-mips-ptrace.patch
-	eend
-
-
-#	# 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.9-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r6.ebuild
new file mode 100644
index 000000000000..62e14b39a579
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r6.ebuild
@@ -0,0 +1,159 @@
+# 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.9-r6.ebuild,v 1.1 2004/12/02 04:29:47 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20041022"			# Date of diff between kernel.org and lmo CVS
+COBALTPATCHVER="1.8"			# Tarball version for cobalt patches
+SECPATCHVER="1.7"			# Tarball version for security patches
+GENPATCHVER="1.4"			# Tarball version for generic patches
+EXTRAVERSION="-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) Generic Fixes
+# 4) Security fixes
+# 5) Patches for Cobalt support (http://www.colonel-panic.org/cobalt-mips/)
+# 6) Patch for IP30 Octane Support (http://helios.et.put.poznan.pl/~sskowron/ip30/)
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip30 livecd"
+#IUSE="cobalt ip30 ip27 livecd"
+
+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 )"
+#		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 "Octane Support is EXPERIMENTAL!  Note the use of caps and the word"
+		einfo "EXPERIMENTAL.  That said, while current tests of Octane support"
+		einfo "generally have worked well, there are some known drawbacks, including"
+		einfo "lack of an X driver (Octane only works in console framebuffer for"
+		einfo "now, but this will likely change).  Also, and this is important,"
+		einfo "but you can ONLY use ONE scsi disk in the Octane.  Use of a second or"
+		einfo "more disks will oops the kernel.  It is hoped the move to the qla1280"
+		einfo "scsi driver will resolve this bug, but that is in the future.  For now,"
+		einfo "the qlogicisp driver is the only thing available, and thus limits us to"
+		einfo "one scsi disk."
+		echo -e ""
+		einfo "Also, Octane can only be netbooted.  There is no support for disk-booting"
+		einfo "as of yet.  Disk-booting will require a 64bit Arcboot or an entirely new"
+		einfo "bootloader, and both are non-existant at this point in time."
+		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"
+		# IP32 Patches
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-20041029.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6.9-ths-ip32-misc.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-tweak-makefile.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-fix-rm7k.patch
+
+		# Generic
+		epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-new-ramdisk-code.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-kconfig-tweak
+	eend
+
+
+	# IP30 (Octane) Patch
+	if use ip30; then
+		echo -e ""
+		einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
+		epatch ${WORKDIR}/mips-patches/misc-2.6.9-ip30-octane-support.patch
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip30
+		S="${S}.ip30"
+	fi
+
+
+	# Patches used in building LiveCDs /* EXPERIMENTAL */
+	if use livecd; then
+		epatch ${WORKDIR}/mips-patches/misc-2.6-livecd-partitioned-cdroms.patch
+	fi
+
+
+	# 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}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/security-2.6.9-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.6.9-mips-ptrace.patch
+		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.patch
+	eend
+
+
+#	# IP27 (Origin) Hacks - XXX - Not Implemented
+#	if use ip27; then
+#		echo -e ""
+#		einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
+#	fi
+
+
+	kernel_universal_unpack
+}
-- 
cgit v1.2.3-65-gdbad