Update to 3.9.11/3.10.1. All use git pull from linux-mips 20130721. Minor Octane hacks added by J. Pendergrass, but still needs additional work to boot.

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

5 files changed, 17 insertions, 184 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index e3a264bc0e03..a441fd2353c9 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,16 @@
 # 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.149 2013/06/09 23:12:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.150 2013/07/22 06:16:14 kumba Exp $
+
+*mips-sources-3.10.1 (22 Jul 2013)
+*mips-sources-3.9.11 (22 Jul 2013)
+
+  22 Jul 2013; Joshua Kinard <kumba@gentoo.org> -mips-sources-3.4.24.ebuild,
+  -mips-sources-3.6.11.ebuild, -mips-sources-3.7.1.ebuild,
+  +mips-sources-3.9.11.ebuild, +mips-sources-3.10.1.ebuild, metadata.xml:
+  Update to 3.9.11/3.10.1. All use git pull from linux-mips 20130721. Minor
+  Octane hacks added by J. Pendergrass, but still needs additional work to
+  boot.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml
index fb63e48c82e0..891ca504252f 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 
 	<longdescription>
-		mips-sources are CVS Snapshots from the Linux-Mips.org CVS server for MIPS-Based machines
+		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
diff --git a/sys-kernel/mips-sources/mips-sources-3.7.1.ebuild b/sys-kernel/mips-sources/mips-sources-3.10.1.ebuild
index ad0776f88ea1..79a5d975da63 100644
--- a/sys-kernel/mips-sources/mips-sources-3.7.1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.10.1.ebuild,v 1.1 2013/07/22 06:16:14 kumba Exp $
 
 # EAPI Version
 EAPI="5"
@@ -18,7 +18,7 @@ EAPI="5"
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20121226"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20130721"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
diff --git a/sys-kernel/mips-sources/mips-sources-3.6.11.ebuild b/sys-kernel/mips-sources/mips-sources-3.6.11.ebuild
deleted file mode 100644
index 0294ee77a274..000000000000
--- a/sys-kernel/mips-sources/mips-sources-3.6.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.6.11.ebuild,v 1.2 2013/03/09 21:07:33 tomwij 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="20121226"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="2"				# 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 ; }
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-3.4.24.ebuild b/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild
index 12878c2dcd3b..28356052433b 100644
--- a/sys-kernel/mips-sources/mips-sources-3.4.24.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.9.11.ebuild
@@ -1,6 +1,6 @@
 # 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.4.24.ebuild,v 1.2 2013/03/09 21:07:33 tomwij Exp $
+# $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"
@@ -18,8 +18,8 @@ EAPI="5"
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20121226"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="2"				# Tarball revision for patches
+GITDATE="20130721"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${GITDATE}"