Numerous small fixes, see ChangeLog for details.

9 files changed, 26 insertions, 22 deletions

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:'`"