Moving patches to a seperate patch tarball

Package-Manager: portage-2.1_pre4-r1

10 files changed, 60 insertions, 491 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index e045a1e2b239..6c484095b64a 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.10 2006/01/12 14:30:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.11 2006/02/18 09:18:22 phreak Exp $
+
+  18 Feb 2006; Christian Heim <phreak@gentoo.org>
+  -files/vzctl-2.7.0.23-gentoo_etc_vz.patch, -files/vzctl-2.7.0-amd64.patch,
+  -files/vzctl-2.7.0.24-pic.patch, -files/vzctl-2.7.0-gentoo_conf_d.patch,
+  vzctl-2.7.0.24.ebuild, vzctl-2.7.0.25.ebuild:
+  Moving patches to a seperate patch tarball
 
   12 Jan 2006; Benedikt Boehm <hollow@gentoo.org>
   +files/vzctl-2.7.0-amd64.patch, +files/vzctl-2.7.0.24-pic.patch,
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index ba95c5d44cb4..016b3f25fbc3 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eb5887541f4d341a74096db81a932359 ChangeLog 1836
-MD5 8aea757fe2bda9943ef7cfd6d6c51fe6 files/digest-vzctl-2.7.0.24 66
-MD5 fdc2f878f8d875de1d34854ef14675c9 files/digest-vzctl-2.7.0.25 66
+MD5 3d6fe5df8fb2372eb2ca554595b29280 ChangeLog 2132
+RMD160 b7cad5312a3f83672334c080af781c117cac6232 ChangeLog 2132
+SHA256 f63614e3dee9c70d6647a56758d58e4529f68dc6525f66fc96ac71222a62c68e ChangeLog 2132
+MD5 3236a2f9ce3ca6d1b4bd679a1a9f7d23 files/digest-vzctl-2.7.0.24 518
+RMD160 7583c7394f5774b22756ca351b7e1905cab5a918 files/digest-vzctl-2.7.0.24 518
+SHA256 163bc729b5ce1ee15d1f284baf29c2b780304a89f36cfcf0f3b5ac4f448e8441 files/digest-vzctl-2.7.0.24 518
+MD5 c6ced3cddbb3dda9a60336e82e68e52f files/digest-vzctl-2.7.0.25 518
+RMD160 96b6b1293ccff487df49dcab044152842f480216 files/digest-vzctl-2.7.0.25 518
+SHA256 9324d6f79c8c7052d3c6fc5f37675ec8ca360c14b7357840f36f37a68f4c7c9d files/digest-vzctl-2.7.0.25 518
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
-MD5 aa370ed43c03e3e93a36812d3eaf903a files/vzctl-2.7.0-amd64.patch 4434
-MD5 687eaa4427600a7a5edfc0b8b7f69480 files/vzctl-2.7.0-gentoo_conf_d.patch 3899
-MD5 48002ae17f4c768412ac70a33023d09d files/vzctl-2.7.0.23-gentoo_etc_vz.patch 7115
-MD5 d2877804e8c71fc4a8b5a9c97d2e79a7 files/vzctl-2.7.0.24-pic.patch 2419
+RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465
+SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0 files/vz.initd 5465
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
-MD5 e8ffa79f8864cae469d1c57dadede85c vzctl-2.7.0.24.ebuild 1731
-MD5 d2fb08f050dde7aa7780bf5693545a0d vzctl-2.7.0.25.ebuild 1678
+RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
+SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
+MD5 d4d7a8e7cb9d9f35dbcdd4a4b03b5a17 vzctl-2.7.0.24.ebuild 1885
+RMD160 21e6c867203bfffecbd01355991e0267d1ce2a3f vzctl-2.7.0.24.ebuild 1885
+SHA256 b26a6c6adaff7530dcd5c9cd15ab03451cf94c38ff68cd775a4955554e1657e7 vzctl-2.7.0.24.ebuild 1885
+MD5 c8da668a1a0d9703651ff9b2b7b8de0f vzctl-2.7.0.25.ebuild 1821
+RMD160 c486f836679bc2eb8c319c1aaef7fb82fe28d197 vzctl-2.7.0.25.ebuild 1821
+SHA256 9a47021cb788e622d78f0e0e59f0ad9504ad0c2493eddaf97472dd147a56d171 vzctl-2.7.0.25.ebuild 1821
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDxmgjmPFBzbX68WERAr99AJ447OBgyGB+K+BeQdO0tFNuXtH6vgCfX15E
-WvdCiDI/oekuzIfkVSdzUgg=
-=DKx3
+iD8DBQFD9uZuflZ8QqxhrsMRAgOrAJ9uHfYppwUjhxPAsqON2unVTyWfxQCgvg3y
+BezddybshKBYJwMACfqZdVc=
+=txFJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-2.7.0.24 b/sys-cluster/vzctl/files/digest-vzctl-2.7.0.24
index f90d34ce589f..0c88fae313d7 100644
--- a/sys-cluster/vzctl/files/digest-vzctl-2.7.0.24
+++ b/sys-cluster/vzctl/files/digest-vzctl-2.7.0.24
@@ -1 +1,6 @@
 MD5 89bca7cc0936156905b1f01f778b09ff vzctl-2.7.0-24.tar.bz2 97877
