Version bump. Drop old.

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

4 files changed, 18 insertions, 132 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 394229d61f02..d166bf124583 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2011/09/21 09:04:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.85 2011/09/29 07:59:17 pva Exp $
+
+*vzctl-3.0.29.3 (29 Sep 2011)
+
+  29 Sep 2011; Peter Volkov <pva@gentoo.org> -vzctl-3.0.26.2-r1.ebuild,
+  -files/vzctl-3.0.26.2-vzeventd.patch, +vzctl-3.0.29.3.ebuild:
+  Version bump. Drop old.
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> vzctl-9999.ebuild:
   Migrate to git-2.
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 2ae86ef45071..0924929ecac2 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX vzctl-3.0.26.2-vzeventd.patch 2315 RMD160 ebc24de1454ccdb6375be8562dbde0c0e233ecd0 SHA1 1b52d832b09dfc55e63e9c87324734311f6f27a6 SHA256 1f767c686841f24432ac4e75a9743b41362e096fbb01d99263e82853636c8c9e
 AUX vzctl-3.0.28.3-vzeventd-stop.patch 1068 RMD160 c482d4d4770687e9c7d5d13c406518a5a4bf1cbf SHA1 37e04da90df8d78d903e673dbc916f7a7047eab8 SHA256 65a0b15ac4b0f1da3005207e3e15ef9bdd2adae714fb0f6d26eb9498b817b9c5
-DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f
 DIST vzctl-3.0.28.3.tar.bz2 414418 RMD160 518247189a01a178d4783a3a95e0b69e187f7ceb SHA1 18113c3f9910985893fa8eceaade16fec093fc85 SHA256 926b88de4e2c065f3389751dc183f1653eff470a0d0cae4401697fc8aae8a30e
-EBUILD vzctl-3.0.26.2-r1.ebuild 2362 RMD160 d5e81238399feb92bfde03980514adcab332b3ea SHA1 5ed058d01b16a24ce8dff3f4240a9bf0d1128636 SHA256 57e87865e0dbad8fd7dfe0b68eb77693327478f6665a1036b627575f81383e11
+DIST vzctl-3.0.29.3.tar.bz2 421448 RMD160 2e50e2449f8358a3f21463d6012f846ea06f4bcc SHA1 af616f61a86a0da18d6184021204c1543ea0475b SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12b41f74da0276c49102c262d2e7
 EBUILD vzctl-3.0.28.3-r1.ebuild 2285 RMD160 2c23d86657b3c32c345dbaf08d33dd322813713d SHA1 273a4cea2a031347bcadf1cf4e073d8551236f61 SHA256 7a0b17cff31deda5c23ea8a1c463bcf078c1b2923e2f99d3c3eac3eb225b420f
 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-9999.ebuild 2307 RMD160 0cab32026442705248f30670247c8b3c769fd155 SHA1 d60a289c0a50af3010e7697836ca1230f0210a59 SHA256 fe8370afac29cd637a1f4dad319a9d6eeab7b89a31c715b05a66f59880aa2d3d
