8 files changed, 17 insertions, 192 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 72496c66a537..841cb8ba1d80 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.49 2007/08/16 11:43:29 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.50 2007/11/20 07:05:07 pva Exp $
+
+  20 Nov 2007; <pva@gentoo.org> -files/vzctl-3.0.14-ndsend.c.patch,
+  metadata.xml, -vzctl-3.0.0.8.ebuild, -vzctl-3.0.14.ebuild:
+  Added myself into metadata. Clean old.
 
 *vzctl-3.0.18-r1 (16 Aug 2007)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 009a18c7e7d4..b7607e8bbf6d 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,31 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d71109db574f565d2f733332cfafcf50 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465
 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0 files/vz.initd 5465
-AUX vzctl-3.0.14-ndsend.c.patch 333 RMD160 0a1fda036be77bfc5b4569ba5c0df395deb0ec7a SHA1 d0c99f4d6535425031f7b840a6667d77be36b120 SHA256 8fef90a7b4c8193c0df7b8460fc5345bf7eca5b07d7a00691a7468fe45967418
-MD5 10807ba11492d1d129a88aaa5259912c files/vzctl-3.0.14-ndsend.c.patch 333
-RMD160 0a1fda036be77bfc5b4569ba5c0df395deb0ec7a files/vzctl-3.0.14-ndsend.c.patch 333
-SHA256 8fef90a7b4c8193c0df7b8460fc5345bf7eca5b07d7a00691a7468fe45967418 files/vzctl-3.0.14-ndsend.c.patch 333
 AUX vzctl-3.0.16-prevent-stripping.patch 1407 RMD160 beac951027ab76136ce2dc7f15690e7c1fe829f9 SHA1 4d25c369ab3a27201ae2c1954daf6f322874b801 SHA256 bc1299d1fe12fe720309f06df5360ab49ce3f6ab282398f6ff155fab43020c1f
 MD5 98c14895aed6ac13e2fc14ed15f7ffb0 files/vzctl-3.0.16-prevent-stripping.patch 1407
 RMD160 beac951027ab76136ce2dc7f15690e7c1fe829f9 files/vzctl-3.0.16-prevent-stripping.patch 1407
 SHA256 bc1299d1fe12fe720309f06df5360ab49ce3f6ab282398f6ff155fab43020c1f files/vzctl-3.0.16-prevent-stripping.patch 1407
-DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 SHA1 f6dc12f3572897cbc9f0ebf8b4f438756b320983 SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632
-DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 SHA1 727e323d73c3505ebc47221850df7f695f7bc43d SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535
-DIST vzctl-3.0.14.tar.bz2 356300 RMD160 529b4e3bb1fbcf673831d2891becedf6e003dcd8 SHA1 c773b495d688ee6b172d1c0941a5a57e2c188c57 SHA256 86be0231fd12f97e45bae8dae86fadc466e631051d4ee04569d40bb8f82d8b83
 DIST vzctl-3.0.16.tar.bz2 356821 RMD160 5127a73652f616e5a595b66837ea79c98bd7ad33 SHA1 096903901ec41b98b7723dcb010f19f4c69009dd SHA256 c88acc850efef172ca1f66383af895f5c199325cf7049d2d4608e6eb42ac5b63
 DIST vzctl-3.0.18.tar.bz2 359655 RMD160 9c7169e151c6384fd489df3dd6392d442706f46f SHA1 35bc546f9af7254b1739bca9cead71b8dad04ca1 SHA256 8610efa9a8327a1b6457eaa28b772ad753db5f23c2c18b25bb3ce0cf6a929e2f
-EBUILD vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 SHA1 a3d5124f6e47ff95f5b7fc5359533f88e893542e SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c
-MD5 8c19abdd920fd9bc4734c496aae0bec4 vzctl-3.0.0.8.ebuild 1720
-RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 vzctl-3.0.0.8.ebuild 1720
-SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c vzctl-3.0.0.8.ebuild 1720
-EBUILD vzctl-3.0.14.ebuild 1602 RMD160 9f24bc44adf9a5174d93c2f6024fd0e1fac3b0e3 SHA1 49a5a7dbdfb739557be2a5866285201416248c2a SHA256 a1b2a3fde2acc9f7ab181a80a2df173f7f1c80bb1ed17ee22e23596d4725a6e5
-MD5 c5f211fd46dc01a71c4b62d2449b4594 vzctl-3.0.14.ebuild 1602
-RMD160 9f24bc44adf9a5174d93c2f6024fd0e1fac3b0e3 vzctl-3.0.14.ebuild 1602
-SHA256 a1b2a3fde2acc9f7ab181a80a2df173f7f1c80bb1ed17ee22e23596d4725a6e5 vzctl-3.0.14.ebuild 1602
 EBUILD vzctl-3.0.16.ebuild 1678 RMD160 3037263cc90684873a99c1226ca681ba917d8d6e SHA1 dadc7a817a78b516b4da0faab11f618837ccbeef SHA256 7a292a2a9399e785f78c9fc7087a5980f3f98f55624ad9d92f1fb9dcb08de0d5
 MD5 bbaca2195858fe7d327ce65c4ad82247 vzctl-3.0.16.ebuild 1678
 RMD160 3037263cc90684873a99c1226ca681ba917d8d6e vzctl-3.0.16.ebuild 1678
