marked 2.4.25 stable, added 2.4.26_pre5 , fixed naming scheme -rc3 > -pre3

8 files changed, 112 insertions, 24 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index ceec5b42303a..7750872dfcff 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.61 2004/03/16 23:03:05 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.62 2004/03/21 03:12:28 livewire Exp $
+
+*gentoo-sources-2.4.26_pre5 (20 Mar 2004)
+
+  20 Mar 2004; Bob Johnson <livewire@gentoo.org>
+  gentoo-sources-2.4.26_pre5.ebuild, gentoo-sources-2.4.26_pre3.ebuild,
+  gentoo-sources-2.4.25.ebuild:
+  Bumped ~x86 to pre5
+  changed mis-named ebuilds -rc3 > -pre3
+  marked 2.4.25 stable
 
 *gentoo-sources-2.4.25 (16 Mar 2004)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1ab41c838f57..f99d688d8dc6 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,14 +1,15 @@
 MD5 2f5b34d48f970c35408ce284343ec488 gentoo-sources-2.4.22-r3.ebuild 2275
+MD5 516290f1da61407136d4a0f985a815df gentoo-sources-2.4.26_pre5.ebuild 1840
 MD5 7df466da51d9c506ccb1a9b1a640f2d8 gentoo-sources-2.4.22-r5.ebuild 1053
 MD5 5ed42dacc019ea162347050d075f0059 gentoo-sources-2.4.22-r7.ebuild 1096
 MD5 af17640381fe454755d0a54e5bf85473 gentoo-sources-2.4.22-r4.ebuild 1966
 MD5 3d8ad6e27089077c302b968b621aaa00 gentoo-sources-2.4.19-r11.ebuild 2502
 MD5 b241384c9b554ea3ef9ed6d959c01681 gentoo-sources-2.4.20-r14.ebuild 5514
-MD5 78815e879f25652dbeed3cb3fee6ffa2 ChangeLog 15300
+MD5 ccb2ad5ad614fd8a2aca7f4b50ed081b ChangeLog 15586
 MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
 MD5 95fcdbd58c05a5297d15a5aa0c957bdd gentoo-sources-2.4.20-r7.ebuild 5390
-MD5 d859ed66b3617ee3ec18fdf08e93214c gentoo-sources-2.4.25.ebuild 525
-MD5 52979f5f362427ba144085d2ebb3ce27 gentoo-sources-2.4.26_rc3.ebuild 823
+MD5 6ea65142152a09db4cd23cec61477f76 gentoo-sources-2.4.26_pre3.ebuild 1840
+MD5 f971e3d19b32c5440a8e02b427e55ab4 gentoo-sources-2.4.25.ebuild 527
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25 144
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
@@ -32,7 +33,6 @@ MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
 MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r11 146
 MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r14 146
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
-MD5 8e9986534cc6dc488b8fc25b9044ae7c files/digest-gentoo-sources-2.4.26_rc3 148
 MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
@@ -42,5 +42,7 @@ MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
 MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r7 147
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
 MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
+MD5 6568ac20687149b643dbcc0f07101f2c files/digest-gentoo-sources-2.4.26_pre3 149
+MD5 06ae5abba7a02c0c44f7f15c00fb682d files/digest-gentoo-sources-2.4.26_pre5 149
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3
new file mode 100644
index 000000000000..23f3dcf1efd4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 58f5196aca4e9e23fcf77222cff3eb94 gentoo-sources-2.4.26_pre3.patch.bz2 2258404
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5
new file mode 100644
index 000000000000..dcb0403a9913
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 ccea1f50afec616ef29d32440e179457 gentoo-sources-2.4.26_pre5.patch.bz2 2297080
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild
index 496dc6f04500..d92385f44a9b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild,v 1.1 2004/03/16 23:03:05 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild,v 1.2 2004/03/21 03:12:28 livewire Exp $
 
 ETYPE="sources"
 inherit kernel-2
 detect_version
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 UNIPATCH_LIST="${DISTDIR}/${P}.patch.bz2"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild
new file mode 100644
index 000000000000..928ab00b77a6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild,v 1.1 2004/03/21 03:12:28 livewire Exp $
+
+IUSE="build crypt"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
+# *evms*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+
+inherit kernel
+OKV=2.4.25
+EXTRAVERSION=_pre3-gentoo
+KV=2.4.26_pre3-gentoo
+S=${WORKDIR}/linux-${KV}
+DESCRIPTION="Full sources for the Gentoo Kernel."
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
+
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	 htpp://dev.gentoo.org/~livewire/${P}.patch.bz2"
+KEYWORDS="~x86 -ppc -sparc "
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+	cd linux-${KV} || die
+	bzcat ${DISTDIR}/${P}.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
+	# Kill patches we aren't suppposed to use, don't worry about
+	# failures, if they aren't there that is a good thing!
+	# This is the ratified crypt USE flag, enables IPSEC and patch-int
+	make mrproper || die "make mrproper failed"
+	make include/linux/version.h || die "make include/linux/version.h failed"
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild
new file mode 100644
index 000000000000..cb337a151c40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild,v 1.1 2004/03/21 03:12:28 livewire Exp $
+
+IUSE="build crypt"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
+# *evms*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+
+inherit kernel
+OKV=2.4.25
+EXTRAVERSION=_pre5-gentoo
+KV=2.4.26_pre5-gentoo
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
+
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	 htpp://dev.gentoo.org/~livewire/${P}.patch.bz2"
+KEYWORDS="~x86 -ppc -sparc "
+SLOT="${KV}"
+DESCRIPTION="Full sources for the Gentoo Kernel."
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+	cd linux-${KV} || die
+	bzcat ${DISTDIR}/${P}.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
+	# Kill patches we aren't suppposed to use, don't worry about
+	# failures, if they aren't there that is a good thing!
+	# This is the ratified crypt USE flag, enables IPSEC and patch-int
+	make mrproper || die "make mrproper failed"
+	make include/linux/version.h || die "make include/linux/version.h failed"
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_rc3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_rc3.ebuild
deleted file mode 100644
index c956ac425a4b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_rc3.ebuild
+++ /dev/null
@@ -1,17 +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/gentoo-sources/gentoo-sources-2.4.26_rc3.ebuild,v 1.1 2004/03/16 23:03:05 johnm Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-KEYWORDS="~x86"
-# the following line prevents the eclass pulling the -rc patch from the kernel mirrors
-# if you choose to do that in future, you need to change SRC_URI to have ${KERNEL_URI} and drop the hard kernel mirror
-UNIPATCH_LIST_DEFAULT=""
-UNIPATCH_LIST="${DISTDIR}/${P}.patch.bz2"
-
-DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~livewire/${P}.patch.bz2"