Version bump, bug 350806 thank Fabian Fingerle for report and Dennis Schridde for initial work. Sync 9999 ebuild. Drop unused.

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

5 files changed, 29 insertions, 119 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 6279e7a699e9..04b8154af326 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/vzctl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.73 2010/09/10 07:46:45 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.74 2011/03/22 16:28:14 pva Exp $
+
+*vzctl-3.0.26.2 (22 Mar 2011)
+
+  22 Mar 2011; Peter Volkov <pva@gentoo.org> -vzctl-3.0.24.ebuild,
+  -vzctl-3.0.24.1-r1.ebuild, +vzctl-3.0.26.2.ebuild, vzctl-9999.ebuild:
+  Version bump, bug 350806 thank Fabian Fingerle for report and Dennis Schridde
+  for initial work. Sync 9999 ebuild. Drop unused.
 
 *vzctl-3.0.24.2 (10 Sep 2010)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 9773f7dfea1e..1b9f7571f298 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -14,13 +14,11 @@ AUX vzctl-3.0.23-vzarp-on-ifup.patch 3404 RMD160 d08123addc176a5532bfd8b264b4e54
 AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1edf32ff31773eb2f3026ab SHA1 59845fa8f10fcda7f2a390205858ccb032eaaf6b SHA256 2225bcf154ca629ce9ef5d390eed19b5fbdbee4b902e203cfca9854c951a3035
 AUX vzctl-3.0.24.1-vzpostup.patch 846 RMD160 f7f844c2f4325f81e7de46f76c6ec5739ba885ff SHA1 dcd541bd9d021b02067f993001614d7d1182042b SHA256 718a00b7a02246e343f1726f8a12ad725f569ee1a9dbcd36f7d3be539a59a5c9
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
-DIST vzctl-3.0.24.1.tar.bz2 399161 RMD160 6cbe312018e40f067ba4f5d492b41b98106689fb SHA1 43e6da25473b51ee4ca1971d9347d66a7feb1ec2 SHA256 f0ff98e7ed4871d9435bbabfd2c8c6e23710fab43ec1827f246fd80d586e6fab
 DIST vzctl-3.0.24.2.tar.bz2 399241 RMD160 93af0cbbcdf2789f505feab21ba0c48977cbcddc SHA1 bb222e985dbe09d28c8387a861636297d6c3eb93 SHA256 378839a4d5eda102df84ddd7daa170c9b28d7df355ed57b04c5a7e19b8203ae3
-DIST vzctl-3.0.24.tar.bz2 399118 RMD160 5e3c295a37b3a38980b4931ddabbe6624b001346 SHA1 12aee6917bac4466019d000b444c5eef0dd92019 SHA256 6a853339409b8305516850c8d09aa3c4c62c7e5ec841e8dbc91e6d26de1e6d45
+DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f
 EBUILD vzctl-3.0.23-r2.ebuild 2999 RMD160 1b0a21d0bf1b815a467c5d82535d9229860614b7 SHA1 56d478571bdbde2214b80ae255c89df93ad67a43 SHA256 35b495874f09fe1757d3cc24879cb936008d7ef8e5398396c90a6db3db70e23b
-EBUILD vzctl-3.0.24.1-r1.ebuild 2835 RMD160 7f3b3cac2b1829654be846e0f6d6633e57907d50 SHA1 aca9532c8df58dd559efe744d64f0673ff71c74a SHA256 100c083f517d3d26e274461f5d1cb70022f65ff51d8cb96161e43b169f61270a
 EBUILD vzctl-3.0.24.2.ebuild 2960 RMD160 563e12f3c9f25c5c25e2e4c13519ac2d17990bf1 SHA1 4dc81e76e58c5f61769cb8374c5a7f133bc5bc3d SHA256 1e2091770232b1450398aab3592b3b9585b9a0d259c8dda3a996651d700b4abe
