amd64/x86 stable, bug #199738. Removed old.

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 1efa59d3cecdd479caf95c39a8ae2b04bc00a569..cea9dba9c4ea2de680889b6355efed2b1be18be4 100644 (file)
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.86 2011/10/12 11:20:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.87 2011/11/06 18:12:32 pva Exp $
+
+  06 Nov 2011; Peter Volkov <pva@gentoo.org> -vzctl-3.0.28.3.ebuild,
+  -files/vzctl-3.0.28.3-vzeventd-stop.patch, vzctl-3.0.29.3.ebuild:
+  amd64/x86 stable, bug #199738. Removed old.
 
   12 Oct 2011; Peter Volkov <pva@gentoo.org> vzctl-3.0.28.3-r1.ebuild:
   amd64/x86 stable, bug #199738.

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 3c8760625d60d801e3d6b93d317f6eb47cf7bdec..2944bc4900ea369468ba50165793f9846d36c80b 100644 (file)
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vzctl-3.0.28.3-vzeventd-stop.patch 1068 RMD160 c482d4d4770687e9c7d5d13c406518a5a4bf1cbf SHA1 37e04da90df8d78d903e673dbc916f7a7047eab8 SHA256 65a0b15ac4b0f1da3005207e3e15ef9bdd2adae714fb0f6d26eb9498b817b9c5
 DIST vzctl-3.0.28.3.tar.bz2 414418 RMD160 518247189a01a178d4783a3a95e0b69e187f7ceb SHA1 18113c3f9910985893fa8eceaade16fec093fc85 SHA256 926b88de4e2c065f3389751dc183f1653eff470a0d0cae4401697fc8aae8a30e
 DIST vzctl-3.0.29.3.tar.bz2 421448 RMD160 2e50e2449f8358a3f21463d6012f846ea06f4bcc SHA1 af616f61a86a0da18d6184021204c1543ea0475b SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12b41f74da0276c49102c262d2e7
 EBUILD vzctl-3.0.28.3-r1.ebuild 2283 RMD160 20fd456ac6146f87325a5f43bee7b9db0493cf02 SHA1 24677161a781f74fdff64a16fcf96a2a276c2ff1 SHA256 76cfbbe7881e577010c3769bb0dfb03349ce3c075167dd9a5d4c4922ae458a31
-EBUILD vzctl-3.0.28.3.ebuild 2301 RMD160 6daad9a84cfa463cab2c0e8f2cda4906ecdfd95b SHA1 f1b12cacfea27d70344c6aa5753cff4f258dc9e0 SHA256 4ceedd88ea28f26f2dee4291e098886663d39bc08e31949e5a4b50d2f6fad232
-EBUILD vzctl-3.0.29.3.ebuild 1655 RMD160 a6ab25e91ff15f0954d2f79ed25ec114ce22283f SHA1 ecf68647017300c7a788a1d91fb3b679f56af09c SHA256 fcf9abe175f0736d2eec84d11a57bb5557cd224e3a3f59741ec8175700019264
+EBUILD vzctl-3.0.29.3.ebuild 1653 RMD160 a06106fb7da572680fe230edc0c6b3c3e8010f08 SHA1 4ff4307ba198e337cade3856de31290b958991d1 SHA256 8476c4552b03f0d0f28f2b47012da8bf760c5f5706f46845e7e5d147b7de08c6
 EBUILD vzctl-9999.ebuild 2307 RMD160 0cab32026442705248f30670247c8b3c769fd155 SHA1 d60a289c0a50af3010e7697836ca1230f0210a59 SHA256 fe8370afac29cd637a1f4dad319a9d6eeab7b89a31c715b05a66f59880aa2d3d
