remove deprecated ebuilds and fix copyrights

17 files changed, 21 insertions, 589 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index d1b09ba673bf..9ee8deae7bbf 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.19 2004/01/05 21:28:00 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.20 2004/01/05 21:43:49 brad_mssw Exp $
+
+  05 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  gentoo-dev-sources-2.6.0-r1.ebuild, gentoo-dev-sources-2.6.0.ebuild,
+  gentoo-dev-sources-2.6.0_beta10-r1.ebuild,
+  gentoo-dev-sources-2.6.0_beta10.ebuild,
+  gentoo-dev-sources-2.6.0_beta11-r1.ebuild,
+  gentoo-dev-sources-2.6.0_beta11-r2.ebuild,
+  gentoo-dev-sources-2.6.0_beta11.ebuild,
+  gentoo-dev-sources-2.6.0_beta9.ebuild, gentoo-dev-sources-2.6.1_rc1.ebuild:
+  remove deprecated ebuilds and fix copyrights
 
   05 Jan 2004; Brad House <brad_mssw@gentoo.org>
   gentoo-dev-sources-2.6.0-r2.ebuild, gentoo-dev-sources-2.6.1_rc1.ebuild:
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 4b69d75255fa..69e57c6335fb 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,22 +1,10 @@
-MD5 d0ca14349e8a7d79e142c10fec08ab71 ChangeLog 4222
-MD5 28dbb115d7c9f2c982087a556028a54f gentoo-dev-sources-2.6.0.ebuild 3294
-MD5 3aa2de29714ded6575c28ef08452319c gentoo-dev-sources-2.6.0_beta10-r1.ebuild 3023
-MD5 a4d672f58dc685b5403312ae1e9db563 gentoo-dev-sources-2.6.0_beta10.ebuild 2632
-MD5 77c5731b696e03a6cb31b62435b685e8 gentoo-dev-sources-2.6.0_beta11-r1.ebuild 3219
-MD5 85948c4ad067e60876f8f27a9edd272c gentoo-dev-sources-2.6.0_beta11-r2.ebuild 3307
-MD5 e47d675b21d3c3c710142ecebd3b9039 gentoo-dev-sources-2.6.0_beta11.ebuild 3216
-MD5 6f63cb99dc8533aeca57408321c91cd1 gentoo-dev-sources-2.6.0_beta9.ebuild 2352
+MD5 11f86351a6f39a5f5037683c2a43749d ChangeLog 4687
+MD5 877780ca40dc7fbd63a8fffd845b960d gentoo-dev-sources-2.6.0.ebuild 3294
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
-MD5 438d333157b562dd25e5a83b51941b41 gentoo-dev-sources-2.6.0-r1.ebuild 3300
-MD5 b8b21566b1fe6bae00799b51c0ae7fba gentoo-dev-sources-2.6.1_rc1.ebuild 4681
+MD5 447664c741a2a2eaa6893fd473459344 gentoo-dev-sources-2.6.0-r1.ebuild 3300
+MD5 f65c852aedb4af3a8383058ae16382d2 gentoo-dev-sources-2.6.1_rc1.ebuild 4680
 MD5 31e6dd2efc842ae1a08207b41a4ddf44 gentoo-dev-sources-2.6.0-r2.ebuild 3342
 MD5 0bb5e60d954d4e595f357475973e279f files/digest-gentoo-dev-sources-2.6.0 137
