From: Joshua Kinard <kumba@gentoo.org>
Date: Mon, 31 Aug 2015 08:38:27 +0000 (-0400)
Subject: Update to 4.1.6/4.2.0, update several eblits, and fix copyright dates.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=769498709dfbf5efeb64090da058dd8d37a8b624;p=gentoo.git

Update to 4.1.6/4.2.0, update several eblits, and fix copyright dates.

Package-Manager: portage-2.2.20.1
---

diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index bcccdc037742..65729af0cd8c 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,7 @@
-DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
-DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
-DIST mips-sources-3.19.0-patches-v2.tar.xz 103912 SHA256 45e4f018c89ba899db8feb976bf16dccc83c99a24fa80402f2c40a112a859b96 SHA512 b7bf9ad8073ac190cf2cb6110b798b6be2c59b193eb8762d8c4b3fe66f3519a05810a4db1f6b43cc979946f4d3827b6b43191599a9c10bac9c907f1299ff6d1e WHIRLPOOL 2bb1ff3a28e1067d225b5614580ab83b27813ef4a803d4bc83f7469763ed0c6cf8a5a0905167ac043115b7512a6af186c181d1ac139ec2fae06e877c8faa5ea2
-DIST mips-sources-4.0.0-patches-v1.tar.xz 94208 SHA256 f6a21f6f2e1136d9e1fa43dccd7b8bd76f8c44fa24c33d841c444c2e9dd03094 SHA512 4e6ff611ba1dc9d34b215a5cff44e74f0c196a83556a5eba52feff26a833de5540f9acee0cb1eb0a8b1e2ed255e24059dbde8f192c1082ab6169e44720d22a44 WHIRLPOOL 7c81bb9b5c5f5b459a763023ea36c395f8d38008ca5b0e2f2bb01a8cd53fcdef04e793e0168524cc8b3f0de44498228aa4946da7fb7cbaf3b2ce4ca78c2b6110
-DIST mipsgit-3.19.0-20150418.diff.xz 2996 SHA256 c44dc0956375ae3b56dd05f47229657479dbc76572d1457577bb59c9db19b802 SHA512 f2aae6e01d6e8f152720b46551bb980cb7fda27ac3752182ee7afccbd779565279e29c3329ac87553de374c54cf4f79374ef3022b475dddf88842864a4bd2390 WHIRLPOOL c8a4b95b78793fd5528c24f984ccbdc62ab02794c52d8a97baec7703272f20103d850628f4dcdcf6dae3be15430ef907c6455beea71b2c277a3f7635cba6be89
-DIST mipsgit-4.0.0-20150418.diff.xz 6820 SHA256 970b6ab12578dc30b770ea3157589f1015c8d28c9269ded2e16296269e8ac499 SHA512 cb8cf9d6e53ccdfe382dfba2312115860641ee638e5defc0fbe2452c0e69641ec283caef63fcc59557cefc54611005c95bc9120fb42aa6704ba1d56022b21ea0 WHIRLPOOL 8526ab03f4be1a4332028951a63f92b7e738db8d70369ce0afc18641b1da092e33bf7e1b5d32a0761450ea94f5eb1462bea0452b171c1a17de17b85d6eedaa53
-DIST patch-3.19.6.xz 202724 SHA256 8dd82b6e2daca608e18dcda50b370b089dd45a7b3915ea274b59bfe15f657026 SHA512 871d5a8a1588e0c2d313802a89bdc52d7fc2ba84d731f01c7a07fe941ae311696043ce07b85483821cf2ece910119d59ce6c432f78db51ff0c80cfa46c24842f WHIRLPOOL d777885fe82d8172aebdf64fb69af30b4aa057df2d25ce8d2804bd0b7d857ef41e3d2847a8729eca3d2ee2acdca45f6f006c733b6200cc3dae43c2e1e9e0312e
-DIST patch-4.0.1.xz 4072 SHA256 9b4b47eb6584dc39aaa5db46843b83f7c60975abecbda4dc106a8722eabe96fb SHA512 3f4547c759a7ce9f75671676d9d57e516ba8a6617d1c195aa5d728bc10926e200ac4285aa2612a7e3a8f4e4f4e3038e250563f139fb4f76d0f93b73222eb7d30 WHIRLPOOL c20bdc0f434702758512b0707da4d90cd3d89fe9ae0e22e4a7a5794a17ed02e0c13b6ea0951907950aa173beccf1022fb72da2badf3bc8e5b957a7ae5d9f7d13
+DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
+DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
+DIST mips-sources-4.1.0-patches-v1.tar.xz 155512 SHA256 4093fa9a36ed3ac513d3a1d2f321362ee1552361fcbffbfe666e9907bb8fe7b0 SHA512 6a16f2461fed92686bdbcd86ae10c4a6ebcd1c0e38f7da9727f587bf4d129d1dec1e3c45fddc3c337d6ba9e0c07ac16f42b8eab4ecaa2c02f33786b5cc8cbcea WHIRLPOOL 492076e979e017887ce545d8a1633a129d86ecd85d4e0221ea8a5d6271b959d3a1f02bf4d5045df97d7432787e4302db7226bc282733d56d119b4933646e8338
+DIST mips-sources-4.2.0-patches-v1.tar.xz 154572 SHA256 5b22bdab634ebfabef9b680e1334ed600c36d0f2bac2692f763e538562aa3546 SHA512 2c1d749f8bc20fdc62eb8f157e3a86e25fd2cb0d20b250a913bb99c14b3c693a726a99a082f8f3524f4c4da16ec89e62e244bcfe4285641d1e285188d7a3a42a WHIRLPOOL e4508a6a093add3a18d87b1e8762199a904365bb7b2173d53a2bd1798516221c56a5a24708478bba130bc3288e595167c59b2bea88b754c6c4431ee84c8ba2c4
+DIST mipsgit-4.1.0-20150830.diff.xz 2172 SHA256 1dc6449311b607f21f64f8051bb1b5a318c4827b71a1fbe619fec4198500e76e SHA512 8f2724313e4a41a0492146ca9da8b7772688d4f71be4d4f75e0dc6e33ba0c8c47ecd2f1ca7916375afb8db9abae07fb19714e51c55a10f14a6a87488666a4870 WHIRLPOOL 41c51c3d40ee64f1a584e2d2ef08bf04c41b951a2d1db955edb65f2f3461573f9bb6226b646a8a0dbe812e112fdbab80915915c67d9f5c08c52e9e37704c0a7d
+DIST mipsgit-4.2.0-20150830.diff.xz 6676 SHA256 15a45b998a3dae1adfc0a1efe8681f3dd006537d5a33e6dc9b1b0160e6fe7503 SHA512 6d16263d34cb6865647d89ac6933f37fe063d74fd55e1db6911533dc8de5a55f9731d1e5b55eea030d51244e8d59244a0e9f8bda4c283d8684b74738a8dadf0d WHIRLPOOL 7baa008a100e7dab569dbe9e234bf2d11408389db0e9d2eaef9b8823b4aeb0a39f713d28a4ca74606fdcafec2ba95a0c4eaf492ae0c5a7ec570440c35e35fd0f
+DIST patch-4.1.6.xz 201836 SHA256 64e4deb16a279e233b0c91463b131bd0f3de6aabdb49efded8314bcf5dbfe070 SHA512 1b725c2051d7dd9129c927fdb90d8d7a2e13149a2dd1175c5efacfc516e664af3647bca83d847197f8c19ef140bf07ea856868e27bef4a1cad9607e40b527424 WHIRLPOOL cc685876a4bf84903720a7a311854b4b469d29e8f09303b8e05e82501c6bb105fe149eed78f14084bbd748bfbd13ad55a22277ac1ab17c497b6c5e0db64af0d6
diff --git a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
index 631ca4679cc3..6f9ff7e81eff 100644
--- a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
index e312204329c2..c3562cf8cb16 100644
--- a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
index a28fb8c09268..7c76ffd68051 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
index d9eaf60db16a..b1b4ff9d145f 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,9 +16,9 @@ eblit-mips-sources-pkg_setup() {
 	# See if we're on a cobalt system first (must use the cobalt-mips profile)
 	if use cobalt; then
 		arch_is_selected="yes"
-		[ "${DO_CBLT}" = "test" ] 						\
+		[ "${DO_CBLT}" = "test" ]						\
 			&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt" "test"
-		[ "${DO_CBLT}" = "no" ] 						\
+		[ "${DO_CBLT}" = "no" ]							\
 			&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt"
 		show_cobalt_info
 	fi
diff --git a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
index 68f62cab9e49..b1ff8ff3f84b 100644
--- a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
index 0d2568060e67..e926d3133c92 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
index f6be936f2e52..2ad25cdc10ea 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
similarity index 77%
rename from sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit
rename to sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
index 1c1a160b5c7f..90c3e5bfdf89 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
@@ -10,19 +10,19 @@
 
 show_ip30_info() {
 	echo -e ""
-	einfo "Octane boots again as-of 3.14!  Celebrate!"
+	einfo "Octane SMP support works again as-of 4.1!  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- Do NOT use CONFIG_TRANSPARENT_HUGEPAGE, otherwise, when the machine"
+	eerror "\t\040\040starts to boot into userland, it will trigger Instruction"
+	eerror "\t\040\040Bus Errors (IBEs), which requires a complete powerdown of the"
+	eerror "\t\040\040machine for about 15 seconds to 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- Greater than 2GB memory causes problems with DMA.  This is a long-standing"
+	eerror "\t\040\040problem and patches to fix it by DMA experts would be greatly"
+	eerror "\t\040\040appreciated!"
 	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 ""
@@ -46,11 +46,12 @@ show_ip30_info() {
 	ewarn "\t\040\040video conversion boards as well."
 	echo -e ""
 	einfo "Things that DO work:"
+	einfo "\t- SMP works again, celebrate!"
 	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."
+	einfo "\t\040\040report any problems with these devices."
 	echo -e ""
 }
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
similarity index 65%
rename from sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
rename to sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
index 112b44c0823a..daac6d931a23 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,19 +23,6 @@ show_ip32_info() {
 	einfo "\t\040\040patches!"
 	echo -e ""
 
-	if use ip32r10k; then
-		eerror "The R10K patch for IP32 is now updated and will apply to 3.0.x kernels."
-		eerror "When it did apply and booted, it was flaky at best, and didn't stay online"
-		eerror "for long before locking up.  Don't attempt to play with this unless you"
-		eerror "are seriously interested in kernel hacking."
-		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
-
 	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
 	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
 	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
similarity index 90%
rename from sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit
rename to sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
index dade9b268a6b..c1428ea6f47d 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
@@ -28,18 +28,17 @@ eblit-mips-sources-src_unpack() {
 	# 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*"
+	local p_generic="51*"
+	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
 	use ip27 && unset p_generic p_ip27
 	use ip28 && unset p_ip28
 	use ip30 && unset p_generic p_ip30
-	use ip32r10k && unset p_ip32r10k
 
 	# 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}"
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30}"
 	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 fe41a9022a41..3cc12ffcadfd 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -15,7 +15,6 @@
 		<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>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/mips-sources/mips-sources-4.0.1.ebuild b/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild
similarity index 88%
rename from sys-kernel/mips-sources/mips-sources-4.0.1.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.1.6.ebuild
index bf79eba0b3e3..f18e0d49f431 100644
--- a/sys-kernel/mips-sources/mips-sources-4.0.1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild
@@ -5,19 +5,10 @@
 # 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) Experimental patches (if needed)
-
 #//------------------------------------------------------------------------------
 
 # Version Data
-OKV=${PV/_/-}
-GITDATE="20150418"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20150830"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
@@ -25,10 +16,11 @@ 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"
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.0"
 ETYPE="sources"
 
 # Inherit Eclasses
@@ -41,10 +33,9 @@ BASE_KV="$(get_version_component_range 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ https://www.gentoo.org/"
-SLOT="${OKV}"
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k"
+IUSE="cobalt ip27 ip28 ip30"
 DEPEND=">=sys-devel/gcc-4.6.0"
 RDEPEND=""
 
@@ -153,8 +144,8 @@ load_eblit_funcs() {
 	eblit-include show_ip22_info v3
 	eblit-include show_ip27_info v3
 	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v3
-	eblit-include show_ip32_info v3
+	eblit-include show_ip30_info v4
+	eblit-include show_ip32_info v4
 	eblit-include show_cobalt_info v1
 
 	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
@@ -171,6 +162,6 @@ pkg_setup() {
 	pkg_setup
 }
 
-src_unpack() { eblit-run src_unpack v5 ; }
+src_unpack() { eblit-run src_unpack v6 ; }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-3.19.6.ebuild b/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild
similarity index 87%
rename from sys-kernel/mips-sources/mips-sources-3.19.6.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.2.0.ebuild
index efb1fd501db8..f18e0d49f431 100644
--- a/sys-kernel/mips-sources/mips-sources-3.19.6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild
@@ -5,30 +5,22 @@
 # 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) Experimental patches (if needed)
-
 #//------------------------------------------------------------------------------
 
 # Version Data
-OKV=${PV/_/-}
-GITDATE="20150418"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="2"				# Tarball revision for patches
+GITDATE="20150830"			# 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"
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.0"
 ETYPE="sources"
 
 # Inherit Eclasses
@@ -41,10 +33,9 @@ BASE_KV="$(get_version_component_range 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ https://www.gentoo.org/"
-SLOT="${OKV}"
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 ip32r10k"
+IUSE="cobalt ip27 ip28 ip30"
 DEPEND=">=sys-devel/gcc-4.6.0"
 RDEPEND=""
 
@@ -153,8 +144,8 @@ load_eblit_funcs() {
 	eblit-include show_ip22_info v3
 	eblit-include show_ip27_info v3
 	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v3
-	eblit-include show_ip32_info v3
+	eblit-include show_ip30_info v4
+	eblit-include show_ip32_info v4
 	eblit-include show_cobalt_info v1
 
 	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
@@ -171,6 +162,6 @@ pkg_setup() {
 	pkg_setup
 }
 
-src_unpack() { eblit-run src_unpack v5 ; }
+src_unpack() { eblit-run src_unpack v6 ; }
 
 #//------------------------------------------------------------------------------