Sync 9999 with the latest ebuild, drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 14 insertions, 114 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index bd632bed1b9d..42cd0ac2a53a 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.88 2012/03/31 05:04:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.89 2012/03/31 05:09:25 pva Exp $
+
+  31 Mar 2012; Peter Volkov <pva@gentoo.org> -vzctl-3.0.28.3-r1.ebuild,
+  vzctl-3.0.30.2.ebuild, vzctl-9999.ebuild:
+  Sync 9999 with the latest ebuild, drop old.
 
 *vzctl-3.0.30.2 (31 Mar 2012)
 
diff --git a/sys-cluster/vzctl/vzctl-3.0.28.3-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.28.3-r1.ebuild
deleted file mode 100644
index a2830b1f1bf4..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.28.3-r1.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-r1.ebuild,v 1.2 2011/10/12 11:20:25 pva Exp $
-
-EAPI="4"
-
-inherit bash-completion-r1 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=""
-
-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
-	epatch "${FILESDIR}/${P}-vzeventd-stop.patch"
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-udev \
-		--enable-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
-	newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
-
-	# We need to keep some dirs
-	keepdir /vz/{dump,lock,root,private,template/cache}
-	keepdir /etc/vz/names /var/lib/vzctl/veip
-}
-
-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.30.2.ebuild b/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild
index 11b99893bc98..6f6c6385efaf 100644
--- a/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild,v 1.1 2012/03/31 05:04:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild,v 1.2 2012/03/31 05:09:25 pva Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	# Set default OSTEMPLATE on gentoo added in vzctl-3.0.24 (29 Jun 2010)
+	# Set default OSTEMPLATE on gentoo added
 	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
 }
 
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
index a7f75ec983e5..1b2d3010b0b1 100644
--- a/sys-cluster/vzctl/vzctl-9999.ebuild
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.8 2011/09/21 09:04:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.9 2012/03/31 05:09:25 pva Exp $
 
 EAPI="4"
 
-inherit bash-completion autotools git-2
+inherit bash-completion-r1 autotools git-2
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://git.openvz.org/pub/${PN}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bash-completion"
+IUSE=""
 
 RDEPEND="
 	net-firewall/iptables
@@ -34,7 +34,7 @@ src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
+		--enable-bashcomp \
 		--enable-logrotate
 }
 
@@ -43,7 +43,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}
@@ -51,33 +51,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"