Add mips-sources-3.0.4, and remove old ebuilds and associated eblits.

(Portage version: 2.1.10.13/cvs/Linux x86_64)

11 files changed, 101 insertions, 726 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index c346a14939b0..b2a89c1fb90d 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.140 2011/04/25 06:45:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.141 2011/09/04 11:18:13 kumba Exp $
+
+*mips-sources-3.0.4 (04 Sep 2011)
+
+  04 Sep 2011; Joshua Kinard <kumba@gentoo.org>
+  +files/eblits/show_ip22_info-v3.eblit, +files/eblits/show_ip30_info-v2.eblit,
+  +files/eblits/show_ip32_info-v3.eblit, +files/eblits/src_unpack-v3.eblit,
+  -files/eblits/show_ip22_info-v2.eblit, -files/eblits/show_ip32_info-v2.eblit,
+  -files/eblits/src_unpack-v1.eblit, -mips-sources-2.6.31.12.ebuild,
+  -mips-sources-2.6.34.7.ebuild, -mips-sources-2.6.35.9.ebuild,
+  -mips-sources-2.6.36.3.ebuild, -mips-sources-2.6.37.ebuild,
+  +mips-sources-3.0.4.ebuild, metadata.xml:
+  Add mips-sources-3.0.4, and remove old ebuilds and associated eblits.
 
   25 Apr 2011; Ulrich Mueller <ulm@gentoo.org> mips-sources-2.6.29.1.ebuild,
   mips-sources-2.6.31.12.ebuild, mips-sources-2.6.34.7.ebuild,
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
index 4ad563f6bd34..9f6fa2e69ace 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v2.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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_ip22_info-v2.eblit,v 1.1 2010/06/07 06:43:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # Eblit with information/warnings for IP22 (Indy/Indigo2 R4x00) users.
 #
@@ -16,10 +16,6 @@ show_ip22_info() {
 	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 ${HILITE}onion${NORMAL}"
-	einfo "\t\040\040in ${GOOD}#mipslinux${NORMAL} on the Freenode IRC network.  Given that he is the"
-	einfo "\t\040\040author, he will know the most current status of the driver."
+	einfo "\t- A driver for Extreme (XZ) does not exist at present."
 	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
new file mode 100644
index 000000000000..1b886521b143
--- /dev/null
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v2.eblit
@@ -0,0 +1,51 @@
+# 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_ip32_info-v2.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
index 5617bfc59815..57e4036e2d52 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v2.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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_ip32_info-v2.eblit,v 1.1 2010/06/07 06:43:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # Eblit with information/warnings for IP32 (O2) users.
 #
@@ -24,11 +24,10 @@ show_ip32_info() {
 	echo -e ""
 
 	if use ip32r10k; then
-		eerror "The R10K patch for IP32 is out of date and doesn't apply.  It might or"
-		eerror "might not be updated in the future to apply.  When it did apply and boot,"
-		eerror "however, it was flaky at best, and didn't stay online for long before"
-		eerror "locking up.  Don't attempt to play with this unless you are seriously"
-		eerror "interested in kernel hacking."
+		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"
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v1.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit
index fc3de1c70c28..f61b3bfc29ec 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v3.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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/src_unpack-v1.eblit,v 1.1 2009/03/16 06:39:10 kumba Exp $
+# $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 $
 
 # Eblit to handle src_unpack.
 
@@ -9,10 +9,10 @@ eblit-mips-sources-src_unpack() {
 	# and apply the latest patch from linux-mips git.
 	kernel-2_src_unpack
 
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${F_KV}.
+	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
 	echo -e ""
 	cd "${WORKDIR}"
-	unpack "${PN}-${F_KV}-patches-v${GENPATCHREV}.tar.bz2"
+	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
 
 	# Create a new folder, patch-symlinks, and create symlinks to
 	# mips-patches in there.  If we want to exclude a patch, we'll
@@ -20,7 +20,7 @@ eblit-mips-sources-src_unpack() {
 	local psym="patch-symlinks"
 	mkdir "${psym}"
 	cd "${psym}"
-	for x in ../mips-patches-${F_KV}/*.patch; do
+	for x in ../mips-patches-${BASE_KV}/*.patch; do
 		ln -s "${x}" "${x##../mips-patches-*/}"
 	done
 
@@ -30,23 +30,26 @@ 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}"
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k} ${p_impactdebug} ${p_odysseydebug}"
 	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}"
