Numerous small fixes, see ChangeLog for details.

22 files changed, 66 insertions, 43 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index 5186f4c062c6..6b9b51df634e 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,9 @@
 # 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.34 2004/04/17 08:40:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.35 2004/04/17 19:03:26 aliz Exp $
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> aa-sources-2.4.23-r2.ebuild:
+  Fixed IUSE flags.
 
   17 Apr 2004; <plasmaroo@gentoo.org>
   +files/aa-sources-2.4.23.CAN-2004-0010.patch,
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
index f41dacb26952..26ee93809611 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2004/04/17 08:40:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild,v 1.5 2004/04/17 19:03:26 aliz Exp $
 
-IUSE="build"
+IUSE=""
 
 # OKV=original kernel version, KV=patched kernel version.  
 
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index d1f555f4144e..cc918d67a7f6 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.31 2004/04/17 09:24:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.32 2004/04/17 19:03:26 aliz Exp $
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ck-sources-2.4.24-r1.ebuild,
+  ck-sources-2.4.25-r1.ebuild:
+  Fixed IUSE flags, inherit eutils, added IUSE=.
 
   17 Apr 2004; <plasmaroo@gentoo.org>
   +files/ck-sources-2.4.25.CAN-2004-0177.patch,
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild
index e158ea9d1518..a3df0f958c0d 100644
--- a/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild,v 1.4 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild,v 1.5 2004/04/17 19:03:26 aliz Exp $
 
-IUSE="build"
+IUSE=""
 
 # OKV=original kernel version, KV=patched kernel version.  
 
diff --git a/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild
index 17afe1ee30c9..afae3a1de074 100644
--- a/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild,v 1.3 2004/04/17 09:24:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild,v 1.4 2004/04/17 19:03:26 aliz Exp $
 
-IUSE="build"
+IUSE=""
 
 # OKV=original kernel version, KV=patched kernel version.  
 
 ETYPE="sources"
 
-inherit kernel
+inherit kernel eutils
 
 # CKV=con kolivas release version
 CKV=lck${PR/r/}
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild
index b908901bad38..c640055ae7bc 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild,v 1.1 2004/03/14 12:00:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild,v 1.2 2004/04/17 19:03:26 aliz Exp $
 
 UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
-
+IUSE=""
 K_NOUSENAME="yes"
 ETYPE="sources"
 inherit kernel-2
diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 735557ce48d8..8c36b45e0f79 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.36 2004/04/17 02:14:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.37 2004/04/17 19:03:26 aliz Exp $
 
   16 Apr 2004; Joshua Kinard <kumba@gentoo.org>
   files/CAN-2004-0109-2.6-iso9660.patch:
@@ -8,6 +8,9 @@
   originally). Patch is now the correct one.
 
 *mips-sources-2.4.26 (16 Apr 2004)
+*mips-sources-2.4.22-r11 (16 Apr 2004)
+*mips-sources-2.4.23-r7 (16 Apr 2004)
+*mips-sources-2.4.25-r1 (16 Apr 2004)
 
   16 Apr 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r8.ebuild,
   mips-sources-2.4.22-r11.ebuild, mips-sources-2.4.23-r7.ebuild,
diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 667c216c9671..7cc89b63c51a 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.148 2004/04/16 17:23:35 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.149 2004/04/17 19:03:26 aliz Exp $
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
+  mm-sources-2.6.5_rc1-r1.ebuild:
+  Added IUSE=
 
 *mm-sources-2.6.5-r6 (15 Apr 2004)
 
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild
index 4448b1f48f0a..c4354361313a 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild,v 1.2 2004/04/16 17:23:35 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.5_rc1-r1.ebuild,v 1.3 2004/04/17 19:03:26 aliz Exp $
 
 UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
 K_PREPATCHED="yes"
@@ -13,7 +13,7 @@ K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
 DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
 SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
-
+IUSE=""
 KEYWORDS="~x86 ~amd64 ~ia64 -*"
 
 K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
diff --git a/sys-kernel/ppc-headers/ChangeLog b/sys-kernel/ppc-headers/ChangeLog
index 8c9bff2dfa09..afa776a12a39 100644
--- a/sys-kernel/ppc-headers/ChangeLog
+++ b/sys-kernel/ppc-headers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/ppc-headers
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ChangeLog,v 1.4 2003/12/04 22:21:45 plasmaroo Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ChangeLog,v 1.5 2004/04/17 19:03:26 aliz Exp $
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ppc-headers-2.4.21-r1.ebuild:
+  Fixed IUSE flags.
 
   20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
   ppc-headers-2.4.21-r1.ebuild:
diff --git a/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild b/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild
index 3c40b0c81280..32ec70a5c36b 100644
--- a/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild,v 1.7 2004/02/22 23:32:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-headers/ppc-headers-2.4.21-r1.ebuild,v 1.8 2004/04/17 19:03:26 aliz Exp $
 
