Ebuild for 2.4.22 added, older ebuilds cleaned out

13 files changed, 40 insertions, 561 deletions

diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 850b44763027..46c227d1f9d3 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,20 +1,10 @@
 MD5 89be188b7a7dbe55f25c85d013b4488f ChangeLog 1289
-MD5 139536498ac2981d424ae1628d0935fe openmosix-sources-2.4.20-r1.ebuild 3318
-MD5 5cd09b3b7f14b5e7e81fea3d0f6c0e26 openmosix-sources-2.4.20-r2.ebuild 3340
-MD5 9f1f6507b5b24fe752321906f4835a3d openmosix-sources-2.4.20-r3.ebuild 3198
-MD5 47b7798301ac13c745649ca70e6eed67 openmosix-sources-2.4.20-r4.ebuild 3355
-MD5 3eec695f0481b07db403de0e580062eb openmosix-sources-2.4.20-r5.ebuild 3197
 MD5 2baf3a70602d45cf08b466989175cb5a openmosix-sources-2.4.20-r6.ebuild 3198
 MD5 433f31a4ff1b72a6eabe1ccbd40a3e86 openmosix-sources-2.4.21.ebuild 3199
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 e0f222318183bd127875a072f80b1721 openmosix-sources-2.4.22_rc2.ebuild 1491
 MD5 4931aa289d1d7a25dc59a1d33a2da647 openmosix-sources-2.6.0_beta3.ebuild 3748
-MD5 23ac4c0a23b3da549846287a392a422f openmosix-sources-2.4.22.ebuild 1318
-MD5 41b8fa1f0e2e59514496f8f5d52bcd75 files/digest-openmosix-sources-2.4.20-r1 154
-MD5 4843f8c1a5a7d5a7f0f2b37038cab7b6 files/digest-openmosix-sources-2.4.20-r2 154
-MD5 32f9a2d3d0d7c57a50c7a055031a72f4 files/digest-openmosix-sources-2.4.20-r3 133
-MD5 0e35bbea8bbbfc6f20bfb05afe729846 files/digest-openmosix-sources-2.4.20-r4 206
-MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r5 133
+MD5 3feb53885cfe772bb58e48c75b600780 openmosix-sources-2.4.22.ebuild 1314
 MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r6 133
 MD5 f5cf28ccf74eccc21f96d399b429420b files/digest-openmosix-sources-2.4.21 134
 MD5 c395ea0baec90a5ea7c334a07f57b275 files/digest-openmosix-sources-2.4.22_rc2 210
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r1
deleted file mode 100644
index c3c5e2705573..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 de0b1d975a55f9e01b271db75b369fdc linux-gentoo-2.4.20-openmosix-r1.patch.bz2 448993
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r2 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r2
deleted file mode 100644
index d223f9b84486..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 de0b1d975a55f9e01b271db75b369fdc linux-gentoo-2.4.20-openmosix-r2.patch.bz2 448993
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r3 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r3
deleted file mode 100644
index 1bccf35e8b7e..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 d56d5af11dc03be858210b086708e723 openMosix-2.4.20-2.gz 296657
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r4 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r4
deleted file mode 100644
index 072fea3e21da..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 d56d5af11dc03be858210b086708e723 openMosix-2.4.20-2.gz 296657
-MD5 1dc29257a45172eea7e8f11056f89bd8 openmosix-2.4.20-ptrace.patch 24651
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r5 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r5
deleted file mode 100644
index 4300571b7e2a..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 7b593d35115e0d3bead25c47353d8999 openMosix-2.4.20-3.gz 305185
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22
new file mode 100644
index 000000000000..d17300f74f35
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 aca08f49b5fe995be24483a5eef2f0bc patch-2.4.22-om-20030825.bz2 253223
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r1.ebuild
deleted file mode 100644
index 3cef31205bdd..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r1.ebuild,v 1.5 2003/03/24 23:34:01 drobbins Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-1
-#   2.4.20  evms-1.2.1 (evms-linux-2.4.20-common-files, evms-1.2.1-linux-2.4.patch, linux-2.4.20.VFS-lock.patch)
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2  http://www.ibiblio.org/gentoo/distfiles/linux-gentoo-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#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"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/linux-gentoo-${KV}.patch.bz2 | bzip2 -d | patch -p1 || die
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-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.20-r2.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r2.ebuild
deleted file mode 100644
index 6ee48a9ddad9..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r2.ebuild,v 1.6 2003/03/24 23:34:01 drobbins Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-1
-#   2.4.20  evms-1.2.1 (evms-linux-2.4.20-common-files, evms-1.2.1-linux-2.4.patch, linux-2.4.20.VFS-lock.patch)
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2  http://www.ibiblio.org/gentoo/distfiles/linux-gentoo-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#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"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/linux-gentoo-${KV}.patch.bz2 | bzip2 -d | patch -p1 || die
-
-
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	rm Makefile~
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-
-
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-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.20-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r3.ebuild
deleted file mode 100644
index c3defe8e1e28..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r3.ebuild,v 1.2 2003/04/14 19:45:24 tantive Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-2
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.20-2.gz"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#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"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/openMosix-2.4.20-2.gz | gzip -d | patch -p1 || die
-
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	rm Makefile~
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-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.20-r4.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r4.ebuild
deleted file mode 100644
index 896877132adb..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r4.ebuild,v 1.2 2003/05/07 20:33:22 tantive Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-2
-#   2.4.20  ptrace patch
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.20-2.gz 
-http://www.css.tayloru.edu/~elorimer/openmosix-2.4.20-ptrace.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 -ppc -sparc -alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#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"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/openMosix-2.4.20-2.gz | gzip -d | patch -p1 || die
-	cat ${DISTDIR}/openmosix-2.4.20-ptrace.patch | patch -p1 || die
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	rm Makefile~
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-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.20-r5.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r5.ebuild
deleted file mode 100644
index 9826c9d1f239..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r5.ebuild,v 1.1 2003/06/09 12:21:54 tantive Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-3
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.20-3.gz"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#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"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/openMosix-2.4.20-2.gz | gzip -d | patch -p1 || die
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	rm Makefile~
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-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.22.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
new file mode 100644
index 000000000000..2dfd16a160d7
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild,v 1.1 2003/09/02 15:04:58 tantive Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+OKV="2.4.22"
+[ "${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}
+
+ETYPE="sources"
+inherit kernel || die
+
+# What's in this kernel?
+
+# INCLUDED:
+#   2.4.22, plus:
+#   2.4.22  openmosix-2.4.22-20030825
+
+DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+http://tab.tuxfamily.org/download/openmosix/patch-2.4.22-om-20030825.bz2"
+PROVIDE="virtual/linux-sources"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/" 
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="~x86 -ppc -sparc -alpha"
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die
+	cd linux-${KV}
+	bzcat ${DISTDIR}/patch-2.4.22-om-20030825.bz2|patch -p1 || die "-openmosix patch failed"
+
+	kernel_universal_unpack
+}