-MISC ChangeLog 18534 RMD160 fe03bf4e0f23ecf9bd7464776dde3bd3867c3e69 SHA1 a18626d0be77327fa3c991dab57cc59dfcf9dadf SHA256 49c4c19687bfd78db1ddce349ad5f70b3d07f4ac9c770f7a02a8711b8113fc71
+MISC ChangeLog 18718 RMD160 c54c66ea467dac07f5f6bde2a17437269c95a565 SHA1 793d9133bc722332ccc7fd7e698e15ca55c00e02 SHA256 6a4b129c20bd00fae3b6b84d6eb70ff2d2438d5c19325ae2cb0727f9f412fd99
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6Vd48ACgkQGrk+8vGYmwdvLwD/WtU/+PAV2BVQ5SIAmuiPq7nn
-gN6oYIi3YHj6FC6UTpwA/jp6R5U4Z5iRt9wvPvCaPLfsEfoVILGCtBdu3LtLlHc6
-=7ixP
+iF4EAREIAAYFAk62zXIACgkQGrk+8vGYmweWnQD9GxNLY3lrGqXzl2Ko8ixGsBvH
+nEfFcMY1/iAfc5AMnPQA/1u/mbZTtnc0xSh74EOr/+8uSnkbEGCE92bCSe+mk7IZ
+=p6u6
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch b/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch
deleted file mode 100644 (file)
index 960afa2..0000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cf5b82e9758a96f493469caade1b447552415c5a Mon Sep 17 00:00:00 2001
-From: Peter Volkov <pva@gentoo.org>
-Date: Sun, 11 Sep 2011 15:47:22 +0400
-Subject: [PATCH] etc/init.d/vzeventd-gentoo.in: fix service stop
-
-vzeventd does not create pid file. Drop its mentioning from init script
-to fix /etc/init.d/vzeventd stop.
-
-https://bugs.gentoo.org/show_bug.cgi?id=382213
----
- etc/init.d/vzeventd-gentoo.in |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/etc/init.d/vzeventd-gentoo.in b/etc/init.d/vzeventd-gentoo.in
-index 2c0da26..d7abcdf 100644
---- a/etc/init.d/vzeventd-gentoo.in
-+++ b/etc/init.d/vzeventd-gentoo.in
-@@ -41,7 +41,6 @@ start() {
- 
-       ebegin "Starting vzeventd"
-       start-stop-daemon --start --exec ${VZEVENTD} \
--              --pidfile /var/run/vzeventd.pid \
-               -- ${VZEVENTD_OPTS}
-       eend $?
- }
-@@ -49,7 +48,6 @@ start() {
- stop() {
-       check_config || return
-       ebegin "Stopping vzeventd"
--      start-stop-daemon --stop --exec ${VZEVENTD} \
--              --pidfile /var/run/vzeventd.pid
-+      start-stop-daemon --stop --exec ${VZEVENTD}
-       eend $?
- }
--- 
-1.7.3.4
-

diff --git a/sys-cluster/vzctl/vzctl-3.0.28.3.ebuild b/sys-cluster/vzctl/vzctl-3.0.28.3.ebuild
deleted file mode 100644 (file)
index 839f640..0000000
--- a/sys-cluster/vzctl/vzctl-3.0.28.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.28.3.ebuild,v 1.2 2011/08/13 13:32:44 pva Exp $
-
-EAPI="4"
-
-inherit bash-completion eutils
-
-DESCRIPTION="OpenVZ ConTainers 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"
-
-RDEPEND="
-       net-firewall/iptables
-       sys-apps/ed
-       sys-apps/iproute2
-       sys-fs/vzquota"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       # Set default OSTEMPLATE on gentoo
-       sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
-}
-
-src_configure() {
-       econf \
-               --localstatedir=/var \
-               --enable-udev \
-               $(use_enable bash-completion bashcomp) \
-               --enable-logrotate
-}
-
-src_install() {
-       emake DESTDIR="${D}" install install-gentoo
-
-       # install the bash-completion script into the right location
-       rm -rf "${ED}"/etc/bash_completion.d
-       dobashcompletion etc/bash_completion.d/vzctl.sh vzctl
-
-       # We need to keep some dirs
-       keepdir /vz/{dump,lock,root,private,template/cache}
-       keepdir /etc/vz/names /var/lib/vzctl/veip
-}
-
-pkg_postinst() {
-       bash-completion_pkg_postinst
-       local conf_without_OSTEMPLATE
-       for file in \
-               $(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
-               if ! grep '^OSTEMPLATE' $file > /dev/null; then
-                       conf_without_OSTEMPLATE+=" $file"
-               fi
-       done
-
-       if [[ -n ${conf_without_OSTEMPLATE} ]]; then
-               ewarn
-               ewarn "OSTEMPLATE default was changed from redhat-like to gentoo."
-               ewarn "This means that any VEID.conf files without explicit or correct"
-               ewarn "OSTEMPLATE set will use gentoo scripts instead of redhat."
-               ewarn "Please check the following configs:"
-               for file in ${conf_without_OSTEMPLATE}; do
-                       ewarn "${file}"
-               done
-               ewarn
-       fi
-
-       ewarn "To avoid loosing network to CTs on iface down/up, please, add the"
-       ewarn "following code to /etc/conf.d/net:"
-       ewarn " postup() {"
-       ewarn "     /usr/sbin/vzifup-post \${IFACE}"
-       ewarn " }"
-
-       ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
-       ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
-       ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
-       ewarn "/etc/init.d/vzeventd."
-}

diff --git a/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild b/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild
index d4498475ab0bbd483de09eddd9e4e89da2b62f77..726120e2173dacb7aada9d7ba756862405ca8ecd 100644 (file)
--- a/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild,v 1.1 2011/09/29 07:59:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild,v 1.2 2011/11/06 18:12:32 pva Exp $
 
 EAPI="4"
 
@@ -12,7 +12,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=""
 
 RDEPEND="