version bump, clean up old ebuilds

13 files changed, 20 insertions, 234 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index ac0425aa45d5..1635928e22f1 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,11 +1,21 @@
 # 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.118 2004/01/26 18:13:28 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.119 2004/01/28 08:20:07 iggy Exp $
 
   26 Jan 2004; Brandon Low <lostlogic@gentoo.org>
   mm-sources-2.6.2_rc1-r3.ebuild:
   Fix extraversion
 
+*mm-sources-2.6.2_rc2-r1 (28 Jan 2004)
+
+  28 Jan 2004; Brian Jackson <iggy@gentoo.org> mm-sources-2.6.1-r3.ebuild,
+  mm-sources-2.6.1-r4.ebuild, mm-sources-2.6.1-r5.ebuild,
+  mm-sources-2.6.2_rc1-r3.ebuild, mm-sources-2.6.2_rc2-r1.ebuild,
+  files/apic.patch, files/mm-sources.CAN-2003-0985.patch,
+  files/mm4-export-dnotify_parent.diff, files/mm4-fix-bw-qcam-typo.diff,
+  files/wpadded.patch:
+  version bump, clean up old ebuilds
+
 *mm-sources-2.6.2_rc1-r3 (24 Jan 2004)
 
   24 Jan 2004; Brian Jackson <iggy@gentoo.org> mm-sources-2.6.2_rc1-r3.ebuild:
