Vresion bump; closes bug #43241.

4 files changed, 83 insertions, 7 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index 855d8fb39122..ed34ca3cb913 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/aa-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.29 2004/02/27 11:52:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.30 2004/02/29 12:35:36 plasmaroo Exp $
+
+*aa-sources-2.4.23-r2 (29 Feb 2004)
+
+  29 Feb 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r2.ebuild:
+  Version bump; closes bug #43241.
 
   18 Feb 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r1.ebuild,
   files/aa-sources-2.4.23.munmap.patch:
diff --git a/sys-kernel/aa-sources/Manifest b/sys-kernel/aa-sources/Manifest
index 3514f4046f03..0ce723508aa3 100644
--- a/sys-kernel/aa-sources/Manifest
+++ b/sys-kernel/aa-sources/Manifest
@@ -1,12 +1,14 @@
+MD5 5b1ce7afe6641669d27b5875ef488aa3 ChangeLog 4467
+MD5 399eb7607b8f1f3f597e93566b1bda7c metadata.xml 453
 MD5 dd95424479551aa582232901c85ddc88 aa-sources-2.4.23-r1.ebuild 2421
+MD5 c2bb7aca989f4ddd80f2b50c644261e3 aa-sources-2.4.23-r2.ebuild 2403
 MD5 c3a5fc97c1f5e6d4feb3e0f6b14212d1 aa-sources-2.4.22-r1.ebuild 2418
-MD5 cddcddf292ae682417364a488d2ef89d ChangeLog 4322
-MD5 399eb7607b8f1f3f597e93566b1bda7c metadata.xml 453
+MD5 7b08e3780e3b7c8c671db00ce6010125 files/digest-aa-sources-2.4.23-r2 126
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/aa-sources-2.4.23.rtc_fix.patch 7073
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/aa-sources-2.4.23.CAN-2003-0985.patch 414
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 fcfb3fc100621b77d191f86b66dd810a files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch 465
 MD5 bf2b609e8cab6460d220b1267db09826 files/aa-sources-2.4.23.CAN-2004-0001.patch 982
+MD5 174438d215b70cad5ffb00ca8123c062 files/aa-sources-2.4.23.munmap.patch 837
 MD5 017a713155afe3e4b9c5672eef0bc959 files/digest-aa-sources-2.4.22-r1 126
+MD5 fcfb3fc100621b77d191f86b66dd810a files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch 465
 MD5 23188d802797d56fc9b4a55f3b1d3b31 files/digest-aa-sources-2.4.23-r1 126
-MD5 174438d215b70cad5ffb00ca8123c062 files/aa-sources-2.4.23.munmap.patch 837
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/aa-sources-2.4.23.rtc_fix.patch 7073
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
new file mode 100644
index 000000000000..3392d6b54f90
--- /dev/null
+++ b/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild,v 1.1 2004/02/29 12:35:36 plasmaroo Exp $
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  
+
+ETYPE="sources"
+
+inherit kernel
+
+# AAV=andrea arcangeli release version
+AAV=aa${PR/r/}
+# KV=patched kernel version
+KV="${PV/_/-}-${AAV}"
+# 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}::`"
+
+# If it's a last-stable+pre/rc+aa (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="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV/-}.bz2
+		mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
+else
+	OURKERNEL="2.4.${OKVLAST}"
+	SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
+		mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV/-}.bz2"
+fi
+
+DESCRIPTION="Full sources for Andrea Arcangeli's Linux kernel"
+KEYWORDS="x86"
+SLOT="${KV}"
+
+src_unpack() {
+	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}/${KV/-}.bz2|patch -p1 || die "-aa patch failed"
+	sed -e '51i \				   qsort.o \\' -i fs/xfs/support/Makefile || die "XFS patch failed!"
+
+	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to apply mremap() patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
+	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to apply RTC patch!"
+	# The munmap() patch is already in aa2...
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.23-r2 b/sys-kernel/aa-sources/files/digest-aa-sources-2.4.23-r2
new file mode 100644
index 000000000000..c09c15bfa6cf
--- /dev/null
+++ b/sys-kernel/aa-sources/files/digest-aa-sources-2.4.23-r2
@@ -0,0 +1,2 @@
+MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
+MD5 4d3cdc11578f59ecc163815dc7cd867d 2.4.23aa2.bz2 2036817