A whole lotta house cleaning

26 files changed, 41 insertions, 871 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index e48c4c655747..7f33921feeee 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.80 2003/09/23 01:31:15 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.81 2003/09/25 17:42:59 tseng Exp $
+
+  25 Sep 2003; Brandon Hale <tseng@gentoo.org> metadata.xml,
+  mm-sources-2.6.0_beta3-r1.ebuild, mm-sources-2.6.0_beta3-r2.ebuild,
+  mm-sources-2.6.0_beta3-r3.ebuild, mm-sources-2.6.0_beta4-r1.ebuild,
+  mm-sources-2.6.0_beta4-r2.ebuild, mm-sources-2.6.0_beta4-r3.ebuild,
+  mm-sources-2.6.0_beta4-r4.ebuild, mm-sources-2.6.0_beta4-r5.ebuild,
+  mm-sources-2.6.0_beta4-r6.ebuild, mm-sources-2.6.0_beta5-r1.ebuild,
+  mm-sources-2.6.0_beta5-r2.ebuild, mm-sources-2.6.0_beta5-r3.ebuild,
+  mm-sources-2.6.0_beta5-r4.ebuild:
+  Some serious cleanups, added virtual provides for linux-sources and alsa, and
+  included metadata.xml.
 
 *mm-sources-2.6.0_beta5-r4 (22 Sep 2003)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index ca0db57b37db..761443c9f840 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,29 +1,10 @@
-MD5 7717c1d2eb839722fb0364e65bb72e38 ChangeLog 13381
-MD5 de6f56266c94e31a0b8a4d9c4da0d9f1 mm-sources-2.6.0_beta3-r1.ebuild 2072
-MD5 b140135947ad7abf9969215cb14f61bb mm-sources-2.6.0_beta3-r2.ebuild 2101
-MD5 9eb810173fe9cef5fde58c9da6efc4cd mm-sources-2.6.0_beta3-r3.ebuild 2109
-MD5 0c55015700e8de0a8328acbe1376e3e2 mm-sources-2.6.0_beta4-r1.ebuild 2920
-MD5 58e3cbd7120f582a9e134efd74f54325 mm-sources-2.6.0_beta4-r2.ebuild 2920
-MD5 31b4471944762587c36e5bdcf2c828b8 mm-sources-2.6.0_beta4-r3.ebuild 2924
-MD5 067d3364059f1f766f1407963b4cc095 mm-sources-2.6.0_beta4-r4.ebuild 2920
-MD5 1e325327e7b60ce6c03a78769b398455 mm-sources-2.6.0_beta4-r5.ebuild 2920
-MD5 34c045a7e9f4abd2150a14dbc07845c1 mm-sources-2.6.0_beta4-r6.ebuild 2920
-MD5 6d0a5f9bc52b2e6bb0c149d702b4939b mm-sources-2.6.0_beta5-r1.ebuild 2984
-MD5 567120fcb0aeb4fb38b68c33419b2065 mm-sources-2.6.0_beta5-r2.ebuild 2918
-MD5 9faf2234a6419870ed4f89b11bded76c mm-sources-2.6.0_beta5-r3.ebuild 2920
-MD5 36ce630f62ead25d14603c5a616296f9 mm-sources-2.6.0_beta5-r4.ebuild 2972
-MD5 7a30e716e2d27e98aaa68d5eee6c63b2 files/digest-mm-sources-2.6.0_beta3-r1 136
-MD5 c21a38ab9d0191bf6d8e29c62ed33a8f files/digest-mm-sources-2.6.0_beta3-r2 136
+MD5 2d25843acfc247e13de20b90e03280dc ChangeLog 14004
+MD5 ad08941b58dba3678d8d2a899588e7d0 mm-sources-2.6.0_beta5-r4.ebuild 3019
+MD5 d7e84f43655549f91c800d4c88a7b6f8 mm-sources-2.6.0_beta4-r6.ebuild 2965
+MD5 7aea0f1d7117e66dd5f010ad3a42e4df mm-sources-2.6.0_beta3-r3.ebuild 2154
+MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
 MD5 9dd17030e60ec4e849afdb6d610e231d files/digest-mm-sources-2.6.0_beta3-r3 137
