Bump and remove cruft

11 files changed, 10 insertions, 299 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 0de0f79032ed..98a9a38b66d1 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,11 +1,9 @@
-MD5 a719933e912550bf3f017cfc9e1d7e52 mm-sources-2.6.1-r2.ebuild 2855
-MD5 a719933e912550bf3f017cfc9e1d7e52 mm-sources-2.6.1-r1.ebuild 2855
-MD5 9441dae177253e5822de66af60db6a3c ChangeLog 18620
+MD5 820591814c92176f894d222db754c601 mm-sources-2.6.1-r2.ebuild 2855
+MD5 bbb3ebd2f964f7dc9967b9a3ebb65125 mm-sources-2.6.1-r1.ebuild 2854
+MD5 afe1ff77559ed01c6f23bcb1087adcca ChangeLog 18620
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
 MD5 c6ddb08fee22dd0196da6bf8af5cd401 files/digest-mm-sources-2.6.1-r1 125
 MD5 7c518bc2b7220fb3073feb31238e6462 files/digest-mm-sources-2.6.1-r2 125
 MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/mm-sources.CAN-2003-0985.patch 414
 MD5 c57fb303f389d1b448d8c5ffa004b58f files/apic.patch 533
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
-MD5 b5da5c743790e47591d9ae0dfd9ba795 files/digest-mm-sources-2.6.1_rc1-r1 192
-MD5 d2ae620ce6ed9a0dc5b6a268b0380499 files/digest-mm-sources-2.6.1_rc1-r2 192
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1
deleted file mode 100644
index 79c0b2a5ab9d..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
-MD5 c4cdd53c455178478be2adc4b62c800b 2.6.0-mm1.bz2 700665
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r2
deleted file mode 100644
index 77cd9c13fef2..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
-MD5 6f32e5fe424fd05dca202b765f4962cb 2.6.0-mm2.bz2 1231834
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2
new file mode 100644
index 000000000000..19afcccc8dbc
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r2
@@ -0,0 +1,2 @@
+MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
+MD5 f8339fffd606ad187e62e7f0c59a70dc 2.6.1-mm2.bz2 1480954
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
deleted file mode 100644
index 4cdc2dd637a9..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
-MD5 c3d3c57560c53b86709477f38621d9d5 patch-2.6.1-rc1.bz2 726490
-MD5 eba7b1b9b701b19e58b06cfbe70d550b 2.6.1-rc1-mm1.bz2 709052
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2
deleted file mode 100644
index 82ac7321ab3d..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1_rc1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
-MD5 c3d3c57560c53b86709477f38621d9d5 patch-2.6.1-rc1.bz2 726490
-MD5 ef2ef381b81046cf0ece148959ab1ba2 2.6.1-rc1-mm2.bz2 871432
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
deleted file mode 100644
index 6b293d14a132..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.3 2004/01/06 21:58:32 plasmaroo Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-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
-
-# What's in this kernel?
-
-# INCLUDED:
-# 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"
-RDEPEND="sys-apps/module-init-tools"
-SLOT=${KV}
-PROVIDE="virtual/linux-sources
-		virtual/alsa"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	find . -iname "*~" | xargs rm 2> /dev/null
-
-	# 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:' \
-		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-			Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-
-	cd  ${S}/Documentation/DocBook
-	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-		&& mv Makefile.new Makefile
-	cd ${S}
-
-	# This is needed on > 2.5
-	MY_ARCH=${ARCH}
-	unset ARCH
-
-	# Sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die "make mrproper died"
-	ARCH=${MY_ARCH}
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}usr/src/linux-beta ]
-	then
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	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."
-	echo
-	ewarn "Also, note that you must compile in support for"
-	ewarn "input devices (Input device support->Input devices),"
-	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
-	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
-	ewarn "and the vt_console (Character Devices->Support for console...)."
-	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""        ewarn "error."
-	echo
-	einfo "Consult http://www.codemonkey.org.uk/post-halloween-2.5.txt"
-	einfo "for more info about the development series."
-	echo
-}
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
deleted file mode 100644
index a04a767a6556..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.3 2004/01/06 21:58:32 plasmaroo Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-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
-
-# What's in this kernel?
-
-# INCLUDED:
-# 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"
-RDEPEND="sys-apps/module-init-tools"
-SLOT=${KV}
-PROVIDE="virtual/linux-sources
-		virtual/alsa"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	find . -iname "*~" | xargs rm 2> /dev/null
-
-	# 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:' \
-		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-			Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-
-	cd  ${S}/Documentation/DocBook
-	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-		&& mv Makefile.new Makefile
-	cd ${S}
-
-	#This is needed on > 2.5
-	MY_ARCH=${ARCH}
-	unset ARCH
-	#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
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	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."
-	echo
-	ewarn "Also, note that you must compile in support for"
-	ewarn "input devices (Input device support->Input devices),"
-	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
-	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
-	ewarn "and the vt_console (Character Devices->Support for console...)."
-	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""        ewarn "error."
-	echo
-	einfo "Consult http://www.codemonkey.org.uk/post-halloween-2.5.txt"
-	einfo "for more info about the development series."
-	echo
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild
index 22da6936cfcc..2ba715ecd5d6 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r1.ebuild,v 1.1 2004/01/09 15:10:15 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1-r1.ebuild,v 1.2 2004/01/10 17:28:39 lostlogic Exp $
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -24,7 +24,7 @@ inherit eutils
 DESCRIPTION="Full sources for the development linux kernel with Andrew Morton's patchset"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
 PROVIDE="virtual/linux-sources
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild
index 2615bd32fec6..33f0c8ebb681 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild
@@ -1,13 +1,12 @@
 # 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.1_rc1-r2.ebuild,v 1.3 2004/01/07 20:22:58 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1-r2.ebuild,v 1.1 2004/01/10 17:28:39 lostlogic Exp $
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel
 