diff --git a/sys-kernel/mm-sources/files/apic.patch b/sys-kernel/mm-sources/files/apic.patch
deleted file mode 100644
index c0aeec1fab49..000000000000
--- a/sys-kernel/mm-sources/files/apic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c
---- linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c	2003-12-17 14:21:29.060115753 +0100
-+++ linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c	2003-12-17 14:10:39.886919748 +0100
-@@ -9,9 +9,11 @@
- #include <asm/msr.h>
- #include <asm/uaccess.h>
- #include <asm/desc.h>
-+#include <asm/mpspec.h>
-+#include <asm/apic.h>
- 
- #include "cpu.h"
--#include "mach_apic.h"
-+#include <mach_apic.h>
- 
- #ifdef CONFIG_X86_INTEL_USERCOPY
- /*
\ No newline at end of file
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r3
deleted file mode 100644
index daffe913e803..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 0788dbbc5a6cb88c2b726d590cda6508 2.6.1-mm3.bz2 1736419
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r4 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r4
deleted file mode 100644
index 0969c95137c3..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 ac4ae60cb37f6d83c70414cbd7f361fe 2.6.1-mm4.bz2 2316862
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r5 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r5
deleted file mode 100644
index 46a0e35ec225..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.1-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 182711358fe120bb3a68712f1cc4b092 2.6.1-mm5.bz2 2670600
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.2_rc2-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.2_rc2-r1
new file mode 100644
index 000000000000..7b84ad793d6c
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.2_rc2-r1
@@ -0,0 +1,3 @@
+MD5 1d7658fc92ae73e6cd4e28b81edf8181 patch-2.6.2-rc2.bz2 2115975
+MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
+MD5 f439109edb05087fe3e99f089e5f3af7 2.6.2-rc2-mm1.bz2 1434335
diff --git a/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch b/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch
deleted file mode 100644
index 03f49e4f6d7d..000000000000
--- a/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
-+++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
-@@ -270,6 +270,10 @@
- 	old_len = PAGE_ALIGN(old_len);
- 	new_len = PAGE_ALIGN(new_len);
- 
-+	/* Don't allow the degenerate cases */
-+	if (!old_len || !new_len)
-+		goto out;
-+
- 	/* new_addr is only valid if MREMAP_FIXED is specified */
- 	if (flags & MREMAP_FIXED) {
- 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff b/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff
deleted file mode 100644
index 7e964e066f0c..000000000000
--- a/sys-kernel/mm-sources/files/mm4-export-dnotify_parent.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.1-mm4/fs/dnotify.c.orig	2004-01-16 17:46:40.844370408 +0100
-+++ linux-2.6.1-mm4/fs/dnotify.c	2004-01-16 17:48:46.045336968 +0100
-@@ -166,6 +166,8 @@
- 	}
- }
- 
-+EXPORT_SYMBOL(dnotify_parent);
-+
- static int __init dnotify_init(void)
- {
- 	dn_cache = kmem_cache_create("dnotify_cache",
diff --git a/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff b/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff
deleted file mode 100644
index 463f847fbbe1..000000000000
--- a/sys-kernel/mm-sources/files/mm4-fix-bw-qcam-typo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.1-mm4/drivers/media/video/bw-qcam.c.orig	2004-01-16 16:42:27.178216712 +0100
-+++ linux-2.6.1-mm4/drivers/media/video/bw-qcam.c	2004-01-16 16:42:51.534513992 +0100
-@@ -963,7 +963,7 @@
- #ifdef MODULE
- 	int n;
- 
--	if (parport[0] && strcnmp(parport[0], "auto", 4) != 0) {
-+	if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
- 		/* user gave parport parameters */
- 		for(n=0; parport[n] && n<MAX_CAMS; n++){
- 			char *ep;
diff --git a/sys-kernel/mm-sources/files/wpadded.patch b/sys-kernel/mm-sources/files/wpadded.patch
deleted file mode 100644
index b39bd64c9ce1..000000000000
--- a/sys-kernel/mm-sources/files/wpadded.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-
-From: Albert Cahalan <albert@users.sourceforge.net>
-
-Explicit padding is better than compiler-generated padding, because
-awareness of the issue reduces waste.  There's also a security issue, with
-info leaking whenever padded structs get copied to the user.
-
-This patch adds -Wpadded for i386, mips, and s390.
-
-
-
- arch/i386/Makefile |    2 ++
- arch/mips/Makefile |    1 +
- arch/s390/Makefile |    1 +
- 3 files changed, 4 insertions(+)
-
-diff -puN arch/i386/Makefile~wpadded arch/i386/Makefile
---- 25/arch/i386/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
-+++ 25-akpm/arch/i386/Makefile	2003-07-13 21:54:54.000000000 -0700
-@@ -27,6 +27,8 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
- # prevent gcc from keeping the stack 16 byte aligned
- CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,)
- 
-+CFLAGS += $(call check_gcc,-Wpadded,)
-+
- align := $(subst -functions=0,,$(call check_gcc,-falign-functions=0,-malign-functions=0))
- 
- cflags-$(CONFIG_M386)		+= -march=i386
-diff -puN arch/mips/Makefile~wpadded arch/mips/Makefile
---- 25/arch/mips/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
-+++ 25-akpm/arch/mips/Makefile	2003-07-13 21:54:54.000000000 -0700
-@@ -78,6 +78,7 @@ endif
- 
- AFLAGS		+= $(cflags-y)
- CFLAGS		+= $(cflags-y)
-+CFLAGS		+= $(call check_gcc,-Wpadded,)
- 
- 
- #
-diff -puN arch/s390/Makefile~wpadded arch/s390/Makefile
---- 25/arch/s390/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
-+++ 25-akpm/arch/s390/Makefile	2003-07-13 21:54:54.000000000 -0700
-@@ -38,6 +38,7 @@ cflags-$(CONFIG_MARCH_Z990) += $(call ch
- 
- CFLAGS		+= $(cflags-y)
- CFLAGS		+= $(call check_gcc,-finline-limit=10000,)
-+CFLAGS		+= $(call check_gcc,-Wpadded,)
- CFLAGS 		+= -pipe -fno-strength-reduce -Wno-sign-compare 
- 
- OBJCOPYFLAGS	:= -O binary
-
-_
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r3.ebuild
deleted file mode 100644
index 61df3a659c8c..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r3.ebuild
+++ /dev/null
@@ -1,90 +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.1-r3.ebuild,v 1.1 2004/01/15 04:17:13 tseng Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=2.6.1
-
-EXTRAVERSION="`echo ${PKV}-${PR/r/mm} | \
-	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
-
-KV=${PV/_/-}-${PR/r/mm}
-S=${WORKDIR}/linux-${KV}
-
-inherit eutils
-
-# 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-${OKV}.tar.bz2
-	 mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
-KEYWORDS="~x86"
-RDEPEND="sys-apps/module-init-tools"
-SLOT=${KV}
-PROVIDE="virtual/linux-sources
-		virtual/alsa"
-
-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}
-
-}
-
-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 "and you have to compile it in now, or else you will get"
-	ewarn "errors when trying to open a pty. The options are:"
-	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
-	ewarn "File systems -> Pseudo filesystems -> /dev/pts 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.linux.org.uk/~davej/docs/post-halloween-2.6.txt"
-	einfo "for more info about the development series."
-	echo
-}
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild
deleted file mode 100644
index 6b1f205e7940..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r4.ebuild
+++ /dev/null
@@ -1,27 +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.1-r4.ebuild,v 1.3 2004/01/20 18:55:44 iggy Exp $
-
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/mm4-export-dnotify_parent.diff ${FILESDIR}/mm4-fix-bw-qcam-typo.diff"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-KV=${KV/-r/}
-K_NOSETEXTRAVERSION="don't_set_it"
-RESTRICT="nomirror"
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
-KEYWORDS="x86 ~amd64 ~ia64 -*"
-SLOT="${KV}"
-
-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."
-
-K_EXTRAEWARN="NOTE: processor selection has changed. You'll need to make sure you
-select the proper cpu type during make oldconfig"
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1-r5.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.2_rc2-r1.ebuild
index aa10f32578b3..6b4294f5523a 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.1-r5.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.2_rc2-r1.ebuild
@@ -1,21 +1,20 @@
 # 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.1-r5.ebuild,v 1.1 2004/01/20 18:55:44 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.2_rc2-r1.ebuild,v 1.1 2004/01/28 08:20:07 iggy Exp $
 
 UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+
 ETYPE="sources"
 inherit kernel-2
 detect_version
-KV=${KV/-r/}
 K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
-S=${WORKDIR}/linux-${KV}
-
 DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	mirror://kernel/linux/kernel/people/akpm/patches/2.6/${OKV}/${KV}/${KV}.bz2"
+SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
+
 KEYWORDS="x86 ~amd64 ~ia64 -*"
-SLOT="${KV}"
 
 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