-MD5 8ddadf31b5dcf41e4a17ba7b2e7f4ac1 files/digest-gentoo-dev-sources-2.6.0_beta10 144
-MD5 c242a7844916262f087398b60ec62705 files/digest-gentoo-dev-sources-2.6.0_beta10-r1 144
-MD5 a6f41cae4fa405138226dfb227911003 files/digest-gentoo-dev-sources-2.6.0_beta11 144
-MD5 1a88dcc33b21c4109ce7cf693b43b974 files/digest-gentoo-dev-sources-2.6.0_beta11-r1 144
-MD5 d472f52790525a410af311ff82b4e179 files/digest-gentoo-dev-sources-2.6.0_beta11-r2 144
-MD5 2c930a031439b36d073cdbadc16a5bbc files/digest-gentoo-dev-sources-2.6.0_beta9 142
 MD5 8104284047ea615d1ddcd79fa96e65fc files/digest-gentoo-dev-sources-2.6.0-r1 138
 MD5 049cf3bb4dbeb55995bad1459931c3b5 files/digest-gentoo-dev-sources-2.6.1_rc1 202
 MD5 e7ee256f3e809a78b23313a7c73e7e97 files/digest-gentoo-dev-sources-2.6.0-r2 140
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10
deleted file mode 100644
index 3242cdd5901e..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 61828549d38189bdece85f5107a507ca linux-2.6.0-test10.tar.bz2 33240118
-MD5 71fd3a71e8403286b86d0c09f6655d8e genpatches-2.6-0.4.tar.bz2 211599
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10-r1
deleted file mode 100644
index de7bc1ca8c27..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 61828549d38189bdece85f5107a507ca linux-2.6.0-test10.tar.bz2 33240118
-MD5 e2d76a3311e73611d93fa9508c503c45 genpatches-2.6-0.5.tar.bz2 209474
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11
deleted file mode 100644
index 5845e1a864d7..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
-MD5 e58c080c47a2db6b155b4c4e2edf5b62 genpatches-2.6-0.6.tar.bz2 207610
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r1
deleted file mode 100644
index f915323b543e..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
-MD5 6142c2a5ad0651cfcaabea8e51be8a1a genpatches-2.6-0.7.tar.bz2 227099
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r2 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r2
deleted file mode 100644
index ed792f43dc60..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta11-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
-MD5 449ad4e572d4e948c040264c49f32fa1 genpatches-2.6-0.8.tar.bz2 332753
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta9 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta9
deleted file mode 100644
index 88c010031688..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.0_beta9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52eef08a43aa28689213b8ab5674f73b linux-2.6.0-test9.tar.bz2 33226512
-MD5 0f5a2c79ca17e4a89d7b93c4b36ebabb genpatches-2.6-0.3.tar.bz2 18021
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r1.ebuild
index 8ee6c7bbb082..305507cb656b 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-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/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r1.ebuild,v 1.1 2003/12/29 02:50:00 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0-r1.ebuild,v 1.2 2004/01/05 21:43:49 brad_mssw Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild
index e3c76452f96f..eeb7a0a5455d 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.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/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild,v 1.3 2003/12/18 16:33:09 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0.ebuild,v 1.4 2004/01/05 21:43:49 brad_mssw Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10-r1.ebuild
deleted file mode 100644
index 8297bccecf9a..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10-r1.ebuild
+++ /dev/null
@@ -1,91 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10-r1.ebuild,v 1.2 2003/11/24 17:30:09 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.5
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-#GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
-GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 ${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack genpatches-2.6-${GPV}.tar.bz2
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
-	for file in ${PATCHES}
-	do
-		epatch $file
-	done
-
-	# Our EXTRAVERSION needs to be appended to the end for the Makefile
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	-e "s:EXTRAVERSION = \(.\+\):EXTRAVERSION = \1${EXTRAVERSION}:" Makefile > Makefile.new
-#	rm -f Makefile
-#	mv Makefile.new Makefile
-
-	kernel_universal_unpack
-
-	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
-	rm -f Makefile
-	mv Makefile.new Makefile
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10.ebuild
deleted file mode 100644
index 2c1fd97c160b..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10.ebuild
+++ /dev/null
@@ -1,81 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta10.ebuild,v 1.1 2003/11/24 04:29:25 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.4
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-#GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
-GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 ${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack genpatches-2.6-${GPV}.tar.bz2
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
-	for file in ${PATCHES}
-	do
-		epatch $file
-	done
-
-	kernel_universal_unpack
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r1.ebuild
deleted file mode 100644
index 6d2f62da1820..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r1.ebuild
+++ /dev/null
@@ -1,101 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r1.ebuild,v 1.1 2003/12/02 01:42:10 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.7
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
-#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 ${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack genpatches-2.6-${GPV}.tar.bz2
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
-	for file in ${PATCHES}
-	do
-		epatch $file
-	done
-
-	# Our EXTRAVERSION needs to be appended to the end for the Makefile
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	-e "s:EXTRAVERSION = \(.\+\):EXTRAVERSION = \1${EXTRAVERSION}:" Makefile > Makefile.new
-#	rm -f Makefile
-#	mv Makefile.new Makefile
-
-	kernel_universal_unpack
-
-	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
-	rm -f Makefile
-	mv Makefile.new Makefile
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	if [ ! -h "/usr/src/linux-beta" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-
-	if [ ! -h "/usr/src/linux" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
-	fi
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r2.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r2.ebuild
deleted file mode 100644
index bb4a7200ce38..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r2.ebuild
+++ /dev/null
@@ -1,107 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11-r2.ebuild,v 1.2 2003/12/14 20:29:46 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.8
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
-#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 ${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack genpatches-2.6-${GPV}.tar.bz2
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
-	for file in ${PATCHES}
-	do
-		epatch $file
-	done
-
-	# Our EXTRAVERSION needs to be appended to the end for the Makefile
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	-e "s:EXTRAVERSION = \(.\+\):EXTRAVERSION = \1${EXTRAVERSION}:" Makefile > Makefile.new
-#	rm -f Makefile
-#	mv Makefile.new Makefile
-
-	kernel_universal_unpack
-
-	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
-	rm -f Makefile
-	mv Makefile.new Makefile
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	if [ ! -h "/usr/src/linux-beta" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-
-	if [ ! -h "/usr/src/linux" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
-	fi
-
-	# Don't forget to make directory for sysfs
-	if [ ! -d "/sys" ]
-	then
-		mkdir /sys
-	fi
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11.ebuild
deleted file mode 100644
index a34b7b1111c0..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11.ebuild
+++ /dev/null
@@ -1,101 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta11.ebuild,v 1.3 2003/11/27 16:20:18 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.6
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-#GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/2.6.0/genpatches-2.6-${GPV}.tar.bz2"
-GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 ${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack genpatches-2.6-${GPV}.tar.bz2
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-	PATCHES=`find ${WORKDIR}/genpatches-${GPV} -type f -name *.patch | sort`
-	for file in ${PATCHES}
-	do
-		epatch $file
-	done
-
-	# Our EXTRAVERSION needs to be appended to the end for the Makefile
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	-e "s:EXTRAVERSION = \(.\+\):EXTRAVERSION = \1${EXTRAVERSION}:" Makefile > Makefile.new
-#	rm -f Makefile
-#	mv Makefile.new Makefile
-
-	kernel_universal_unpack
-
-	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
-	rm -f Makefile
-	mv Makefile.new Makefile
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	if [ ! -h "/usr/src/linux-beta" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-
-	if [ ! -h "/usr/src/linux" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
-	fi
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
deleted file mode 100644
index d1ffb8f44e63..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
+++ /dev/null
@@ -1,73 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-#Original Kernel Version before Patches
-# eg: 2.6.0-test8
-OKV=${PV/_beta/-test}
-OKV=${OKV/-r*//}
-
-#version of gentoo patchset
-GPV=0.3
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	# apply gentoo patches
-	epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-
-	kernel_universal_unpack
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	echo
-	eerror "IMPORTANT:"
-	eerror "ptyfs support has now been dropped from devfs and as a"
-	eerror "result you are now required to compile this support into"
-	eerror "the kernel. You can do so by enabling the following option"
-	eerror "	File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	eerror "To prevent the problem while uncompressing the kernel image"
-	eerror "you should also enable:"
-	eerror "	Input Devices (Input Device Support -> Input Devices),"
-	eerror "	Virtual Terminal (Character Devices -> Virtual Terminal),"
-	eerror "	vga_console (Graphics Support -> Console... -> VGA Text Console)"
-	eerror "	vt_console (Character Devices -> Support for Console...)."
-	echo
-}
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild
index 818e147b6d07..e5f0138046e1 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.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/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild,v 1.6 2004/01/05 21:28:00 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1_rc1.ebuild,v 1.7 2004/01/05 21:43:49 brad_mssw Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -48,7 +48,7 @@ then
 fi
 
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OFFICIAL_KV}.tar.bz2
-	${KP_SRC} 
+	${KP_SRC}
 	${GPV_SRC}"
 LICENSE="GPL-2"
 SLOT="${KV}"