Update to 3.18.3, and all older ebuilds and associated eblits removed. Octane (IP30) support returns in this release, with some caveats. Origin/Onyx2 (IP27) support has been fixed up, and other hardware is known to work, with the exception of IP22, IP28, and Cobalt, which have not been tested in some time.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D25D95E3)

13 files changed, 97 insertions, 601 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index d1d5ecd1d2a8..e9374b7d5dc5 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-kernel/mips-sources
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.151 2013/07/29 09:59:34 kumba Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.152 2015/01/18 07:44:14 kumba Exp $
+
+*mips-sources-3.18.3 (18 Jan 2015)
+
+  18 Jan 2015; Joshua Kinard <kumba@gentoo.org> -mips-sources-2.6.29.1.ebuild,
+  -mips-sources-3.9.11.ebuild, -mips-sources-3.10.4.ebuild,
+  +mips-sources-3.18.3.ebuild, -files/eblits/show_ip22_info-v1.eblit,
+  -files/eblits/show_ip27_info-v1.eblit, +files/eblits/show_ip27_info-v2.eblit,
+  -files/eblits/show_ip30_info-v1.eblit, -files/eblits/show_ip30_info-v2.eblit,
+  +files/eblits/show_ip30_info-v3.eblit, -files/eblits/show_ip32_info-v1.eblit,
+  -files/eblits/src_unpack-v2.eblit, -files/eblits/src_unpack-v3.eblit,
+  +files/eblits/src_unpack-v4.eblit, metadata.xml:
+  Update to 3.18.3, and all older ebuilds and associated eblits removed. Octane
+  (IP30) support returns in this release, with some caveats. Origin/Onyx2
+  (IP27) support has been fixed up, and other hardware is known to work, with
+  the exception of IP22, IP28, and Cobalt, which have not been tested in some
+  time.
 
 *mips-sources-3.10.4 (29 Jul 2013)
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v1.eblit
deleted file mode 100644
index 75c7b94e10bd..000000000000
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v1.eblit
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip22_info-v1.eblit,v 1.1 2009/03/16 06:39:09 kumba Exp $
-
-# Eblit with information/warnings for IP22 (Indy/Indigo2 R4x00) users.
-#
-# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
-# \040 for a space instead of the standard space.  These functions will strip
-# redundant white space.
-
-show_ip22_info() {
-	echo -e ""
-	einfo "IP22 systems with an R5000 processor should work well with this release."
-	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
-	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
-	einfo ""
-	einfo "Some Notes:"
-	einfo "\t- Supported graphics card right now is Newport (XL)."
-	einfo "\t- A driver for Extreme (XZ) supposedly exists, but its author"
-	einfo "\t\040\040has steadfastly refused to release the code for various reasons."
-	einfo "\t\040\040Any questions regarding its status should be directed to "onion" in"
-	einfo "\t\040\040#mipslinux on the Freenode IRC network.  Given he is the author, he"
-	einfo "\t\040\040will know the most current status of the driver."
-	echo -e ""
-}
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip27_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip27_info-v2.eblit
index 4f4ea940f8ca..a154d5fb2c5b 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip27_info-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip27_info-v2.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip27_info-v1.eblit,v 1.1 2009/03/16 06:39:10 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip27_info-v2.eblit,v 1.1 2015/01/18 07:44:14 kumba Exp $
 
 # Eblit with information/warnings for IP27 (Origin 200/2000/Onyx2) users.
 #
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v1.eblit
deleted file mode 100644
index 111772579af6..000000000000
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v1.eblit
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip30_info-v1.eblit,v 1.1 2009/03/16 06:39:10 kumba Exp $
-
-# Eblit with information/warnings for IP30 (Octane) users.
-#
-# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
-# \040 for a space instead of the standard space.  These functions will strip
-# redundant white space.
-
-show_ip30_info() {
-	echo -e ""
-	einfo "Things to keep in mind when building a kernel for an SGI Octane:"
-	einfo "\t- Impact (MGRAS) console and X driver work, please report any bugs."
-	einfo "\t- VPro (Odyssey) console works, but no X driver exists yet."
-	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
-	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
-	einfo "\t- Do not use OHCI-based USB cards in Octane.  They're broke on this machine."
-	einfo "\t\040\040Patches are welcome to fix the issue."
-	einfo "\t- Equally, UHCI Cards are showing issues in this release, but should still"
-	einfo "\t\040\040function somewhat.  This issue manifests itself when using pl2303 USB->Serial"
-	einfo "\t\040\040adapters."
-	einfo "\t- Other XIO-based devices like MENET and various Impact addons remain"
-	einfo "\t\040\040untested and are not guaranteed to work.  This applies to various"
-	einfo "\t\040\040digital video conversion boards as well."
-	echo -e ""
-}
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit
deleted file mode 100644
index 1b886521b143..000000000000
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
-
-# Eblit with information/warnings for IP30 (Octane) users.
-#
-# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
-# \040 for a space instead of the standard space.  These functions will strip
-# redundant white space.
-
-show_ip30_info() {
-	echo -e ""
-	eerror "!!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!!"
-	eerror "!!!                                                               !!!"
-	eerror "!!! As of the 2.6.30-series of kernels, SGI Octane Support is     !!!"
-	eerror "!!! broken.  This ebuild includes a patch that does NOT work      !!!"
-	eerror "!!! but is here in case someone has the desire to try and fix it  !!!"
-	eerror "!!! and bring Octane support back to life.                        !!!"
-	eerror "!!!                                                               !!!"
-	eerror "!!! Areas that need HEAVY review are IRQ handling, PCI Bridge     !!!"
-	eerror "!!! support, and DMA handling.  Currently, this patch, if         !!!"
-	eerror "!!! applied, will allow the kernel to boot, but that's it.  The   !!!"
-	eerror "!!! root filesystem WILL mount, and it is possible that /bin/init !!!"
-	eerror "!!! is able to execute one or two processes.  At this point, Bus  !!!"
-	eerror "!!! Errors will appear at random if the ImpactSR Early Console    !!!"
-	eerror "!!! hack/patch is applied.  The cause of these errors is not yet  !!!"
-	eerror "!!! known.                                                        !!!"
-	eerror "!!!                                                               !!!"
-	eerror "!!! Any help is appreciated.  Please stop by #gentoo-mips on the  !!!"
-	eerror "!!! Freenode IRC Network (irc.freenode.com) if you think you can  !!!"
-	eerror "!!! help.                                                         !!!"
-	eerror "!!!                                                               !!!"
-	eerror "!!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!! BROKEN !!!"
-	echo -e ""
-
-# Commented out until Octane lives again.
-#	einfo "Things to keep in mind when building a kernel for an SGI Octane:"
-#	einfo "\t- Impact (MGRAS) console and X driver work, please report any bugs."
-#	einfo "\t- VPro (Odyssey) console works, but no X driver exists yet."
-#	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
-#	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
-#	einfo "\t- Do not use OHCI-based USB cards in Octane.  They're broke on this machine."
-#	einfo "\t\040\040Patches are welcome to fix the issue."
-#	einfo "\t- Equally, UHCI Cards are showing issues in this release, but should still"
-#	einfo "\t\040\040function somewhat.  This issue manifests itself when using pl2303 USB->Serial"
-#	einfo "\t\040\040adapters."
-#	einfo "\t- Other XIO-based devices like MENET and various Impact addons remain"
-#	einfo "\t\040\040untested and are not guaranteed to work.  This applies to various"
-#	einfo "\t\040\040digital video conversion boards as well."
-#	echo -e ""
-}
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit
new file mode 100644
index 000000000000..b9a5bc0fe522
--- /dev/null
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit,v 1.1 2015/01/18 07:44:14 kumba Exp $
+
+# Eblit with information/warnings for IP30 (Octane) users.
+#
+# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
+# \040 for a space instead of the standard space.  These functions will strip
+# redundant white space.
+
+show_ip30_info() {
+	echo -e ""
+	einfo "Octane boots again as-of 3.14!  Celebrate!"
+	echo -e ""
+	eerror "Things that DON'T work:"
+	eerror "\t- SMP SUPPORT IS CURRENTLY BROKEN!  I require help in getting CPU1 to"
+	eerror "\t\040\040'tick' properly, as it hangs up in the generic MIPS SMP code."
+	eerror "\t- R14000 ONLY: Do NOT use CONFIG_TRANSPARENT_HUGEPAGE on an Octane with"
+	eerror "\t\040\040an R14000 CPU, otherwise, when the machine starts to boot into"
+	eerror "\t\040\040userland, it will trigger Instruction Bus Errors (IBEs), which"
+	eerror "\t\040\040requires a complete powerdown of the machine for about 15 seconds"
+	eerror "\t\040\040to clear."
+	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
+	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in"
+	eerror "\t\040\040sysfs."
+	eerror "\t- Do not use OHCI-based USB cards in Octane.  They're broke on this machine."
+	eerror "\t\040\040Patches are welcome to fix the issue."
+	echo -e ""
+	ewarn "Things that might work, but have problems, or are unknown:"
+	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
+	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
+	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
+	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
+	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
+	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
+	ewarn "\t- UHCI Cards are known to have issues, but should still have some functionality."
+	ewarn "\t\040\040This issue primarily manifests itself when using pl2303 USB->Serial"
+	ewarn "\t\040\040adapters."
+	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
+	ewarn "\t\040\040the six serial ports didn't appear to get picked up by the IOC3"
+	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
+	ewarn "\t\040\040from the four Number-In-a-Cans.  Additional testing would be"
+	ewarn "\t\040\040appreciated and patches welcome."
+	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
+	ewarn "\t\040\040and are not guaranteed to work.  This applies to various digital"
+	ewarn "\t\040\040video conversion boards as well."
+	echo -e ""
+	einfo "Things that DO work:"
+	einfo "\t- Impact (MGRAS) console and X driver, please report any bugs."
+	einfo "\t- VPro (Odyssey) console, but no X driver exists yet."
+	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
+	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
+	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
+	einfo "\t\040\040 report any problems with these devices."
+	echo -e ""
+}
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v1.eblit
deleted file mode 100644
index 891ecb459210..000000000000
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v1.eblit
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip32_info-v1.eblit,v 1.1 2009/03/16 06:39:10 kumba Exp $
-
-# Eblit with information/warnings for IP32 (O2) users.
-#
-# If you need to add whitespace for formatting in 'einfo', 'ewarn', or 'eerror', use
-# \040 for a space instead of the standard space.  These functions will strip
-# redundant white space.
-
-show_ip32_info() {
-	echo -e ""
-	einfo "IP32 systems function well, however there are some notes:"
-	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
-	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
-	einfo "\t\040\040specified when building the kernel will likely oops or panic"
-	einfo "\t\040\040the kernel."
-	einfo "\t- X support is limited to the generic fbdev driver.  No X gbefb"
-	einfo "\t\040\040driver exists for O2 yet.  Patches are welcome, however! :)"
-	echo -e ""
-
-	if use ip32r10k; then
-		eerror "R10000/R12000 Support on IP32 is ${HILITE}HIGHLY EXPERIMENTAL!${NORMAL}"
-		eerror "This is intended ONLY for people interested in fixing it up.  And"
-		eerror "by that, I mean people willing to SEND IN PATCHES!  If you're not"
-		eerror "interested in debugging this issue seriously or just want to run it"
-		eerror "as a user, then DO NOT USE THIS.  Really, we mean it."
-		echo -e ""
-		eerror "All that said, initial testing seems to indicate that this system will"
-		eerror "stay online for a reasonable amount of time and will compile packages."
-		eerror "However, the primary console (which is serial, gbefb seems dead for now)"
-		eerror "will fill with CRIME CPU errors every so often.  A majority of these"
-		eerror "seem harmless, however a few non-fatal oopses have also been triggered."
-		echo -e ""
-		eerror "We're interesting in finding anyone with knowledge of the R10000"
-		eerror "workaround for speculative execution listed in the R10000 Processor"
-		eerror "manual, or those who are familiar with the IP32 chipset and the feature"
-		eerror "called \"Juice\"."
-		echo -e ""
-	fi
-
-	eerror "!!! To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
-	eerror "!!! systems, you _need_ to be using a >=gcc-4.1.1 compiler, have CONFIG_BUILD_ELF64"
-	eerror "!!! disabled in your kernel config, and building with the ${HILITE}vmlinux.32${NORMAL} make target."
-	eerror ""
-	eerror "!!! Once done, copy the ${GOOD}vmlinux.32${NORMAL} file and boot that.  Do not use the"
-	eerror "!!! ${BAD}vmlinux${NORMAL} file -- this will either not boot on IP22 or result in"
-	eerror "!!! undocumented weirdness on IP32 systems."
-}
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v2.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v2.eblit
deleted file mode 100644
index aa46025cc0ab..000000000000
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v2.eblit
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/src_unpack-v2.eblit,v 1.1 2009/03/24 05:33:37 kumba Exp $
-
-# Eblit to handle src_unpack.
-
-eblit-mips-sources-src_unpack() {
-	# Unpack the kernel sources, update to the latest rev (if needed),
-	# and apply the latest patch from linux-mips git.
-	kernel-2_src_unpack
-
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${F_KV}.
-	echo -e ""
-	cd "${WORKDIR}"
-	unpack "${PN}-${F_KV}-patches-v${GENPATCHREV}.tar.bz2"
-
-	# Create a new folder, patch-symlinks, and create symlinks to
-	# mips-patches in there.  If we want to exclude a patch, we'll
-	# just delete the symlink instead of the actual patch.
-	local psym="patch-symlinks"
-	mkdir "${psym}"
-	cd "${psym}"
-	for x in ../mips-patches-${F_KV}/*.patch; do
-		ln -s "${x}" "${x##../mips-patches-*/}"
-	done
-
-	# With symlinks created, setup the variables referencing external
-	# machine patches and if a machine USE flag is enabled, then unset
-	# its corresponding variable.
-	# See 0000_README for the patch numbers and their meanings.
-	local p_generic="501*"
-	local p_ip27="502*" p_ip28="503*" p_ip30="504*" p_ip32r10k="6001*" p_impactdebug="6002*"
-	use ip27 && unset p_generic p_ip27
-	use ip28 && unset p_ip28
-	use ip30 && unset p_generic p_ip30
-	use ip32r10k && unset p_ip32r10k
-	use impactdebug && unset p_impactdebug
-
-	# Remove symlinks for any patches that we don't want applied.  We do
-	# this by looping through all the above variables, and deleting
-	# matching symlinks that point to the corresponding patches.
-	# The remaining symlinks will be applied to the kernel source.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k} ${p_impactdebug}"
-	for x in $patchlist; do rm -f "./${x}"; done
-
-	# Rename the source tree to match the linux-mips git checkout date and
-	# machine type.
-	local v="${F_KV}${EXTRAVERSION}-${GITDATE}"
-	for x in {ip27,ip28,ip30,cobalt}; do use ${x} && v="${v}.${x}" && break; done
-	mv "${WORKDIR}/linux-${F_KV}${EXTRAVERSION}" "${WORKDIR}/linux-${v}"
-	S="${WORKDIR}/linux-${v}"
-
-	# Now go into the kernel source and patch it.
-	cd "${S}"
-	epatch "${WORKDIR}/${psym}"/*.patch
-
-	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
-	EXTRAVERSION="${EXTRAVERSION}-mipsgit-${GITDATE}"
-	unpack_set_extraversion
-}
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v4.eblit
index f61b3bfc29ec..98f61459bae0 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v4.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/src_unpack-v4.eblit,v 1.1 2015/01/18 07:44:14 kumba Exp $
 
 # Eblit to handle src_unpack.
 
@@ -30,19 +30,16 @@ eblit-mips-sources-src_unpack() {
 	# See 0000_README for the patch numbers and their meanings.
 	local p_generic="501*"
 	local p_ip27="502*" p_ip28="503*" p_ip30="504*" p_ip32r10k="6001*"
-	local p_impactdebug="6002*" p_odysseydebug="6003*"
 	use ip27 && unset p_generic p_ip27
 	use ip28 && unset p_ip28
 	use ip30 && unset p_generic p_ip30
 	use ip32r10k && unset p_ip32r10k
-	use impactdebug && unset p_impactdebug
-	use odysseydebug && unset p_odysseydebug
 
 	# Remove symlinks for any patches that we don't want applied.  We do
 	# this by looping through all the above variables, and deleting
 	# matching symlinks that point to the corresponding patches.
 	# The remaining symlinks will be applied to the kernel source.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k} ${p_impactdebug} ${p_odysseydebug}"
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k}"
 	for x in $patchlist; do rm -f "./${x}"; done
 
 	# Rename the source tree to match the linux-mips git checkout date and
diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml
index 891ca504252f..816b3dfc9daa 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -11,19 +11,11 @@
 		mips-sources are git snapshots from the Linux-Mips.org git server for MIPS-Based machines
 	</longdescription>
 	<use>
-		<flag name='cobalt'>Enables support for Cobalt Microserver hardware
-			(Qube2/RaQ2)</flag>
+		<flag name='cobalt'>Enables support for Cobalt Microserver hardware (Qube2/RaQ2)</flag>
 		<flag name='ip27'>Enables support for SGI Origin (IP27)</flag>
-		<flag name='ip28'>Enables support for SGI Indigo2 Impact R10000
-			(IP28)</flag>
-		<flag name='ip30'>Enables support for SGI Octane (IP30,
-			'Speedracer')</flag>
-		<flag name='ip32r10k'>Enables experimental support for IP32 R10K kernels
-			(SGI O2, 'Moosehead')</flag>
-		<flag name='impactdebug'>Enables use of the IP30 Impact Early Console Hack.
-			FOR DEBUGGING ONLY!</flag>
-		<flag name='odysseydebug'>Enables use of the IP30 Odyssey Early Console Hack.
-			FOR DEBUGGING ONLY!</flag>
+		<flag name='ip28'>Enables support for SGI Indigo2 Impact R10000	(IP28)</flag>
+		<flag name='ip30'>Enables support for SGI Octane (IP30,	'Speedracer')</flag>
+		<flag name='ip32r10k'>Enables experimental support for IP32 R10K kernels (SGI O2, 'Moosehead')</flag>
 		<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 	</use>
 	<upstream>
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
deleted file mode 100644
index 0c95025b71d7..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2013 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.29.1.ebuild,v 1.8 2013/03/09 21:07:33 tomwij Exp $
-
-EAPI="5"
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org GIT snapshot diff
-# 3) Generic Fixes
-# 4) Patch for the IOC3 Metadriver (IP27, IP30)
-# 5) Patch for IP30 Support
-# 6) Patch for IP28 Graphics Support (SolidImpact)
-# 7) Experimental patches (if needed)
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-OKV=${PV/_/-}
-GITDATE="20090324"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="3"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="1"
-K_NOUSENAME="0"
-K_NOUSEPR="0"
-K_USEPV="0"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-SLOT="${OKV}"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug"
-DEPEND=">=sys-devel/gcc-4.1.1"
-RDEPEND=""
-
-# Machine Support Control Variables
-DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${F_KV}${KVE}-${GITDATE}.diff.bz2
-	 mirror://gentoo/${PN}-${F_KV}-patches-v${GENPATCHREV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="1"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${F_KV}${KVE}-${GITDATE}.diff.bz2"
-
-#//------------------------------------------------------------------------------
-
-# Eblit Handling Functions
-#
-# They'll likely be superseded someday by better ideas, possibly elibs.
-
-# eblit-core
-# Usage: <function> [version]
-# Main eblit engine
-eblit-core() {
-	local e v func=$1 ver=$2
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Runs the pkg_* functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core pkg_$1 $2
-}
-
-#//------------------------------------------------------------------------------
-
-load_eblit_funcs() {
-	# This is a sanity check to avoid QA issues.  It prevents
-	# eblits from being referenced during metadata operations.
-	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-
-	# All are in ${FILESDIR}/eblits
-	# If a message for a given machine needs to change,
-	# then we create a new eblit and increment the
-	# version and reference it here.
-	eblit-include err_disabled_mach v1
-	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v1
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v1
-	eblit-include show_cobalt_info v1
-
-	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-	eblit-pkg setup v1
-	eblit-pkg postinst v1
-
-	# Eblit load complete
-	MIPS_SOURCES_EBLITS_LOADED=1
-}
-
-pkg_setup() {
-	load_eblit_funcs
-	pkg_setup
-}
-
-src_unpack() { eblit-run src_unpack v2 ; }
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-3.10.4.ebuild b/sys-kernel/mips-sources/mips-sources-3.18.3.ebuild
index 21482892f091..3ca648d45c0d 100644
--- a/sys-kernel/mips-sources/mips-sources-3.10.4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.18.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.10.4.ebuild,v 1.1 2013/07/29 09:59:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.18.3.ebuild,v 1.1 2015/01/18 07:44:14 kumba Exp $
 
 # EAPI Version
 EAPI="5"
@@ -11,14 +11,13 @@ EAPI="5"
 # 3) Generic Fixes
 # 4) Patch for the IOC3 Metadriver (IP27, IP30)
 # 5) Patch for IP30 Support
-# 6) Patch for IP28 Graphics Support (SolidImpact)
-# 7) Experimental patches (if needed)
+# 6) Experimental patches (if needed)
 
 #//------------------------------------------------------------------------------
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20130729"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20150118"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
@@ -45,17 +44,17 @@ BASE_KV="$(get_version_component_range 1-2).0"
 HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 SLOT="${OKV}"
 KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug"
-DEPEND=">=sys-devel/gcc-4.1.1"
+IUSE="cobalt ip27 ip28 ip30 ip32r10k"
+DEPEND=">=sys-devel/gcc-4.6.0"
 RDEPEND=""
 
 # Machine Support Control Variables
-DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="test"				# 		   IP27 support		(SGI Origin)
-DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="test"				# 		   IP30 support		(SGI Octane)
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
 DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
+DO_CBLT="test"				# 		   Cobalt Support	(Cobalt Microsystems)
 
 # Machine Stable Version Variables
 SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
@@ -152,9 +151,9 @@ load_eblit_funcs() {
 	eblit-include err_disabled_mach v1
 	eblit-include err_only_one_mach_allowed v1
 	eblit-include show_ip22_info v3
-	eblit-include show_ip27_info v1
+	eblit-include show_ip27_info v2
 	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v2
+	eblit-include show_ip30_info v3
 	eblit-include show_ip32_info v3
 	eblit-include show_cobalt_info v1
 
@@ -172,6 +171,6 @@ pkg_setup() {
 	pkg_setup
 }
 
-src_unpack() { eblit-run src_unpack v3 ; }
+src_unpack() { eblit-run src_unpack v4 ; }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild b/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild
deleted file mode 100644
index 28356052433b..000000000000
--- a/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild,v 1.1 2013/07/22 06:16:14 kumba Exp $
-
-# EAPI Version
-EAPI="5"
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org GIT snapshot diff
-# 3) Generic Fixes
-# 4) Patch for the IOC3 Metadriver (IP27, IP30)
-# 5) Patch for IP30 Support
-# 6) Patch for IP28 Graphics Support (SolidImpact)
-# 7) Experimental patches (if needed)
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-OKV=${PV/_/-}
-GITDATE="20130721"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="1"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="1"
-K_NOUSENAME="0"
-K_NOUSEPR="0"
-K_USEPV="0"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-SLOT="${OKV}"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug"
-DEPEND=">=sys-devel/gcc-4.1.1"
-RDEPEND=""
-
-# Machine Support Control Variables
-DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="test"				# 		   IP27 support		(SGI Origin)
-DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="test"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
-	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-UNIPATCH_STRICTORDER="1"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
-
-#//------------------------------------------------------------------------------
-
-# Eblit Handling Functions
-#
-# They'll likely be superseded someday by better ideas, possibly elibs.
-
-# eblit-core
-# Usage: <function> [version]
-# Main eblit engine
-eblit-core() {
-	local e v func=$1 ver=$2
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Runs the pkg_* functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core pkg_$1 $2
-}
-
-#//------------------------------------------------------------------------------
-
-load_eblit_funcs() {
-	# This is a sanity check to avoid QA issues.  It prevents
-	# eblits from being referenced during metadata operations.
-	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-
-	# All are in ${FILESDIR}/eblits
-	# If a message for a given machine needs to change,
-	# then we create a new eblit and increment the
-	# version and reference it here.
-	eblit-include err_disabled_mach v1
-	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v3
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v2
-	eblit-include show_ip32_info v3
-	eblit-include show_cobalt_info v1
-
-	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-	eblit-pkg setup v1
-	eblit-pkg postinst v1
-
-	# Eblit load complete
-	MIPS_SOURCES_EBLITS_LOADED=1
-}
-
-pkg_setup() {
-	load_eblit_funcs
-	pkg_setup
-}
-
-src_unpack() { eblit-run src_unpack v3 ; }
-
-#//------------------------------------------------------------------------------