Bump and cleanup

8 files changed, 12 insertions, 218 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 08daf235a5b0..0558d8b58b59 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,15 +1,9 @@
-MD5 98f773c2d8d837d43755fe277ede6344 mm-sources-2.5.73-r2.ebuild 2703
 MD5 8c8e886fd53d80e668deedfa5e48147f mm-sources-2.5.74-r1.ebuild 2701
 MD5 ece2eca96d8d1148ca5271b8d1812e59 mm-sources-2.5.74-r3.ebuild 2701
-MD5 1d15c4a17fc72e7a24832b38db40e3a5 mm-sources-2.5.73-r1.ebuild 2701
-MD5 356691ce5b054b8d1e89bae0a9b5dc94 mm-sources-2.6.0_beta1-r1.ebuild 2771
-MD5 088dc725938e368145e6c631ddc34b49 mm-sources-2.5.73-r3.ebuild 2703
+MD5 e921ab52dc151188fbffd2f37c1c47db mm-sources-2.6.0_beta1-r1.ebuild 2774
 MD5 2c81d4ac92ff6eaa1ac7e3b0f926d869 mm-sources-2.5.74-r2.ebuild 2703
-MD5 34a56113975d29d333d977be906d36fc ChangeLog 8121
+MD5 8df46b5d523c7e2f9438574a17be29fd ChangeLog 8447
 MD5 f5051bf46b0cb3f14a41e4d668dd041d mm-sources-2.5.75-r1.ebuild 2703
-MD5 28c4be6f72a1a8c32bbec8c4648115ae files/digest-mm-sources-2.5.73-r1 127
-MD5 c69b7d716de9420c9f12e22c62d33246 files/digest-mm-sources-2.5.73-r2 127
-MD5 c54fcbaeb55a027ef7a6a681b251bfcc files/digest-mm-sources-2.5.73-r3 127
 MD5 3d94ace6d82ed6e8d61c475ddcc474e7 files/digest-mm-sources-2.5.74-r1 126
 MD5 71dc5f7dc36f9310defc13b205ea8def files/digest-mm-sources-2.5.74-r2 126
 MD5 b5b2d46c43379111c30fb09828379395 files/digest-mm-sources-2.5.74-r3 126
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r1
deleted file mode 100644
index c21c8f41de6e..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48dcb423fc2857d64d0e69856c7af5ad linux-2.5.73.tar.bz2 32289411
-MD5 c7971e8d2cf2d9b8d40e49e09acbe1b2 2.5.73-mm1.bz2 2007261
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r2
deleted file mode 100644
index bfcb4ac34c26..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48dcb423fc2857d64d0e69856c7af5ad linux-2.5.73.tar.bz2 32289411
-MD5 62eefc2f3dba9ca78da7c908d471bd48 2.5.73-mm2.bz2 2237656
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r3
deleted file mode 100644
index 8961f20e07e5..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.73-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48dcb423fc2857d64d0e69856c7af5ad linux-2.5.73.tar.bz2 32289411
-MD5 d99e9ed4ff844ccc32a376626ac7451a 2.5.73-mm3.bz2 2411187
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta1-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta1-r1
new file mode 100644
index 000000000000..fa46e1013176
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta1-r1
@@ -0,0 +1,2 @@
+MD5 e732d9fc3a59262a129700d9f4f300e0 linux-2.6.0-test1.tar.bz2 32927268
+MD5 14ed00e9057fbbb90046d244c5e49cb3 2.6.0-test1-mm1.bz2 895707
diff --git a/sys-kernel/mm-sources/mm-sources-2.5.73-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.73-r1.ebuild
deleted file mode 100644
index 8d6bc442c350..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.73-r1.ebuild
+++ /dev/null
@@ -1,99 +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.5.73-r1.ebuild,v 1.1 2003/06/24 11:41:54 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils 
-
-OKV=${PV}
-KV=${PVR/r/mm}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# 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.5/linux-${OKV}.tar.bz2 ${PATCH_URI}
-mirror://kernel/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 ppc"
-
-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
-			>=sys-apps/sed-4"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/${PVR/r/mm}.bz2 | patch -p1 || die "mm patch failed"
-	sed -i -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" Makefile
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	# ARCH is used differently in the makefiles now, and this seems to fix things
-	unset ARCH
-	make mrproper || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux-beta ]
-	then
-
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.5.73-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.73-r3.ebuild
deleted file mode 100644
index b1a623634c47..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.73-r3.ebuild
+++ /dev/null
@@ -1,99 +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.5.73-r3.ebuild,v 1.1 2003/07/02 14:48:57 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils 
-
-OKV=${PV}
-KV=${PVR/r/mm}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# 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.5/linux-${OKV}.tar.bz2 ${PATCH_URI}
-mirror://kernel/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 ppc"
-
-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
-			>=sys-apps/sed-4"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	bzcat ${DISTDIR}/${PVR/r/mm}.bz2 | patch -p1 || die "mm patch failed"
-	sed -i -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" Makefile
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	# ARCH is used differently in the makefiles now, and this seems to fix things
-	unset ARCH
-	make mrproper || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux-beta ]
-	then
-
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.5.73-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild
index a22520c80bb0..b5c3648428f3 100644
--- a/sys-kernel/mm-sources/mm-sources-2.5.73-r2.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild
@@ -1,12 +1,14 @@
 # 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.5.73-r2.ebuild,v 1.1 2003/06/28 20:26:55 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild,v 1.1 2003/07/16 12:14:53 latexer Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 inherit eutils 
 
-OKV=${PV}
-KV=${PVR/r/mm}
+MY_PV=${PV/_beta/-test}
+MY_PVR=${PVR/_beta/-test}
+OKV=${MY_PV}
+KV=${MY_PVR/r/mm}
 S=${WORKDIR}/linux-${KV}
 ETYPE="sources"
 
@@ -16,8 +18,8 @@ ETYPE="sources"
 # 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.5/linux-${OKV}.tar.bz2 ${PATCH_URI}
-mirror://kernel/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 ${PATCH_URI}
+mirror://kernel/linux/kernel/people/akpm/patches/2.6/${MY_PV}/${MY_PVR/r/mm}/${MY_PVR/r/mm}.bz2"
 PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
 LICENSE="GPL-2"
@@ -41,7 +43,7 @@ src_unpack() {
 
 	mv linux-${OKV} linux-${KV}
 	cd ${S}
-	bzcat ${DISTDIR}/${PVR/r/mm}.bz2 | patch -p1 || die "mm patch failed"
+	bzcat ${DISTDIR}/${MY_PVR/r/mm}.bz2 | patch -p1 || die "mm patch failed"
 	sed -i -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" Makefile
 
 	#sometimes we have icky kernel symbols; this seems to get rid of them