Convert to kernel-2. Clean up.

4 files changed, 52 insertions, 74 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 3af9a78a3ef3..273888a602c6 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.51 2004/11/20 15:54:02 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.52 2004/11/26 16:27:19 dsd Exp $
+
+  26 Nov 2004; Daniel Drake <dsd@gentoo.org>
+  usermode-sources-2.4.26-r9.ebuild, usermode-sources-2.6.8.1-r4.ebuild:
+  Convert to kernel-2. Clean up.
 
 *usermode-sources-2.4.26-r9 (20 Nov 2004)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index f9d2a69ed0a0..608b4952bd10 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,20 +1,20 @@
-MD5 a553728acc1c3d0a13c6a3f633ec7a27 ChangeLog 13937
+MD5 048fae91d93121008e7a6ceaa7d3cd51 usermode-sources-2.4.26-r9.ebuild 1797
+MD5 830ba0e46cfc4df8f58445dcb3727291 ChangeLog 14083
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 11f5175866d37cc8cc3fb83d1d239566 usermode-sources-2.4.26-r9.ebuild 2815
-MD5 808c5e768ef8340d3cf18a833f0b8e8f usermode-sources-2.6.8.1-r4.ebuild 1096
-MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
-MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
-MD5 5748125eb42554148c90a042a7454065 files/digest-usermode-sources-2.6.8.1-r4 214
-MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
-MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
+MD5 c49eefac1395494c36bdbc4adb7d858e usermode-sources-2.6.8.1-r4.ebuild 982
+MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/usermode-sources-2.4.smbfs.patch 3434
 MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
-MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
+MD5 054d55975dd07c5a434e0ccfcf26f682 files/digest-usermode-sources-2.4.26-r9 297
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
+MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
+MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499
+MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
+MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
+MD5 5748125eb42554148c90a042a7454065 files/digest-usermode-sources-2.6.8.1-r4 214
 MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309
-MD5 054d55975dd07c5a434e0ccfcf26f682 files/digest-usermode-sources-2.4.26-r9 297
 MD5 c2510fe1891f5a9effb12c2196922206 files/usermode-sources-2.6.cmdlineLeak.patch 281
+MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
 MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
-MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
-MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild
index 758799128392..ca263554e755 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild
@@ -1,71 +1,48 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild,v 1.1 2004/11/20 15:54:02 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild,v 1.2 2004/11/26 16:27:19 dsd Exp $
 
 ETYPE="sources"
-inherit kernel eutils
+inherit kernel-2
+detect_version
 
-OKV='2.4.26'
-UML_PATCH='uml-patch-2.4.26-3'
+EXTRAVERSION="${EXTRAVERSION/usermode/uml1}"
+KV_FULL="${KV_FULL/usermode/uml1}"
+
+UML_PATCH="uml-patch-${PV}-3"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
 	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0415.patch
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
-SLOT="${PV}-${PR}"
 KEYWORDS="x86 -ppc"
 IUSE=""
-EXTRAVERSION="-uml1-${PR}"
 RESTRICT="nomirror"
 
 # console-tools is needed to solve the loadkeys fiasco.
 # binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-DEPEND=">=sys-devel/binutils-2.11.90.0.31 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/linux-${PV}${EXTRAVERSION}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${PV}.tar.bz2
-
-	mv linux-${PV} ${S} && cd ${S}
-	epatch ${DISTDIR}/${UML_PATCH}.bz2
-	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
-	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
-	epatch ${DISTDIR}/${P}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
-	epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
-	epatch ${FILESDIR}/${PN}-2.4.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!"
-	epatch ${FILESDIR}/${PN}-2.4.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!"
-	epatch ${FILESDIR}/${PN}-2.4.smbfs.patch || die "Failed to apply the SMBFS patch!"
-
-	kernel_universal_unpack
-}
+DEPEND="${DEPEND} >=sys-devel/binutils-2.11.90.0.31 dev-lang/perl"
+RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2"
+
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
+	${FILESDIR}/${P}.CAN-2004-0394.patch
+	${DISTDIR}/linux-${PV}-CAN-2004-0415.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}.CAN-2004-0497.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch
+	${DISTDIR}/${P}-CAN-2004-0814.patch
+	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
+	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
+	${FILESDIR}/${PN}-2.4.XDRWrapFix.patch
+	${FILESDIR}/${PN}-2.4.binfmt_elf.patch
+	${FILESDIR}/${PN}-2.4.smbfs.patch"
 
 src_install() {
+	kernel-2_src_install
 	mkdir -p ${D}/usr/src/uml
-
-	# Fix permissions
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-
-	mv linux-${PV}${EXTRAVERSION} ${D}/usr/src/uml/
-}
-
-pkg_postinst() {
-	# Create linux symlink
-	if [ ! -e ${ROOT}usr/src/uml/linux ]
-	then
-		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV}${EXTRAVERSION} ${ROOT}usr/src/uml/linux
-	fi
+	mv ${D}/usr/src/linux-${KV_FULL} ${D}/usr/src/uml/
 }
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild
index 2340e7547469..e789df0be4e7 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild
@@ -1,20 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild,v 1.1 2004/11/20 15:54:02 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild,v 1.2 2004/11/26 16:27:19 dsd Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
-
 inherit kernel-2
-UML_PATCH="uml-patch-2.6.8.1-1"
-OKV="${PV}"
-EXTRAVERSION="-${UML_PATCH//-*-/}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-S="${WORKDIR}/linux-${KV}"
-IUSE=""
+detect_version
+
+UML_PATCH="uml-patch-${PV}-1"
 
 UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
-	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch
+	${DISTDIR}/linux-${PV}-CAN-2004-0814.patch
 	${FILESDIR}/${PN}-2.6.cmdlineLeak.patch
 	${FILESDIR}/${PN}-2.6.devPtmx.patch
 	${FILESDIR}/${PN}-2.6.binfmt_elf.patch
@@ -23,8 +19,9 @@ UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
 	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0814.patch"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-SLOT="${KV}"
 KEYWORDS="~x86"
 RESTRICT="nomirror"
+IUSE=""
+