+RMD160 6550566690360f157373314f23cc1f434fdaf8fa vzctl-2.7.0-24.tar.bz2 97877
+SHA256 438e254a3f5b1e2ad275b0aff67d8c6d12fe8dcf1714f7e786bb6ed266559a85 vzctl-2.7.0-24.tar.bz2 97877
+MD5 c63d22d7285609f6043ab6bb1696be51 vzctl-2.7.0.24-patches-r0.tar.bz2 4694
+RMD160 916881b0fbaca73d2f1e8cb8e8cd86afa902c837 vzctl-2.7.0.24-patches-r0.tar.bz2 4694
+SHA256 c7e49daccc43c0e452a02e3d619c501de40edec502b0d5bbe1a1c6bb18434bc8 vzctl-2.7.0.24-patches-r0.tar.bz2 4694
diff --git a/sys-cluster/vzctl/files/digest-vzctl-2.7.0.25 b/sys-cluster/vzctl/files/digest-vzctl-2.7.0.25
index e4562890a9ae..eb92f61de3cb 100644
--- a/sys-cluster/vzctl/files/digest-vzctl-2.7.0.25
+++ b/sys-cluster/vzctl/files/digest-vzctl-2.7.0.25
@@ -1 +1,6 @@
 MD5 4b588927a590c8e91b185ba9442f97d6 vzctl-2.7.0-25.tar.bz2 98704
