Bump

5 files changed, 110 insertions, 12 deletions

diff --git a/sys-kernel/ac-sources/ChangeLog b/sys-kernel/ac-sources/ChangeLog
index 13641e55824c..3c34c8397bf9 100644
--- a/sys-kernel/ac-sources/ChangeLog
+++ b/sys-kernel/ac-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ac-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.19 2003/06/16 17:59:44 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.20 2003/06/22 21:29:35 lostlogic Exp $
+
+*ac-sources-2.4.21-r2 (22 Jun 2003)
+
+  22 Jun 2003; Brandon Low <lostlogic@gentoo.org> ac-sources-2.4.21-r1.ebuild,
+  ac-sources-2.4.21-r2.ebuild:
+  Bump
 
 *ac-sources-2.4.21-r1 (16 Jun 2003)
 
diff --git a/sys-kernel/ac-sources/Manifest b/sys-kernel/ac-sources/Manifest
index 86e7e3b55248..bff0f4478261 100644
--- a/sys-kernel/ac-sources/Manifest
+++ b/sys-kernel/ac-sources/Manifest
@@ -1,10 +1,10 @@
 MD5 80957859a97f99eaa8edb7653f5f1a0c ac-sources-2.4.21_rc6-r1.ebuild 1135
-MD5 d7730eb4cc03b0591b7dd275356e36d7 ac-sources-2.4.21-r2.ebuild 2080
+MD5 cf43ce06cd33f28adf23bf3e59f5eff9 ac-sources-2.4.21-r2.ebuild 2080
 MD5 ab627ee13ca5e4846f8fd69d4edf7513 ac-sources-2.4.21_rc4-r1.ebuild 1135
 MD5 31638d92ed9a9efaa8c982b1a9b95591 ac-sources-2.4.21_rc6-r2.ebuild 1135
 MD5 b8e6d5b4203b7efd7f5fdf7297fc6d8b ac-sources-2.4.21_rc7-r1.ebuild 1135
-MD5 d7730eb4cc03b0591b7dd275356e36d7 ac-sources-2.4.21-r1.ebuild 2080
-MD5 4fafe3ead999225928c989cdbcb2a92a ChangeLog 3063
+MD5 3052f8c9b352aa0fcfd0d4e17dfd7cb0 ac-sources-2.4.21-r1.ebuild 2080
+MD5 7a41a80cbdd41555f2ceb5210f341164 ChangeLog 3218
 MD5 0c0a3f16d05ddcc0d8c9b9c1460e11c0 files/digest-ac-sources-2.4.21-r1 133
 MD5 6778f2b1e8bcf6653828be79365fa447 files/digest-ac-sources-2.4.21-r2 133
 MD5 29f65434b6a35e54dd15015e40074bff files/digest-ac-sources-2.4.21_rc4-r1 203
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.21-r1.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21-r1.ebuild
index 48b568c6d025..0a24f5db9696 100644
--- a/sys-kernel/ac-sources/ac-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/ac-sources/ac-sources-2.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2003/06/16 17:59:44 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.4.21-r1.ebuild,v 1.2 2003/06/22 21:29:35 lostlogic Exp $
 
 IUSE="build"
 
@@ -10,28 +10,54 @@ ETYPE="sources"
 
 inherit kernel || die
 
-OKV="2.4.21"
+# ACV=alan cox release version
 ACV=ac${PR/r/}
+# KV=patched kernel version
 KV="${PV/_/-}-${ACV}"
-S=${WORKDIR}/linux-${KV}
+# 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"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+
+# 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"
-#http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
+fi
 
 KEYWORDS="x86"
 SLOT="${KV}"
 
 src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
+	sleep 1
+	unpack linux-${OURKERNEL}.tar.bz2
+	mv linux-${OURKERNEL} linux-${KV} || die
 
 	cd linux-${KV}
-#	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
+	
+	# 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/ac-sources-2.4.21-r2.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.21-r2.ebuild
new file mode 100644
index 000000000000..eaed65e19700
--- /dev/null
+++ b/sys-kernel/ac-sources/ac-sources-2.4.21-r2.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.21-r2.ebuild,v 1.1 2003/06/22 21:29:35 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-r2 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21-r2
new file mode 100644
index 000000000000..ea947cb517d0
--- /dev/null
+++ b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.21-r2
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 7ec20959e685cb4464326db593a05c9c patch-2.4.21-ac2.bz2 2256137