Bump and clean up

7 files changed, 13 insertions, 62 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 49db12221d90..0edd93f38d8e 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.154 2004/04/30 16:26:36 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.155 2004/05/10 14:12:44 lostlogic Exp $
+
+*mm-sources-2.6.6-r1 (10 May 2004)
+
+  10 May 2004; Brandon Low <lostlogic@gentoo.org> -mm-sources-2.6.5-r1.ebuild,
+  -mm-sources-2.6.5-r6.ebuild, +mm-sources-2.6.6-r1.ebuild:
+  Bump and clean up
 
 *mm-sources-2.6.6_rc3-r1 (30 Apr 2004)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 8f85268e0aab..9fd8efb6ac10 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,4 +1,5 @@
 MD5 8d736afafe07572b42679096147ec15a mm-sources-2.6.6_rc1-r1.ebuild 1034
+MD5 bfcc8174794b1bc71e1527d199156742 mm-sources-2.6.6-r1.ebuild 1035
 MD5 bfcc8174794b1bc71e1527d199156742 mm-sources-2.6.6_rc3-r1.ebuild 1035
 MD5 744204584d314ff518d410cda27a8661 mm-sources-2.6.5-r6.ebuild 1030
 MD5 ad3796f44a9753018e8fe9e99b24f1ec mm-sources-2.6.5-r1.ebuild 1898
@@ -7,6 +8,7 @@ MD5 89a0c4c66fa45f3386cd50decd29b910 ChangeLog 26955
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
 MD5 94a6922773123134741030d74becd696 files/digest-mm-sources-2.6.5-r1 133
 MD5 a2b6c6dbe8e356dd8715e6aa233de287 files/digest-mm-sources-2.6.5-r6 125
+MD5 54ff05e40b7569520e9222e992466a0a files/digest-mm-sources-2.6.6-r1 124
 MD5 3bb3e71859d42927e886b9830232e802 files/digest-mm-sources-2.6.6_rc1-r1 193
 MD5 5fd57f288c9c8d1cd3eb5e178fd30d3b files/digest-mm-sources-2.6.6_rc2-r1 193
 MD5 e9e3829fe366dc19b371d61c572460fd files/digest-mm-sources-2.6.6_rc3-r1 193
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r1
deleted file mode 100644
index bb9a645b4b0a..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
-MD5 0512556f021587860ae1f2d7834c9291 2.6.5-mm1-gentoo1.bz2 1295483
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r6 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r6
deleted file mode 100644
index f5057a00e5d5..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
-MD5 5a9a6b6840ff1c6dc0cb8e06f1683cda 2.6.5-mm6.bz2 1981842
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.6-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.6-r1
new file mode 100644
index 000000000000..5f506deea078
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.6-r1
@@ -0,0 +1,2 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 3ec9a0b9d92f98773ad2c0ccfd9068ac 2.6.6-mm1.bz2 839421
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.5-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.5-r1.ebuild
deleted file mode 100644
index c2cffc829abf..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.5-r1.ebuild,v 1.5 2004/04/27 22:02:27 agriffis Exp $
-
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-
-ETYPE="sources"
-inherit kernel-2 eutils
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
-SRC_URI="${KERNEL_URI} mirror://gentoo.org/${KV}-gentoo1.bz2"
-KEYWORDS="x86 ~amd64 ~ia64 -*"
-
-K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
-existing bug. Only create a new bug if you have not found one that matches
-your issue. It is best to do an advanced search as the initial search has a
-very low yield. Please assign your bugs to x86-kernel@gentoo.org.
-Please read the ChangeLog and associated docs for more information."
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-
-	mv linux-${OKV} linux-${KV}
-	cd ${S}
-	epatch ${DISTDIR}/${KV}-gentoo1.bz2
-	find . -iname "*~" | xargs rm 2> /dev/null
-
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-
-	cd  ${S}/Documentation/DocBook
-	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-		&& mv Makefile.new Makefile
-	cd ${S}
-
-	#This is needed on > 2.5
-	MY_ARCH=${ARCH}
-	unset ARCH
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die "make mrproper died"
-	ARCH=${MY_ARCH}
-}
-
-pkg_postinst() {
-	ewarn "If you use the nvidia-kernel binary module, then be sure to verify that"
-	ewarn "Kernel Hacking --> Use 4Kb for kernel stacks instead of 8Kb is not"
-	ewarn "selected. It causes the lockups and will not work with it enabled."
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.5-r6.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.6-r1.ebuild
index 5290c1286d0f..d4517c960066 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.5-r6.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.5-r6.ebuild,v 1.1 2004/04/15 08:18:11 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.6-r1.ebuild,v 1.1 2004/05/10 14:12:44 lostlogic Exp $
 
 UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
 K_PREPATCHED="yes"
@@ -14,7 +14,7 @@ RESTRICT="nomirror"
 DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
 SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
 
-KEYWORDS="x86 ~amd64 ~ia64 -*"
+KEYWORDS="~x86 ~amd64 ~ia64 -*"
 
 K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
 existing bug. Only create a new bug if you have not found one that matches