Bump, remove oldness

11 files changed, 69 insertions, 174 deletions

diff --git a/sys-kernel/ac-sources/Manifest b/sys-kernel/ac-sources/Manifest
index 343d5e720776..f18eba2370ea 100644
--- a/sys-kernel/ac-sources/Manifest
+++ b/sys-kernel/ac-sources/Manifest
@@ -1,21 +1,13 @@
-MD5 80957859a97f99eaa8edb7653f5f1a0c ac-sources-2.4.21_rc6-r1.ebuild 1135
 MD5 cf43ce06cd33f28adf23bf3e59f5eff9 ac-sources-2.4.21-r2.ebuild 2080
-MD5 ab627ee13ca5e4846f8fd69d4edf7513 ac-sources-2.4.21_rc4-r1.ebuild 1135
 MD5 a4e7fb4cf5389659b2857e1f24d25a11 ac-sources-2.4.21-r4.ebuild 2080
-MD5 31638d92ed9a9efaa8c982b1a9b95591 ac-sources-2.4.21_rc6-r2.ebuild 1135
 MD5 f657c27aa94aff6675e82c5b1a8232e9 ac-sources-2.4.22_pre3-r1.ebuild 2085
-MD5 b8e6d5b4203b7efd7f5fdf7297fc6d8b ac-sources-2.4.21_rc7-r1.ebuild 1135
 MD5 3052f8c9b352aa0fcfd0d4e17dfd7cb0 ac-sources-2.4.21-r1.ebuild 2080
-MD5 14caa6b8bb3126dfd938993dc46e8829 ChangeLog 3602
-MD5 f657c27aa94aff6675e82c5b1a8232e9 ac-sources-2.4.22_pre6-r1.ebuild 2085
+MD5 72b06317f9ee58ca5bda7a4a4c0021b3 ChangeLog 3890
+MD5 4c19d0255386a2c5f4b304afe4d9438e ac-sources-2.4.22_pre6-r1.ebuild 2085
 MD5 87327fa2c5b00497e2b6ab670c36218f ac-sources-2.4.21-r3.ebuild 2080
 MD5 0c0a3f16d05ddcc0d8c9b9c1460e11c0 files/digest-ac-sources-2.4.21-r1 133
 MD5 6778f2b1e8bcf6653828be79365fa447 files/digest-ac-sources-2.4.21-r2 133
 MD5 f1920a944ef04d36695bd6b3cf3dc43c files/digest-ac-sources-2.4.21-r3 133
 MD5 776db5ee2f0a2a8d622e932277cf65de files/digest-ac-sources-2.4.21-r4 133
