044 to stable x86, cleanup

(Portage version: 2.0.53_rc7)

11 files changed, 19 insertions, 149 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 1093380f5653..7800b43bddbc 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.7 2005/11/26 08:57:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.8 2005/11/26 09:10:12 hollow Exp $
+
+  26 Nov 2005; Benedikt Boehm <hollow@gentoo.org>
+  -files/linux-2.6.8.1.patch, -openvz-sources-022.034.ebuild,
+  -openvz-sources-022.038.ebuild, openvz-sources-022.044.ebuild,
+  -openvz-sources-022.045.ebuild, openvz-sources-022.045-r1.ebuild:
+  044 to stable x86, cleanup
 
   26 Nov 2005; Christian Heim <phreak@gentoo.org>
   openvz-sources-022.044.ebuild, openvz-sources-022.045.ebuild,
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index e600069c9c6c..01bec266d5de 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,23 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 db69ccdae1292aadd018f5f212ec1525 ChangeLog 1523
-MD5 8059df244197e2bc4c9001148e7b089d files/digest-openvz-sources-022.034 143
-MD5 8c043ef00db5837ae78eb255a17fae6d files/digest-openvz-sources-022.038 143
+MD5 237033601eb3fcf7380aca9b451624c4 ChangeLog 1731
 MD5 6ac5cd5d3e68664565f7fd08b9acc803 files/digest-openvz-sources-022.044 143
-MD5 bb63e27d518e7b7802507c7bfe4fbf86 files/digest-openvz-sources-022.045 144
 MD5 282ac3d6c8d376fa5a46a6fcc1790ce2 files/digest-openvz-sources-022.045-r1 145
-MD5 3ae3bab30256016777b44cbe71b53f76 files/linux-2.6.8.1.patch 711
 MD5 647244b44cdc8ef50e6dd53b4b8e88af metadata.xml 564
-MD5 de5916dcbcbd653fd0ab646f81dbb2c8 openvz-sources-022.034.ebuild 906
-MD5 29358bd95ab1192c63c8c2e5e7f9f5d0 openvz-sources-022.038.ebuild 906
-MD5 0717970daf866ee03902604bb37824bf openvz-sources-022.044.ebuild 938
-MD5 d62b0d1948c42425bb60a0758cdeca65 openvz-sources-022.045-r1.ebuild 696
-MD5 13d5b88ad08390e9dfd2b09d89421bbf openvz-sources-022.045.ebuild 938
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiCOdflZ8QqxhrsMRAujNAJ9d2dZbkbGPHg+YPQovjP46VD4OGgCgxDw1
-D+EjM8ZgPA4RPXSadPS9LQc=
-=7iVM
------END PGP SIGNATURE-----
+MD5 be1b8f2c874169180a31e359e563e75c openvz-sources-022.044.ebuild 943
+MD5 c944a724c6b306e87ae9605d3c1eb46c openvz-sources-022.045-r1.ebuild 702
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.034 b/sys-kernel/openvz-sources/files/digest-openvz-sources-022.034
deleted file mode 100644
index ae3e04066bb9..000000000000
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.034
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f8b0030ce970f3c1a460faf5d2b1cec linux-2.6.8.tar.bz2 35634061
-MD5 4a8c86ffe316bae776fe477ff3b944f1 openvz-022stab034-core.patch.bz2 371640
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.038 b/sys-kernel/openvz-sources/files/digest-openvz-sources-022.038
deleted file mode 100644
index 5d1dc949d613..000000000000
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.038
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f8b0030ce970f3c1a460faf5d2b1cec linux-2.6.8.tar.bz2 35634061
-MD5 fe7bd88d22a8262b6268b39f7f16b6f9 openvz-022stab038-core.patch.bz2 384949
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.045 b/sys-kernel/openvz-sources/files/digest-openvz-sources-022.045
deleted file mode 100644
index aaef15ed3dfb..000000000000
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.045
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f8b0030ce970f3c1a460faf5d2b1cec linux-2.6.8.tar.bz2 35634061
-MD5 f5e43476ddc5fab7bc81da2e75a74017 openvz-022stab045-core.patch.bz2 1332669
diff --git a/sys-kernel/openvz-sources/files/linux-2.6.8.1.patch b/sys-kernel/openvz-sources/files/linux-2.6.8.1.patch
deleted file mode 100644
index 7c7004406a2b..000000000000
--- a/sys-kernel/openvz-sources/files/linux-2.6.8.1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru a/Makefile b/Makefile
---- a/Makefile	2004-08-14 03:56:28 -07:00
-+++ b/Makefile	2004-08-14 03:56:28 -07:00
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 8
--EXTRAVERSION =
-+EXTRAVERSION = .1
- NAME=Zonked Quokka
- 
- # *DOCUMENTATION*
-diff -Nru a/fs/nfs/file.c b/fs/nfs/file.c
---- a/fs/nfs/file.c	2004-08-14 03:56:28 -07:00
-+++ b/fs/nfs/file.c	2004-08-14 03:56:28 -07:00
-@@ -72,7 +72,7 @@
- 
- static int nfs_check_flags(int flags)
- {
--	if (flags & (O_APPEND | O_DIRECT))
-+	if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))
- 		return -EINVAL;
- 
- 	return 0;
-@@ -89,7 +89,7 @@
- 	int res;
- 
- 	res = nfs_check_flags(filp->f_flags);
--	if (!res)
-+	if (res)
- 		return res;
- 
- 	lock_kernel();
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.034.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.034.ebuild
deleted file mode 100644
index 59551288cd30..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-022.034.ebuild
+++ /dev/null
@@ -1,28 +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/openvz-sources/openvz-sources-022.034.ebuild,v 1.3 2005/10/21 17:12:04 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.8"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-OVZ_TREE="$(get_version_component_range 1 ${PV})"
-OVZ_BUILD="$(get_version_component_range 2 ${PV})"
-OVZ_STATUS="stab"
-OVZ_VER="${OVZ_TREE}${OVZ_STATUS}${OVZ_BUILD}"
-OVZ_COREPATCH="openvz-${OVZ_VER}-core.patch.bz2"
-
-KEYWORDS="x86"
-
-DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} mirror://gentoo/${OVZ_COREPATCH}"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${FILESDIR}/linux-2.6.8.1.patch ${DISTDIR}/${OVZ_COREPATCH}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.038.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.038.ebuild
deleted file mode 100644
index cd781e6ac2ca..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-022.038.ebuild
+++ /dev/null
@@ -1,28 +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/openvz-sources/openvz-sources-022.038.ebuild,v 1.2 2005/11/05 20:43:32 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.8"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-OVZ_TREE="$(get_version_component_range 1 ${PV})"
-OVZ_BUILD="$(get_version_component_range 2 ${PV})"
-OVZ_STATUS="stab"
-OVZ_VER="${OVZ_TREE}${OVZ_STATUS}${OVZ_BUILD}"
-OVZ_COREPATCH="openvz-${OVZ_VER}-core.patch.bz2"
-
-KEYWORDS="x86"
-
-DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} mirror://gentoo/${OVZ_COREPATCH}"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${FILESDIR}/linux-2.6.8.1.patch ${DISTDIR}/${OVZ_COREPATCH}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.044.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.044.ebuild
index e77e3cda23ed..6e7d502b4393 100644
--- a/sys-kernel/openvz-sources/openvz-sources-022.044.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-022.044.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/openvz-sources/openvz-sources-022.044.ebuild,v 1.2 2005/11/26 08:57:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-022.044.ebuild,v 1.3 2005/11/26 09:10:12 hollow Exp $
 
 ETYPE="sources"
 CKV="2.6.8"
