Sync 9999 with the latest ebuild, drop old.

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

5 files changed, 20 insertions, 122 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/Manifest b/sys-cluster/vzctl/Manifest
index de9cd9609ab7..994d6f25af12 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 DIST vzctl-3.0.30.2.tar.bz2 425118 RMD160 8be0d48b016153d7017562e2d68ec38768037378 SHA1 eeaec72f7cb2f899df64272fb2eacccd751cd45f SHA256 c100914ec10db7cce6114bb8fcfdf67dd406d0547ac07ea8d2994e6ca7299635
-EBUILD vzctl-3.0.28.3-r1.ebuild 2283 RMD160 20fd456ac6146f87325a5f43bee7b9db0493cf02 SHA1 24677161a781f74fdff64a16fcf96a2a276c2ff1 SHA256 76cfbbe7881e577010c3769bb0dfb03349ce3c075167dd9a5d4c4922ae458a31
 EBUILD vzctl-3.0.29.3.ebuild 1653 RMD160 a06106fb7da572680fe230edc0c6b3c3e8010f08 SHA1 4ff4307ba198e337cade3856de31290b958991d1 SHA256 8476c4552b03f0d0f28f2b47012da8bf760c5f5706f46845e7e5d147b7de08c6
-EBUILD vzctl-3.0.30.2.ebuild 1655 RMD160 6895a64f6b45c353c43ccff86e79acec0f84ea8a SHA1 3a701a20c014701931c9a616cdcd2ea2f2eb75ac SHA256 4e9afcd8507b93954143129f807ed60c78cd9759dc0f0e541a9fb8ec0c59c4b8
-EBUILD vzctl-9999.ebuild 2307 RMD160 0cab32026442705248f30670247c8b3c769fd155 SHA1 d60a289c0a50af3010e7697836ca1230f0210a59 SHA256 fe8370afac29cd637a1f4dad319a9d6eeab7b89a31c715b05a66f59880aa2d3d
-MISC ChangeLog 18835 RMD160 e82952f5b186b3665f379d773c0ce8f31570f457 SHA1 dcf74142f34961826c73009e0506d7e9d6fd5e20 SHA256 cc232d49c6dcb6c680f2ac67f3aac9e67793ca2641c5986600d6785c68fde9a1
+EBUILD vzctl-3.0.30.2.ebuild 1625 RMD160 d9d096aa1dbcb1f3fb02d70d59b7c517c8d61f0e SHA1 026bfae9b600b94a87ea81f019a97678239c9fd4 SHA256 14a531f6db786723d922ae7db2aa9eaad808f73d76b20d34aaa2a7d01fb875ba
+EBUILD vzctl-9999.ebuild 1614 RMD160 61ccb3a63162925de5805ff2243c80efc6d44700 SHA1 9db514d81eb8b607576b729a62b7078773df771e SHA256 ba5513a0362767b5f55036b8c34b1d550a52c298142c7e8fcc5f5517c42fcce1
+MISC ChangeLog 18998 RMD160 6ad8d2a373642a9a2d24bb48d28d3fa2eec756b9 SHA1 b54d16a9a355fc50bd328cd296a28162f7bba57b SHA256 599f7b8a12cc0e3df9e7e95c7f33115a7f3bf5e8a1501b6b21fbad185efb6137
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk92j/YACgkQGrk+8vGYmwcbXAD+PZGGXAzY1szl6xhBGsPTtcmk
-Ki9dMfD2DhsAB77NJ+kA/RfgJf0Yxa3b8sEITfqWph3k5x6Fnn8oNcTkdwP8Cj1z
-=CZhO
+iF4EAREIAAYFAk92kQwACgkQGrk+8vGYmwd2yQEA2cJlJGfGwQB4ri65p8/HQ7DA
+WU1h4R2Ev2k8KuwzkGYBAJ9uqJniQu/RDxyc4ex0Wymzp5X6JvGrDN7rAJfvVHzw
+=G4L6
 -----END PGP SIGNATURE-----
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"