-MD5 29f65434b6a35e54dd15015e40074bff files/digest-ac-sources-2.4.21_rc4-r1 203
-MD5 b0714bca2807ff76b128e63626aceaac files/digest-ac-sources-2.4.21_rc6-r1 203
-MD5 176612d3dec4d870cffafd79c0960732 files/digest-ac-sources-2.4.21_rc6-r2 203
-MD5 8edf83224562d934fa886a534da36346 files/digest-ac-sources-2.4.21_rc7-r1 203
 MD5 573a3ee7b7cd3cf2e3008d4c13d5e6ed files/digest-ac-sources-2.4.22_pre3-r1 205
 MD5 e30604eab4b5ca270ae1149b1159a583 files/digest-ac-sources-2.4.22_pre6-r1 205
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.21_rc4-r1.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21_rc4-r1.ebuild
deleted file mode 100644
index 380573f649de..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.4.21_rc4-r1.ebuild
+++ /dev/null
@@ -1,38 +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/ac-sources/ac-sources-2.4.21_rc4-r1.ebuild,v 1.1 2003/05/28 01:28:19 lostlogic Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel || die
-
-OKV="2.4.20"
-ACV=ac${PR/r/}
-KV="${PV/_/-}-${ACV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Alan Cox's Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2
-http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ac patch failed"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r1.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r1.ebuild
deleted file mode 100644
index a48b7aefda59..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r1.ebuild
+++ /dev/null
@@ -1,38 +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/ac-sources/ac-sources-2.4.21_rc6-r1.ebuild,v 1.1 2003/06/01 06:42:31 lostlogic Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel || die
-
-OKV="2.4.20"
-ACV=ac${PR/r/}
-KV="${PV/_/-}-${ACV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Alan Cox's Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2
-http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ac patch failed"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r2.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r2.ebuild
deleted file mode 100644
index a5c2a8ee83fb..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.4.21_rc6-r2.ebuild
+++ /dev/null
@@ -1,38 +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/ac-sources/ac-sources-2.4.21_rc6-r2.ebuild,v 1.1 2003/06/04 00:08:22 lostlogic Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel || die
-
-OKV="2.4.20"
-ACV=ac${PR/r/}
-KV="${PV/_/-}-${ACV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Alan Cox's Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2
-http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ac patch failed"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.21_rc7-r1.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21_rc7-r1.ebuild
deleted file mode 100644
index 17ad9d83535d..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.4.21_rc7-r1.ebuild
+++ /dev/null
@@ -1,38 +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/ac-sources/ac-sources-2.4.21_rc7-r1.ebuild,v 1.1 2003/06/06 06:02:57 lostlogic Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel || die
-
-OKV="2.4.20"
-ACV=ac${PR/r/}
-KV="${PV/_/-}-${ACV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Alan Cox's Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2
-http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ac patch failed"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.22_pre6-r1.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.22_pre6-r1.ebuild
new file mode 100644
index 000000000000..07aac3249226
--- /dev/null
+++ b/sys-kernel/ac-sources/ac-sources-2.4.22_pre6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.4.22_pre6-r1.ebuild,v 1.1 2003/07/18 16:29:12 lostlogic Exp $
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  
+
+ETYPE="sources"
+
+inherit kernel || die
+
+# ACV=alan cox release version
+ACV=ac${PR/r/}
+# KV=patched kernel version
+KV="${PV/_/-}-${ACV}"
+# OKV=original kernel version as provided by ebuild
+OKV="`echo ${KV} | cut -d- -f1`"
+# OKVLAST=(working) last digit of OKV
+OKVLAST="`echo ${OKV} | cut -d. -f3`"
+# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release)
+OKVLASTPR="`expr ${OKVLAST} - 1`"
+# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac
+PRERC="`echo ${PV}|grep \_`"
+
+# Other working variables
+S=${WORKDIR}/linux-${KV}
+EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
+BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
+
+DESCRIPTION="Full sources for Alan Cox's Linux kernel"
+
+# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently
+# ourkernel is the stable kernel we'll be working with (previous or current)
+if [ ${PRERC} ]; then
+OURKERNEL="2.4.${OKVLASTPR}"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2
+http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
+else
+OURKERNEL="2.4.${OKVLAST}"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2"
+fi
+
+KEYWORDS="x86"
+SLOT="${KV}"
+
+src_unpack() {
+	sleep 1
+	unpack linux-${OURKERNEL}.tar.bz2
+	mv linux-${OURKERNEL} linux-${KV} || die
+
+	cd linux-${KV}
+	
+	# if we need a pre/rc patch, then use it
+	if [ ${PRERC} ]; then
+	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
+	fi
+
+	bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ac patch failed"
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc4-r1 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc4-r1
deleted file mode 100644
index bfcf6303c95d..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 1c0f2914983b59165cbd1a99ff308afa patch-2.4.21-rc4-ac1.bz2 1850803
-MD5 1e0970030d22def192525ad9e5c6566a patch-2.4.21-rc4.bz2 3837506
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r1 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r1
deleted file mode 100644
index b4b7b37bf93a..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 a50ac5fbcefd1cd7597318227a114302 patch-2.4.21-rc6-ac1.bz2 1956456
-MD5 f45c8553777ea27fc750185de65b149f patch-2.4.21-rc6.bz2 3838892
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r2 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r2
deleted file mode 100644
index 975d0a4dab5f..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 f1a5b3c57a322eb41eec3feb55f76789 patch-2.4.21-rc6-ac2.bz2 1988521
-MD5 f45c8553777ea27fc750185de65b149f patch-2.4.21-rc6.bz2 3838892
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc7-r1 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc7-r1
deleted file mode 100644
index 1ae0d8ff5825..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21_rc7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 e4b780c2607a236a3fe9f5a245d03e46 patch-2.4.21-rc7-ac1.bz2 1991155
-MD5 397d034e71d0fe5313955cca431a839a patch-2.4.21-rc7.bz2 3857614
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.22_pre6-r1 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.22_pre6-r1
new file mode 100644
index 000000000000..c38b02d263b2
--- /dev/null
+++ b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.22_pre6-r1
@@ -0,0 +1,3 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 8c8fd7ece7867af7dec130539b4492b2 patch-2.4.22-pre6-ac1.bz2 1183236
+MD5 d62006939925ba07b4f835d9af0e2147 patch-2.4.22-pre6.bz2 3680467