Version bump. 3.0.18-r1 - x86/amd64 stable, bug 199738. Remove old from the tree.

Package-Manager: portage-2.1.3.19

8 files changed, 33 insertions, 100 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 841cb8ba1d80..7f93a856ee22 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2007/11/20 07:05:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.51 2007/12/24 10:29:12 pva Exp $
+
+*vzctl-3.0.22 (24 Dec 2007)
+
+  24 Dec 2007; <pva@gentoo.org> -vzctl-3.0.16.ebuild, -vzctl-3.0.18.ebuild,
+  vzctl-3.0.18-r1.ebuild, +vzctl-3.0.22.ebuild:
+  Version bump. 3.0.18-r1 - x86/amd64 stable, bug 199738. Remove old from the
+  tree.
 
   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:
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index b7607e8bbf6d..a63c99f4690d 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -6,34 +6,27 @@ AUX vzctl-3.0.16-prevent-stripping.patch 1407 RMD160 beac951027ab76136ce2dc7f156
 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.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.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
-SHA256 7a292a2a9399e785f78c9fc7087a5980f3f98f55624ad9d92f1fb9dcb08de0d5 vzctl-3.0.16.ebuild 1678
-EBUILD vzctl-3.0.18-r1.ebuild 1776 RMD160 d7e3ab6f09e8cf2c1f728401e851187fdc5e194d SHA1 bb1c6e21f8e2f8384774f21d78e497780606870f SHA256 3cd01843a134b366639d45b6080eef4f42ba43c02ac432244ad90be62cfeadc9
-MD5 4be733b05a1acd7baf65edd3ed6ca658 vzctl-3.0.18-r1.ebuild 1776
-RMD160 d7e3ab6f09e8cf2c1f728401e851187fdc5e194d vzctl-3.0.18-r1.ebuild 1776
-SHA256 3cd01843a134b366639d45b6080eef4f42ba43c02ac432244ad90be62cfeadc9 vzctl-3.0.18-r1.ebuild 1776
-EBUILD vzctl-3.0.18.ebuild 1586 RMD160 eb7467d883cd321ca02b7b5fa8c29846f12d60a6 SHA1 36b5ab5b0b895e46a755b6bacf6b763984e8e276 SHA256 d3716ff68f1fb677f7d078d694e1e39df9d87d911e53b7f2ffe2222d7559b7a1
-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 9417 RMD160 a5f7f655ea930fbecd833100de036eaebaa40f5a SHA1 c5409ce1de6a5390cb3214d754422a3bad5ca431 SHA256 57fa20a8549451cb64c0121af1a2c4a5805c81bea8c6f0633a47fb349c6777b8
-MD5 a94113c79b31197eeebd99a9188549cb ChangeLog 9417
-RMD160 a5f7f655ea930fbecd833100de036eaebaa40f5a ChangeLog 9417
-SHA256 57fa20a8549451cb64c0121af1a2c4a5805c81bea8c6f0633a47fb349c6777b8 ChangeLog 9417
+DIST vzctl-3.0.22.tar.bz2 360012 RMD160 53353981fefea94d997b3555600583f4c5818833 SHA1 58e5c55855aebf9e4ca032b325d8960a3836d648 SHA256 20f75e8342b85909d6bf01d0db47acaa088125da7f203b5e6e6169aa4c139166
+EBUILD vzctl-3.0.18-r1.ebuild 1771 RMD160 96bca16be9a37a8e630856d7128322090bbc6eda SHA1 494d3c9626c0fa2c252186b663eb3284744f2e8e SHA256 1734e54adde38e4649214f56c13ff5575216a34ac5b263f08f4a8d1069dddc65
+MD5 b42ca59dcabb81b78ad5382499097dd0 vzctl-3.0.18-r1.ebuild 1771
+RMD160 96bca16be9a37a8e630856d7128322090bbc6eda vzctl-3.0.18-r1.ebuild 1771
+SHA256 1734e54adde38e4649214f56c13ff5575216a34ac5b263f08f4a8d1069dddc65 vzctl-3.0.18-r1.ebuild 1771
+EBUILD vzctl-3.0.22.ebuild 1652 RMD160 de5f86abdd5398bc26f5398cc2f1bd8e3843a4f6 SHA1 35108964bf98c2ea7312d2b495c234c06f0d1855 SHA256 455326c105059a3a71fe687e64a51f16dc2a1755aa9810d8be82e72ef8e141ff
+MD5 811fd8c4a203d1f3361dbe6277ff23f0 vzctl-3.0.22.ebuild 1652
+RMD160 de5f86abdd5398bc26f5398cc2f1bd8e3843a4f6 vzctl-3.0.22.ebuild 1652
+SHA256 455326c105059a3a71fe687e64a51f16dc2a1755aa9810d8be82e72ef8e141ff vzctl-3.0.22.ebuild 1652
+MISC ChangeLog 9657 RMD160 ad628e1c02d448c7832a75cad4497f1325c214e8 SHA1 af7c7b6dccd681d0320ec28beb615815c336461e SHA256 e9b43e9a6cc720dfa9054a3f5465da3cefe338defb97cfce30c3e8bffc475434
+MD5 64c45ecd99af5895fbc4e9d14f8b8545 ChangeLog 9657
+RMD160 ad628e1c02d448c7832a75cad4497f1325c214e8 ChangeLog 9657
+SHA256 e9b43e9a6cc720dfa9054a3f5465da3cefe338defb97cfce30c3e8bffc475434 ChangeLog 9657
 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
