summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2014-06-08 17:20:20 +0000
committerPeter Volkov <pva@gentoo.org>2014-06-08 17:20:20 +0000
commite3886f82aea5a2f6fb36a44ecbde18798fcc22e7 (patch)
treef565d850b6ab6c2af9ebaae4d5eab2bf944c064c /sys-cluster/vzctl
parentkeyword ~ia64 wrt bug #509628 (diff)
downloadgentoo-2-e3886f82aea5a2f6fb36a44ecbde18798fcc22e7.tar.gz
gentoo-2-e3886f82aea5a2f6fb36a44ecbde18798fcc22e7.tar.bz2
gentoo-2-e3886f82aea5a2f6fb36a44ecbde18798fcc22e7.zip
amd64 stable, bug #199738 and #5072765.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F1989B07)
Diffstat (limited to 'sys-cluster/vzctl')
-rw-r--r--sys-cluster/vzctl/ChangeLog6
-rw-r--r--sys-cluster/vzctl/vzctl-4.5.1.ebuild6
-rw-r--r--sys-cluster/vzctl/vzctl-4.6.1.ebuild9
3 files changed, 11 insertions, 10 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 290e365f59bd..6122bd7b1c6c 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/vzctl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.125 2014/05/08 07:55:12 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.126 2014/06/08 17:20:20 pva Exp $
+
+ 08 Jun 2014; Peter Volkov <pva@gentoo.org> vzctl-4.5.1.ebuild,
+ vzctl-4.6.1.ebuild:
+ amd64 stable, bug #199738 and #5072765.
08 May 2014; Vladimir Smirnov <civil@gentoo.org> vzctl-4.7.2.ebuild:
Fix several typos in pkg_postinst, now messages should be displayed properly
diff --git a/sys-cluster/vzctl/vzctl-4.5.1.ebuild b/sys-cluster/vzctl/vzctl-4.5.1.ebuild
index 73bf60d7d196..d7cf0e5cefcd 100644
--- a/sys-cluster/vzctl/vzctl-4.5.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.5.1.ebuild,v 1.3 2014/03/03 23:39:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.5.1.ebuild,v 1.4 2014/06/08 17:20:20 pva Exp $
EAPI="5"
@@ -83,7 +83,7 @@ pkg_postinst() {
einfo "please install "sys-process/criu" "
einfo "This is experimental and not stable ( in gentoo ) now"
- einfo "if you have work with .xz compressed template, please install app-arch/xz-utils"
- einfo "if you have check signature donwloaded template - install gpg "
+ einfo "To work with .xz compressed template, please install app-arch/xz-utils"
+ einfo "To check signature donwloaded template - install gpg "
}
diff --git a/sys-cluster/vzctl/vzctl-4.6.1.ebuild b/sys-cluster/vzctl/vzctl-4.6.1.ebuild
index 711b53198988..2dced65620f5 100644
--- a/sys-cluster/vzctl/vzctl-4.6.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.6.1.ebuild,v 1.1 2013/12/03 16:06:11 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.6.1.ebuild,v 1.2 2014/06/08 17:20:20 pva Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc64 -amd64-fbsd -x86-fbsd -sparc-fbsd"
+KEYWORDS="amd64 ~x86 ~ppc64 -amd64-fbsd -x86-fbsd -sparc-fbsd"
IUSE="+ploop +vz-kernel +vzmigrate"
RDEPEND="net-firewall/iptables
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
"
src_prepare() {
-
# Set default OSTEMPLATE on gentoo
sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
# Set proper udev directory
@@ -45,7 +44,6 @@ src_prepare() {
}
src_configure() {
-
econf \
--localstatedir=/var \
--enable-udev \
@@ -57,7 +55,6 @@ src_configure() {
}
src_install() {
-
emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
# install the bash-completion script into the right location