@@ -38,20 +20,14 @@ EBUILD vzctl-3.0.18.ebuild 1586 RMD160 eb7467d883cd321ca02b7b5fa8c29846f12d60a6
 MD5 a54e090eb0fa27304412517ec04e20af vzctl-3.0.18.ebuild 1586
 RMD160 eb7467d883cd321ca02b7b5fa8c29846f12d60a6 vzctl-3.0.18.ebuild 1586
 SHA256 d3716ff68f1fb677f7d078d694e1e39df9d87d911e53b7f2ffe2222d7559b7a1 vzctl-3.0.18.ebuild 1586
-MISC ChangeLog 9249 RMD160 23e04b5665b56dce2feb22b8db1e901e99c6eea7 SHA1 28295114bef4a921fef0cc51796460b6750cea6e SHA256 c0de3a84d4a04d62d08e31f8f7f5b8d44711279d7e4070e83cff05c653238eb8
-MD5 8ed469d6741e27e9ff41b3e292e5fa13 ChangeLog 9249
-RMD160 23e04b5665b56dce2feb22b8db1e901e99c6eea7 ChangeLog 9249
-SHA256 c0de3a84d4a04d62d08e31f8f7f5b8d44711279d7e4070e83cff05c653238eb8 ChangeLog 9249
-MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
-MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
-RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
-SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
-MD5 29df91389efeb4843177a9078a89ca58 files/digest-vzctl-3.0.0.8 515
-RMD160 9e0f277c9a8385fa918174cc1edc0f9e641dec50 files/digest-vzctl-3.0.0.8 515
-SHA256 dc1dba3fb70c9a7212de8916eaaeb3c2b4a6b847702d90e0c58d06c62e9b3dc2 files/digest-vzctl-3.0.0.8 515
-MD5 604d30b9c731718babaeebabb624dd01 files/digest-vzctl-3.0.14 241
-RMD160 f2ada0ab328e14ff8b97255c320a6fdc82b9f89a files/digest-vzctl-3.0.14 241
-SHA256 f31d206d22b741c4a7e5b5acee694512e153e1d7f8c4e61e1e9d31c9d633d611 files/digest-vzctl-3.0.14 241
+MISC ChangeLog 9417 RMD160 a5f7f655ea930fbecd833100de036eaebaa40f5a SHA1 c5409ce1de6a5390cb3214d754422a3bad5ca431 SHA256 57fa20a8549451cb64c0121af1a2c4a5805c81bea8c6f0633a47fb349c6777b8
+MD5 a94113c79b31197eeebd99a9188549cb ChangeLog 9417
+RMD160 a5f7f655ea930fbecd833100de036eaebaa40f5a ChangeLog 9417
+SHA256 57fa20a8549451cb64c0121af1a2c4a5805c81bea8c6f0633a47fb349c6777b8 ChangeLog 9417
+MISC metadata.xml 320 RMD160 a3cf3e328fa14020fb66ee38fa8ca77735dfb60b SHA1 c032f1877d893c7013a1aa6a5da78259757f08f6 SHA256 9dfc4869ab41c8d4563ec79c3f9f2f9058d1c9dd898be1290be517447a2b22a9
+MD5 472634e6b844af0eb963e52c579d16d8 metadata.xml 320
+RMD160 a3cf3e328fa14020fb66ee38fa8ca77735dfb60b metadata.xml 320
+SHA256 9dfc4869ab41c8d4563ec79c3f9f2f9058d1c9dd898be1290be517447a2b22a9 metadata.xml 320
 MD5 ac7629e47cd341b32c731f7e1e32c1bf files/digest-vzctl-3.0.16 241
 RMD160 063328319b5629f00f5dbaa0e944f620e8bc65bf files/digest-vzctl-3.0.16 241
 SHA256 d66728e7c28df9b76d60bf85f9244798cdf4ed912b7a9a09cfcc906288178258 files/digest-vzctl-3.0.16 241
@@ -61,10 +37,3 @@ SHA256 25cc33bb2771a34ebc102cb0a40d09ae005df521c15b01cd89ce265202637d8b files/di
 MD5 7b54924e31faafebc4caf246160890f0 files/digest-vzctl-3.0.18-r1 241
 RMD160 87ab42d92baf0c900a4ba90bb086acd84ef2494c files/digest-vzctl-3.0.18-r1 241
 SHA256 25cc33bb2771a34ebc102cb0a40d09ae005df521c15b01cd89ce265202637d8b files/digest-vzctl-3.0.18-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGxDhvyuNVb5qfaOYRAiS7AKDCiBacLAUNUH+b5uijQXOSZ0lBTgCfcDdV