-MD5 7b54924e31faafebc4caf246160890f0 files/digest-vzctl-3.0.18 241
-RMD160 87ab42d92baf0c900a4ba90bb086acd84ef2494c files/digest-vzctl-3.0.18 241
-SHA256 25cc33bb2771a34ebc102cb0a40d09ae005df521c15b01cd89ce265202637d8b files/digest-vzctl-3.0.18 241
 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
+MD5 e5551b10a0e820ce1c575a424fe05a6b files/digest-vzctl-3.0.22 241
+RMD160 f29a1086cc5fff756261555afb9a9b51e1b22783 files/digest-vzctl-3.0.22 241
+SHA256 80d19d05b56990156d87191daeeddb2da96d433b7f28db110cb0ca4e547db7a0 files/digest-vzctl-3.0.22 241
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.16 b/sys-cluster/vzctl/files/digest-vzctl-3.0.16
deleted file mode 100644
index 72cd0a0a4a6b..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 370e4a7e26e4798553f3189377868949 vzctl-3.0.16.tar.bz2 356821
-RMD160 5127a73652f616e5a595b66837ea79c98bd7ad33 vzctl-3.0.16.tar.bz2 356821
-SHA256 c88acc850efef172ca1f66383af895f5c199325cf7049d2d4608e6eb42ac5b63 vzctl-3.0.16.tar.bz2 356821
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.18 b/sys-cluster/vzctl/files/digest-vzctl-3.0.18
deleted file mode 100644
index 613109e369e5..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9284e668da669ed92e33abc39c70ca9 vzctl-3.0.18.tar.bz2 359655
-RMD160 9c7169e151c6384fd489df3dd6392d442706f46f vzctl-3.0.18.tar.bz2 359655
-SHA256 8610efa9a8327a1b6457eaa28b772ad753db5f23c2c18b25bb3ce0cf6a929e2f vzctl-3.0.18.tar.bz2 359655
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.22 b/sys-cluster/vzctl/files/digest-vzctl-3.0.22
new file mode 100644
index 000000000000..0af2b3987f2a
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.22
@@ -0,0 +1,3 @@
+MD5 d02fdecaeaa1327c08ba5d980383cafa vzctl-3.0.22.tar.bz2 360012
+RMD160 53353981fefea94d997b3555600583f4c5818833 vzctl-3.0.22.tar.bz2 360012
+SHA256 20f75e8342b85909d6bf01d0db47acaa088125da7f203b5e6e6169aa4c139166 vzctl-3.0.22.tar.bz2 360012
diff --git a/sys-cluster/vzctl/vzctl-3.0.16.ebuild b/sys-cluster/vzctl/vzctl-3.0.16.ebuild
deleted file mode 100644
index cfa7ac4e198c..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.16.ebuild
+++ /dev/null
@@ -1,65 +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.16.ebuild,v 1.3 2007/07/13 07:32:46 phreak 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}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-prevent-stripping.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
-
-	# We need to keep /etc/vz/names
-	keepdir /etc/vz/names
-}
-
-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
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild
index 2bd40cb9ae86..8b3ec803ef16 100644
--- a/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.18-r1.ebuild,v 1.1 2007/08/16 11:43:29 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild,v 1.2 2007/12/24 10:29:12 pva Exp $
 
 inherit bash-completion eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 IUSE="bash-completion logrotate"
 
 RDEPEND="logrotate? ( app-admin/logrotate )
diff --git a/sys-cluster/vzctl/vzctl-3.0.18.ebuild b/sys-cluster/vzctl/vzctl-3.0.22.ebuild
index d67f1d536b29..ec1f7713ecd0 100644
--- a/sys-cluster/vzctl/vzctl-3.0.18.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.22.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.2 2007/07/13 07:32:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22.ebuild,v 1.1 2007/12/24 10:29:12 pva Exp $
 
 inherit bash-completion eutils
 
@@ -39,8 +39,9 @@ src_install() {
 	rm -rf "${D}"/etc/bash_completion.d
 	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
 
-	# We need to keep /etc/vz/names
-	keepdir /etc/vz/names
+	# We need to keep some dirs
+	keepdir /vz/{dump,lock,root,private,template/cache}
+	keepdir /etc/vz/names /var/lib/vzctl/veip
 }
 
 pkg_postinst() {