* version bump for 2.6, official 2.4 is back

Package-Manager: portage-2.0.51.22-r1

10 files changed, 69 insertions, 76 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index cbbcf9a7025b..d31eb98f1eb4 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,16 @@
 # 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.91 2005/07/14 13:09:56 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.92 2005/07/14 18:32:16 voxus Exp $
+
+*openmosix-sources-2.6.12.576 (14 Jul 2005)
+*openmosix-sources-2.4.26-r1 (14 Jul 2005)
+
+  14 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org>
+  -openmosix-sources-2.6.11.570.ebuild,
+  -openmosix-sources-2.6.11.570-r1.ebuild,
+  +openmosix-sources-2.6.12.576.ebuild,
+  +openmosix-sources-2.4.26-r1.ebuild, openmosix-sources-2.4.24-r10.ebuild:
+  Version bump on 2.6 series and restored official patchset.
 
   14 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org>
   -openmosix-sources-2.4.30-r2.ebuild, openmosix-sources-2.4.30-r3.ebuild:
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 68494ea62896..5f7c1d6a1cd4 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,9 +1,9 @@
-MD5 25ef471f8b4a86410927b8df8d3784db openmosix-sources-2.6.11.570.ebuild 1540
+MD5 2cfcac4f1470459f6afbb068f156ccca openmosix-sources-2.6.12.576.ebuild 1731
 MD5 b843e753abdd9c90198f4b1288d2e0a1 openmosix-sources-2.4.30-r3.ebuild 1412
-MD5 02c90eb97739a42c06d7fc580cb750bc ChangeLog 20124
+MD5 ea0924fd833f27f2b928197eab6ceba7 openmosix-sources-2.4.26-r1.ebuild 1236
+MD5 558ddde288b6e3df7a789767506826a7 ChangeLog 20527
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
-MD5 c88faf378c83d3685faa8521a96c4651 openmosix-sources-2.6.11.570-r1.ebuild 1744
-MD5 84aefe78bce905bb0fea280865516826 openmosix-sources-2.4.24-r10.ebuild 3418
+MD5 e0c89d5b58da89de3724a7d923d0e8d9 openmosix-sources-2.4.24-r10.ebuild 3420
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
 MD5 b0a1f80aff51d6601e8924329023b241 files/openmosix-sources-af_unix.patch 515
@@ -11,12 +11,12 @@ MD5 eb003205dcff506c0ddfd4783862889a files/openmosix-sources-binfmt_aout.patch 1
 MD5 97d5fad4a9d39486b7da19adeada5d6d files/openmosix-sources-dn_neigh.patch 310
 MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
-MD5 09abb2fd97dad81fe85db960204a91f1 files/digest-openmosix-sources-2.6.11.570-r1 296
 MD5 04be98c8627ae3649c27ca03d4f2e26c files/openmosix-sources.CAN-2004-1137.patch 1845
 MD5 a0f813730ae690dca97b052b0bddc4b6 files/openmosix-sources-extraversion.patch 546
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/openmosix-sources.CAN-2004-1016.patch 2835
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
+MD5 1c6b7a1334af8e521558fac389f6d54d files/digest-openmosix-sources-2.4.26-r1 134
 MD5 a5a0127feba11fd2d34c3dd9b2ecb199 files/digest-openmosix-sources-2.4.30-r3 154
 MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
 MD5 916bc047f3f4e3fdc8f70aa16ffb5514 files/openmosix-sources.CAN-2004-1235.patch 8317
@@ -30,7 +30,7 @@ MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/openmosix-sources-2.4.27-smbfs.patch
 MD5 1adf8f1d53fb366d14f46450071156af files/openmosix-sources-moxa_random.patch 1099
 MD5 c27699e9d62f7d46213bd51f87636163 files/openmosix-sources-vma.patch 8143
 MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
