Import new kernel versions: 2.6.13.4 for ip22, ip28, ip30, and ip32;; 2.6.12.5 for ip27 (2.6.13.4 has major PCI issues on ip27); Also updated 2.4.31 for ip22 w/ a patch that allows use of the RJ-45 port on Challenge S.

(Portage version: 2.0.53_rc5)

12 files changed, 394 insertions, 434 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 5d49a6a180ec..893b52532c3f 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.78 2005/07/06 04:18:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.79 2005/10/16 02:31:27 kumba Exp $
+
+*mips-sources-2.6.13.4 (16 Oct 2005)
+
+  16 Oct 2005; Joshua Kinard <kumba@gentoo.org>
+  +mips-sources-2.4.31-r1.ebuild, -mips-sources-2.4.31.ebuild,
+  -mips-sources-2.6.10-r4.ebuild, +mips-sources-2.6.12.5.ebuild,
+  -mips-sources-2.6.12.ebuild, +mips-sources-2.6.13.4.ebuild:
+  Import new kernel versions: 2.6.13.4 for ip22, ip28, ip30, and ip32;; 2.6.12.5
+  for ip27 (2.6.13.4 has major PCI issues on ip27); Also updated 2.4.31 for ip22
+  w/ a patch that allows use of the RJ-45 port on Challenge S.
 
 *mips-sources-2.6.12 (05 Jul 2005)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 203abc55311c..a6ea98a167c3 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 34d8139b69215675b468aa639d522d81 ChangeLog 34271