-MISC ChangeLog 18238 RMD160 3e2867dd6de409dd1afb9bade8c752d5cac8619f SHA1 f79dbe3471325527fdc21cd49f6b408ccf56f8e3 SHA256 e5f617444fe7bb7e39cb910807fd7990845d390f7db5a44202ae91a61cbbb759
+MISC ChangeLog 18429 RMD160 e069a5ad0fba3d9ac33ae7e4e0a45b990892015b SHA1 70b01d18601c365bc0d0c62b7be454df73f78ce1 SHA256 65307d8fbd6b44b4bfc737c560313068262e9e8570fb9c983eaca2970aab2bf8
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk55qT4ACgkQfXuS5UK5QB3NhwP7Bx8tIbEpS4C2J9WKi2oip7BB
-FkQiwP6q8yBS4znjt3SmLwEGtmsbcqRN26u9RX8tbvQDYr1cMq51WwNQb+BmP6Dm
-rMAN2s4OmfyUDOiPKx9XFosIDyMTwe63syxScNXN4uGhMyxFnpJym7gBYiAuAQqU
-JC+gcDxn0ZTJzPAFgns=
-=o9jS
------END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch b/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch
deleted file mode 100644
index 620c86dceb9c..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f24b1603090c6d4af163d42eff620fcfaa7c6297 Mon Sep 17 00:00:00 2001
-From: Peter Volkov <pva@gentoo.org>
-Date: Fri, 1 Apr 2011 14:25:45 +0400
-Subject: [PATCH] vzeventd-gentoo: set reboot_event, solid kernel
-
-Allow it to work when modules are built in (MODULES_DISABLED=yes).
-Set /sys/module/vzevent/parameters/reboot_event=1 on service startup.
-Small clenups.
-
-Fixes Gentoo bugs:
-http://bugs.gentoo.org/show_bug.cgi?id=361453
-http://bugs.gentoo.org/show_bug.cgi?id=361457
----
- etc/init.d/vzeventd-gentoo.in |   40 ++++++++++++++++++++++++++++------------
- 1 files changed, 28 insertions(+), 12 deletions(-)
-
-diff --git a/etc/init.d/vzeventd-gentoo.in b/etc/init.d/vzeventd-gentoo.in
-index e8fe64e..2c0da26 100644
---- a/etc/init.d/vzeventd-gentoo.in
-+++ b/etc/init.d/vzeventd-gentoo.in
-@@ -6,25 +6,41 @@ depend() {
- }
- 
- check_config() {
--# if we don't want openvz running, say so
-+	source /etc/conf.d/vz
-+	# if we don't want openvz running, say so
- 	[ "${VIRTUOZZO}" = "yes" ] || return 1
- 	: ${VZEVENTD:=@SBINDIR@/vzeventd}
- }
- 
-+load_module() {
-+	if [ "${MODULES_DISABLED}" != "yes" ]; then
-+		local rv=0
-+		ebegin "Loading vzevent module"
-+		modprobe -r vzevent >/dev/null 2>&1
-+		modprobe vzevent reboot_event=1 >/dev/null 2>&1
-+		rv=$?
-+		if [ ${rv} -ne 0 ]; then
-+			eend ${rv}
-+			return ${rv}
-+		fi
-+	fi
-+
-+	local param=/sys/module/vzevent/parameters/reboot_event
-+	if ! grep -Fqw 1 "${param}"; then
-+		ewarn "vzevent module should be loaded with reboot_event=1 parameter"
-+		ewarn "setting reboot_event to 1..."
-+		ewarn "echo 1 > ${param}"
-+		echo 1 > "${param}"
-+	fi
-+	return 0
-+}
-+
- start() {
- 	check_config || return
--	ebegin "Loading vzevent module"
--	modprobe -r vzevent >/dev/null 2>&1
--	modprobe vzevent reboot_event=1 >/dev/null 2>&1
--	rc=$?
--	if [ ${rc} -ne 0 ]; then
--		eend ${rc} "failed"
--		return ${rc}
--	fi
--	eend ${rc}
-+	load_module || return
- 
- 	ebegin "Starting vzeventd"
--	start-stop-daemon --start --exec $VZEVENTD \
-+	start-stop-daemon --start --exec ${VZEVENTD} \
- 		--pidfile /var/run/vzeventd.pid \
- 		-- ${VZEVENTD_OPTS}
- 	eend $?
-@@ -33,7 +49,7 @@ start() {
- stop() {
- 	check_config || return
- 	ebegin "Stopping vzeventd"
--		start-stop-daemon --stop --exec $VZEVENTD \
-+	start-stop-daemon --stop --exec ${VZEVENTD} \
- 		--pidfile /var/run/vzeventd.pid
- 	eend $?
- }
--- 
-1.7.3.4
-
diff --git a/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild
index 003f1df02fb8..d4498475ab0b 100644
--- a/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.29.3.ebuild
@@ -1,10 +1,10 @@
 # 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.26.2-r1.ebuild,v 1.2 2011/05/16 07:25:18 pva Exp $
+# $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 $
 
 EAPI="4"
 
-inherit bash-completion eutils
+inherit bash-completion-r1 eutils
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -12,8 +12,8 @@ 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"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
 
 RDEPEND="
 	net-firewall/iptables
@@ -24,16 +24,15 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	# Set default OSTEMPLATE on gentoo
+	# Set default OSTEMPLATE on gentoo added in vzctl-3.0.24 (29 Jun 2010)
 	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
-	epatch "${FILESDIR}/vzctl-3.0.26.2-vzeventd.patch"
 }
 
 src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
+		--enable-bashcomp \
 		--enable-logrotate
 }
 
@@ -42,7 +41,7 @@ src_install() {
 
 	# install the bash-completion script into the right location
 	rm -rf "${ED}"/etc/bash_completion.d
-	dobashcompletion etc/bash_completion.d/vzctl.sh vzctl
+	newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
 
 	# We need to keep some dirs
 	keepdir /vz/{dump,lock,root,private,template/cache}
@@ -50,33 +49,12 @@ src_install() {
 }
 
 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
+
 	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"