amd64/x86 stable, bug #199738. Removed old.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

6 files changed, 10 insertions, 172 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index c94cedddaf77..f5635c0de83c 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.57 2008/10/13 09:25:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.58 2008/10/13 09:35:18 pva Exp $
+
+  13 Oct 2008; Peter Volkov <pva@gentoo.org>
+  -files/vzctl-3.0.16-prevent-stripping.patch, -vzctl-3.0.18-r1.ebuild,
+  -vzctl-3.0.22.ebuild, vzctl-3.0.22-r1.ebuild:
+  amd64/x86 stable, bug #199738. Removed old.
 
 *vzctl-3.0.22-r10 (13 Oct 2008)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 7bd46de14fb7..926f6c92f166 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,15 +1,11 @@
 AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d71109db574f565d2f733332cfafcf50 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0
-AUX vzctl-3.0.16-prevent-stripping.patch 1407 RMD160 beac951027ab76136ce2dc7f15690e7c1fe829f9 SHA1 4d25c369ab3a27201ae2c1954daf6f322874b801 SHA256 bc1299d1fe12fe720309f06df5360ab49ce3f6ab282398f6ff155fab43020c1f
 AUX vzctl-3.0.22-capability-fix.patch 1037 RMD160 d244af55f1eaf249d1db04e53ab452aeec5e32f5 SHA1 bb6699627ddedaa524e4858e3c46e3bce50fb1f1 SHA256 977eea8154c3276fbab5a091cd30cf5072e26e7a9957b3aaa4428eacd3be0e56
 AUX vzctl-3.0.22-document-disable-modules.patch 843 RMD160 635e9417e3bbdef88d447f65e7d8007b89ba52ad SHA1 b6c1bc340ed29efe9ebf99d50b214b4c03e23379 SHA256 e2f4d5b3d3447eb6a4086ec3ff1ab5e8cc10797afe4febc3f06847a94430e6d5
 AUX vzctl-3.0.22-glibc28.patch 758 RMD160 633a9feb1a7101a166aa8e090fac4b5720546d0c SHA1 d19fb01c59366eb97da8178864ddda88010b7110 SHA256 36021ca9dabe548075ca016db047131f3536f916b2fa620ed61b00c41545e19e
 AUX vzctl-3.0.22-scripts-openrc.patch 6804 RMD160 3535f073b8fd99749891e28dfb5843729f97e801 SHA1 58a124fe8de1893c2f8526502117b3cca86279da SHA256 2a94de0d088c1ef66cf0e568099ca5376bc166467f48a9e0b39610f309c17c8e
 AUX vzctl-3.0.22-workaround-gentoo-add_ip.patch 1250 RMD160 d77d99b74ed55894a947d6651f3a8471f3f582ff SHA1 a3da293f85076cc8c86f68c128733e57ddba8b56 SHA256 b5d52398a85d947ceebcd7db17fbd6ec602bb03c338ec4af5b202a814e226730
-DIST vzctl-3.0.18.tar.bz2 359655 RMD160 9c7169e151c6384fd489df3dd6392d442706f46f SHA1 35bc546f9af7254b1739bca9cead71b8dad04ca1 SHA256 8610efa9a8327a1b6457eaa28b772ad753db5f23c2c18b25bb3ce0cf6a929e2f
 DIST vzctl-3.0.22.tar.bz2 360012 RMD160 53353981fefea94d997b3555600583f4c5818833 SHA1 58e5c55855aebf9e4ca032b325d8960a3836d648 SHA256 20f75e8342b85909d6bf01d0db47acaa088125da7f203b5e6e6169aa4c139166
-EBUILD vzctl-3.0.18-r1.ebuild 1771 RMD160 96bca16be9a37a8e630856d7128322090bbc6eda SHA1 494d3c9626c0fa2c252186b663eb3284744f2e8e SHA256 1734e54adde38e4649214f56c13ff5575216a34ac5b263f08f4a8d1069dddc65
-EBUILD vzctl-3.0.22-r1.ebuild 2587 RMD160 7dc6eb0555fc978b6a234e4fb6988a6394829b50 SHA1 00a65bb152621a0834c78607cc4d1aaf39037867 SHA256 a15b08beb6303d9244677eea27ab67ef3e577fa513beae5909ed05760d60df3f
+EBUILD vzctl-3.0.22-r1.ebuild 2585 RMD160 3a26d40c46dc4e7052184eaf9fb7f96bb1cbdf76 SHA1 0e673748b748658799e7e4646c789e73fc44161f SHA256 be918b625ea4a3c411402f596a04939912e82c6de1a173fb9f86180fc08e9b73
 EBUILD vzctl-3.0.22-r10.ebuild 2613 RMD160 9bfa3722615f22e6e0b2efeefb738fa251ea9db0 SHA1 9916ed88dde7403d778df002f9356c91ee59eb53 SHA256 259d015efa14dc10434badfcc7a726fba49fe087f80ca4c7b4e4ce757c8ff481