-MD5 ecc285581b63685ebab90443fec8d6c0 files/digest-openmosix-sources-2.6.11.570 293
+MD5 d124ee54bce678ca7499f00af4b1762a files/digest-openmosix-sources-2.6.12.576 291
 MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
 MD5 9971231cef0a944990e47a3c1e4b717c files/openmosix-sources-2.4.24-smbfs.patch 2790
 MD5 dc18e982f8149588a291956481885a8c files/openmosix-sources.CAN-2004-0495.patch 17549
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.26-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.26-r1
new file mode 100644
index 000000000000..670f35f44654
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.26-r1
@@ -0,0 +1,2 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 3c4eaa62eb1c6fe81e4659f3d5e1985c openMosix-2.4.26-1.bz2 194189
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570
deleted file mode 100644
index bbf609b19040..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 954360d48b99db736a6a6757d1137a6c genpatches-2.6-11.11-base.tar.bz2 42055
-MD5 c627c57b530ebb83cb37052b2d3b05db genpatches-2.6-11.11-extras.tar.bz2 210154
-MD5 4d44c0ec773a62d62deb514b35af1998 patch-2.6.11-om-r570.bz2 106418
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570-r1
deleted file mode 100644
index 770e9bdaa198..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.11.570-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 1de4e2172e543605efdf523887d29d70 genpatches-2.6.11-14.base.tar.bz2 48592
-MD5 0262f9693b61e988ddbbc0d61aac5dc8 genpatches-2.6.11-14.extras.tar.bz2 213514
-MD5 950b84accde8a747691c7aba2f82cea1 patch-2.6.11.12-om-r570.bz2 106560
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.12.576 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.12.576
new file mode 100644
index 000000000000..7f49d092c0c6
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.6.12.576
@@ -0,0 +1,4 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 936937a2a0dd4e6ac431a0190347567d genpatches-2.6.12-8.base.tar.bz2 23445
+MD5 2d9aad1136dafa46665320ba4dec2d76 genpatches-2.6.12-8.extras.tar.bz2 227527
+MD5 88a29cd3a64727b74b31eda07b67572b patch-2.6.12-om-r576.bz2 106683
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
index 26f1db2107b5..f121a58f72a0 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r10.ebuild,v 1.5 2005/07/09 18:05:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild,v 1.6 2005/07/14 18:32:16 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -29,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="-*"
+KEYWORDS="-* ~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r1.ebuild
new file mode 100644
index 000000000000..551db65ab1dc
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 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.26-r1.ebuild,v 1.4 2005/07/14 18:32:16 voxus Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel-2 eutils
+
+[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
+		mirror://sourceforge/openmosix/openMosix-2.4.26-1.bz2"
+PROVIDE="virtual/linux-sources"
+HOMEPAGE="http://www.kernel.org/
+		http://www.openmosix.org/"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-* ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack linux-${PV}.tar.bz2
+	mv linux-${PV} linux-${KV}
+	cd linux-${KV}
+	epatch ${DISTDIR}/openMosix-${PV}-${PR/r/}.bz2 || die "openMosix patch failed."
+
+	unpack_2_4
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Please, note that MFS and DFSA support is now Officially dropped."
+	echo
+	einfo "For documentation about setting up your cluster - consider look at"
+	einfo "http://www.gentoo.org/doc/en/openmosix-howto.xml"
+	echo
+}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.6.11.570.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.6.11.570.ebuild
deleted file mode 100644
index 63e70a64415c..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.6.11.570.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 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.6.11.570.ebuild,v 1.1 2005/05/16 07:54:38 voxus Exp $
-
-ETYPE="sources"
-
-# stripping oM's revision
-inherit versionator eutils
-
-OMR="$(get_version_component_range 4 ${PV})"
-OKV="$(get_version_component_range 1-3 ${OKV})"
-EXTRAVERSION="-openmosix-r${OMR}"
-
-inherit kernel-2
-
-detect_version
-detect_arch
-
-KV_FULL=${OKV}-openmosix-r${OMR}
-
-# version of gentoo patchset
-GPV="11.11"
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
-	mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-extras.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-
-HOMEPAGE="http://openmosix.snarc.org/"
-
-UNIPATCH_LIST="${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
-			${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-extras.tar.bz2
-			${DISTDIR}/patch-${OKV}-om-r${OMR}.bz2"
-
-UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README"
-
-OM_SRC="http://openmosix.snarc.org/files/releases/2.6/patch-${OKV}-om-r${OMR}.bz2"
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GPV_SRC} ${ARCH_URI} ${OM_SRC}"
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-extraversion.patch
-}
-
-pkg_postinst() {
-	postinst_sources
-
-	echo
-
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.6.11.570-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.6.12.576.ebuild
index 0d2a6af19d82..9e69fbef221a 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.6.11.570-r1.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.6.12.576.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6.11.570-r1.ebuild,v 1.1 2005/07/01 21:19:14 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.6.12.576.ebuild,v 1.1 2005/07/14 18:32:16 voxus Exp $
 
 ETYPE="sources"
 
@@ -19,7 +19,7 @@ detect_arch
 KV_FULL=${OKV}-openmosix-r${OMR}
 
 # version of gentoo patchset
-GPV="11-14"
+GPV="12-8"
 GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2
 	mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2"
 
@@ -29,15 +29,15 @@ HOMEPAGE="http://openmosix.snarc.org/"
 
 UNIPATCH_LIST="${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2
 			${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2
-			${DISTDIR}/patch-${OKV}.12-om-r${OMR}.bz2"
+			${DISTDIR}/patch-${OKV}-om-r${OMR}.bz2"
 
 UNIPATCH_STRICTORDER="genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2
 			${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2
-			${DISTDIR}/patch-${OKV}.12-om-r${OMR}.bz2"
+			${DISTDIR}/patch-${OKV}-om-r${OMR}.bz2"
 
 UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}/0000_README"
 
-OM_SRC="http://openmosix.snarc.org/files/releases/2.6/patch-${OKV}.12-om-r${OMR}.bz2"
+OM_SRC="http://openmosix.snarc.org/files/releases/2.6/patch-${OKV}-om-r${OMR}.bz2"
 
 DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel ${KV_MAJOR}.${KV_MINOR} kernel tree"
 SRC_URI="${KERNEL_URI} ${GPV_SRC} ${ARCH_URI} ${OM_SRC}"