unmasked "safe" .24-r5, qa-cleanups

6 files changed, 12 insertions, 82 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index 6476209cbc2b..ae7ce2a06572 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.67 2004/11/10 09:29:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.68 2004/11/12 07:30:29 voxus Exp $
+
+  12 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  -openmosix-sources-2.4.24-r4.ebuild:
+  Unmasked .24-r5 due to recent security patch, old version removed.
+  QA fixes (sed in global scope).
 
 *openmosix-sources-2.4.24-r5 (10 Nov 2004)
 *openmosix-sources-2.4.27-r3 (10 Nov 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index aa99ec676d52..662ae4a8ffbe 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,7 +1,6 @@
-MD5 6009e0de9f1abb0d0697e92c20b853ad openmosix-sources-2.4.24-r5.ebuild 3026
-MD5 263d8fce28e2a70a82ab32a4fe7f4797 openmosix-sources-2.4.27-r3.ebuild 1732
-MD5 0af3f3e449f2c0dd116d14e1dfbd68c6 openmosix-sources-2.4.24-r4.ebuild 2705
-MD5 4047cf450e6fa1115a14567dfa7fe3c7 ChangeLog 12313
+MD5 4f7f2233424ab09566d8bb96c0ebd181 openmosix-sources-2.4.24-r5.ebuild 2903
+MD5 b37565827dcf1140f2dc9f3c87e0e533 openmosix-sources-2.4.27-r3.ebuild 1610
+MD5 917504c0e2e261a06c4ec1af60d216de ChangeLog 12511
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
@@ -9,7 +8,6 @@ MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
-MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r4 212
 MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r5 359
 MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r3 296
 MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r4 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r4
deleted file mode 100644
index b75fe69b673a..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 7327583ac763d8833499274caa7e4771 openMosix-2.4.24-om1.bz2 234126
-MD5 7e0e9f3d57bcc1b1bb7900ada383c129 linux-2.4.23-CAN-2004-0415.patch 89319
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild
deleted file mode 100644
index 9f0c79701838..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild
+++ /dev/null
@@ -1,66 +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/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild,v 1.2 2004/08/22 14:59:28 voxus Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-OKV="2.4.24"
-OMV="om1"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-3
-#			various security patches
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-${OKV}-${OMV}.bz2
-http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.23-CAN-2004-0415.patch"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-
-	epatch ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2 || die "openMosix patch failed"
-
-	epatch ${FILESDIR}/openmosix-sources.CAN-2003-0985.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0001.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0010.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0109.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0177.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0178.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0181.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0495.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0497.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0535.patch || die "Security patch failed"
-	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0685.patch || die "Security patch failed"
-	epatch ${FILESDIR}/cmdline-proc-fix.patch || die "Security patch failed"
-
-	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add CAN-2004-0415"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild
index 43d050ed094b..e50f269bbc65 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild,v 1.1 2004/11/10 09:29:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild,v 1.2 2004/11/12 07:30:29 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -9,8 +9,6 @@ inherit kernel eutils
 OKV="2.4.24"
 OMV="2"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
 S=${WORKDIR}/linux-${KV}
 
 # What's in this kernel?
@@ -31,7 +29,7 @@ PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild
index 19efb6e18301..b8dd04380c95 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild,v 1.1 2004/11/10 09:29:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild,v 1.2 2004/11/12 07:30:29 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -9,8 +9,6 @@ inherit kernel eutils
 OKV="2.4.27"
 TIMESTAMP="20040914"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
 S=${WORKDIR}/linux-${KV}
 
 # What's in this kernel?