+	mv "${WORKDIR}/linux-${F_KV}${EXTRAVERSION}" "${WORKDIR}/linux-${v}" || die
 	S="${WORKDIR}/linux-${v}"
 
 	# Now go into the kernel source and patch it.
diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml
index b2fdffda72bc..5e04d55f628b 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -20,7 +20,9 @@
 			'Speedracer')</flag>
 		<flag name='ip32r10k'>Enables experimental support for IP32 R10K kernels
 			(SGI O2, 'Moosehead')</flag>
-		<flag name='impactdebug'>Enables use of the Impact Early Console Hack.
+		<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='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 	</use>
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.31.12.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.31.12.ebuild
deleted file mode 100644
index 1d5ed5c63e78..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.31.12.ebuild
+++ /dev/null
@@ -1,173 +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/mips-sources-2.6.31.12.ebuild,v 1.4 2011/04/25 06:45:37 ulm Exp $
-
-# 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="20100213"			# 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="${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="no"				# 		   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="2.6.29.1"			# 	    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-2.6.35.9.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.35.9.ebuild
deleted file mode 100644
index 12ed06bb6a19..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.35.9.ebuild
+++ /dev/null
@@ -1,173 +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/mips-sources-2.6.35.9.ebuild,v 1.4 2011/04/25 06:45:37 ulm Exp $
-
-# 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="20101116"			# 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="${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="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-${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 v2
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v2
-	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-2.6.36.3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.36.3.ebuild
deleted file mode 100644
index c39a360a0e58..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.36.3.ebuild
+++ /dev/null
@@ -1,173 +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/mips-sources-2.6.36.3.ebuild,v 1.4 2011/04/25 06:45:37 ulm Exp $
-
-# 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="20101116"			# 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="${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="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-${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 v2
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v2
-	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-2.6.37.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.37.ebuild
deleted file mode 100644
index 653fc4a9ec23..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.37.ebuild
+++ /dev/null
@@ -1,173 +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/mips-sources-2.6.37.ebuild,v 1.4 2011/04/25 06:45:37 ulm Exp $
-
-# 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="20110207"			# 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="${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="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-${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 v2
-	eblit-include show_ip27_info v1
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v2
-	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-2.6.34.7.ebuild b/sys-kernel/mips-sources/mips-sources-3.0.4.ebuild
index c5418357521e..8d9b54e4ade5 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.34.7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # 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/mips-sources-2.6.34.7.ebuild,v 1.4 2011/04/25 06:45:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.0.4.ebuild,v 1.1 2011/09/04 11:18:13 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -15,7 +15,7 @@
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20101116"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20110821"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
@@ -29,19 +29,23 @@ K_NOUSEPR="0"
 K_USEPV="0"
 ETYPE="sources"
 
+# EAPI Version
+EAPI="4"
+
 # Inherit Eclasses
 inherit kernel-2 eutils
 detect_version
 
 # Version Data
-F_KV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+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"
+IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug"
 DEPEND=">=sys-devel/gcc-4.1.1"
 RDEPEND=""
 
@@ -63,11 +67,11 @@ 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"
+	 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-${F_KV}${KVE}-${GITDATE}.diff.bz2"
+UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
 
 #//------------------------------------------------------------------------------
 
@@ -147,11 +151,11 @@ load_eblit_funcs() {
 	# version and reference it here.
 	eblit-include err_disabled_mach v1
 	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v2
+	eblit-include show_ip22_info v3
 	eblit-include show_ip27_info v1
 	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v1
-	eblit-include show_ip32_info v2
+	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.
@@ -168,6 +172,6 @@ pkg_setup() {
 	pkg_setup
 }
 
-src_unpack() { eblit-run src_unpack v2 ; }
+src_unpack() { eblit-run src_unpack v3 ; }
 
 #//------------------------------------------------------------------------------