Removed 2.4.31 -- this terminates support for the 2.4 kernel series on all Gentoo-supported MIPS systems. Also update 2.6.15 to the .7 release from .4. 2.6.16 import is forth coming.

(Portage version: 2.1_pre7-r1)

7 files changed, 43 insertions, 88 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index a350e52f62b1..b8fddf58fc4c 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.84 2006/02/14 21:13:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.85 2006/03/28 19:22:31 kumba Exp $
+
+*mips-sources-2.6.15.7 (02 Apr 2006)
+
+  02 Apr 2006; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.31-r1.ebuild, -mips-sources-2.6.15.4.ebuild,
+  +mips-sources-2.6.15.7.ebuild:
+  Removed 2.4.31 -- this terminates support for the 2.4 kernel series on all
+  Gentoo-supported MIPS systems. Also update 2.6.15 to the .7 release from .4.
+  2.6.16 import is forth coming.
 
 *mips-sources-2.6.15.4 (19 Feb 2006)
 *mips-sources-2.6.14.7 (19 Feb 2006)
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 6300702f97fb..01938b701404 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,18 @@
-MD5 206f1230f9490a15a6a1c9a6faab259c ChangeLog 36719
-MD5 0c97fdd0af4e709a2a3173aa53a0990b files/digest-mips-sources-2.4.31-r1 316
+MD5 09ad67051d26bd5e077f20355366332f ChangeLog 37093
+RMD160 4b2590967ef6a6db4c421e61804102c21e919d57 ChangeLog 37093
+SHA256 3c7e651c0ba08b747ae0f6dc2b9794320a48dae08c29130990fbf00ecdd1ca0b ChangeLog 37093
 MD5 732d132378b3283e01120a3c0bff80cc files/digest-mips-sources-2.6.14.7 378
-MD5 b2b1f729e56b4904460648e1541f101d files/digest-mips-sources-2.6.15.4 378
+RMD160 cf4840ac5526f7af82fee081f20997f3f061d2ba files/digest-mips-sources-2.6.14.7 378
+SHA256 d73bcf4a216c3cc045af976e8f20033b76dff97c9cc7098b2ecad1b1a2a1acdd files/digest-mips-sources-2.6.14.7 378
+MD5 8749ef4a49a1675742eca811b0993453 files/digest-mips-sources-2.6.15.7 1364
+RMD160 09f87e21706e25f52a057d163c1f7a77fd04d50c files/digest-mips-sources-2.6.15.7 1364
+SHA256 778e60f27227c9811b838a2648e006875c07639d4308ba1b6507fd880e01e328 files/digest-mips-sources-2.6.15.7 1364
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 33808696f457977c99d2691c774ca703 mips-sources-2.4.31-r1.ebuild 2035
+RMD160 16684ccbf54bd2a4580dbf6e11cb0c8b4582e38b metadata.xml 378
+SHA256 25f7c0d45f0238401d2ab5075149519037844bf692c3c60ea355d984e22834fd metadata.xml 378
 MD5 d6c4f271666afd5cd3efe2a57a0b0108 mips-sources-2.6.14.7.ebuild 13791
