Version bump. Drop old.

(Portage version: 2.1.10.15/cvs/Linux x86_64)

3 files changed, 15 insertions, 116 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/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"