-OKV=2.6.0
-PKV=${PV/_/-}
+OKV=2.6.1
 
 EXTRAVERSION="`echo ${PKV}-${PR/r/mm} | \
 	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
@@ -24,8 +23,7 @@ inherit eutils
 
 DESCRIPTION="Full sources for the development linux kernel with Andrew Morton's patchset"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 mirror://kernel/linux/kernel/v2.6/testing/patch-${PKV}.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PKV}/${KV}/${KV}.bz2"
+	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
 KEYWORDS="~x86"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
@@ -39,9 +37,7 @@ src_unpack() {
 
 	mv linux-${OKV} linux-${KV}
 	cd ${S}
-	bzcat ${DISTDIR}/patch-${PKV}.bz2 | patch -p1 || die "2.6.1-rc1 patch failed!"
 	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 	find . -iname "*~" | xargs rm 2> /dev/null
 
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
deleted file mode 100644
index 75d50676f5b8..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.1_rc1-r1.ebuild,v 1.4 2004/01/06 21:58:32 plasmaroo Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=2.6.0
-PKV=${PV/_/-}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${PV/_/-}-${PR/r/mm}
-S=${WORKDIR}/linux-${KV}
-
-inherit eutils
-
-# What's in this kernel?
-
-# INCLUDED:
-# 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-${OKV}.tar.bz2
-	 mirror://kernel/linux/kernel/v2.6/testing/patch-${PKV}.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PKV}/${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
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/patch-${PKV}.bz2 | patch -p1 || die "2.6.1-rc1 patch failed!"
-	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	find . -iname "*~" | xargs rm 2> /dev/null
-
-	# 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:' \
-		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-			Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-
-	cd  ${S}/Documentation/DocBook
-	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-		&& mv Makefile.new Makefile
-	cd ${S}
-
-	# This is needed on > 2.5
-	MY_ARCH=${ARCH}
-	unset ARCH
-
-	# Sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die "make mrproper died"
-	ARCH=${MY_ARCH}
-
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}usr/src/linux-beta ]
-	then
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-
-	ewarn "Please note that ptyfs support has been removed from devfs"
-	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),"
-	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
-	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
-	ewarn "and the vt_console (Character Devices->Support for console...)."
-	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""        ewarn "error."
-	echo
-	einfo "Consult http://www.codemonkey.org.uk/post-halloween-2.5.txt"
-	einfo "for more info about the development series."
-	echo
-}