-MD5 4868ffc8753f49e400bf0507e8a943c6 mips-sources-2.6.15.4.ebuild 18816
+RMD160 a2eca49cf09d92a21612810c27f64aa813b7f27c mips-sources-2.6.14.7.ebuild 13791
+SHA256 83b52d2a2561b3f1444ae006fa0fb0734299287062aa59581d2e0596d4289d0f mips-sources-2.6.14.7.ebuild 13791
+MD5 aa79c14939ece849957787b06200400d mips-sources-2.6.15.7.ebuild 18783
+RMD160 2152f670cbb442bd2bad5cd291f94bbd85c540a6 mips-sources-2.6.15.7.ebuild 18783
+SHA256 0d1baa9130e2760236e099a98721b86fe37f8a403ac459960c413944909d9686 mips-sources-2.6.15.7.ebuild 18783
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1
deleted file mode 100644
index 0f58b4cd3da3..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bf6e3843ca122e3ad9ad28b94f4b8ed5 linux-2.4.31.tar.bz2 31129841
-MD5 998480888a0049e3537af2cd2240d92b mips-sources-generic_patches-1.14.tar.bz2 118949
-MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
-MD5 f168633caef6078fe0afbd7fc7e1d767 mipscvs-2.4.31-20050606.diff.bz2 139016
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.4
deleted file mode 100644
index 1bc15eb5fd31..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
-MD5 400949477a84f5f752a70e5f0b242b13 mips-sources-generic_patches-1.19.tar.bz2 250689
-MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
-MD5 2f563f3c35bc4de10296981e66c15579 mipsgit-2.6.15-20060109.diff.bz2 135328
-MD5 16c9747058fa575886b32ca022667f60 patch-2.6.15.4.bz2 18466
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.7
new file mode 100644
index 000000000000..6fe204751c19
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.15.7
@@ -0,0 +1,15 @@
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+RMD160 e65904bf253b3515f8dd2a480c7e99ec7117cf60 linux-2.6.15.tar.bz2 39832836
+SHA256 066ec56ce5f57c79a526b6bb3541d32dbf796c11c26c32073fc64b93f09825db linux-2.6.15.tar.bz2 39832836
+MD5 400949477a84f5f752a70e5f0b242b13 mips-sources-generic_patches-1.19.tar.bz2 250689
+RMD160 4b2162a8a7072e4932a99abc905793a6933d81c8 mips-sources-generic_patches-1.19.tar.bz2 250689
+SHA256 06ab5ed393f13865f39a34ac2bc65e7ecf058a73d55551dbdc37113a1734135e mips-sources-generic_patches-1.19.tar.bz2 250689
+MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
+RMD160 b0f8dcf5ae9bc2881c0e96302e5f7ce36b9eef9d mips-sources-security_patches-1.15.tar.bz2 95503
+SHA256 188459e458fd059dedf0a70c766358a64fa3122d4584f8ef01286d5f8ad424ed mips-sources-security_patches-1.15.tar.bz2 95503
+MD5 2f563f3c35bc4de10296981e66c15579 mipsgit-2.6.15-20060109.diff.bz2 135328
+RMD160 092ee406c2aed0fb296f9279b30610f7bf244f21 mipsgit-2.6.15-20060109.diff.bz2 135328
+SHA256 c47907b1e5d729a57708ce6c641ba1cdad0080c5a863b8e48ee826bc8b714ccc mipsgit-2.6.15-20060109.diff.bz2 135328
+MD5 f86ac6652439c95705295eb773aae65b patch-2.6.15.7.bz2 30839
+RMD160 941b3782008926c0f4418260eee2d9cc46b348e1 patch-2.6.15.7.bz2 30839
+SHA256 862a046e01437ee979d3adf7df91ad3f64e0e0e44a6fd7b46962b62c5b89ca0a patch-2.6.15.7.bz2 30839
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild
deleted file mode 100644
index a6dd2083a5b8..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.31-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 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.4.31-r1.ebuild,v 1.1 2005/10/16 02:31:27 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20050606"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.15"			# Tarball version for security patches
-GENPATCHVER="1.14"			# Tarball version for generic patches
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 12 Jul 2004
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
-# 5) iso9660 fix
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-IUSE=""
-
-
-src_unpack() {
-	unpack ${A}
-
-	echo -e ""
-	einfo "Ignore warnings about using the 'linux-info' eclass."
-	echo -e ""
-
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# gcc-3.4.x compatibility patches
-	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-strcpy-fix.patch
-	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-stop-dead-code-elim.patch
-
-	# Support the second seeq on Challenge S systems
-	epatch ${WORKDIR}/mips-patches/misc-2.4-ip22-support-mezz-seeq.patch
-
-	# Security Fixes
-#	echo -e ""
-#	ebegin ">>> Applying Security Fixes"
-#	eend
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.15.4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.15.7.ebuild
index c06411d4f99e..a8c85ccebcf9 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.15.4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.15.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.15.4.ebuild,v 1.1 2006/02/14 21:13:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.15.7.ebuild,v 1.1 2006/03/28 19:22:31 kumba Exp $
 
 
 # INCLUDED:
@@ -42,9 +42,9 @@ inherit kernel eutils versionator
 HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 IUSE="cobalt ip27 ip28 ip30 ip32r10k"
-
+DEPEND="<=sys-devel/gcc-3.4.5-r1"
 
 # Version Control Variables
 USE_RC="no"				# If set to "yes", then attempt to use an RC kernel
@@ -365,7 +365,6 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.11-ip32-mace-is-always-eth0.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.15-ip32-fix-another-gbefb-typo.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.15-ip32-fix-rm52xx-support.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.15-ip32-gbefb-true-color.patch
 
 		# Cobalt Patches
 		epatch ${MIPS_PATCHES}/misc-2.6.15-cobalt-bits.patch