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

(Portage version: 2.1.3.19)

7 files changed, 17 insertions, 77 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/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() {