bump

10 files changed, 11 insertions, 338 deletions

diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 81e60e4b0985..a37b332b49b5 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 b7869872e62a8e1f91fd3528356c8d55 mm-sources-2.5.69-r3.ebuild 2612
+MD5 d20ebd8d746cc787742dc090893701ee mm-sources-2.5.69-r3.ebuild 2612
 MD5 b7869872e62a8e1f91fd3528356c8d55 mm-sources-2.5.69-r2.ebuild 2612
 MD5 5c258daebd108bee746e8e5727fc4fc3 mm-sources-2.5.69-r1.ebuild 2612
-MD5 c8e638b1e3a47d1076084fbbada3d34b ChangeLog 4357
+MD5 ccc75435a7fca73587723c5d5bf423ff ChangeLog 4601
 MD5 3d2d616a50391a21dcba5afeda39d681 files/digest-mm-sources-2.5.69-r1 126
 MD5 637e5d21e35d6efd85fe335212c2b2b1 files/digest-mm-sources-2.5.69-r2 126
 MD5 c73317a09cbf84666143033a3adf2e37 files/digest-mm-sources-2.5.69-r3 126
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r1
deleted file mode 100644
index 2157d22a186c..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80597a889e6bfb432f4fbea5e29432c1 /mm-sources-2.5.67-r1.ebuild 2715
-MD5 8d626f9c2e1234d140012aa5f8fdebd2 linux-2.5.67.tar.bz2 32009373
-MD5 3f72c481e21c4090609fb170fc43c26e 2.5.67-mm1.gz 783933
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r2
deleted file mode 100644
index eba4058021e5..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8d626f9c2e1234d140012aa5f8fdebd2 linux-2.5.67.tar.bz2 32009373
-MD5 04025b8672b476257408d32bac53ba74 2.5.67-mm2.gz 2091152
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r3
deleted file mode 100644
index cc7604c2d678..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8d626f9c2e1234d140012aa5f8fdebd2 linux-2.5.67.tar.bz2 32009373
-MD5 0f11d4e504aaef0d3bc71dcd963e7ebe 2.5.67-mm3.gz 2136398
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r4 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r4
deleted file mode 100644
index 571ea11e6862..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.67-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8d626f9c2e1234d140012aa5f8fdebd2 linux-2.5.67.tar.bz2 32009373
-MD5 709a821f56eaa140a641c4c3905a4986 2.5.67-mm4.bz2 2304479
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.5.69-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.69-r3
new file mode 100644
index 000000000000..06678ea74f3e
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.5.69-r3
@@ -0,0 +1,2 @@
+MD5 af77e8c9504cb50a5473d485e76b62b6 linux-2.5.69.tar.bz2 32091813
+MD5 e0e062ce04e622bb886240e3d3518b1d 2.5.69-mm3.bz2 832821
diff --git a/sys-kernel/mm-sources/mm-sources-2.5.67-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.67-r1.ebuild
deleted file mode 100644
index c861ba87dcf8..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.67-r1.ebuild
+++ /dev/null
@@ -1,104 +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.67-r1.ebuild,v 1.1 2003/04/08 18:59:23 latexer Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils 
-
-OKV=${PV}
-if [ "${PR}" != "r0" ]; then 
-	PATCH_URI="http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.gz"
-fi
-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="http://www.kernel.org/pub/linux/kernel/v2.5/linux-${OKV}.tar.bz2 ${PATCH_URI}"
-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"
-	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
-
-	if [ "${PATCH_URI}" ]; then
-		mv linux-${OKV} linux-${KV}
-		cd ${S}
-		epatch ${DISTDIR}/${PVR/r/mm}.gz
-		sed -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" \
-			Makefile > Makefile.new
-		mv Makefile.new Makefile
-	else
-		cd ${S}
-	fi
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	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.67-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.67-r2.ebuild
deleted file mode 100644
index 5401160978d9..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.67-r2.ebuild
+++ /dev/null
@@ -1,104 +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.67-r2.ebuild,v 1.1 2003/04/13 01:48:37 lostlogic Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils 
-
-OKV=${PV}
-if [ "${PR}" != "r0" ]; then 
-	PATCH_URI="http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.gz"
-fi
-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="http://www.kernel.org/pub/linux/kernel/v2.5/linux-${OKV}.tar.bz2 ${PATCH_URI}"
-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"
-	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
-
-	if [ "${PATCH_URI}" ]; then
-		mv linux-${OKV} linux-${KV}
-		cd ${S}
-		epatch ${DISTDIR}/${PVR/r/mm}.gz
-		sed -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" \
-			Makefile > Makefile.new
-		mv Makefile.new Makefile
-	else
-		cd ${S}
-	fi
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	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.67-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.67-r4.ebuild
deleted file mode 100644
index 967f295fd17a..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.5.67-r4.ebuild
+++ /dev/null
@@ -1,104 +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.67-r4.ebuild,v 1.1 2003/04/18 13:34:58 dragon Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils 
-
-OKV=${PV}
-if [ "${PR}" != "r0" ]; then 
-	PATCH_URI="http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.bz2"
-fi
-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="http://www.kernel.org/pub/linux/kernel/v2.5/linux-${OKV}.tar.bz2 ${PATCH_URI}"
-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"
-	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
-
-	if [ "${PATCH_URI}" ]; then
-		mv linux-${OKV} linux-${KV}
-		cd ${S}
-		epatch ${DISTDIR}/${PVR/r/mm}.bz2
-		sed -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" \
-			Makefile > Makefile.new
-		mv Makefile.new Makefile
-	else
-		cd ${S}
-	fi
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	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.67-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.5.69-r3.ebuild
index ff7bfcb9b7db..f1f223ae2064 100644
--- a/sys-kernel/mm-sources/mm-sources-2.5.67-r3.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.5.69-r3.ebuild
@@ -1,14 +1,11 @@
 # 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.67-r3.ebuild,v 1.1 2003/04/14 20:27:28 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.5.69-r3.ebuild,v 1.1 2003/05/09 03:29:14 lostlogic Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 inherit eutils 
 
 OKV=${PV}
-if [ "${PR}" != "r0" ]; then 
-	PATCH_URI="http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/${PV}/${PVR/r/mm}/${PVR/r/mm}.gz"
-fi
 KV=${PVR/r/mm}
 S=${WORKDIR}/linux-${KV}
 ETYPE="sources"
@@ -19,7 +16,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="http://www.kernel.org/pub/linux/kernel/v2.5/linux-${OKV}.tar.bz2 ${PATCH_URI}"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.5/linux-${OKV}.tar.bz2 ${PATCH_URI}
+http://www.kernel.org/pub/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"
@@ -40,16 +38,10 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack linux-${OKV}.tar.bz2
 
-	if [ "${PATCH_URI}" ]; then
-		mv linux-${OKV} linux-${KV}
-		cd ${S}
-		epatch ${DISTDIR}/${PVR/r/mm}.gz
-		sed -e "s:^EXTRAVERSION.*$:EXTRAVERSION = -${PR/r/mm}:" \
-			Makefile > Makefile.new
-		mv Makefile.new Makefile
-	else
-		cd ${S}
-	fi
+	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
 	make mrproper || die