Removing vzctl-3.0.17. Adding the keepdir for /etc/vz/names as Kir pointed in the mail from today.

Package-Manager: portage-2.1.3_rc8

6 files changed, 30 insertions, 85 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 4c849bc3b841..04f3dcedc891 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.47 2007/07/06 10:10:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.48 2007/07/13 07:32:46 phreak Exp $
+
+  13 Jul 2007; Christian Heim <phreak@gentoo.org> vzctl-3.0.16.ebuild,
+  -vzctl-3.0.17.ebuild, vzctl-3.0.18.ebuild:
+  Removing vzctl-3.0.17. Adding the keepdir for /etc/vz/names as Kir pointed
+  in the mail from today.
 
 *vzctl-3.0.18 (06 Jul 2007)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 1fa237cb9893..cbcc95559808 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -17,7 +17,6 @@ DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e9
 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.17.tar.bz2 359457 RMD160 cb10ce676975e9a0adfaab9cd69e84ceea761064 SHA1 32b736bee8c7389a487365f20dc6063cd787f1e6 SHA256 4f915b8a9ef9fafd8656daf41aeac93998c64aab198cd89b47d53128501c2410
 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
@@ -27,22 +26,18 @@ EBUILD vzctl-3.0.14.ebuild 1602 RMD160 9f24bc44adf9a5174d93c2f6024fd0e1fac3b0e3
 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 1621 RMD160 5ceff3bd8edb488c24e822f1681dfeb595fad8ca SHA1 75cf412a4b45eeca9624a7a2e7ab7da85b4b8e22 SHA256 b442de63452ce55e633d8d0a8370accb297480761105e796c18a65192a0bdb26
-MD5 e204a3405a16d53fdeb88ef63889dfbe vzctl-3.0.16.ebuild 1621
-RMD160 5ceff3bd8edb488c24e822f1681dfeb595fad8ca vzctl-3.0.16.ebuild 1621
-SHA256 b442de63452ce55e633d8d0a8370accb297480761105e796c18a65192a0bdb26 vzctl-3.0.16.ebuild 1621
-EBUILD vzctl-3.0.17.ebuild 1529 RMD160 905decf73ce40ba92a8a322bbe6989f7c212ae42 SHA1 9ad7d8961a61ed18b552d6b67948043bc7289546 SHA256 291fddfd2111830a03482208618999df5db38436c325a55cf081e81cf137169f
-MD5 e5d00ed292f2795d56efa95901b04317 vzctl-3.0.17.ebuild 1529
-RMD160 905decf73ce40ba92a8a322bbe6989f7c212ae42 vzctl-3.0.17.ebuild 1529
-SHA256 291fddfd2111830a03482208618999df5db38436c325a55cf081e81cf137169f vzctl-3.0.17.ebuild 1529
-EBUILD vzctl-3.0.18.ebuild 1529 RMD160 7c3c134b73183ded7293c0697ade63e51d9a4b00 SHA1 5955f90fe9b607668d1d1a32dafb4b8732f1aadd SHA256 bfc0c73cf09ce3e18e381b41352e8ca8b4c507291631757fd995aa91f4a7d88d
-MD5 7e12254014361e6a7208479aa89d5de3 vzctl-3.0.18.ebuild 1529
-RMD160 7c3c134b73183ded7293c0697ade63e51d9a4b00 vzctl-3.0.18.ebuild 1529
-SHA256 bfc0c73cf09ce3e18e381b41352e8ca8b4c507291631757fd995aa91f4a7d88d vzctl-3.0.18.ebuild 1529
-MISC ChangeLog 8799 RMD160 70ea6410224f71c91ff92eb467479a37f3a5ec0f SHA1 a0ca5f6168d2015f0604ed04d4295a65c10c4ef5 SHA256 6df1372869c53af5015089d1ef906d51428a5ed4f81bc61737f3b33caebedd86
-MD5 c8d9b64ce6811ab71dc2b1f23034a7d2 ChangeLog 8799
-RMD160 70ea6410224f71c91ff92eb467479a37f3a5ec0f ChangeLog 8799
-SHA256 6df1372869c53af5015089d1ef906d51428a5ed4f81bc61737f3b33caebedd86 ChangeLog 8799
+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.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 9019 RMD160 9d803dad8b64818f449a4eafac2f8ae0e1b39b89 SHA1 daf2a0c451ea528da2803c133c451828bd5e23f1 SHA256 983b67e31d63015f7980a62d9a22c9914a4b121bf20ad53132326a9489695705
+MD5 864ac84d208319afc86f63b25c3f2740 ChangeLog 9019
+RMD160 9d803dad8b64818f449a4eafac2f8ae0e1b39b89 ChangeLog 9019
+SHA256 983b67e31d63015f7980a62d9a22c9914a4b121bf20ad53132326a9489695705 ChangeLog 9019
 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
@@ -56,16 +51,13 @@ SHA256 f31d206d22b741c4a7e5b5acee694512e153e1d7f8c4e61e1e9d31c9d633d611 files/di
 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 69fca091fd03219182fad30f2739af0f files/digest-vzctl-3.0.17 241
-RMD160 66b3601ad4b92df38c9c87f9fff7a6426a2b13ba files/digest-vzctl-3.0.17 241
-SHA256 5fc2a7e83f915fb7fe83654889815fba3a3546f0aa2cddd2baa6b162bb9e81d8 files/digest-vzctl-3.0.17 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGjhUwyuNVb5qfaOYRAvdiAJ43zlB7qNpJjwD14ZbCqYawOSuV7wCeOYdk
-qc6bZ5WVF4YEvrC8x9TZP8Q=
-=CaZ7
+iD8DBQFGlyqmyuNVb5qfaOYRAjxZAJ9aS3rBTkWlR9s1cNG0wT+1r+JiowCgzPSf
+SQvQBTwFp5FLgeZg6vVo7VM=
+=qfHV
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.17 b/sys-cluster/vzctl/files/digest-vzctl-3.0.17
deleted file mode 100644
index a68a676bd40f..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7ad86b9219ccd09035b5f85a81b21e5 vzctl-3.0.17.tar.bz2 359457
-RMD160 cb10ce676975e9a0adfaab9cd69e84ceea761064 vzctl-3.0.17.tar.bz2 359457
-SHA256 4f915b8a9ef9fafd8656daf41aeac93998c64aab198cd89b47d53128501c2410 vzctl-3.0.17.tar.bz2 359457
diff --git a/sys-cluster/vzctl/vzctl-3.0.16.ebuild b/sys-cluster/vzctl/vzctl-3.0.16.ebuild
index e9c0dc7fbcf4..cfa7ac4e198c 100644
--- a/sys-cluster/vzctl/vzctl-3.0.16.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.16.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.16.ebuild,v 1.2 2007/06/03 07:35:50 phreak Exp $
+# $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
 
@@ -45,6 +45,9 @@ src_install() {
 	# 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() {
diff --git a/sys-cluster/vzctl/vzctl-3.0.17.ebuild b/sys-cluster/vzctl/vzctl-3.0.17.ebuild
deleted file mode 100644
index 03f20c4384ac..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.17.ebuild
+++ /dev/null
@@ -1,55 +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.17.ebuild,v 1.1 2007/07/06 09:17:20 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_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
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.18.ebuild b/sys-cluster/vzctl/vzctl-3.0.18.ebuild
index 812e03b87f78..d67f1d536b29 100644
--- a/sys-cluster/vzctl/vzctl-3.0.18.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.18.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.1 2007/07/06 10:10:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.18.ebuild,v 1.2 2007/07/13 07:32:46 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -38,6 +38,9 @@ src_install() {
 	# 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() {