From: Joshua Kinard <kumba@gentoo.org>
Date: Sun, 18 Dec 2011 03:54:19 +0000 (+0000)
Subject: Bump to 3.0.9 and add 3.1.5.  Include new patchsets for both that fix an issue in... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ba61f495edf8b6f3b044102cff7165f78dde1c0;p=gentoo.git

Bump to 3.0.9 and add 3.1.5.  Include new patchsets for both that fix an issue in SGI IP32 where ICMPv6 neighbor discovery didn't work.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
---

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index b2a89c1fb90d..c47edb76df12 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.141 2011/09/04 11:18:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.142 2011/12/18 03:54:19 kumba Exp $
+
+*mips-sources-3.1.5 (17 Dec 2011)
+*mips-sources-3.0.9 (17 Dec 2011)
+
+  17 Dec 2011; Joshua Kinard <kumba@gentoo.org> -mips-sources-3.0.4.ebuild,
+  +mips-sources-3.0.9.ebuild, +mips-sources-3.1.5.ebuild:
+  Bump to 3.0.9 and add 3.1.5. Include new patchsets for both that fix an issue
+  in SGI IP32 where ICMPv6 neighbor discovery didn't work.
 
 *mips-sources-3.0.4 (04 Sep 2011)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 13b6cf0ed1e6..2bfa98636d6e 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -20,30 +20,35 @@ DIST deblob-2.6.29 76155 RMD160 b56288e338c16ec6aafd5d9146bd4dc8ae82d2ba SHA1 ab
 DIST deblob-check-2.6.29 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
 DIST linux-2.6.29.tar.bz2 56579370 RMD160 e0e8c0635665ed34618b04fe1140015a4b6ff806 SHA1 0640a2f4bea3fc272541f322b74ea365ad7f2349 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
+DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
 DIST mips-sources-2.6.29-patches-v3.tar.bz2 74933 RMD160 37c21087351188f0300ff81e778ba86f33b10a3b SHA1 dc35f8d47928f1db450115bea3b6e2ccd18806de SHA256 d3c77c91b810824bcfbe25b96703e0b3a7f6200c71aa550c4abe9d296f5bbbff
-DIST mips-sources-3.0.0-patches-v1.tar.xz 84072 RMD160 99ba52c6bac9e1391644d554a608c82b04e85444 SHA1 b6b88b5fefd99a4dc488c5008085b2e521ff91af SHA256 bcf6a9a71def1b68dab3cf03fb6a2484d6a046640e95b0d4596a1b5d53ee181d
+DIST mips-sources-3.0.0-patches-v2.tar.xz 90140 RMD160 f9a6cc6c1b0f592d814d0a955628ec3fd346d513 SHA1 48f48c0f9b1908ae409766cdfcd00dc543938da2 SHA256 ce0afba480c4ed2d6b4d9b39d0ffad19e01c3ff9f0d81490bbcfabd07f07f9a1
+DIST mips-sources-3.1.0-patches-v1.tar.xz 90172 RMD160 d11d15903143637b824694187be3fda3c7dda9ed SHA1 2d138357b1200dac4b66d0865ced7c30e3675ac8 SHA256 febc729869959e7f675fe35ca276b491e83d0076ed63c430e81a3236ae91d97f
 DIST mipsgit-2.6.29-20090324.diff.bz2 17991 RMD160 fc94317086c27111c2e43cd6c7ff7684e43160f9 SHA1 2f72a7057809d98eb15c08df1527a8147ed3b5eb SHA256 e5867f9e92a83734505d6865640af3e8dd117b448d371d1514cec94c182e4511
 DIST mipsgit-3.0.0-20110821.diff.xz 28224 RMD160 6f6b59bef1d2b15f3569a6a18445efeed762fc3d SHA1 43d02dd57acfa280c53703067b9b4656c08c097b SHA256 40b6c725451dd54532f5f13c8d531b23fd4d5ff729ed597ee71fd633bfabb3b2
+DIST mipsgit-3.1.0-20111216.diff.xz 22640 RMD160 688ab990eee8be863be392e00d6b2e057b7b1cc7 SHA1 7daca7fede0fcaa54549dfa39919050eac97300e SHA256 4fde4b69a5c758b333b560e60f4d0def6873bad20f550bc501637f754ac8625d
 DIST patch-2.6.29.1.bz2 14395 RMD160 78b2817db8a001750648ee4609a94de26829a4bc SHA1 de0c8efa7927fca5c95dce0e1a47e354527a6c52 SHA256 0c44a41816082602f9d2bd45524d85f6e5fa8e4a6a9a15861048ca2aaf068d8f
