Bumped and cleanup

10 files changed, 51 insertions, 312 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index a240a434370c..24c6d0049fdf 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2003/07/28 14:38:18 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.56 2003/07/31 11:59:34 latexer Exp $
+
+*mm-sources-2.6.0_beta2-r2 (31 Jul 2003)
+
+  31 Jul 2003; Peter Johanson <latexer@gentoo.org>
+  mm-sources-2.5.74-r1.ebuild, mm-sources-2.5.74-r2.ebuild,
+  mm-sources-2.5.74-r3.ebuild, mm-sources-2.6.0_beta2-r2.ebuild:
+  Bump and cleanup
 
 *mm-sources-2.6.0_beta2-r1 (28 Jul 2003)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 67cdf3b4dba1..ccc3bd5bd84e 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,15 +1,9 @@
 MD5 f31654d3bc2df53af3be7ef99c0351a0 mm-sources-2.6.0_beta1-r2.ebuild 1097
-MD5 8c8e886fd53d80e668deedfa5e48147f mm-sources-2.5.74-r1.ebuild 2701
 MD5 f63b6c8d584f48104a9dd65731999806 mm-sources-2.6.0_beta2-r1.ebuild 1097
-MD5 ece2eca96d8d1148ca5271b8d1812e59 mm-sources-2.5.74-r3.ebuild 2701
 MD5 a2fa04ef5dff12be2c541a8e407758a1 mm-sources-2.6.0_beta1-r1.ebuild 1253
-MD5 2c81d4ac92ff6eaa1ac7e3b0f926d869 mm-sources-2.5.74-r2.ebuild 2703
-MD5 f63b6c8d584f48104a9dd65731999806 mm-sources-2.6.0_beta2-r2.ebuild 1097
-MD5 0c8a12d500c10612129b8ac0c44973bd ChangeLog 9077
+MD5 91cc71ffd672181ce7fac0ea3c441031 mm-sources-2.6.0_beta2-r2.ebuild 1097
+MD5 126babdf3f9235d19734cfc2a42545e7 ChangeLog 9315
 MD5 f5051bf46b0cb3f14a41e4d668dd041d mm-sources-2.5.75-r1.ebuild 2703
-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
 MD5 80e85d6efa72a547174fb64b8ad08a49 files/digest-mm-sources-2.5.75-r1 126
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 6e09c7cb2c57f6a048b89ea2cafc059b files/digest-mm-sources-2.6.0_beta1-r1 136
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r1
deleted file mode 100644
index 4cfae0763d26..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5285fc8b7aea93b9fa5fe67c31c0124a linux-2.5.74.tar.bz2 32768829
-MD5 a1360864a29a6dc1e9b8a41f232087d1 2.5.74-mm1.bz2 677280
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r2
deleted file mode 100644
index 53f9f36b531a..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5285fc8b7aea93b9fa5fe67c31c0124a linux-2.5.74.tar.bz2 32768829
-MD5 fda60d12eb42b3d7fe7593c3e35a9b89 2.5.74-mm2.bz2 933423
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r3
deleted file mode 100644
index 618e0ead7e2e..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.74-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5285fc8b7aea93b9fa5fe67c31c0124a linux-2.5.74.tar.bz2 32768829
-MD5 d5cb268693aa5bdb77d8635788539284 2.5.74-mm3.bz2 999612
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta2-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta2-r2
new file mode 100644
index 000000000000..db7b566ad76a
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.0_beta2-r2
@@ -0,0 +1,2 @@
+MD5 7d274d5fcd3d86a8d95c2749a702f830 linux-2.6.0-test2.tar.bz2 32969193
+MD5 cdf9448dfe9d5f4300b71f0349501872 2.6.0-test2-mm2.bz2 816235
diff --git a/sys-kernel/mm-sources/mm-sources-2.5.74-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.74-r1.ebuild
deleted file mode 100644
index c4591a2670b3..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.74-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.74-r1.ebuild,v 1.1 2003/07/03 13:56:44 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.74-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.74-r2.ebuild
deleted file mode 100644
index 19f0d09357e1..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.74-r2.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.74-r2.ebuild,v 1.1 2003/07/06 04:24:27 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.74-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.74-r3.ebuild
deleted file mode 100644
index 5d8527bfbaf0..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.74-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.74-r3.ebuild,v 1.1 2003/07/09 11:56:23 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.6.0_beta2-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..756cc7874af9
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta2-r2.ebuild
@@ -0,0 +1,39 @@
+# 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_beta2-r2.ebuild,v 1.1 2003/07/31 11:59:34 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
+
+}