Convert to kernel-2.eclass

11 files changed, 82 insertions, 251 deletions

diff --git a/sys-kernel/vanilla-sources/ChangeLog b/sys-kernel/vanilla-sources/ChangeLog
index 28289dd705ca..1e5c3988f4c2 100644
--- a/sys-kernel/vanilla-sources/ChangeLog
+++ b/sys-kernel/vanilla-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/vanilla-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.35 2004/11/19 20:27:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.36 2004/11/25 23:30:52 dsd Exp $
+
+  26 Nov 2004; Daniel Drake <dsd@gentoo.org> vanilla-sources-2.4.20.ebuild,
+  vanilla-sources-2.4.21.ebuild, vanilla-sources-2.4.22.ebuild,
+  vanilla-sources-2.4.23.ebuild, vanilla-sources-2.4.24-r1.ebuild,
+  -vanilla-sources-2.4.24.ebuild, vanilla-sources-2.4.25.ebuild,
+  vanilla-sources-2.4.26.ebuild, vanilla-sources-2.4.27.ebuild,
+  vanilla-sources-2.4.28.ebuild:
+  Convert to kernel-2.eclass
 
 *vanilla-sources-2.4.28 (19 Nov 2004)
 
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
index fbb80719f4e5..ea3ad788f875 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
@@ -1,34 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.16 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.17 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel eutils
-
-OKV=2.4.20
-KV=2.4.20
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.20 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
+
 KEYWORDS="x86 -ppc sparc alpha"
 IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-
-	cd ${S}
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
-	kernel_universal_unpack
-}
+UNIPATCH_LIST="${FILESDIR}/do_brk_fix.patch"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
index 42bb00e3c7a8..4b69870b47a0 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
@@ -1,34 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.14 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.15 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel eutils
-
-OKV=2.4.21
-KV=2.4.21
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.21 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
+
 KEYWORDS="x86 -ppc sparc alpha amd64 ~s390"
 IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-
-	cd ${S}
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
-	kernel_universal_unpack
-}
+UNIPATCH_LIST="${FILESDIR}/do_brk_fix.patch"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
index a84f29e842e0..00dbbb21a743 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild
@@ -1,34 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild,v 1.11 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.22.ebuild,v 1.12 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel eutils
-
-OKV=2.4.22
-KV=2.4.22
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.22 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
+
 KEYWORDS="x86 -ppc sparc alpha amd64"
 IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-
-	cd ${S}
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
-	kernel_universal_unpack
-}
+UNIPATCH_LIST="${FILESDIR}/do_brk_fix.patch"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild
index 0db8d6047a0d..bcc2627d1a87 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild
@@ -1,32 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild,v 1.5 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.23.ebuild,v 1.6 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel
-
-OKV=2.4.23
-KV=2.4.23
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.23 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
+
 KEYWORDS="x86 -ppc sparc alpha amd64"
 IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-
-	cd ${S}
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild
index ddd0c150d538..39fb52655556 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild
@@ -1,32 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild,v 1.5 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.24-r1.ebuild,v 1.6 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel eutils
-
-OKV=2.4.24
-KV=2.4.24
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.24 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="amd64 -* -ppc"
-IUSE=""
-SLOT="${KV}"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
 
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
+KEYWORDS="x86 -ppc sparc alpha amd64"
+IUSE=""
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
-	kernel_universal_unpack
-}
+UNIPATCH_LIST="${FILESDIR}/${P}.CAN-2004-0001.patch"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.24.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.24.ebuild
deleted file mode 100644
index eecc18d847cc..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.24.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.24.ebuild,v 1.5 2004/07/15 05:28:49 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV=2.4.24
-KV=2.4.24
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.24 kernel sources
-
-DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="x86 -ppc sparc alpha amd64"
-IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-
-	cd ${S}
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild
index 2c32b21d6b9c..52037d16d9c1 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild
@@ -1,32 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild,v 1.4 2004/06/24 23:01:52 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.25.ebuild,v 1.5 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel
-IUSE=""
-
-OKV=2.4.25
-KV=2.4.25
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.25 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="x86 -ppc sparc alpha amd64"
-SLOT="${KV}"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
 
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
+KEYWORDS="x86 -ppc sparc alpha amd64"
+IUSE=""
 
-	cd ${S}
-	patch -p1 -f < ${FILESDIR}/${PN}-2.4.24.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
-	kernel_universal_unpack
-}
+UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.24.CAN-2004-0001.patch"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild
index ade06fbf001f..aed1cfe39d7e 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild
@@ -1,31 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild,v 1.3 2004/06/24 23:01:52 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild,v 1.4 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel
-IUSE=""
-
-OKV=2.4.26
-KV=2.4.26
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.26 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="x86 -ppc sparc alpha amd64"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
 
-	cd ${S}
-	kernel_universal_unpack
-}
+KEYWORDS="x86 -ppc sparc alpha amd64"
+IUSE=""
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild
index 54185253e987..e9cc6850bc54 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild
@@ -1,31 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild,v 1.2 2004/08/24 12:20:24 plasmaroo Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.27.ebuild,v 1.3 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel
-IUSE=""
-
-OKV=2.4.27
-KV=2.4.27
-EXTRAVERSION=" "
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.27 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="x86 -ppc sparc alpha amd64"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
 
-	cd ${S}
-	kernel_universal_unpack
-}
+KEYWORDS="x86 -ppc sparc alpha amd64"
+IUSE=""
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild
index 3f26dd7862e4..a4a0646aa81f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild
@@ -1,31 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild,v 1.1 2004/11/19 20:27:41 plasmaroo Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.28.ebuild,v 1.2 2004/11/25 23:30:52 dsd Exp $
 
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
-inherit kernel
-IUSE=""
-
-OKV="${PV}"
-KV="${PV}"
-EXTRAVERSION=' '
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.28 kernel sources
+inherit kernel-2
 
 DESCRIPTION="Full sources for the Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-KEYWORDS="x86 -ppc sparc alpha amd64"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2"
 
-	cd ${S}
-	kernel_universal_unpack
-}
+KEYWORDS="x86 -ppc sparc alpha amd64"
+IUSE=""