-EBUILD vzctl-3.0.22.ebuild 2316 RMD160 16e83e4cfe8e1ea49f062ec79d50e8749bb57d2d SHA1 e8588f3c09d88914548a8b152eeaacb1b84b3527 SHA256 240a995f88cd827e173bece0ff416995dcab3ae9321b63c80029e60e7be8ef4e
-MISC ChangeLog 11049 RMD160 db53417f26f330cb0b412c0c678dcf17a2d30890 SHA1 26d0d4950c6e09d109139139619ce4c10ad7b4e4 SHA256 40dab48784a3f6c7b202250e927bc54e23cdccad8bf49fadc88d1964e057e76d
+MISC ChangeLog 11261 RMD160 75c351b18e6b8a8767d9744a855ced75ba574e9d SHA1 b3c34860a382b6435e8ed13db0cb7d6204d8db94 SHA256 6a666c4311d593ed81af618543996712786defd995325604044b02ae0268885a
 MISC metadata.xml 332 RMD160 b40e74088fb74ddb66a5eda7f46bf63742e2258a SHA1 719e3d0e91af2df78aa7478990ef65c307fb0c31 SHA256 30e1f46e13b10bc59d15c29e986bf8d8aab98ce8338c33d6f37650f399ebb4b2
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.16-prevent-stripping.patch b/sys-cluster/vzctl/files/vzctl-3.0.16-prevent-stripping.patch
deleted file mode 100644
index 218187d59b13..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.16-prevent-stripping.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: vzctl-3.0.16/Makefile.in
-===================================================================
---- vzctl-3.0.16.orig/Makefile.in
-+++ vzctl-3.0.16/Makefile.in
-@@ -614,7 +614,7 @@ uninstall-info: uninstall-info-recursive
- 	dvi-am html html-am info info-am install install-am \
- 	install-data install-data-am install-data-local install-exec \
- 	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
-+	installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-Index: vzctl-3.0.16/src/Makefile.in
-===================================================================
---- vzctl-3.0.16.orig/src/Makefile.in
-+++ vzctl-3.0.16/src/Makefile.in
-@@ -680,7 +680,7 @@ uninstall-info: uninstall-info-recursive
- 	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
- 	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-sbinPROGRAMS install-strip \
-+	install-info-am install-man install-sbinPROGRAMS \
- 	installcheck installcheck-am installdirs installdirs-am \
- 	maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
diff --git a/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild
deleted file mode 100644
index 8b3ec803ef16..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.18-r1.ebuild,v 1.2 2007/12/24 10:29:12 pva Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="OpenVZ VE 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 logrotate"
-
-RDEPEND="logrotate? ( app-admin/logrotate )
-	net-firewall/iptables
-	sys-apps/ed
-	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf --localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		$(use_enable logrotate) || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-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 /etc/vz
-	keepdir /etc/vz/conf
-	keepdir /etc/vz/names
-	keepdir /vz
-	keepdir /vz/dump
-	keepdir /vz/lock
-	keepdir /vz/template
-	keepdir /vz/template/cache
-	keepdir /var/lib/vzctl
-	keepdir /var/lib/vzctl/veip
-}
-
-pkg_postinst() {
-	bash-completion_pkg_postinst
-	if has_version "<3.0.10"; then
-		ewarn
-		ewarn "The location of some vzctl files have changed. Most notably,"
-		ewarn "VE configuration files and samples directory has changed from"
-		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
-		ewarn "your VEs, please do the following:"
-		ewarn
-		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
-		ewarn
-	fi
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild
index 0e07e3fbcc74..cbdc16a897b8 100644
--- a/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild,v 1.1 2008/07/14 06:12:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild,v 1.2 2008/10/13 09:35:18 pva Exp $
 
 inherit bash-completion eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 IUSE="bash-completion logrotate"
 
 RDEPEND="logrotate? ( app-admin/logrotate )
diff --git a/sys-cluster/vzctl/vzctl-3.0.22.ebuild b/sys-cluster/vzctl/vzctl-3.0.22.ebuild
deleted file mode 100644
index dbc39b95f9f8..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.22.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22.ebuild,v 1.3 2008/01/30 08:30:30 pva Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="OpenVZ VE 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 logrotate"
-
-RDEPEND="logrotate? ( app-admin/logrotate )
-	net-firewall/iptables
-	sys-apps/ed
-	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf --localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		$(use_enable logrotate) || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-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
-	ewarn
-	if has_version "<3.0.10"; then
-		ewarn "The location of some vzctl files have changed. Most notably,"
-		ewarn "VE configuration files and samples directory has changed from"
-		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
-		ewarn "your VEs, please do the following:"
-		ewarn
-		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
-		ewarn
-	fi
-	ewarn "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
-	ewarn "interfaces to send ARP requests to has been improved (see description"
-	ewarn "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case VE IP addresses"
-	ewarn "are not on the same subnet as HN IPs, it may lead to such VEs being"
-	ewarn "unreachable from the outside world."
-	ewarn
-	ewarn "The solution is to set up a device route(s) for the network your VEs are"
-	ewarn "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
-	ewarn
-	ewarn "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
-	ewarn 'value other than "detect" in /etc/vz/vz.conf.'
-}