+MD5 cb06aa832ee7f63624ab2126e4f56ca8 ChangeLog 34773
+MD5 0c97fdd0af4e709a2a3173aa53a0990b files/digest-mips-sources-2.4.31-r1 316
+MD5 02c693ab6545cc5292854005a9c228db files/digest-mips-sources-2.6.12.5 378
+MD5 1dee266050a38ef1bc578cd4b12b7d0c files/digest-mips-sources-2.6.13.4 378
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 1e1ed2506800456faee2c2a4557463b9 mips-sources-2.6.12.ebuild 11029
-MD5 9c451cc8e9d7708ef0e513567a271a4f mips-sources-2.4.31.ebuild 1912
-MD5 2bcef40a019778e84f9c9188ae97b5d0 mips-sources-2.6.10-r4.ebuild 12779
-MD5 8aa07663823de29a8abba4e176da6576 files/digest-mips-sources-2.4.31 316
-MD5 3e5274d4d23180cde5daf51b751d2cc5 files/digest-mips-sources-2.6.10-r4 316
-MD5 4e00a498debdcbfe02ab1c216f587d8b files/digest-mips-sources-2.6.12 316
+MD5 f120c947be7a44236bd84323fa2eb325 mips-sources-2.4.31-r1.ebuild 2032
+MD5 1b965dcb3f5bb16259463044059fcee8 mips-sources-2.6.12.5.ebuild 7623
+MD5 ce31abf83920bfaffb3da8abf46d7cfb mips-sources-2.6.13.4.ebuild 12655
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31
deleted file mode 100644
index 0b6ccfced207..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bf6e3843ca122e3ad9ad28b94f4b8ed5 linux-2.4.31.tar.bz2 31129841
-MD5 f168633caef6078fe0afbd7fc7e1d767 mipscvs-2.4.31-20050606.diff.bz2 139016
-MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
-MD5 463d4901c7f44a9922ab69179adc0b47 mips-sources-generic_patches-1.12.tar.bz2 178249
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1
new file mode 100644
index 000000000000..0f58b4cd3da3
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1
@@ -0,0 +1,4 @@
+MD5 bf6e3843ca122e3ad9ad28b94f4b8ed5 linux-2.4.31.tar.bz2 31129841
+MD5 998480888a0049e3537af2cd2240d92b mips-sources-generic_patches-1.14.tar.bz2 118949
+MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
+MD5 f168633caef6078fe0afbd7fc7e1d767 mipscvs-2.4.31-20050606.diff.bz2 139016
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r4
deleted file mode 100644
index adcaafc91edb..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 bfa5c9bb9e1b95327baae53a9a6c2d35 mipscvs-2.6.10-20050115.diff.bz2 351205
-MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
-MD5 d5063a377e2d9c58f358a537c4251d8b mips-sources-generic_patches-1.11.tar.bz2 173016
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12
deleted file mode 100644
index a544796d1fbd..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 df24d440182035e8ab4bfa305410b5e3 mipscvs-2.6.12-20050703.diff.bz2 368631
-MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
-MD5 2bfdaaa1ba8fdbda9e8e1aa7dfe167ea mips-sources-generic_patches-1.13.tar.bz2 114518
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12.5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12.5
new file mode 100644
index 000000000000..be0fb9b427de
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12.5
@@ -0,0 +1,5 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 998480888a0049e3537af2cd2240d92b mips-sources-generic_patches-1.14.tar.bz2 118949
+MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
+MD5 810a4f1e68d7e9ee1a46372698f0978f mipscvs-2.6.12-20050711.diff.bz2 393859
+MD5 cff8abb6a5a992018cbcf382ff95c577 patch-2.6.12.5.bz2 14588
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.13.4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.13.4
new file mode 100644
index 000000000000..1e1ba4b3d1b9
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.13.4
@@ -0,0 +1,5 @@
+MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
+MD5 998480888a0049e3537af2cd2240d92b mips-sources-generic_patches-1.14.tar.bz2 118949
+MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
+MD5 4fc24a9f9d591009e4609ef3acc9ebf6 mipscvs-2.6.13-20050914.diff.bz2 537371
+MD5 37bd1949c1d0d5911510a9157e80a8ae patch-2.6.13.4.bz2 13589
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.31.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild
index d5b6ad0a2c3a..a6dd2083a5b8 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.31.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 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.31.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild,v 1.1 2005/10/16 02:31:27 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20050606"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.14"			# Tarball version for security patches
-GENPATCHVER="1.12"			# Tarball version for generic patches
+SECPATCHVER="1.15"			# Tarball version for security patches
+GENPATCHVER="1.14"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -57,6 +57,8 @@ src_unpack() {
 	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-strcpy-fix.patch
 	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-stop-dead-code-elim.patch
 
+	# Support the second seeq on Challenge S systems
+	epatch ${WORKDIR}/mips-patches/misc-2.4-ip22-support-mezz-seeq.patch
 
 	# Security Fixes
 #	echo -e ""
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10-r4.ebuild
deleted file mode 100644
index 00f9b71473f7..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.10-r4.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2005 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.10-r4.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 09 Jan 2005
-# 3) Generic Fixes
-# 4) Security fixes
-# 5) Patch for IP28 Indigo2 Impact Support	(http://home.alphastar.de/fuerst/download.html)
-# 6) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
-# 7) Patch for Cobalt support			(http://www.colonel-panic.org/cobalt-mips/)
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20050115"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.14"			# Tarball version for security patches
-GENPATCHVER="1.11"			# Tarball version for generic patches
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-USERC="no"				# If set to "yes", then it will attempt to use an RC kernel
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-MIPS_SECURITY="${WORKDIR}/security"
-
-# Inherit Eclasses
-ETYPE="sources"
-inherit kernel eutils
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* mips"
-IUSE="cobalt ip28 ip30 livecd"
-
-
-# If USERC == "yes", use a release candidate kernel (2.6.X-rcY)
-if [ "${USERC}" = "yes" ]; then
-	KVMjMn="${OKV%.*}"				# Kernel Major/Minor
-	KVREV="${OKV%%-*}"				# Kernel Revision Pt. 1
-	KVREV="${KVREV##*.}"				# Kernel Revision Pt. 2
-	KVRC="${OKV#*-}"				# Kernel RC
-	STABLEVER="${KVMjMn}.$((${KVREV} - 1))"		# Last stable Kernel version (Revision - 1)
-	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
-	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
-	KV="${OKV}-${EXTRAVERSION}"
-else
-	STABLEVER="${OKV}"
-	PATCHVER=""
-fi
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.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
-		${PATCHVER}"
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Error message 
-err_only_one_arch_allowed() {
-	echo -e ""
-	eerror "A patchset for a specific machine-type has already been selected."
-	eerror "No other patches for machines-types are permitted.  You will need a"
-	eerror "separate copy of the kernel sources for each different machine-type"
-	eerror "you want to build a kernel for."
-	die "Only one machine-type patchset allowed"
-}
-
-
-# Check our USE flags for machine-specific flags and give appropriate warnings.
-# Hope the user isn't crazy enough to try using combinations of these flags.
-# Only use one machine-specific flag at a time for each type of desired machine-support.
-pkg_setup() {
-	local arch_is_selected="no"
-
-	# See if we're using IP28 (Indigo2 Impact R10000)
-	if use ip28; then
-		if [ "${arch_is_selected}" = "no" ]; then
-			echo -e ""
-			einfo "Support for the Indigo2 Impact R10000 is probably even more experimental"
-			einfo "than Octane support.  If you seriously do not have a clue in the world about"
-			einfo "what you are doing, what an IP28 is, what a mips is, or even what gentoo is,"
-			einfo "then stop now, and return to regularly scheduled x86 programming.  Consider"
-			einfo "this the warning that you are about to venture into no-man's land with a"
-			einfo "machine that is barely supported, likely very unstable, and may very well"
-			einfo "eat your grandmother's pet cat Fluffy."
-			echo -e ""
-			einfo "That said, support for this system REQUIRES that you use the ip28 cascade"
-			einfo "profile (default-linux/mips/mips64/ip28/XXXX.Y), because a very special"
-			einfo "patch is used on the system gcc, kernel-gcc (gcc-mips64) and the kernel"
-			einfo "itself in order to support this machine.  These patches will only be applied"
-			einfo "if \"ip28\" is defined in USE, which the profile sets.  Other things to keep"
-			einfo "in mind are that this system can only be netbooted (no arcboot support),"
-			einfo "requires a full 64-bit kernel, serial-console only (Impact graphics not"
-			einfo "supported yet), and _nothing_ is guaranteed to work smoothly."
-			echo -e ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-
-
-	# See if we're using IP30 (Octane)
-	if use ip30; then
-		if [ "${arch_is_selected}" = "no" ]; 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 ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-
-
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if use cobalt; then
-		if [ "${arch_is_selected}" = "no" ]; 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 ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Generic Patches - Safe to use globally
-do_generic_patches() {
-	echo -e ""
-	ebegin ">>> Generic Patches"
-		# IP32 Patches (Safe for non-IP32 use)
-		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-onion2-gbefb-fixes.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-tweak-makefile.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.10-ths-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-pdh-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
-
-		# Generic
-		epatch ${MIPS_PATCHES}/misc-2.6-fix-prologue-error.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.10-add-ramdisk-back.patch
-		epatch ${MIPS_PATCHES}/misc-2.6-mips-iomap-functions.patch
-
-		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
-		if ! use ip30 and ! use ip28; then
-			epatch ${MIPS_PATCHES}/misc-2.6-ugly-wrong-kphysaddr-hack.patch
-		fi
-	eend
-}
-
-
-# NOT safe for production systems
-# Use at own risk, do _not_ file bugs on effects of these patches
-do_sekret_patches() {
-	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
-	# Patches used in building LiveCDs
-	if use livecd; then
-		epatch ${MIPS_PATCHES}/misc-2.6-livecd-partitioned-cdroms.patch
-	fi
-	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
-}
-
-
-do_security_patches() {
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${MIPS_SECURITY}/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch
-		epatch ${MIPS_SECURITY}/CAN-2004-1056-2.6.9-dos_drm.patch
-		epatch ${MIPS_SECURITY}/CAN-2004-1235-2.6-uselib_priv_escalation.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0001-2.6.10-prereq-grsec_mult_kern_adv.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0001-2.6.10-i386_smp_page_fault_handler.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0207-2.6-nfs-client-o_direct.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0209-2.6-keep-frag-queues-private.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0210-2.6-netfilter-dos.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0384-2.6-ppp-dos.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0400-2.6-ext2-mem-leak.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0449-2.6-ip_fragment-reset_ip_summed.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0529-2.6-proc_file_read-sign-comp.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0530-2.6-copy_from_read_buf-sign-chk.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0531-2.6-atm-copy_to_user-sign-chk.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0532-2.6-reiserfs_file_write-64bit-types.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0736-2.6-sys_epoll_wait-int-ovrflw.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0749-2.6-load_elf_library-dos.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0750-2.6-af_bluetooth_local_root.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0815-2.6-iso9660-range-chk.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0839-2.6-unrestricted-n_mouse-line.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0867-2.6-sysfs_write_file-int-ovrflw.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0916-2.6-is_hugepage_only_range.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-0937-2.6-futex-deadlock.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1041-fib_seq_start-dos.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1263-2.6-elf-core-dump.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1264-2.6-raw-pktcdvd-local-priv.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1265-local-dos-via-mmap.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1368-2.6-key_user_lookup-dos.patch
-		epatch ${MIPS_SECURITY}/CAN-2005-1589-pkt_ioctl-local-priv-esc.patch
-		epatch ${MIPS_SECURITY}/security-2.6.10-lsm-local_priv_elevate_flaw.patch
-		epatch ${MIPS_SECURITY}/security-2.6-local-dos-tmpfs.patch
-		epatch ${MIPS_SECURITY}/security-2.6.10-rose-scsi_tape-vulns.patch
-		epatch ${MIPS_SECURITY}/security-2.6-ntfs-dos.patch
-		epatch ${MIPS_SECURITY}/security-2.6-nfsacl-remote-nfs.patch
-	eend
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# These patches are separate from generic patches for a good reason - namely because it is
-# possible (but untested) that patches for one machine-type may conflict with patches from
-# another machine type and therefore produce unwanted side-effects.  We therefore enforce 
-# this by checking if an arch patch has already been applied, and if so, error out.
-
-# SGI Indigo2 Impact R10000 (IP28)
-do_ip28_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.10-rc2-ip28-i2_impact-support.patch
-	epatch ${MIPS_PATCHES}/misc-2.6.10-rc2-ip28-c_r4k-tweak.patch
-}
-
-
-# SGI Octane 'Speedracer' (IP30)
-do_ip30_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.10-rc2-ip30-octane-support.patch
-}
-
-
-# Cobalt Microserver
-do_cobalt_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for Cobalt support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.9-cobalt-support.patch
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Renames source trees for the few machines that we have separate patches for
-rename_source_tree() {
-	if [ ! -z "${1}" ]; then
-		if use ${1}; then
-			mv ${S} ${S}.${1}
-			S="${S}.${1}"
-		fi
-	fi
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-
-	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
-	if [ "${USERC}" = "yes" ]; then
-		echo -e ""
-		einfo ">>> linux-${STABLEVER} --> linux-${OKV} ..."
-		epatch ${WORKDIR}/patch-${OKV}
-	fi
-
-
-	# Update the vanilla sources with linux-mips CVS changes
-	echo -e ""
-	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Generic patches we always include
-	do_generic_patches
-
-	# Machine-specific patches
-	use ip28	&& do_ip28_support
-	use ip30	&& do_ip30_support
-	use cobalt	&& do_cobalt_support
-
-	# Patches for experimental use
-	do_sekret_patches
-
-	# Security Fixes
-	do_security_patches
-
-
-	# All done, resume normal portage work
-	kernel_universal_unpack
-}
-
-
-src_install() {
-	use ip28	&& rename_source_tree ip28
-	use ip30	&& rename_source_tree ip30
-	use cobalt	&& rename_source_tree cobalt
-
-	kernel_src_install
-}
-
-
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12.5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12.5.ebuild
new file mode 100644
index 000000000000..16871a8ff5e7
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12.5.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2005 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.12.5.ebuild,v 1.1 2005/10/16 02:31:27 kumba Exp $
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 11 Jul 2005
+# 3) Generic Fixes
+# 4) Security fixes
+# 7) Experimental patches (IP27)
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20050711"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.15"			# Tarball version for security patches
+GENPATCHVER="1.14"			# Tarball version for generic patches
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+F_KV="${OKV}"				# Fetch KV, used to know what mipscvs diff to grab.
+STABLEVER="${F_KV}"			# Stable Version (2.6.x)
+PATCHVER=""
+USERC="no"				# If set to "yes", then attempt to use an RC kernel
+USEPNT="yes"				# If set to "yes", then attempt to use a point-release (2.6.x.y)
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+MIPS_SECURITY="${WORKDIR}/security"
+
+# Inherit Eclasses
+ETYPE="sources"
+inherit kernel eutils versionator
+
+# Portage Vars
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources virtual/alsa"
+KEYWORDS="-* ~mips"
+IUSE="ip27"
+
+
+# If USERC == "yes", use a release candidate kernel (2.6.X-rcY)
+# Do not set this to "yes" if using a point-release kernel
+if [ "${USERC}" = "yes" ]; then
+	KVXY="$(get_version_component_range 1-2)"			# Kernel Major/Minor
+	KVZ="$(get_version_component_range 3)"				# Kernel Revision Pt. 1
+	KVRC="${get_version_component_range 4}"				# Kernel RC
+	F_KV="$(get_version_component_range 1-3)"
+	STABLEVER="${KVXY}.$((${KVZ} - 1))"				# Last stable version (Rev - 1)
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
+	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
+	KV="${OKV}-${EXTRAVERSION}"
+fi
+
+# If USEPNT == "yes", use a point release kernel (2.6.x.y)
+# Do not set this to "yes" if using a release candidate kernel
+if [ "${USEPNT}" = "yes" ]; then
+	F_KV="$(get_version_component_range 1-3)"			# Get Maj/Min/Rev (x.y.z)
+	STABLEVER="${F_KV}"						# Last Revision release
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/patch-${OKV}.bz2"	# Patch for new point release
+	EXTRAVERSION=".$(get_version_component_range 4)-mipscvs-${CVSDATE}"
+	KV="${OKV}${EXTRAVERSION}"
+fi
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.tar.bz2
+		mirror://gentoo/mipscvs-${F_KV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
+		${PATCHVER}"
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Error message 
+err_only_one_arch_allowed() {
+	echo -e ""
+	die "IP27 Support pre-selected"
+}
+
+
+# Check our USE flags for machine-specific flags and give appropriate warnings.
+# Hope the user isn't crazy enough to try using combinations of these flags.
+# Only use one machine-specific flag at a time for each type of desired machine-support.
+#
+# Affected machines:	ip27
+# Not Affected:
+pkg_setup() {
+	local arch_is_selected="no"
+
+	# See if we're using IP27 (Origin)
+	if use ip27; then
+		echo -e ""
+		einfo "IP27 support can be considered a game of Russian Roulette.  It'll work"
+		einfo "great for some but not for others.  It also uses some rather horrible"
+		einfo "hacks to get going -- hopefully these will be repaired in the future."
+		echo -e ""
+		ewarn "Please keep all kittens and any other small, cute, and fluffy creatures"
+		ewarn "away from an IP27 Box running these sources.  Failure to do so may cause"
+		ewarn "the IP27 to consume the hapless creature.  Consider this your only"
+		ewarn "warning regarding the experimental nature of this particular machine."
+		echo -e ""
+		arch_is_selected="yes"
+	else
+		echo -e ""
+		eerror "Only support for the SGI Origin is enabled in this version."
+		eerror "Please pass USE=\"ip27\" or add this USE flag to /etc/make.conf."
+		err_only_one_arch_allowed
+	fi
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Generic Patches - Safe to use globally
+do_generic_patches() {
+	echo -e ""
+	ebegin ">>> Generic Patches"
+		# Generic
+		epatch ${MIPS_PATCHES}/misc-2.6.12-ths-mips-tweaks.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-mips-iomap-functions.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-seccomp-no-default.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.11-add-byteorder-to-proc.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-n32-fix-sigsuspend.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-patch-2_6_13_4-backport.patch
+	eend
+}
+
+
+# NOT safe for production systems
+# Use at own risk, do _not_ file bugs on effects of these patches
+do_sekrit_patches() {
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+
+	# No Sekrit Patches!
+	sleep 0
+
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+}
+
+
+do_security_patches() {
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		einfo ">>> None to apply! ..."
+		echo -e ""
+##		epatch ${MIPS_SECURITY}/
+	eend
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# These patches are separate from generic patches for a good reason - namely because it is
+# possible (but untested) that patches for one machine-type may conflict with patches from
+# another machine type and therefore produce unwanted side-effects.  We therefore enforce 
+# this by checking if an arch patch has already been applied, and if so, error out.
+
+# SGI Origin (IP27)
+do_ip27_support() {
+	echo -e ""
+	einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
+	epatch ${MIPS_PATCHES}/misc-2.6.12-ioc3-metadriver-r25.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.12-ip27-iluxa-fixes.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ip27-horrible-hacks_may-eat-kittens.patch
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Renames source trees for the few machines that we have separate patches for
+rename_source_tree() {
+	if [ ! -z "${1}" ]; then
+		if use ${1}; then
+			mv ${S} ${S}.${1}
+			S="${S}.${1}"
+		fi
+	fi
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	cd ${S}
+
+
+	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
+	# OR
+	# if USEPNT == "yes", use a point-release kernel (2.6.x.y)
+	if [ "${USERC}" = "yes" -o "${USEPNT}" = "yes" ]; then
+		echo -e ""
+		einfo ">>> linux-${STABLEVER} --> linux-${OKV} ..."
+		epatch ${WORKDIR}/patch-${OKV}
+	fi
+
+
+	# Update the vanilla sources with linux-mips CVS changes
+	echo -e ""
+	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
+	epatch ${WORKDIR}/mipscvs-${F_KV}-${CVSDATE}.diff
+
+	# Generic patches we always include
+	do_generic_patches
+
+	# Machine-specific patches
+	use ip27	&& do_ip27_support
+
+	# Patches for experimental use
+	do_sekrit_patches
+
+	# Security Fixes
+	do_security_patches
+
+
+	# All done, resume normal portage work
+	kernel_universal_unpack
+}
+
+
+src_install() {
+	use ip27	&& rename_source_tree ip27
+
+	kernel_src_install
+}
+
+pkg_postinst() {
+	local my_ksrc="${S##*/}"
+	use ip27	&& my_ksrc="${my_ksrc}.ip27"
+
+	if [ ! -e ${ROOT}usr/src/linux ]; then
+		rm -f ${ROOT}usr/src/linux
+		ln -sf ${my_ksrc} ${ROOT}/usr/src/linux
+	fi
+}
+
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.13.4.ebuild
index e89644a40ad9..9a5bf20f99fc 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.12.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.13.4.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 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.12.ebuild,v 1.1 2005/07/06 04:18:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.13.4.ebuild,v 1.1 2005/10/16 02:31:27 kumba Exp $
 
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 03 Jul 2005
+# 2) linux-mips.org CVS snapshot diff from 14 Sep 2005
 # 3) Generic Fixes
 # 4) Security fixes
-# 5) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
+# 5) Patch for IP30 Octane Support		(http://www.linux-mips.org/~skylark/)
+# 5) Patch for IP28 Octane Support		(http://home.alphastar.de/fuerst/download.html)
 # 6) Patch for Remaining Cobalt Bits		(http://www.colonel-panic.org/cobalt-mips/)
-# 7) Experimental patches
+# 7) Experimental patches (IP27 hacks, et al)
 
 
 #//------------------------------------------------------------------------------
@@ -19,12 +20,16 @@
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20050703"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.14"			# Tarball version for security patches
-GENPATCHVER="1.13"			# Tarball version for generic patches
+CVSDATE="20050914"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.15"			# Tarball version for security patches
+GENPATCHVER="1.14"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
+F_KV="${OKV}"				# Fetch KV, used to know what mipscvs diff to grab.
+STABLEVER="${F_KV}"			# Stable Version (2.6.x)
+PATCHVER=""
 USERC="no"				# If set to "yes", then attempt to use an RC kernel
+USEPNT="yes"				# If set to "yes", then attempt to use a point-release (2.6.x.y)
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
@@ -33,35 +38,43 @@ MIPS_SECURITY="${WORKDIR}/security"
 
 # Inherit Eclasses
 ETYPE="sources"
-inherit kernel eutils
+inherit kernel eutils versionator
 
 # Portage Vars
 HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 livecd"
+KEYWORDS="-* mips"
+IUSE="cobalt ip27 ip28 ip30"
 
 
 # If USERC == "yes", use a release candidate kernel (2.6.X-rcY)
+# Do not set this to "yes" if using a point-release kernel
 if [ "${USERC}" = "yes" ]; then
-	KVMjMn="${OKV%.*}"				# Kernel Major/Minor
-	KVREV="${OKV%%-*}"				# Kernel Revision Pt. 1
-	KVREV="${KVREV##*.}"				# Kernel Revision Pt. 2
-	KVRC="${OKV#*-}"				# Kernel RC
-	STABLEVER="${KVMjMn}.$((${KVREV} - 1))"		# Last stable Kernel version (Revision - 1)
+	KVXY="$(get_version_component_range 1-2)"			# Kernel Major/Minor
+	KVZ="$(get_version_component_range 3)"				# Kernel Revision Pt. 1
+	KVRC="${get_version_component_range 4}"				# Kernel RC
+	F_KV="$(get_version_component_range 1-3)"
+	STABLEVER="${KVXY}.$((${KVZ} - 1))"				# Last stable version (Rev - 1)
 	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
 	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
 	KV="${OKV}-${EXTRAVERSION}"
-else
-	STABLEVER="${OKV}"
-	PATCHVER=""
+fi
+
+# If USEPNT == "yes", use a point release kernel (2.6.x.y)
+# Do not set this to "yes" if using a release candidate kernel
+if [ "${USEPNT}" = "yes" ]; then
+	F_KV="$(get_version_component_range 1-3)"			# Get Maj/Min/Rev (x.y.z)
+	STABLEVER="${F_KV}"						# Last Revision release
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/patch-${OKV}.bz2"	# Patch for new point release
+	EXTRAVERSION=".$(get_version_component_range 4)-mipscvs-${CVSDATE}"
+	KV="${OKV}${EXTRAVERSION}"
 fi
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/mipscvs-${F_KV}-${CVSDATE}.diff.bz2
 		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
 		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
 		${PATCHVER}"
@@ -94,21 +107,26 @@ pkg_setup() {
 
 	# See if we're using IP27 (Origin)
 	if use ip27; then
-		if [ "${arch_is_selected}" = "no" ]; then
-			echo -e ""
-			einfo "IP27 support can be considered a game of Russian Roulette.  It'll work"
-			einfo "great for some but not for others.  It also uses some rather horrible"
-			einfo "hacks to get going -- hopefully these will be repaired in the future."
-			echo -e ""
-			ewarn "Please keep all kittens and any other small, cute, and fluffy creatures"
-			ewarn "away from an IP27 Box running these sources.  Failure to do so may cause"
-			ewarn "the IP27 to consume the hapless creature.  Consider this your only"
-			ewarn "warning regarding the experimental nature of this particular machine."
-			echo -e ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
+		echo -e ""
+		eerror "SGI Origin (IP27) Support has been disabled in this ebuild"
+		eerror "revision.  If you wish to merge IP27 sources, then"
+		eerror "run USE=\"ip27\" emerge =mips-sources-2.6.12.5"
+		die "IP27 Support disabled."
+#		if [ "${arch_is_selected}" = "no" ]; then
+#			echo -e ""
+#			einfo "IP27 support can be considered a game of Russian Roulette.  It'll work"
+#			einfo "great for some but not for others.  It also uses some rather horrible"
+#			einfo "hacks to get going -- hopefully these will be repaired in the future."
+#			echo -e ""
+#			ewarn "Please keep all kittens and any other small, cute, and fluffy creatures"
+#			ewarn "away from an IP27 Box running these sources.  Failure to do so may cause"
+#			ewarn "the IP27 to consume the hapless creature.  Consider this your only"
+#			ewarn "warning regarding the experimental nature of this particular machine."
+#			echo -e ""
+#			arch_is_selected="yes"
+#		else
+#			err_only_one_arch_allowed
+#		fi
 	fi
 
 
@@ -194,20 +212,25 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
 
 		# Cobalt Patches (Safe for non-Cobalt use)
-		epatch ${MIPS_PATCHES}/misc-2.6.12-cobalt-bits.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-cobalt-bits.patch
 
 		# Generic
-		epatch ${MIPS_PATCHES}/misc-2.6.12-ths-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-pdh-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-add-ramdisk-back.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-ths-mips-tweaks.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-add-ramdisk-back.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-mips-iomap-functions.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-seccomp-no-default.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-rem-qlogicisp-scsi_to_pci_dma_dir.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.11-add-byteorder-to-proc.patch
-
-		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
-		if ! use ip30 && ! use ip28; then
-			epatch ${MIPS_PATCHES}/misc-2.6.11-ugly-wrong-kphysaddr-hack.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-mm1-fix-md-oops-on-shutdown.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-rev-i18n.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.13-n32-fix-sigsuspend.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.14-csum_tcpudp_nofold-sign-extend.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.14-fix-excessive-signal-lat.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.14-add-sock_dccp-def.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.14-r14k-cpu-prid.patch
+
+		# Ugly Hacks
+		if ! use ip28 && ! use ip30; then
+			epatch ${MIPS_PATCHES}/misc-2.6.13-ugly-wrong-kphysaddr-hack.patch
 		fi
 	eend
 }
@@ -215,12 +238,12 @@ do_generic_patches() {
 
 # NOT safe for production systems
 # Use at own risk, do _not_ file bugs on effects of these patches
-do_sekret_patches() {
+do_sekrit_patches() {
 	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
-	# Patches used in building LiveCDs
-	if use livecd; then
-		epatch ${MIPS_PATCHES}/misc-2.6-livecd-partitioned-cdroms.patch
-	fi
+
+	# No Sekrit Patches!
+	sleep 0
+
 	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
 }
 
@@ -228,7 +251,9 @@ do_sekret_patches() {
 do_security_patches() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
-		epatch ${MIPS_SECURITY}/security-2.6-nfsacl-remote-nfs.patch
+		einfo ">>> None to apply! ..."
+		echo -e ""
+##		epatch ${MIPS_SECURITY}/
 	eend
 }
 
@@ -247,15 +272,15 @@ do_security_patches() {
 do_ip27_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.11-ip27-horrible-hacks_may-eat-kittens.patch
-#	epatch ${MIPS_PATCHES}/misc-2.6.12-ip27-iluxa-fixes.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ioc3-metadriver-r25.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ip27-horrible-hacks_may-eat-kittens.patch
 }
 
 # SGI Indigo2 Impact R10000 (IP28)
 do_ip28_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-ip28-i2_impact-support.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ip28-i2_impact-support.patch
 }
 
 
@@ -263,8 +288,8 @@ do_ip28_support() {
 do_ip30_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-ip30-octane-support.patch
-	epatch ${MIPS_PATCHES}/misc-2.6.12-ip30-switch-to-plat_setup.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ioc3-metadriver-r25.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.13-ip30-octane-support-r26.patch
 }
 
 
@@ -296,7 +321,9 @@ src_unpack() {
 
 
 	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
-	if [ "${USERC}" = "yes" ]; then
+	# OR
+	# if USEPNT == "yes", use a point-release kernel (2.6.x.y)
+	if [ "${USERC}" = "yes" -o "${USEPNT}" = "yes" ]; then
 		echo -e ""
 		einfo ">>> linux-${STABLEVER} --> linux-${OKV} ..."
 		epatch ${WORKDIR}/patch-${OKV}
@@ -306,7 +333,7 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	echo -e ""
 	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+	epatch ${WORKDIR}/mipscvs-${F_KV}-${CVSDATE}.diff
 
 	# Generic patches we always include
 	do_generic_patches
@@ -317,7 +344,7 @@ src_unpack() {
 	use ip30	&& do_ip30_support
 
 	# Patches for experimental use
-	do_sekret_patches
+	do_sekrit_patches
 
 	# Security Fixes
 	do_security_patches
@@ -336,6 +363,17 @@ src_install() {
 	kernel_src_install
 }
 
+pkg_postinst() {
+	local my_ksrc="${S##*/}"
+	use ip27	&& my_ksrc="${my_ksrc}.ip27"
+	use ip28	&& my_ksrc="${my_ksrc}.ip28"
+	use ip30	&& my_ksrc="${my_ksrc}.ip30"
+
+	if [ ! -e ${ROOT}usr/src/linux ]; then
+		rm -f ${ROOT}usr/src/linux
+		ln -sf ${my_ksrc} ${ROOT}/usr/src/linux
+	fi
+}
 
 
 #//------------------------------------------------------------------------------