diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-12-13 08:45:38 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-12-13 08:45:38 +0000 |
| commit | 0dd106e8c25c564a61d6ab9b24c9dfabac579051 (patch) | |
| tree | 1aba3935e7d681b9f3a143cf2e298799e625f3a3 /sys-cluster | |
| parent | sys-fs/aufs3: Linux-3.7 is not supported yet (diff) | |
| download | gentoo-2-0dd106e8c25c564a61d6ab9b24c9dfabac579051.tar.gz gentoo-2-0dd106e8c25c564a61d6ab9b24c9dfabac579051.tar.bz2 gentoo-2-0dd106e8c25c564a61d6ab9b24c9dfabac579051.zip | |
Sync live ebuild with 4.1.1
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/vzctl/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/vzctl/vzctl-9999.ebuild | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog index 811681dba5e6..848deb3f30d7 100644 --- a/sys-cluster/vzctl/ChangeLog +++ b/sys-cluster/vzctl/ChangeLog @@ -1,6 +1,9 @@ # 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.96 2012/12/11 18:17:36 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.97 2012/12/13 08:45:38 pinkbyte Exp $ + + 13 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> vzctl-9999.ebuild: + Sync live ebuild with 4.1.1 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> vzctl-3.3-r1.ebuild, vzctl-4.1.1.ebuild, vzctl-9999.ebuild: diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild index 587d4bbdd44b..86f3c1440ce2 100644 --- a/sys-cluster/vzctl/vzctl-9999.ebuild +++ b/sys-cluster/vzctl/vzctl-9999.ebuild @@ -1,8 +1,8 @@ # 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.12 2012/12/11 18:17:36 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.13 2012/12/13 08:45:38 pinkbyte Exp $ -EAPI="4" +EAPI="5" inherit bash-completion-r1 autotools git-2 udev toolchain-funcs @@ -14,13 +14,15 @@ EGIT_REPO_URI="git://git.openvz.org/pub/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="+ploop +cgroup" RDEPEND=" net-firewall/iptables sys-apps/ed - sys-apps/iproute2 - sys-fs/vzquota" + >=sys-apps/iproute2-3.0 + sys-fs/vzquota + ploop? ( >=sys-cluster/ploop-1.5 ) + cgroup? ( >=dev-libs/libcgroup-0.37 )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -37,7 +39,9 @@ src_configure() { --localstatedir=/var \ --enable-udev \ --enable-bashcomp \ - --enable-logrotate + --enable-logrotate \ + $(use_with ploop) \ + $(use_with cgroup) } src_install() { |