-MD5 a90ffe18140b1269a1e485c823e39e87 files/digest-mm-sources-2.6.0_beta4-r1 136
-MD5 9f2027a0adefcad497f6cf0daf77e175 files/digest-mm-sources-2.6.0_beta4-r2 136
-MD5 d16a458bf6173b8bbc6f67567bcecf02 files/digest-mm-sources-2.6.0_beta4-r3 138
-MD5 875119bf71886bcec2d909c7134501c4 files/digest-mm-sources-2.6.0_beta4-r4 137
-MD5 7c689ec53830d68311304fc8792b0f75 files/digest-mm-sources-2.6.0_beta4-r5 137
 MD5 695b3dc1243fb34b5b5f4fe24378a188 files/digest-mm-sources-2.6.0_beta4-r6 137
-MD5 c9cffb80faf222315de7521e6595cea3 files/digest-mm-sources-2.6.0_beta5-r1 136
-MD5 b38cabe448941c8d86365b5503e48be4 files/digest-mm-sources-2.6.0_beta5-r2 136
-MD5 c5bcd6a7ced53ebbba5d0aea2968b909 files/digest-mm-sources-2.6.0_beta5-r3 136
 MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 ed6f583c9a528322461a432cf8f0409c files/2.6.0-test5-mm4-devfsd-fix 594
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r1
deleted file mode 100644
index ccefd272f172..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b7eb2c72aacb289b1448a8ea574ceab3 linux-2.6.0-test3.tar.bz2 32948106
-MD5 aa976ab5036dd1cf96c414991d0d820d 2.6.0-test3-mm1.bz2 712699
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r2
deleted file mode 100644
index 71b27048e603..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b7eb2c72aacb289b1448a8ea574ceab3 linux-2.6.0-test3.tar.bz2 32948106
-MD5 263baee1e0e88bf9786c3f42c90764b7 2.6.0-test3-mm2.bz2 934116
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r1
deleted file mode 100644
index 6e1cbf38e30e..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c0472d42e56a4b571f92e58b0cf0c55 linux-2.6.0-test4.tar.bz2 33021779
-MD5 35450fb158b9f9d579f63b63d11f2d2d 2.6.0-test4-mm1.bz2 887683
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r2
deleted file mode 100644
index a3fcb11dbe72..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c0472d42e56a4b571f92e58b0cf0c55 linux-2.6.0-test4.tar.bz2 33021779
-MD5 b830bcfbf606b1c06592777dfbd5e746 2.6.0-test4-mm2.bz2 953573
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r3
deleted file mode 100644
index 72902314ac0c..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c0472d42e56a4b571f92e58b0cf0c55 linux-2.6.0-test4.tar.bz2 33021779
-MD5 85a490acb1482e3871b2add2d933b1ec 2.6.0-test4-mm3-1.bz2 975707
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r4 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r4
deleted file mode 100644
index d5535b0b738a..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c0472d42e56a4b571f92e58b0cf0c55 linux-2.6.0-test4.tar.bz2 33021779
-MD5 d7edf46d1d2480cc79b18d3a709dee7b 2.6.0-test4-mm4.bz2 1009829
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r5 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r5
deleted file mode 100644
index c86f84ef8d39..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta4-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c0472d42e56a4b571f92e58b0cf0c55 linux-2.6.0-test4.tar.bz2 33021779
-MD5 54f6f4030147a95761ffa2be1eda3f9e 2.6.0-test4-mm5.bz2 1278328
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r1
deleted file mode 100644
index faa3e4ca0589..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 638fb2fbffad7ff067c178a345605d37 linux-2.6.0-test5.tar.bz2 33048724
-MD5 761a66006032a478fe89163044000e4c 2.6.0-test5-mm1.bz2 876251
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r2
deleted file mode 100644
index c7cd6c8c52a5..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 638fb2fbffad7ff067c178a345605d37 linux-2.6.0-test5.tar.bz2 33048724
-MD5 9fd2483fcc5efb16680affc1ffa6fad6 2.6.0-test5-mm2.bz2 888668
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r3
deleted file mode 100644
index 6923936699c4..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta5-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 638fb2fbffad7ff067c178a345605d37 linux-2.6.0-test5.tar.bz2 33048724
-MD5 286a32b2120410e9dd3ff8644ba7aad5 2.6.0-test5-mm3.bz2 980408
diff --git a/sys-kernel/mm-sources/metadata.xml b/sys-kernel/mm-sources/metadata.xml
new file mode 100644
index 000000000000..9af7f2888f70
--- /dev/null
+++ b/sys-kernel/mm-sources/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+	<email>tseng@gentoo.org</email>
+	<name>Brandon Hale</name>
+</maintainer>
+<longdescription>
+This kernel is based on Andrew Morton's tree.
+It includes a large number of patches to vanilla 2.6 + bk,
+most notably scheduler work by Con Klivias.
+</longdescription>
+</pkgmetadata>
+	
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r1.ebuild
deleted file mode 100644
index d9ce82792f17..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2003 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_beta3-r1.ebuild,v 1.1 2003/08/10 14:53:47 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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"
-SLOT=${KV}
-
-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"
-
-	unset ARCH
-	kernel_universal_unpack
-
-}
-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_beta3-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r2.ebuild
deleted file mode 100644
index 52368ad59c57..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 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_beta3-r2.ebuild,v 1.2 2003/08/16 16:10:10 pfeifer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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"
-SLOT=${KV}
-
-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"
-	sed -i '1930d' mm/filemap.c
-
-	unset ARCH
-	kernel_universal_unpack
-
-}
-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_beta3-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r3.ebuild
index a62032333d1e..5577da771f58 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r3.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_beta3-r3.ebuild,v 1.2 2003/08/20 12:28:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta3-r3.ebuild,v 1.3 2003/09/25 17:42:59 tseng Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -25,6 +25,8 @@ mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PV/_beta/-test}/${KV}/${K
 KEYWORDS="x86 ppc"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
+PROVIDE="virtual/linux-sources
+		virtual/alsa"
 
 src_unpack() {
 	cd ${WORKDIR}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r1.ebuild
deleted file mode 100644
index f4b494a42e3d..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta4-r1.ebuild,v 1.2 2003/09/05 13:57:29 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta4-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r2.ebuild
deleted file mode 100644
index db7668b20d09..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta4-r2.ebuild,v 1.2 2003/09/05 13:57:29 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta4-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r3.ebuild
deleted file mode 100644
index d497734a81a3..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta4-r3.ebuild,v 1.4 2003/09/05 13:57:29 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}-1.bz2"
-KEYWORDS="x86 ppc"
-RDEPEND="sys-apps/module-init-tools"
-SLOT=${KV}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/${KV}-1.bz2 | patch -p1 || die "mm patch failed"
-
-	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.0_beta4-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r4.ebuild
deleted file mode 100644
index f55d09da8c3b..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta4-r4.ebuild,v 1.3 2003/09/05 13:57:29 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta4-r5.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r5.ebuild
deleted file mode 100644
index 8172b8fa3abf..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta4-r5.ebuild,v 1.2 2003/09/05 13:57:29 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta4-r6.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r6.ebuild
index 97a6a44631be..9e9b88b7fb11 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r6.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_beta4-r6.ebuild,v 1.1 2003/09/05 13:57:29 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta4-r6.ebuild,v 1.2 2003/09/25 17:42:59 tseng Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -25,6 +25,8 @@ mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PV/_beta/-test}/${KV}/${K
 KEYWORDS="x86 ppc"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
+PROVIDE="virtual/linux-sources
+		virtual/alsa"
 
 src_unpack() {
 	cd ${WORKDIR}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild
deleted file mode 100644
index a5d80d37df2c..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2003 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_beta5-r1.ebuild,v 1.2 2003/09/10 14:57:59 tseng Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-	#fix fatal build errors in test5
-	epatch ${FILESDIR}/test5.patch
-
-	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.0_beta5-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r2.ebuild
deleted file mode 100644
index ee0d671c0ee0..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta5-r2.ebuild,v 1.1 2003/09/17 04:40:39 kumba Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta5-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r3.ebuild
deleted file mode 100644
index bafcb061f018..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 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_beta5-r3.ebuild,v 1.1 2003/09/19 13:25:14 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-OKV=${PV/_beta/-test}
-
-EXTRAVERSION="`echo ${OKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${OKV}-${PR/r/mm}
-
-inherit kernel
-
-# 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}
-
-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"
-
-	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.0_beta5-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r4.ebuild
index 94dbd341a2a8..44fc6742480d 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r4.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_beta5-r4.ebuild,v 1.1 2003/09/23 01:31:15 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r4.ebuild,v 1.2 2003/09/25 17:42:59 tseng Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -25,6 +25,8 @@ mirror://kernel/linux/kernel/people/akpm/patches/2.6/${PV/_beta/-test}/${KV}/${K
 KEYWORDS="x86 ppc"
 RDEPEND="sys-apps/module-init-tools"
 SLOT=${KV}
+PROVIDE="virtual/linux-sources
+		virtual/alsa"
 
 src_unpack() {
 	cd ${WORKDIR}