Minor tweaks to change CVSDATE to GITDATE, and use newer rev of mips-sources patchball due to a bug in one patch that resulted in patch failure.

(Portage version: 2.0.53)

4 files changed, 24 insertions, 19 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 6614441082a8..44c64e4e4566 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.80 2005/12/20 18:10:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.81 2005/12/20 19:38:30 kumba Exp $
+
+  20 Dec 2005; Joshua Kinard <kumba@gentoo.org>
+  mips-sources-2.6.14.4.ebuild:
+  Minor tweaks to change CVSDATE to GITDATE, and use newer rev of mips-sources
+  patchball due to a bug in one patch that resulted in patch failure.
 
 *mips-sources-2.6.14.4 (20 Dec 2005)
 *mips-sources-2.6.13.5 (20 Dec 2005)
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 025616455ab1..43d81abf696d 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 02d20b5c7032d1ea6de6a08278f0bd54 ChangeLog 35208
+MD5 8ab710fead4874497ea261ec6188ed95 ChangeLog 35438
 MD5 0c97fdd0af4e709a2a3173aa53a0990b files/digest-mips-sources-2.4.31-r1 316
 MD5 2a7fb0ee882ce28399352ba1e72c811c files/digest-mips-sources-2.6.13.5 378
-MD5 aa0c3de27c3fb73ee2cb7de772e7324d files/digest-mips-sources-2.6.14.4 378
+MD5 79155be15630dccae204a7c116c28a7c files/digest-mips-sources-2.6.14.4 378
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
 MD5 33808696f457977c99d2691c774ca703 mips-sources-2.4.31-r1.ebuild 2035
 MD5 f4d1f84286c18bbe12d7162b51d3039e mips-sources-2.6.13.5.ebuild 12708
-MD5 403ea0bb57654ef4a282bb47f385b5b9 mips-sources-2.6.14.4.ebuild 13736
+MD5 89073739b11fa1581576860ad51a5a57 mips-sources-2.6.14.4.ebuild 13736
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.14.4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.14.4
index 911b0d0f36a3..2f00c15147ce 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.14.4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.14.4
@@ -1,5 +1,5 @@
 MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 32728f429527bb4a4446a4d3452fc606 mips-sources-generic_patches-1.15.tar.bz2 206582
+MD5 6802e4e0b610fd7985c33f9dea8331bb mips-sources-generic_patches-1.16.tar.bz2 212350
 MD5 e94ee79cc269b78401ffe9b79ad620ff mips-sources-security_patches-1.15.tar.bz2 95503
 MD5 ee7d677f2c8e81267abc038dfcd0f9c9 mipsgit-2.6.14-20051030.diff.bz2 689749
 MD5 cdf7318dc04eb669938fd6bd6b91e634 patch-2.6.14.4.bz2 19705
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.14.4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.14.4.ebuild
index 629dccaad308..83632736caca 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.14.4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.14.4.ebuild
@@ -1,11 +1,11 @@
 # 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.6.14.4.ebuild,v 1.1 2005/12/20 18:10:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.14.4.ebuild,v 1.2 2005/12/20 19:38:30 kumba Exp $
 
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 14 Sep 2005
+# 2) linux-mips.org GIT snapshot diff from 14 Sep 2005
 # 3) Generic Fixes
 # 4) Security fixes
 # 5) Patch for IP30 Octane Support		(http://www.linux-mips.org/~skylark/)
@@ -20,10 +20,10 @@
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20051030"			# Date of diff between kernel.org and lmo CVS
+GITDATE="20051030"			# Date of diff between kernel.org and lmo GIT
 SECPATCHVER="1.15"			# Tarball version for security patches
-GENPATCHVER="1.15"			# Tarball version for generic patches
-EXTRAVERSION="-mipsgit-${CVSDATE}"
+GENPATCHVER="1.16"			# Tarball version for generic patches
+EXTRAVERSION="-mipsgit-${GITDATE}"
 KV="${OKV}${EXTRAVERSION}"
 F_KV="${OKV}"				# Fetch KV, used to know what mipsgit diff to grab.
 STABLEVER="${F_KV}"			# Stable Version (2.6.x)
@@ -32,7 +32,7 @@ USERC="no"				# If set to "yes", then attempt to use an RC kernel
 USEPNT="yes"				# If set to "yes", then attempt to use a point-release (2.6.x.y)
 
 # Directories
-S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
+S="${WORKDIR}/linux-${OKV}-${GITDATE}"
 MIPS_PATCHES="${WORKDIR}/mips-patches"
 MIPS_SECURITY="${WORKDIR}/security"
 
@@ -57,7 +57,7 @@ if [ "${USERC}" = "yes" ]; then
 	F_KV="$(get_version_component_range 1-3)-${KVRC}"
 	STABLEVER="${KVXY}.$((${KVZ} - 1))"				# Last stable version (Rev - 1)
 	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
-	EXTRAVERSION="-${KVRC}-mipsgit-${CVSDATE}"
+	EXTRAVERSION="-${KVRC}-mipsgit-${GITDATE}"
 	KV="${OKV}-${EXTRAVERSION}"
 fi
 
@@ -67,14 +67,14 @@ if [ "${USEPNT}" = "yes" ]; then
 	F_KV="$(get_version_component_range 1-3)"			# Get Maj/Min/Rev (x.y.z)
 	STABLEVER="${F_KV}"						# Last Revision release
 	PATCHVER="mirror://kernel/linux/kernel/v2.6/patch-${OKV}.bz2"	# Patch for new point release
-	EXTRAVERSION=".$(get_version_component_range 4)-mipsgit-${CVSDATE}"
+	EXTRAVERSION=".$(get_version_component_range 4)-mipsgit-${GITDATE}"
 	KV="${OKV}${EXTRAVERSION}"
 fi
 
 
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.tar.bz2
-		mirror://gentoo/mipsgit-${F_KV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/mipsgit-${F_KV}-${GITDATE}.diff.bz2
 		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
 		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
 		${PATCHVER}"
@@ -338,7 +338,7 @@ rename_source_tree() {
 
 src_unpack() {
 	unpack ${A}
-	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${GITDATE}
 	cd ${S}
 
 
@@ -352,10 +352,10 @@ src_unpack() {
 	fi
 
 
-	# Update the vanilla sources with linux-mips CVS changes
+	# Update the vanilla sources with linux-mips GIT changes
 	echo -e ""
-	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
-	epatch ${WORKDIR}/mipsgit-${F_KV}-${CVSDATE}.diff
+	einfo ">>> linux-${OKV} --> linux-${OKV}-${GITDATE} patch ..."
+	epatch ${WORKDIR}/mipsgit-${F_KV}-${GITDATE}.diff
 
 	# Generic patches we always include
 	do_generic_patches