Version bump and header fix, closes bug #37050...

6 files changed, 27 insertions, 31 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 78c7cfda3f46..e1179705b499 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 e1eb4e25986dabd2cbf5e85f2f14023e ChangeLog 17734
+MD5 ae85357b5190f763cf4acfe9cdb45a1f ChangeLog 17738
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
-MD5 a1017224be36885fda1d16a80f1034aa mm-sources-2.6.1_rc1-r1.ebuild 2858
-MD5 2cc6159918541fe778f96bc41a499892 mm-sources-2.6.0-r1.ebuild 2988
-MD5 7f4a0bdefb6b2001ed145d7426a14699 mm-sources-2.6.0-r2.ebuild 2984
+MD5 814bbfc70fad55558836e2640e306f06 mm-sources-2.6.1_rc1-r1.ebuild 2866
+MD5 c99ef4fc00b590da7296d8e5a22c21a2 mm-sources-2.6.0-r1.ebuild 2992
+MD5 29b1283c035365d2a544935f2afbcfd5 mm-sources-2.6.0-r2.ebuild 2988
 MD5 1ad49f2d7d99c775522b3e7b06f4e9de files/digest-mm-sources-2.6.0-r2 125
 MD5 73266809f62ed7e13ae24b66417880dc files/digest-mm-sources-2.6.1_rc1-r1 132
 MD5 01a838b34918f69ee08e3674c2b3c6e7 files/digest-mm-sources-2.6.0-r1 124
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1
deleted file mode 100644
index 53d27936e461..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta11-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
-MD5 4625409f598f77c923e096ff3ac83bd4 2.6.0-test11-mm1.bz2 370458
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r1
new file mode 100644
index 000000000000..e17807db45b6
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r1
@@ -0,0 +1,2 @@
+MD5 5b8cbd68b11ec012a52b07cfed404a20 linux-2.6.1-rc1.tar.bz2 33173647
+MD5 eba7b1b9b701b19e58b06cfbe70d550b 2.6.1-rc1-mm1.bz2 709052
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
index 562180ab967d..bbdce42fc24b 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild,v 1.1 2003/12/23 21:42:24 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild,v 1.2 2004/01/02 23:34:06 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild
index 81fcb6d3486d..9d1a19e2576b 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild,v 1.1 2003/12/30 01:15:00 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild,v 1.2 2004/01/02 23:34:06 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
index 33e4ca164971..70b627f45fcd 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta11-r1.ebuild,v 1.1 2003/12/17 15:30:19 tseng Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild,v 1.1 2004/01/02 23:34:06 plasmaroo Exp $
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel
 
-OKV=${PV/_beta/-test}
+OKV=${PV/_/-}
 
 EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
 	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
 
 KV=${OKV}-${PR/r/mm}
-
 S=${WORKDIR}/linux-${KV}
 
 inherit eutils
@@ -23,15 +22,16 @@ inherit eutils
 # The development branch of the linux kernel with Andrew Morton's patch
 
 DESCRIPTION="Full sources for the development linux kernel with Andrew Morton's patchset"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV/_beta/-test}.tar.bz2
-mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PV/_beta/-test}/${KV}/${KV}.bz2"
-KEYWORDS="x86 ~ppc"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/testing/linux-${OKV}.tar.bz2
+mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
+KEYWORDS="~x86"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
 PROVIDE="virtual/linux-sources
 		virtual/alsa"
 
 src_unpack() {
+
 	cd ${WORKDIR}
 	unpack linux-${OKV}.tar.bz2
 
@@ -40,11 +40,9 @@ src_unpack() {
 	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
 	find . -iname "*~" | xargs rm 2> /dev/null
 
-	#Fix broken APIC includes in test11-mm1 (tseng)
-	epatch ${FILESDIR}/apic.patch || die "APIC fix failed"
-
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
 	# also fix the EXTRAVERSION
+
 	cd ${S}
 	mv Makefile Makefile.orig
 	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
@@ -57,18 +55,16 @@ src_unpack() {
 		&& mv Makefile.new Makefile
 	cd ${S}
 
-	#This is needed on > 2.5
+	# This is needed on > 2.5
 	MY_ARCH=${ARCH}
 	unset ARCH
-	#sometimes we have icky kernel symbols; this seems to get rid of them
+
+	# Sometimes we have icky kernel symbols; this seems to get rid of them
 	make mrproper || die "make mrproper died"
 	ARCH=${MY_ARCH}
 
-	# kernel_universal_unpack used to do this... changes in kconfig make
-	# this die now
-	#make include/linux/version.h || die "make include/linux/version.h failed"
-
 }
+
 pkg_postinst() {
 	if [ ! -e ${ROOT}usr/src/linux-beta ]
 	then
@@ -76,10 +72,10 @@ pkg_postinst() {
 	fi
 
 	ewarn "Please note that ptyfs support has been removed from devfs"
-	ewarn "in the later 2.5.x kernels, and you have to compile it in now,"
-	ewarn "or else you will get errors when trying to open a pty."
-	ewarn "The option is File systems->Pseudo filesystems->/dev/pts"
-	ewarn "filesystem."
+	ewarn "and you have to compile it in now, or else you will get"
+	ewarn "errors when trying to open a pty. The options are:"
+	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
+	ewarn "File systems -> Pseudo filesystems -> /dev/pts filesystem."
 	echo
 	ewarn "Also, note that you must compile in support for"
 	ewarn "input devices (Input device support->Input devices),"