-IUSE="build crypt"
+IUSE="crypt"
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
diff --git a/sys-kernel/ppc-sources-dev/ChangeLog b/sys-kernel/ppc-sources-dev/ChangeLog
index ee00913e48bf..4668de03c28e 100644
--- a/sys-kernel/ppc-sources-dev/ChangeLog
+++ b/sys-kernel/ppc-sources-dev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ppc-sources-dev
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.24 2004/04/17 13:14:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.25 2004/04/17 19:03:26 aliz Exp $
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ppc-sources-dev-2.4.19.ebuild,
+  ppc-sources-dev-2.4.20.ebuild, ppc-sources-dev-2.4.21.ebuild,
+  ppc-sources-dev-2.4.22-r1.ebuild, ppc-sources-dev-2.4.22.ebuild,
+  ppc-sources-dev-2.4.24-r1.ebuild, ppc-sources-dev-2.4.24-r2.ebuild,
+  ppc-sources-dev-2.4.24.ebuild:
+  Changed patch to epatch, fixed IUSE flags.
 
 *ppc-sources-dev-2.4.24-r4 (17 Apr 2004)
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild
index 1c0def548aeb..41dde0fa89e6 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild,v 1.21 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild,v 1.22 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -10,7 +10,7 @@ OKV=${PVR}
 KV=2.4.19-r7
 S=${WORKDIR}/linux-${KV}
 ETYPE="sources"
-IUSE=""
+IUSE="build"
 
 # What's in this kernel?
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild
index 7f4392309314..8011d5415fef 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild,v 1.16 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild,v 1.17 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -10,7 +10,7 @@ OKV=${PVR}
 KV=2.4.20-r8
 S=${WORKDIR}/linux-${KV}
 ETYPE="sources"
-IUSE=""
+IUSE="build"
 
 # What's in this kernel?
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
index 1225729e1091..ef5a36999324 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild,v 1.5 2004/02/22 23:32:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild,v 1.6 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-IUSE="build crypt"
+IUSE="crypt"
 
 inherit kernel
 OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild
index 6ed2d50d5dce..346b8364b3ef 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild,v 1.3 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild,v 1.4 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-IUSE="build crypt"
+IUSE="crypt"
 
 inherit kernel eutils
 OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
index 900883c38f05..11be5ee562e7 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.6 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.7 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-IUSE="build crypt"
+IUSE="crypt"
 
 inherit kernel eutils
 OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
index 3d5ce350f02d..311351a2785e 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild,v 1.4 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild,v 1.5 2004/04/17 19:03:26 aliz Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 # Included patches:
@@ -48,9 +48,8 @@ src_unpack() {
 
 	mv linux-${OKV} ${PF}
 	cd ${PF}
-	bzcat ${DISTDIR}/patch-${KV}.patch.bz2 | patch -p1 || die "patch failed"
-	patch -p1 < ${FILESDIR}/${P}.pmac_pmu.patch || \
-		die "Failed to apply pmac_pmu fix"
+	epatch ${DISTDIR}/patch-${KV}.patch.bz2
+	epatch ${FILESDIR}/${P}.pmac_pmu.patch
 	find . -iname "*~" | xargs rm 2> /dev/null
 
 	cd ${WORKDIR}/${PF}
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild
index 572e66d74bcc..2eeb6e674b64 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild,v 1.2 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r2.ebuild,v 1.3 2004/04/17 19:03:26 aliz Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 # Included patches:
@@ -46,10 +46,8 @@ src_unpack() {
 
 	mv linux-${OKV} ${PF}
 	cd ${PF}
-	bzcat ${DISTDIR}/patch-${KV/r2/r1}.patch.bz2 | patch -p1 || die "patch failed"
-	patch -p1 < ${FILESDIR}/${P}.pmac_pmu.patch || \
-		die "Failed to apply pmac_pmu fix"
-
+	epatch ${DISTDIR}/patch-${KV/r2/r1}.patch.bz2
+	epatch ${FILESDIR}/${P}.pmac_pmu.patch
 	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
 
 	cd ${WORKDIR}/${PF}
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild
index 82ac0f504a0d..b7b6f44a7a3a 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild,v 1.2 2004/02/22 23:32:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24.ebuild,v 1.3 2004/04/17 19:03:26 aliz Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-IUSE="build crypt"
+IUSE="crypt"
 
 inherit kernel
 OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index d1fc561807c4..049ffffe1168 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,8 +1,9 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.5 2004/04/17 13:43:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.6 2004/04/17 19:03:26 aliz Exp $
 
 *uclinux-sources-2.4.24_p0-r2 (17 Apr 2004)
+*uclinux-sources-2.6.5_p0-r1 (17 Apr 2004)
 
   17 Apr 2004; <plasmaroo@gentoo.org>
   +files/uclinux-sources-2.4.24_p0.CAN-2004-0010.patch,
diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 2093ccc5dc22..594f80918992 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,8 +1,9 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.41 2004/04/17 15:23:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.42 2004/04/17 19:03:26 aliz Exp $
 
 *wolk-sources-4.11-r3 (17 Apr 2004)
+*wolk-sources-4.9-r6 (17 Apr 2004)
 
   17 Apr 2004; <plasmaroo@gentoo.org>
   +files/wolk-sources-4.9s.CAN-2004-0010.patch,