make better, update, scrap old.

6 files changed, 18 insertions, 50 deletions

diff --git a/sys-kernel/ac-sources/ChangeLog b/sys-kernel/ac-sources/ChangeLog
index 6a7fd4a3ba75..f1bea2eda4a6 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 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.1 2002/10/06 18:48:59 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.2 2002/11/15 04:53:22 lostlogic Exp $
+
+*ac-sources-2.4.20_rc1-r3 (14 Nov 2002)
+
+  14 Nov 2002; Brandon Low <lostlogic@gentoo.org> ac-sources-2.4.20_rc1-r3.ebuild:
+
+  Change versioning, this will be easier to bump now.  Oh and bump to latest.
 
 *ac-sources-2.4.20_pre83 (06 Oct 2002)
 
diff --git a/sys-kernel/ac-sources/ac-sources-2.4.20_pre83.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.20_pre83.ebuild
deleted file mode 100644
index 70a12e673601..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.4.20_pre83.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 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.20_pre83.ebuild,v 1.1 2002/10/06 18:48:59 lostlogic Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel || die
-
-OKV="2.4.19"
-KV="2.4.20-pre8-ac3"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="-pre8-ac3"
-
-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/v2.4/testing/patch-${KV/-ac3/}.bz2
-	 http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/2.4.20/patch-${KV}.bz2"
-
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	bzcat ${DISTDIR}/patch-${KV/-ac3/}.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.20_pre102.ebuild b/sys-kernel/ac-sources/ac-sources-2.4.20_rc1-r3.ebuild
index 11e4eddd592a..6aa0f17c0ae0 100644
--- a/sys-kernel/ac-sources/ac-sources-2.4.20_pre102.ebuild
+++ b/sys-kernel/ac-sources/ac-sources-2.4.20_rc1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.20_pre102.ebuild,v 1.1 2002/10/14 20:19:51 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.4.20_rc1-r3.ebuild,v 1.1 2002/11/15 04:53:22 lostlogic Exp $
 
 IUSE="build"
 
@@ -11,15 +11,17 @@ ETYPE="sources"
 inherit kernel || die
 
 OKV="2.4.19"
-KV="2.4.20-pre10-ac2"
+ACV=ac${PR/r/}
+KV="${PV/_/-}-${ACV}"
 S=${WORKDIR}/linux-${KV}
 
-EXTRAVERSION="-pre10-ac2"
+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/v2.4/testing/patch-${KV/-ac2/}.bz2
-http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/2.4.20/patch-${KV}.bz2"
+http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2
+http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.4/${BASE}/patch-${KV}.bz2"
 
 KEYWORDS="x86"
 
@@ -29,9 +31,8 @@ src_unpack() {
 
 	cd linux-${KV}
 
-	bzcat ${DISTDIR}/patch-${KV/-ac2/}.bz2|patch -p1 || die "-marcelo patch failed"
+	bzcat ${DISTDIR}/patch-${RV/_/-}.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/files/digest-ac-sources-2.4.20_pre102 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_pre102
deleted file mode 100644
index fac5b88199f9..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_pre102
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 cbea176bdb3f0e653cdd2a2419404b32 patch-2.4.20-pre10.bz2 3774466
-MD5 5e1f0cd8e5599a69f49af185b0a47629 patch-2.4.20-pre10-ac2.bz2 1338719
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_pre83 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_pre83
deleted file mode 100644
index e27d695bf279..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_pre83
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 41d5636c4b9af99ad63518ad817f5327 patch-2.4.20-pre8.bz2 3731308
-MD5 f0b849c321776acf6657e5c757c62258 patch-2.4.20-pre8-ac3.bz2 1047493
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_rc1-r3 b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_rc1-r3
new file mode 100644
index 000000000000..b39bd025e279
--- /dev/null
+++ b/sys-kernel/ac-sources/files/digest-ac-sources-2.4.20_rc1-r3
@@ -0,0 +1,3 @@
+MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
+MD5 d1e44e8c36d8c60ba3c253e7ddf5526f patch-2.4.20-rc1.bz2 4153842
+MD5 e5bd074e2a67af87a66db8b7e44b0793 patch-2.4.20-rc1-ac3.bz2 1064271