@@ -18,11 +18,13 @@ OVZ_STATUS="stab"
 OVZ_VER="${OVZ_TREE}${OVZ_STATUS}${OVZ_BUILD}"
 OVZ_COREPATCH="openvz-${OVZ_VER}-core.patch.bz2"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI} http://dev.gentoo.org/~hollow/distfiles/${OVZ_COREPATCH} http://dev.gentoo.org/~phreak/distfiles/${OVZ_COREPATCH}"
+SRC_URI="${KERNEL_URI} ${ARCH_URI} \
+	http://dev.gentoo.org/~hollow/distfiles/${OVZ_COREPATCH} \
+	http://dev.gentoo.org/~phreak/distfiles/${OVZ_COREPATCH}"
 
 UNIPATCH_STRICTORDER=1
 UNIPATCH_LIST="${DISTDIR}/${OVZ_COREPATCH}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.045-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.045-r1.ebuild
index 311fede40dff..06fd5adb331a 100644
--- a/sys-kernel/openvz-sources/openvz-sources-022.045-r1.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-022.045-r1.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/openvz-sources/openvz-sources-022.045-r1.ebuild,v 1.3 2005/11/26 08:57:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-022.045-r1.ebuild,v 1.4 2005/11/26 09:10:12 hollow Exp $
 
 ETYPE="sources"
 CKV="2.6.8"
@@ -16,7 +16,9 @@ KEYWORDS="~x86"
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI} http://dev.gentoo.org/~hollow/distfiles/${PF}.tar.bz2 http://dev.gentoo.org/~phreak/distfiles/${PF}.tar.bz2"
+SRC_URI="${KERNEL_URI} ${ARCH_URI} \
+	http://dev.gentoo.org/~hollow/distfiles/${PF}.tar.bz2 \
+	http://dev.gentoo.org/~phreak/distfiles/${PF}.tar.bz2"
 
 UNIPATCH_STRICTORDER=1
 UNIPATCH_LIST="${DISTDIR}/${PF}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.045.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.045.ebuild
deleted file mode 100644
index cd38e75cd14a..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-022.045.ebuild
+++ /dev/null
@@ -1,28 +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/openvz-sources/openvz-sources-022.045.ebuild,v 1.2 2005/11/26 08:57:48 phreak Exp $
-
-ETYPE="sources"
-CKV="2.6.8"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2 versionator
-detect_version
-detect_arch
-
-OVZ_TREE="$(get_version_component_range 1 ${PV})"
-OVZ_BUILD="$(get_version_component_range 2 ${PV})"
-OVZ_STATUS="stab"
-OVZ_VER="${OVZ_TREE}${OVZ_STATUS}${OVZ_BUILD}"
-OVZ_COREPATCH="openvz-${OVZ_VER}-core.patch.bz2"
-
-KEYWORDS="~x86"
-
-DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI} http://dev.gentoo.org/~hollow/distfiles/${OVZ_COREPATCH} http://dev.gentoo.org/~phreak/distfiles/${OVZ_COREPATCH}"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${OVZ_COREPATCH}"