-DIST patch-3.0.4.bz2 96120 RMD160 d7e99a2258a53adaf2ea7b75b92783093dddacf3 SHA1 7946f47608c8fdcb808cd63bf4741d085a8ee40d SHA256 96fcf18ca99ddd760069d03d9e7d61ff3e25b708d9cde42b82b77d4f61f86fb4
+DIST patch-3.0.9.bz2 284740 RMD160 bf495ce69ca11de235c4ee3fe0fedb48386b1f34 SHA1 5e85e1f1ec9c375896283f4b6e1bcfb476867745 SHA256 1f30e7e7ab556bd006e78515a62f7ec459c868ad61c24698af21a357081fa0c8
+DIST patch-3.1.5.bz2 148385 RMD160 0dd7ba28dd215f62234f51ee9933a910bc31452c SHA1 ae0b91c518a30633b55f104a4d3920f7ecf108e0 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 EBUILD mips-sources-2.6.29.1.ebuild 5205 RMD160 3ca931659a5bddbaa33d2a9d1bfe9b31b6cb31d8 SHA1 a3542d1fa6124778933ae4dad23051430f3c62c8 SHA256 d0c3b4ea0c88b756e16c37671d1dadf923ad186788f23f88fcf2efd1a24a63c4
-EBUILD mips-sources-3.0.4.ebuild 5268 RMD160 7ef7f2bee87fba00deb11d1b6ef5b690293da732 SHA1 440590df5a7d86b05e0e6549d9ac2b22884a65b7 SHA256 7c0aaab599fb790bda1cb958e3f9c028bd2892695ce00421f8e2e80b00fbfae1
-MISC ChangeLog 54764 RMD160 2236f266d11e82ccba0b3aceb1cc87613f4a65a3 SHA1 56b612c29ba8930c34ea7108262e781d8c7dfae2 SHA256 fd56785a93cf8f3a705623a45f4d413ef932e8be2b528522f1c5b82c0c6d8bb6
+EBUILD mips-sources-3.0.9.ebuild 5268 RMD160 642bf54e6eff9dd5bbbd8eb7c212489d9991cd98 SHA1 185ef7c8e2d13a709222c1b8bbd26313e6c53139 SHA256 d3d0258c7710782175bc5a2f1c399be6852300c430382cbb7579c58183ddca10
+EBUILD mips-sources-3.1.5.ebuild 5268 RMD160 4a6950082bd5ed45315acf9d7ab69cae91a6e0ee SHA1 01b4cbea095804eb8f1498f00baff56d56ff53e9 SHA256 df166e233d47489add0e7336da92867047706b51f1d946b3a8b724feab23e43b
+MISC ChangeLog 55107 RMD160 c3bd129397f407f516fdc619c6161cf901ad9f23 SHA1 5a5b279b6e1a454d748512b4b3dc5246deebd0ca SHA256 cab77052c5fd290657e8ec40e5fd365dd3e34318aca06df177309b1f48610d5b
 MISC metadata.xml 1147 RMD160 146a4f8116b64be7c7fb2cc5e01e92143b66d83b SHA1 a56b89843931833c8178f50dc67fa910e9c531d0 SHA256 7e52a730a691567b835225d1d83ddaeab8947b1c50790e7b486fdbfe6708c909
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOY16FAAoJENsjoH7SXZXjFXEP/0BtvSC2a9IAKmNOYmduH5Qo
-Gc/3mh1q6I1JH4qJMqN6wzNsZEgiBDhseh4K3MGdpTIQVW08qwWMQbpyaZs7/q+Z
-zTrrkScWKfqVJh/fB7T6XiOcFM2UHg+9m6fnW2yM5h6P8XaVlO1G0m0yhqX/GVqf
-b6VIPQQgUUKBQ7xeUtrPndj2Cl4po0zOoFvsdzzpgXj9H8RI3uowqRNEmNh6eYBK
-7D4ZEBNf3AMXCkeixFAmCQtP/P3m6GJLSEDyDEO1Gtn0RKKLQg3sNNRA7vqK3pDy
-QXOReMeyB+YHlCKFXzw61vYGD0BceApTJ3PRpeuxlf9e3zNkUT0OKbOlivfNw5Br
-hVMaQeL5/hQf09gwtYrRveLd4Q+wpyJRRAuos3RiCbwHkagtWqIVqxqEhm3za+7o
-+mlhQYmQzGi33PGMMjgKn0WN+2k8zgHBdN/Wvs+RytJEmgkx7xigQPGjM7V6XCMx
-0JgFYF6PYFioMVTMkTjcQq8Iv2iK1R0DFHjvyUa6Ui442aYebjQz82G57wSNlLXN
-ay6F3xIVnSjJh2vdnlcn5p2qFKWXA/sYu6FL4ZfkcPJt+x6stV+4Ircxx3SzgquK
-I6ydPFb5nJdcCekb5AKe98CZgZZzqa8vm16umcu3nYMs39aIwCnKrj8DaG4fVO6/
-ttqdGBOWbpElfWALEKgk
-=u8En
+iQIcBAEBAgAGBQJO7Sv8AAoJENsjoH7SXZXjw+UP/35gW2y3EHpBKaMWUArpLDBg
+/qmKzvoPXweIhg+oI9k70rmfDfciI+F1jNEX9GLj5kKXhg4aA//wtnCmCYk+sKwO
+swIdfGWnzAV3PfYpgeFT8rF2zX11EVWezjI2QLp7iis9QWU0Ix6qtMqV4TACfQTw
+12w4Iq1sL6KRIycCzbn0FQqpRKgYXlih3RGsViTnl9EDWsjiRLGWz+oDCy77lalr
+6jx3KS86Qc9zab9bT1e7f69YjBt9rari17DlnmC1IkeE7WVDGDaHB7eeDVrl9SD4
+EcR7cTuHtyyeuknaaOl1z3LDCQ/SMcm4YkgZuckEAWVCnaiCanQ3Bt30lfBgyRHM
+UHBkDH2j0mutXuRFmF8p0kB+bM60q+8GXgJMmyw+KIV6CHbaOG3fkn4yVO2Tff/u
+YL8X20iPArhShWWBLwR3DOZt475x2ohaMupwOnBWuI0ogb/V9mak6o4lpmGuNugL
+ZlX03ADuoIYh2I5cVA8mViW2EgvNzthwN1Yl9bkZNMWcZJKmBlPZIgJkXqfN/B79
+sVP7C8n4NPQeKGF+fVzqwRxrJRy34hpbZquQWlBRIkVREVQiqGNcsYqX7vdUtVN1
+Q+hMxGhRpjEVVHWFhpF9jL8IFvm2Os97uWmG+KejsHJC/Am8uk7bmB/7xh22d9w1
+XoMcTlGZfIQzKKEgcCqR
+=yvqW
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/mips-sources/mips-sources-3.0.4.ebuild b/sys-kernel/mips-sources/mips-sources-3.0.9.ebuild
similarity index 97%
rename from sys-kernel/mips-sources/mips-sources-3.0.4.ebuild
rename to sys-kernel/mips-sources/mips-sources-3.0.9.ebuild
index 8d9b54e4ade5..c315b5dbe151 100644
--- a/sys-kernel/mips-sources/mips-sources-3.0.4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.0.9.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-3.0.4.ebuild,v 1.1 2011/09/04 11:18:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.0.9.ebuild,v 1.1 2011/12/18 03:54:19 kumba Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -16,7 +16,7 @@
 # Version Data
 OKV=${PV/_/-}
 GITDATE="20110821"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="1"				# Tarball revision for patches
+GENPATCHREV="2"				# Tarball revision for patches
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${GITDATE}"
diff --git a/sys-kernel/mips-sources/mips-sources-3.1.5.ebuild b/sys-kernel/mips-sources/mips-sources-3.1.5.ebuild
new file mode 100644
index 000000000000..4228c6fc5ee0
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-3.1.5.ebuild
@@ -0,0 +1,177 @@
+# 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-3.1.5.ebuild,v 1.1 2011/12/18 03:54:19 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="20111216"			# 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"
+
+# EAPI Version
+EAPI="4"
+
+# 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 ; }
+
+#//------------------------------------------------------------------------------