-EBUILD vzctl-3.0.24.ebuild 2788 RMD160 fb18540313e60d9c354df9d25fdc7dd7b83fe9ab SHA1 33ee149dad35e186ea5c3c3ff6cb3d6b91106cd2 SHA256 1e4328a3712d718323031921c7dd24f19bad290fa0152ec0921025a86d6d79ce
-EBUILD vzctl-9999.ebuild 2750 RMD160 b24a40302cbfb30f696e91b0bd91b2702db8e274 SHA1 b73e15b8614b793b4965deb96e5946f7f93910f3 SHA256 4900e93be1351e331dd44ab43a823d379a3cfa2689fe3ff44baead208765b11e
-MISC ChangeLog 15476 RMD160 0274dc15ed387eda461ba50ef08b08e00e9f9f78 SHA1 0f4ab34593b5d89e075ab4df5264f9518e854729 SHA256 3affc0440bea720235b2b38988852d2061c31addcc51ac98253b9f5cf208e50d
+EBUILD vzctl-3.0.26.2.ebuild 2739 RMD160 f2a1b2484b2f2faff0b125bf7c18ecc0c8cb879f SHA1 b2071ef31313f9ecaa146b18443fbf524a01741f SHA256 11ed10eff020c9d6a791b183111b2d2eea0f36a0565d3fc32c8ff91c1e09f75e
+EBUILD vzctl-9999.ebuild 2699 RMD160 bd7d4cfe31c7fadcd88cb7988f11be4aa3fdbe81 SHA1 3b3c2348540d798ad405c2f680aea0ebe8b988a0 SHA256 788aa7ecbfa1058863a922bc8babb5ab7c259908cbe13f7a046352d629bb0b73
+MISC ChangeLog 15778 RMD160 83b14d646874d98d7f9837a8ff1d4f586cd6c949 SHA1 99be2147cf37e7e362d9edfde4bb7e6ac2649318 SHA256 ce0aa0d4e66d73a556e1663e78084eee2075ffa7d18f2ec41db3ef163678f3f9
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.1-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.1-r1.ebuild
deleted file mode 100644
index 4964990d32d5..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.24.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.24.1-r1.ebuild,v 1.1 2010/08/30 11:55:45 pva Exp $
-
-EAPI="2"
-
-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
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Set default OSTEMPLATE on gentoo
-	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
-	epatch "${FILESDIR}/${P}-vzpostup.patch"
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		--enable-logrotate
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-gentoo || die "make install failed"
-
-	# install the bash-completion script into the right location
-	rm -rf "${D}"/etc/bash_completion.d
-	dobashcompletion "${S}"/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 "${ROOT}/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 " }"
-
-	elog "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
-	elog "interfaces to send ARP requests to has been improved (see description"
-	elog "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case CT IP addresses"
-	elog "are not on the same subnet as HN IPs, it may lead to such CTs being"
-	elog "unreachable from the outside world."
-	elog
-	elog "The solution is to set up a device route(s) for the network your CTs are"
-	elog "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
-	elog
-	elog "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
-	elog 'value other than "detect" in /etc/vz/vz.conf.'
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.ebuild b/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild
index 698b2261b592..662eda570dbd 100644
--- a/sys-cluster/vzctl/vzctl-3.0.24.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.24.ebuild,v 1.2 2010/07/02 15:11:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild,v 1.1 2011/03/22 16:28:14 pva Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit bash-completion eutils
 
@@ -32,18 +32,17 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localstatedir=/var \
-		--enable-cron \
 		--enable-udev \
 		$(use_enable bash-completion bashcomp) \
 		--enable-logrotate
 }
 
 src_install() {
-	make DESTDIR="${D}" install install-gentoo || die "make install failed"
+	emake DESTDIR="${D}" install install-gentoo
 
 	# install the bash-completion script into the right location
-	rm -rf "${D}"/etc/bash_completion.d
-	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
+	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}
@@ -54,7 +53,7 @@ pkg_postinst() {
 	bash-completion_pkg_postinst
 	local conf_without_OSTEMPLATE
 	for file in \
-		$(find "${ROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
+		$(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
 		if ! grep '^OSTEMPLATE' $file > /dev/null; then
 			conf_without_OSTEMPLATE+=" $file"
 		fi
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
index 9739686ed99d..878f72541c08 100644
--- a/sys-cluster/vzctl/vzctl-9999.ebuild
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.5 2010/06/29 09:26:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.6 2011/03/22 16:28:14 pva Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit bash-completion autotools git
 
@@ -33,18 +33,17 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localstatedir=/var \
-		--enable-cron \
 		--enable-udev \
-		--enable-logrotate \
-		$(use_enable bash-completion bashcomp)
+		$(use_enable bash-completion bashcomp) \
+		--enable-logrotate
 }
 
 src_install() {
-	make DESTDIR="${D}" install install-gentoo || die "make install failed"
+	emake DESTDIR="${D}" install install-gentoo
 
 	# install the bash-completion script into the right location
-	rm -rf "${D}"/etc/bash_completion.d
-	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
+	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}
@@ -55,7 +54,7 @@ pkg_postinst() {
 	bash-completion_pkg_postinst
 	local conf_without_OSTEMPLATE
 	for file in \
-		$(find "${ROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
+		$(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
 		if ! grep '^OSTEMPLATE' $file > /dev/null; then
 			conf_without_OSTEMPLATE+=" $file"
 		fi