-QM2cdAYp+vA/xysKMYpUPMQ=
-=M7i2
------END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.0.8 b/sys-cluster/vzctl/files/digest-vzctl-3.0.0.8
deleted file mode 100644
index b4fab3f9f4bf..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.0.8
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e8d42b9d85b3fc23c011e9439dffef85 vzctl-3.0.0-8.tar.bz2 115033
-RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 vzctl-3.0.0-8.tar.bz2 115033
-SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632 vzctl-3.0.0-8.tar.bz2 115033
-MD5 b2525320b5f1d4ee661ffa0795f785fa vzctl-3.0.0.8-patches-r0.tar.bz2 3816
-RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 vzctl-3.0.0.8-patches-r0.tar.bz2 3816
-SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535 vzctl-3.0.0.8-patches-r0.tar.bz2 3816
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.14 b/sys-cluster/vzctl/files/digest-vzctl-3.0.14
deleted file mode 100644
index 07b13a27600b..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0e3a15f711e5161b504f77b52898906 vzctl-3.0.14.tar.bz2 356300
-RMD160 529b4e3bb1fbcf673831d2891becedf6e003dcd8 vzctl-3.0.14.tar.bz2 356300
-SHA256 86be0231fd12f97e45bae8dae86fadc466e631051d4ee04569d40bb8f82d8b83 vzctl-3.0.14.tar.bz2 356300
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.14-ndsend.c.patch b/sys-cluster/vzctl/files/vzctl-3.0.14-ndsend.c.patch
deleted file mode 100644
index f41d65bf9deb..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.14-ndsend.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vzctl-3.0.14/src/ndsend.c
-===================================================================
---- vzctl-3.0.14.orig/src/ndsend.c
-+++ vzctl-3.0.14/src/ndsend.c
-@@ -17,6 +17,7 @@
- #include <netdb.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <linux/types.h>
- #include <linux/if.h>
- #include <netinet/icmp6.h>
- 
diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml
index 39c416e08e99..86dab79930de 100644
--- a/sys-cluster/vzctl/metadata.xml
+++ b/sys-cluster/vzctl/metadata.xml
@@ -5,4 +5,8 @@
 	<maintainer>
 		<email>vserver-devs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/vzctl/vzctl-3.0.0.8.ebuild b/sys-cluster/vzctl/vzctl-3.0.0.8.ebuild
deleted file mode 100644
index 860f1e025538..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.0.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-3.0.0.8.ebuild,v 1.2 2006/07/09 17:02:41 phreak Exp $
-
-inherit eutils toolchain-funcs versionator flag-o-matic
-
-VVER="$(get_version_component_range 1-3 ${PV})"
-VREL="$(get_version_component_range 4 ${PV})"
-MY_PV="${VVER}-${VREL}"
-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
-	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
-	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/logrotate
-	app-shells/bash
-	sys-apps/sed
-	sys-apps/ed
-	sys-apps/grep
-	sys-apps/gawk
-	sys-apps/coreutils
-	net-firewall/iptables
-	app-arch/tar
-	sys-fs/vzquota
-	sys-process/procps
-	sys-apps/iproute2"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-gentoo_conf_d.patch
-	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-gentoo_etc_vz.patch
-
-	# fix hardcoded lib paths
-	use amd64 && epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-amd64.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" VZCONFDIR=/etc/conf.d/ install || die "make install failed"
-
-	# sysconfig is vendor specific
-	rm -rf ${D}/etc/sysconfig
-
-	# Install gentoo specific init script
-	rm -f ${D}/etc/init.d/*
-	newinitd ${FILESDIR}/vz.initd vz
-
-	# Fix permissions on cron.d files
-	chmod 0644 ${D}/etc/cron.d/*
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.14.ebuild b/sys-cluster/vzctl/vzctl-3.0.14.ebuild
deleted file mode 100644
index f43e4acec329..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.14.ebuild,v 1.3 2007/01/21 13:57:44 hollow Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="OpenVZ VE control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="bash-completion logrotate"
-
-RDEPEND="logrotate? ( app-admin/logrotate )
-	net-firewall/iptables
-	sys-apps/ed
-	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-ndsend.c.patch
-}
-
-src_compile() {
-	econf --localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		$(use_enable logrotate) || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-gentoo || die "make install failed"
-
-	# install the bash-completion script into the right location
-	rm -rf "${D}"/etc/bash_completion.d
-	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
-}
-
-pkg_postinst() {
-	bash-completion_pkg_postinst
-	if has_version "<3.0.10"; then
-		ewarn
-		ewarn "The location of some vzctl files have changed. Most notably,"
-		ewarn "VE configuration files and samples directory has changed from"
-		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
-		ewarn "your VEs, please do the following:"
-		ewarn
-		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
-		ewarn
-	fi
-}