Update to 2.6.31.12. Octane support is disabled as of this release, and may not return. Testing on 2.6.32 will determine. Also fixed spacing issues in the ebuilds.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 267 insertions, 67 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 88be4999be9c..686732859e46 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.130 2010/01/10 09:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.131 2010/02/13 19:07:33 kumba Exp $
+
+*mips-sources-2.6.31.12 (13 Feb 2010)
+
+  13 Feb 2010; Joshua Kinard <kumba@gentoo.org>
+  mips-sources-2.6.27.21-r1.ebuild, mips-sources-2.6.28.9-r1.ebuild,
+  mips-sources-2.6.29.1.ebuild, +mips-sources-2.6.31.12.ebuild:
+  Update to 2.6.31.12. Octane support is disabled as of this release, and
+  may not return. Testing on 2.6.32 will determine. Also fixed spacing
+  issues in the ebuilds.
 
   10 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   mips-sources-2.6.27.21-r1.ebuild, mips-sources-2.6.28.9-r1.ebuild,
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
index 7d14a85ae03c..8d0e677f252a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.27.21-r1.ebuild,v 1.3 2010/01/10 09:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild,v 1.4 2010/02/13 19:07:33 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -138,31 +138,37 @@ eblit-pkg() {
 #//------------------------------------------------------------------------------
 
 load_eblit_funcs() {
-    # 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.
-    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return;
-    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
-    MIPS_SOURCES_EBLITS_LOADED=1
+	# 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
+	load_eblit_funcs
+	pkg_setup
 }
+
 src_unpack() { eblit-run src_unpack v1 ; }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
index 7eb0847ba77a..46ec43b6e780 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.28.9-r1.ebuild,v 1.3 2010/01/10 09:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild,v 1.4 2010/02/13 19:07:33 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -138,30 +138,35 @@ eblit-pkg() {
 #//------------------------------------------------------------------------------
 
 load_eblit_funcs() {
-    [ -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
-    MIPS_SOURCES_EBLITS_LOADED=1
+	# 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
+	load_eblit_funcs
+	pkg_setup
 }
 
 src_unpack() { eblit-run src_unpack v1 ; }
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
index 4d3ebfe6aa2e..d7bcc8102ce0 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3 2010/01/10 09:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild,v 1.4 2010/02/13 19:07:33 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -138,31 +138,37 @@ eblit-pkg() {
 #//------------------------------------------------------------------------------
 
 load_eblit_funcs() {
-    # 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.
-    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-    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
-    MIPS_SOURCES_EBLITS_LOADED=1
+	# 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
+	load_eblit_funcs
+	pkg_setup
 }
+
 src_unpack() { eblit-run src_unpack v2 ; }
 
 #//------------------------------------------------------------------------------
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
new file mode 100644
index 000000000000..3604b08a5d0d
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.31.12.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2010 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.1 2010/02/13 19:07:33 kumba 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}"
+PROVIDE="virtual/linux-sources virtual/alsa"
+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 ; }
+
+#//------------------------------------------------------------------------------