+RMD160 0de2485e9041a23c8d164f42f2e0582a9ae12e1a vzctl-2.7.0-25.tar.bz2 98704
+SHA256 1082fdbad27f8c849379b596fc5abadec1171448afdf77017dafe4b93b7d2f50 vzctl-2.7.0-25.tar.bz2 98704
+MD5 5b65deec759d048b5c47875c5d953a58 vzctl-2.7.0.25-patches-r0.tar.bz2 3920
+RMD160 f6f9432a46e5b011b418fdc14f999a186994b3e2 vzctl-2.7.0.25-patches-r0.tar.bz2 3920
+SHA256 c93932031279cb6a85592b59cbb06d4b6d1f2eac73a71418e53fa548232b4a11 vzctl-2.7.0.25-patches-r0.tar.bz2 3920
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch b/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch
deleted file mode 100644
index bc8c482277a8..000000000000
--- a/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -NurpP vzctl-2.7.0-25/etc/ifup-venet vzctl-2.7.0-25-amd64/etc/ifup-venet
---- vzctl-2.7.0-25/etc/ifup-venet	2005-12-29 16:57:05.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/ifup-venet	2006-01-12 16:54:15.145147672 +0300
-@@ -21,7 +21,7 @@ vznet=$DEVICE
- modvenet="vznetdev vznet"
- 
- . /etc/init.d/functions
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- . /etc/sysconfig/vz
- 
- veinfo="/proc/vz/veinfo"
-diff -NurpP vzctl-2.7.0-25/etc/vps-create vzctl-2.7.0-25-amd64/etc/vps-create
---- vzctl-2.7.0-25/etc/vps-create	2005-12-29 16:57:05.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/vps-create	2006-01-12 16:54:09.680978352 +0300
-@@ -16,7 +16,7 @@
- #   VE_PRVT		- path to root of VPS private areas
- #   PRIVATE_TEMPLATE	- path to private template used as a source for copying
- 
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- 
- vzcheckvar VE_PRVT PRIVATE_TEMPLATE
- 
-diff -NurpP vzctl-2.7.0-25/etc/vps-net_add vzctl-2.7.0-25-amd64/etc/vps-net_add
---- vzctl-2.7.0-25/etc/vps-net_add	2005-12-29 16:57:05.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/vps-net_add	2006-01-12 16:54:09.681978200 +0300
-@@ -18,7 +18,7 @@
- #                   (several addresses should be divided by space)
- #   VE_STATE      - state of VPS; could be one of:
- #                     starting | stopping | running | stopped
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- 
- vzcheckvar VEID
- 
-diff -NurpP vzctl-2.7.0-25/etc/vps-net_del vzctl-2.7.0-25-amd64/etc/vps-net_del
---- vzctl-2.7.0-25/etc/vps-net_del	2005-12-29 16:57:05.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/vps-net_del	2006-01-12 16:54:09.682978048 +0300
-@@ -18,7 +18,7 @@
- #   VE_STATE      - state of VPS; could be one of:
- #                     starting | stopping | running | stopped
- 
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- 
- vzcheckvar IP_ADDR VEID
- 
-diff -NurpP vzctl-2.7.0-25/etc/vps-stop vzctl-2.7.0-25-amd64/etc/vps-stop
---- vzctl-2.7.0-25/etc/vps-stop	2005-12-29 16:57:05.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/vps-stop	2006-01-12 16:54:09.682978048 +0300
-@@ -15,7 +15,7 @@
- #   VEID    - VPS id
- #   IP_ADDR - VPS IP address(es) divided by spaces
- 
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- 
- # get list of network devices for vzarp
- vzgetnetdev
-diff -NurpP vzctl-2.7.0-25/etc/vpsnetclean vzctl-2.7.0-25-amd64/etc/vpsnetclean
---- vzctl-2.7.0-25/etc/vpsnetclean	2005-12-29 16:57:06.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/etc/vpsnetclean	2006-01-12 16:54:09.683977896 +0300
-@@ -9,7 +9,7 @@
- # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- #
- 
--. /usr/lib/vzctl/scripts/vps-functions
-+. /usr/lib64/vzctl/scripts/vps-functions
- 
- VEINFO=/proc/vz/veinfo
- PROC_PROXY_TR=/proc/proxy/targets
-diff -NurpP vzctl-2.7.0-25/include/modules.h vzctl-2.7.0-25-amd64/include/modules.h
---- vzctl-2.7.0-25/include/modules.h	2005-12-29 16:57:06.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/include/modules.h	2006-01-12 16:52:10.262132776 +0300
-@@ -17,7 +17,7 @@
- #define	TYPE_CMD	0
- #define	TYPE_CONF	1
- 
--#define MOD_DIR		"/usr/lib/vzctl/modules/"
-+#define MOD_DIR		"/usr/lib64/vzctl/modules/"
- 
- #define MOD_INFO_SYM    "vz_get_mod_info"
- 
-diff -NurpP vzctl-2.7.0-25/include/types.h vzctl-2.7.0-25-amd64/include/types.h
---- vzctl-2.7.0-25/include/types.h	2005-12-29 16:57:06.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/include/types.h	2006-01-12 16:52:23.307149632 +0300
-@@ -13,8 +13,8 @@
- 
- #define GLOBAL_CFG              "/etc/conf.d/vz"
- #define VPS_CONF_DIR            "/etc/vz/"
--#define LIB_DIR			"/usr/lib/vzctl/lib/"
--#define VPS_SCRIPTS_DIR         "/usr/lib/vzctl/scripts/"
-+#define LIB_DIR			"/usr/lib64/vzctl/lib/"
-+#define VPS_SCRIPTS_DIR         "/usr/lib64/vzctl/scripts/"
- 
- #define VPS_STOP		VPS_SCRIPTS_DIR "vps-stop"
- #define VPS_NET_ADD		VPS_SCRIPTS_DIR "vps-net_add"
-diff -NurpP vzctl-2.7.0-25/src/Makefile vzctl-2.7.0-25-amd64/src/Makefile
---- vzctl-2.7.0-25/src/Makefile	2005-12-29 16:57:06.000000000 +0300
-+++ vzctl-2.7.0-25-amd64/src/Makefile	2006-01-12 16:51:56.383242688 +0300
-@@ -11,7 +11,7 @@
-      INSTALL = install
-       PREFIX = /usr
-      SBINDIR = $(PREFIX)/sbin
--      LIBDIR = $(PREFIX)/lib/vzctl
-+      LIBDIR = $(PREFIX)/lib64/vzctl
-     CACHEDIR = /vz/template/cache
-    GLBCONFIG = /etc/sysconfig/vz
-   VPSCONFDIR = /etc/sysconfig/vz-scripts
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0-gentoo_conf_d.patch b/sys-cluster/vzctl/files/vzctl-2.7.0-gentoo_conf_d.patch
deleted file mode 100644
index b5d3cfa8fe5c..000000000000
--- a/sys-cluster/vzctl/files/vzctl-2.7.0-gentoo_conf_d.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur vzctl-2.7.0-21/etc/vpsnetclean vzctl-2.7.0-21-gentoo/etc/vpsnetclean
---- vzctl-2.7.0-21/etc/vpsnetclean	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/etc/vpsnetclean	2005-09-23 00:43:35.000000000 +0400
-@@ -17,7 +17,7 @@
- VE_RUN=
- VE_PREV=
- 
--. /etc/sysconfig/vz
-+. /etc/conf.d/vz
- 
- 
- #
-diff -ur vzctl-2.7.0-21/etc/vpsreboot vzctl-2.7.0-21-gentoo/etc/vpsreboot
---- vzctl-2.7.0-21/etc/vpsreboot	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/etc/vpsreboot	2005-09-23 00:42:56.000000000 +0400
-@@ -16,8 +16,8 @@
- REBOOT_MARK='reboot'
- LOCKFILE='/var/lock/vereboot.lock'
- 
--[ -f /etc/sysconfig/vz ] || exit
--. /etc/sysconfig/vz
-+[ -f /etc/conf.d/vz ] || exit
-+. /etc/conf.d/vz
- 
- function check_reboot()
- {
-@@ -28,7 +28,7 @@
- 	VEID=${veid}
- 	[ -f "${CONF_DIR}/${veid}.conf" ] || return
- 	eval ` (
--		. /etc/sysconfig/vz;
-+		. /etc/conf.d/vz;
- 		. ${CONF_DIR}/${veid}.conf;
- 		echo ve_root=${VE_ROOT}\;;
- 		echo allowreboot=${ALLOWREBOOT}\;;
-diff -ur vzctl-2.7.0-21/include/types.h vzctl-2.7.0-21-gentoo/include/types.h
---- vzctl-2.7.0-21/include/types.h	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/include/types.h	2005-09-23 00:48:31.000000000 +0400
-@@ -11,7 +11,7 @@
- #ifndef	_TYPES_H_
- #define	_TYPES_H_
- 
--#define GLOBAL_CFG              "/etc/sysconfig/vz"
-+#define GLOBAL_CFG              "/etc/conf.d/vz"
- #define VPS_CONF_DIR            "/etc/sysconfig/vz-scripts/"
- #define LIB_DIR			"/usr/lib/vzctl/lib/"
- #define VPS_SCRIPTS_DIR         "/usr/lib/vzctl/scripts/"
-diff -ur vzctl-2.7.0-21/include/vzlist.h vzctl-2.7.0-21-gentoo/include/vzlist.h
---- vzctl-2.7.0-21/include/vzlist.h	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/include/vzlist.h	2005-09-23 19:50:57.549383320 +0400
-@@ -26,7 +26,7 @@
- #define PROCFSHED	"/proc/fairsched"
- 
- #define SCRIPT_DIR	"/etc/sysconfig/vz-scripts/"
--#define CFG_FILE	"/etc/sysconfig/vz"
-+#define CFG_FILE	"/etc/conf.d/vz"
- #define VZQUOTA		"/usr/sbin/vzquota"
- 
- #define MAXCPUUNITS	500000
-diff -ur vzctl-2.7.0-21/man/vz.5 vzctl-2.7.0-21-gentoo/man/vz.5
---- vzctl-2.7.0-21/man/vz.5	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/man/vz.5	2005-09-23 00:47:11.000000000 +0400
-@@ -2,7 +2,7 @@
- .SH NAME
- vz \- global Open Virtuozzo configuration file
- .SH SYNOPSIS
--/etc/sysconfig/vz
-+/etc/conf.d/vz
- .SH DESCRIPTION
- This is global configuration file for Open Virtuozzo.
- It consists of lines in the form
-diff -ur vzctl-2.7.0-21/man/vzctl.8 vzctl-2.7.0-21-gentoo/man/vzctl.8
---- vzctl-2.7.0-21/man/vzctl.8	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/man/vzctl.8	2005-09-23 00:47:29.000000000 +0400
-@@ -421,7 +421,7 @@
- .SH FILES
- .ad l
- \f(CR
--/etc/sysconfig/vz
-+/etc/conf.d/vz
- .br
- /etc/sysconfig/vz-scripts/vpsid.conf
- .br
-diff -ur vzctl-2.7.0-21/src/Makefile vzctl-2.7.0-21-gentoo/src/Makefile
---- vzctl-2.7.0-21/src/Makefile	2005-09-12 19:23:58.000000000 +0400
-+++ vzctl-2.7.0-21-gentoo/src/Makefile	2005-09-23 19:46:37.460922776 +0400
-@@ -13,7 +13,7 @@
-      SBINDIR = $(PREFIX)/sbin
-       LIBDIR = $(PREFIX)/lib/vzctl
-     CACHEDIR = /vz/template/cache
--   GLBCONFIG = /etc/sysconfig/vz
-+   VZCONFDIR = /etc/conf.d
-   VPSCONFDIR = /etc/sysconfig/vz-scripts
-  DISTCONFDIR = $(VPSCONFDIR)/dists
- NETSCRIPTDIR = /etc/sysconfig/network-scripts
-@@ -122,7 +122,7 @@
- 		$(INSTALL) ../etc/$$file $(DESTDIR)$(NETSCRIPTDIR)/$$file; \
- 	done
- inst-configs:
--	$(INSTALL) -m 644 ../etc/vz $(DESTDIR)$(GLBCONFIG)
-+	$(INSTALL) -m 644 ../etc/vz $(DESTDIR)$(VZCONFDIR)/vz
- ifeq ($(ARCH),ia64)
- 	for file in $(VECONFIG); do \
- 		$(INSTALL) ../etc/$$file.ia64 $(DESTDIR)$(VPSCONFDIR)/$$file; \
-@@ -153,6 +153,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(VZLOCKDIR)
- 	$(INSTALL) -d $(DESTDIR)$(LOGRDIR)
- 	$(INSTALL) -d $(DESTDIR)$(CACHEDIR)
-+	$(INSTALL) -d $(DESTDIR)$(VZCONFDIR)
- 	$(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl
- 
- install-lib: inst-lib
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
deleted file mode 100644
index 3d8054e28c16..000000000000
--- a/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -urN vzctl-2.7.0-23/etc/cron.d/vpsnetclean vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean
---- vzctl-2.7.0-23/etc/cron.d/vpsnetclean	2005-08-05 19:46:38.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean	2005-10-23 00:31:40.956253816 +0400
-@@ -10,5 +10,5 @@
- # Clean VPS network rules (arp,route,iptables)
- #
- 
--*/5 * * * * root /etc/sysconfig/vz-scripts/vpsnetclean
-+*/5 * * * * root /etc/vz/vpsnetclean
- 
-diff -urN vzctl-2.7.0-23/etc/cron.d/vpsreboot vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot
---- vzctl-2.7.0-23/etc/cron.d/vpsreboot	2005-08-05 20:40:45.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot	2005-10-23 00:31:40.957253664 +0400
-@@ -11,4 +11,4 @@
- # If vzagent not installed you can enable reboot functionality by
- # commented out the line below.
- 
--*/5 * * * * root /etc/sysconfig/vz-scripts/vpsreboot
-+*/5 * * * * root /etc/vz/vpsreboot
-diff -urN vzctl-2.7.0-23/etc/dists/Makefile vzctl-2.7.0-23_etc_vz/etc/dists/Makefile
---- vzctl-2.7.0-23/etc/dists/Makefile	2005-08-12 16:37:33.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/etc/dists/Makefile	2005-10-23 00:31:40.957253664 +0400
-@@ -8,7 +8,7 @@
- # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- 
- INSTALL = install
--DISTCONFDIR = /etc/sysconfig/vz-scripts/dists
-+DISTCONFDIR = /etc/vz/dists
- DISTSCRIPTDIR = ${DISTCONFDIR}/scripts
- DISTSCRIPTS = debian-add_ip.sh debian-del_ip.sh debian-set_hostname.sh 	\
- 	functions postcreate.sh redhat-7.x_add_ip.sh redhat-add_ip.sh 	\
-diff -urN vzctl-2.7.0-23/etc/vps-functions vzctl-2.7.0-23_etc_vz/etc/vps-functions
---- vzctl-2.7.0-23/etc/vps-functions	2005-10-17 13:55:59.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/etc/vps-functions	2005-10-23 00:31:40.957253664 +0400
-@@ -26,7 +26,7 @@
- 
- # iptables parameters
- VE_STATE_DIR="/var/vz/veip/"
--CONF_DIR="/etc/sysconfig/vz-scripts/"
-+CONF_DIR="/etc/vz/"
- 
- ARPSEND_CMD="arpsend -c 1 -w 1"
- IP_CMD=/sbin/ip
-diff -urN vzctl-2.7.0-23/etc/vpsreboot vzctl-2.7.0-23_etc_vz/etc/vpsreboot
---- vzctl-2.7.0-23/etc/vpsreboot	2005-10-23 00:30:51.060839072 +0400
-+++ vzctl-2.7.0-23_etc_vz/etc/vpsreboot	2005-10-23 00:31:40.958253512 +0400
-@@ -11,7 +11,7 @@
- # Script to start VPS was rebooted
- #
- 
--CONF_DIR=/etc/sysconfig/vz-scripts
-+CONF_DIR=/etc/vz
- VE_INFO=/proc/vz/veinfo
- REBOOT_MARK='reboot'
- LOCKFILE='/var/lock/vereboot.lock'
-diff -urN vzctl-2.7.0-23/include/dist.h vzctl-2.7.0-23_etc_vz/include/dist.h
---- vzctl-2.7.0-23/include/dist.h	2005-08-19 18:08:38.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/include/dist.h	2005-10-23 00:31:40.958253512 +0400
-@@ -23,7 +23,7 @@
- #define	SET_UGID_QUOTA		6
- #define	POST_CREATE		7
- 
--#define DIST_DIR		"/etc/sysconfig/vz-scripts/dists"
-+#define DIST_DIR		"/etc/vz/dists"
- 
- typedef struct {
- 	char *def_ostmpl;
-diff -urN vzctl-2.7.0-23/include/types.h vzctl-2.7.0-23_etc_vz/include/types.h
---- vzctl-2.7.0-23/include/types.h	2005-10-23 00:30:51.060839072 +0400
-+++ vzctl-2.7.0-23_etc_vz/include/types.h	2005-10-23 00:31:40.958253512 +0400
-@@ -12,7 +12,7 @@
- #define	_TYPES_H_
- 
- #define GLOBAL_CFG              "/etc/conf.d/vz"
--#define VPS_CONF_DIR            "/etc/sysconfig/vz-scripts/"
-+#define VPS_CONF_DIR            "/etc/vz/"
- #define LIB_DIR			"/usr/lib/vzctl/lib/"
- #define VPS_SCRIPTS_DIR         "/usr/lib/vzctl/scripts/"
- 
-diff -urN vzctl-2.7.0-23/include/vzlist.h vzctl-2.7.0-23_etc_vz/include/vzlist.h
---- vzctl-2.7.0-23/include/vzlist.h	2005-10-23 00:30:51.061838920 +0400
-+++ vzctl-2.7.0-23_etc_vz/include/vzlist.h	2005-10-23 00:31:40.959253360 +0400
-@@ -25,7 +25,7 @@
- #define PROCVEINFO	"/proc/vz/veinfo"
- #define PROCFSHED	"/proc/fairsched"
- 
--#define SCRIPT_DIR	"/etc/sysconfig/vz-scripts/"
-+#define SCRIPT_DIR	"/etc/vz/"
- #define CFG_FILE	"/etc/conf.d/vz"
- #define VZQUOTA		"/usr/sbin/vzquota"
- 
-diff -urN vzctl-2.7.0-23/man/vps.conf.5 vzctl-2.7.0-23_etc_vz/man/vps.conf.5
---- vzctl-2.7.0-23/man/vps.conf.5	2005-10-17 16:50:30.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/man/vps.conf.5	2005-10-23 00:31:40.959253360 +0400
-@@ -3,10 +3,10 @@
- .SH NAME
- vps.conf \- configuration file for a Virtual Private Server.
- .SH SYNOPSIS
--/etc/sysconfig/vz-scripts/XXX.conf
-+/etc/vz/XXX.conf
- .SH DESCRIPTION
- This is a configuration file for a VPS. It is stored as
--\fB/etc/sysconfig/vz-scripts/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR
-+\fB/etc/vz/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR
- is the ID of the given VPS.
- .PP
- Configuration file consists of lines in the form
-diff -urN vzctl-2.7.0-23/man/vzctl.8 vzctl-2.7.0-23_etc_vz/man/vzctl.8
---- vzctl-2.7.0-23/man/vzctl.8	2005-10-23 00:30:51.062838768 +0400
-+++ vzctl-2.7.0-23_etc_vz/man/vzctl.8	2005-10-23 00:31:40.960253208 +0400
-@@ -318,7 +318,7 @@
- .TP
- \fB--applyconfig\fR \fIname\fR
- Read VPS parameters from VPS sample configuration file
--\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and
-+\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and
- apply them, if --save option specified save to VPS config file. These parameters
- are not changed (\fBHOSTNAME\fR \fBIP_ADDRESS\fR \fBOSTEMPLATE\fR \fBVE_ROOT\fR \fBVE_PRIVATE\fR)
- .SS Performing VPS actions
-@@ -328,7 +328,7 @@
- 
- If the \fB--config\fR \fIname\fR option is specified, values from
- example configuration file
--\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR
-+\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR
- are put into VPS configuration file. If VPS configuration file already exists,
- it will be removed.
- 
-@@ -422,7 +422,7 @@
- \f(CR
- /etc/conf.d/vz
- .br
--/etc/sysconfig/vz-scripts/vpsid.conf
-+/etc/vz/vpsid.conf
- .br
- /proc/vz/veinfo
- .br
-diff -urN vzctl-2.7.0-23/man/vzsplit.8 vzctl-2.7.0-23_etc_vz/man/vzsplit.8
---- vzctl-2.7.0-23/man/vzsplit.8	2005-10-17 16:50:30.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/man/vzsplit.8	2005-10-23 00:31:54.328220968 +0400
-@@ -16,7 +16,7 @@
- .TP
- \fB-f\fR \fIconf_name\fR
- Specify the configuration file name. The program output is placed to
--/etc/sysconfig/vz-scripts/ve-\fIconf_name\fR.conf-sample.
-+/etc/vz/ve-\fIconf_name\fR.conf-sample.
- .TP
- \fB-s\fR \fIswapsize\fR
- Specify the swap size in Kbytes. If not provided in the option, the swap size will be read from /proc/meminfo.
-diff -urN vzctl-2.7.0-23/src/Makefile vzctl-2.7.0-23_etc_vz/src/Makefile
---- vzctl-2.7.0-23/src/Makefile	2005-10-23 00:30:51.063838616 +0400
-+++ vzctl-2.7.0-23_etc_vz/src/Makefile	2005-10-23 00:31:40.961253056 +0400
-@@ -14,7 +14,7 @@
-       LIBDIR = $(PREFIX)/lib/vzctl
-     CACHEDIR = /vz/template/cache
-    VZCONFDIR = /etc/conf.d
--  VPSCONFDIR = /etc/sysconfig/vz-scripts
-+  VPSCONFDIR = /etc/vz
-  DISTCONFDIR = $(VPSCONFDIR)/dists
- NETSCRIPTDIR = /etc/sysconfig/network-scripts
-     CRONDDIR = /etc/cron.d
-diff -urN vzctl-2.7.0-23/src/vzsplit.c vzctl-2.7.0-23_etc_vz/src/vzsplit.c
---- vzctl-2.7.0-23/src/vzsplit.c	2005-09-27 15:01:16.000000000 +0400
-+++ vzctl-2.7.0-23_etc_vz/src/vzsplit.c	2005-10-23 00:31:40.962252904 +0400
-@@ -27,7 +27,7 @@
- 
- #define PROCMEM		"/proc/meminfo"
- #define PROCTHREADS	"/proc/sys/kernel/threads-max"
--#define OUTPATH		"/etc/sysconfig/vz-scripts/"
-+#define OUTPATH		"/etc/vz/"
- #define PROCCPU		"/proc/cpuinfo"
- 
- #define MAX_SL		3
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch
deleted file mode 100644
index 86601bb7ec32..000000000000
--- a/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: src/Makefile
-===================================================================
-RCS file: /home/l/cvs/Virtuozzo/Packages/swsoft/vzctl/src/Attic/Makefile,v
-retrieving revision 1.1.2.44
-diff -u -r1.1.2.44 Makefile
---- src/Makefile	24 Oct 2005 13:09:05 -0000	1.1.2.44
-+++ src/Makefile	15 Nov 2005 12:37:19 -0000
-@@ -25,16 +25,17 @@
- 
- export LD_LIBRARY_PATH=.
- CC = gcc
--CFLAGS = -Wall -g2 
-+CFLAGS = -Wall -g2
-+SHAREDLIB_CFLAGS = -fPIC
- VZKERNEL_HEADERS ?= /lib/modules/$(shell uname -r)/build/include
- INC = -I ../include -I$(VZKERNEL_HEADERS)
- ARCH=$(shell uname -i)
- 
--OBJ_libvzctl = lib/env.o lib/ub.o lib/net.o lib/logger.o lib/exec.o lib/cap.o \
--	lib/cpu.o lib/res.o lib/util.o lib/dist.o lib/list.o lib/script.o \
--	lib/dev.o lib/config.o lib/lock.o lib/quota.o lib/modules.o \
--	lib/iptables.o lib/fs.o lib/create.o
--OBJ_simfs=lib/fs_simfs.o
-+OBJ_libvzctl = lib/env.lo lib/ub.lo lib/net.lo lib/logger.lo lib/exec.lo \
-+	lib/cap.lo lib/cpu.lo lib/res.lo lib/util.lo lib/dist.lo lib/list.lo \
-+	lib/script.lo lib/dev.lo lib/config.lo lib/lock.lo lib/quota.lo \
-+	lib/modules.lo lib/iptables.lo lib/fs.lo lib/create.lo
-+OBJ_simfs=lib/fs_simfs.lo
- OBJ_vzctl = vzctl.o vzctl-actions.o modules.o enter.o
- OBJ_vzlist = vzlist.o
- OBJ_arp = arpsend.o
-@@ -42,7 +43,9 @@
- OBJ_memcheck = vzmemcheck.o validate.o
- OBJ_cfgvalidate = vzcfgvalidate.o validate.o
- OBJ_calc = vzcalc.o
--OBJ = $(OBJ_libvzctl) $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_split)
-+OBJ = $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_arp) $(OBJ_split) $(OBJ_memcheck) \
-+	$(OBJ_cfgvalidate) $(OBJ_calc)
-+SOBJ = $(OBJ_libvzctl) $(OBJ_simfs)
- LIB_vzctl = libvzctl.so.$(LIB_VER)
- LIB_simfs = libvzctl-simfs.so.$(LIB_VER)
- LIB_fs = libvzctl-fs.so
-@@ -69,6 +72,9 @@
- %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INC) $< -o $@
- 
-+%.lo: %.c
-+	$(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@
-+
- $(LIB_simfs) : $(OBJ_simfs)
- 	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@
- 
-@@ -170,10 +176,10 @@
- install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
- 	inst-netscripts inst-configs inst-initd inst-cron
- clean:
--	rm -f *.o lib/*.o $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
-+	rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
- 
--.depend:: $(OBJ:.o=.c)
--	$(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $(OBJ:.o=.c) >.depend
-+.depend:: $(OBJ:.o=.c) $(SOBJ:.lo=.c)
-+	$(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $^ >.depend
- 
- depend:: .depend
- 
diff --git a/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild b/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
index 4e3f7f1abf9e..b305772895c5 100644
--- a/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
+++ b/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild,v 1.4 2006/01/12 14:30:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild,v 1.5 2006/02/18 09:18:22 phreak Exp $
 
 inherit eutils toolchain-funcs versionator linux-info
 
@@ -11,7 +11,9 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="OpenVZ VPS control utility"
 HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
+SRC_URI="http://download.openvz.org/utils/${PN}/${MY_PV}/src/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
 
 LICENSE="QPL-1.0"
 SLOT="0"
@@ -42,17 +44,17 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
+	unpack ${A}
+	cd "${S}"
 
-	epatch "${FILESDIR}"/vzctl-2.7.0-gentoo_conf_d.patch
-	epatch "${FILESDIR}"/vzctl-2.7.0.23-gentoo_etc_vz.patch
+	epatch "${WORKDIR}"/patches/vzctl-2.7.0-gentoo_conf_d.patch
+	epatch "${WORKDIR}"/patches/vzctl-2.7.0.23-gentoo_etc_vz.patch
 
 	# fix hardcoded lib paths
-	use amd64 && epatch "${FILESDIR}"/vzctl-2.7.0-amd64.patch
+	use amd64 && epatch "${WORKDIR}"/patches/vzctl-2.7.0-amd64.patch
 
-	# PIC
-	epatch "${FILESDIR}"/vzctl-2.7.0.24-pic.patch
+	# fix PIC
+	epatch "${WORKDIR}"/patches/vzctl-2.7.0.24-pic.patch
 }
 
 src_compile() {
diff --git a/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild b/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
index 5458c36fc1f1..eade96600116 100644
--- a/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
+++ b/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild,v 1.2 2006/01/12 14:30:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild,v 1.3 2006/02/18 09:18:22 phreak Exp $
 
 inherit eutils toolchain-funcs versionator linux-info
 
@@ -11,7 +11,9 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="OpenVZ VPS control utility"
 HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
+SRC_URI="http://download.openvz.org/utils/${PN}/${MY_PV}/src/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
 
 LICENSE="QPL-1.0"
 SLOT="0"
@@ -42,14 +44,14 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
+	unpack ${A}
+	cd "${S}"
 
-	epatch "${FILESDIR}"/vzctl-2.7.0-gentoo_conf_d.patch
-	epatch "${FILESDIR}"/vzctl-2.7.0.23-gentoo_etc_vz.patch
+	epatch "${WORKDIR}"/patches/vzctl-2.7.0-gentoo_conf_d.patch
+	epatch "${WORKDIR}"/patches/vzctl-2.7.0.23-gentoo_etc_vz.patch
 
 	# fix hardcoded lib paths
-	use amd64 && epatch "${FILESDIR}"/vzctl-2.7.0-amd64.patch
+	use amd64 && epatch "${WORKDIR}"/patches/vzctl-2.7.0-amd64.patch
 }
 
 src_compile() {