summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2012-12-13 08:45:43 +0000
committerSergey Popov <pinkbyte@gentoo.org>2012-12-13 08:45:43 +0000
commite48440e5f1627e7052021432598c40ca28d52189 (patch)
tree89de406484b1f9bb87e3d4b9fa2d0ba559bd0f22 /sys-cluster
parentsys-fs/aufs3: Linux-3.7 is not supported yet (diff)
downloadhistorical-e48440e5f1627e7052021432598c40ca28d52189.tar.gz
historical-e48440e5f1627e7052021432598c40ca28d52189.tar.bz2
historical-e48440e5f1627e7052021432598c40ca28d52189.zip
Sync live ebuild with 4.1.1
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/vzctl/ChangeLog5
-rw-r--r--sys-cluster/vzctl/Manifest14
-rw-r--r--sys-cluster/vzctl/vzctl-9999.ebuild16
3 files changed, 16 insertions, 19 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/Manifest b/sys-cluster/vzctl/Manifest
index 6f42f938107e..2e53a32bd4a4 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST vzctl-3.0.29.3.tar.bz2 421448 SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12b41f74da0276c49102c262d2e7
DIST vzctl-3.0.30.2.tar.bz2 425118 SHA256 c100914ec10db7cce6114bb8fcfdf67dd406d0547ac07ea8d2994e6ca7299635 SHA512 2487482c96666bf73e961bb2849fafb54463ccf63b44dfbb7c5e6cedc19a7d029bcb66d902d67d1709b8899f61e014d938c150dcfe7b560800710d78ac6cf8f4 WHIRLPOOL 045826e689244d8fc5b60d32a5c0f26ae713693afc3f823b7d5229477db730c25fbea69edeb41de0add55362fc607e09eeb79dedb13d5705f530ee5372bf5c45
DIST vzctl-3.1.tar.bz2 442684 SHA256 c2b3f37df56613bdd137dbc7d144d146e7f6737bbfae9490458056c7ff8e31ca SHA512 0a49a2a67ec47542a48da6ca43f1fb46d756378cde2453d128d1a8ebcaa7f8814d2a94f0d5dfe9f3e70c72b0aca01704f367d8ffd387bb4afccc2a33b63e5347 WHIRLPOOL fb07e83c2b82d04de0ad9d9cc9f70f733cb97c367d26f8f0862f6626eb2a2e6350cad2f81f9af2fa103b91a4e35075393bbae8174fb09cb8db1e6ccafb0209b2
@@ -12,13 +9,6 @@ EBUILD vzctl-3.1.ebuild 1629 SHA256 c75acf1c39a6197260e23301bdc3e90a2e3c15bd7485
EBUILD vzctl-3.3-r1.ebuild 1773 SHA256 69323206a93e38436ee5fa1ea1dfbb073dc29a0b2f167385eaec0d723162b6d7 SHA512 82507078ab387064b86bb945053ec7a50a8754aa1cfc45e8b80bc3603dd0dce68b3b8ab46008967e2119503296f3ca61d5f3eebfbf633b60f2ab71e43bb1759e WHIRLPOOL 793641374925c844bd126895bfb0da3aceb0ad90859cb6718a0c78366af66ff3a255791535518e637e4aa2f954dc6c36b0fbe6bf28df1bf15fd11aca20618caa
EBUILD vzctl-3.3.ebuild 1703 SHA256 cb4120c9d9a9d4caf212228454cc49b353d0209b620c86bf688aa654dcb3d053 SHA512 752d6aa1651a2656c7da16fcf2fcc662f3fd41f1e83a81b235f4de5e9d3761cf31d00bdd8abc3cacfab8084e78910afed5552edbd02549e72660822d2bac763c WHIRLPOOL e5cda5b715e915e6536323de602464480b2df4dd54a914a703a754b3cd78e78622c15e86d7bba15a05713a08646981641727c04a208c8a8ac16c468717d08cd4
EBUILD vzctl-4.1.1.ebuild 1978 SHA256 01f4cdd6a6730d07a804913940e93b9ee48ce4f06097435d7fe8e8b2532b8bde SHA512 5144dde34728afe064607501d39cd8fb66922a71f50c951d579163919c445fb61512a7cbb8c5de9242fa8d0edab20e5db5383b6cbf992749bf692100e92ec657 WHIRLPOOL f046657e70913fc3063479378e6c30fb6f09a7219478d3f5134c5e6622f2c47c2d26cb151c70d9d4d5757fac885289e78241acf1c166fd147de5ef94b0cba06b
-EBUILD vzctl-9999.ebuild 1760 SHA256 14dc7595bec5697b757c6c3f41b030a4696b97ccc99c799bea121155eed3c64e SHA512 e64cd4b7094f03b499b86981971116644c0889d92219b9da787e8d8765a46d8cdd5492acef1eafaa5117a934265a2173dae275ccb6f3112ac8ad3eccabc809ba WHIRLPOOL 265994fd9c2c79d988d88b5d6309e2f1372576000008a88f5de588f6ee9a32e3c3a5649ae90ea7980dac8eb07e0c60489c11f7c1bdbd47cd5794ad2775919e5b
-MISC ChangeLog 20193 SHA256 7a4b2166c68e0a455c4d908fb5114e842ba607e55b71b624d3dd0fa8dfb30ac4 SHA512 ede3d598666625709d74207a67e2ed47829bdb2c3b4e69aa7495eac357df30199b4936962a17d6e68c46887c076cfda4aa71462cfa4c921e0f9556adc8aaffe5 WHIRLPOOL b3a08b8a72ded59824e54497b11033dc49f6ef9a639e7d8bbae831678bd3755864685fe8c0e8025d061f090f64546592f5b9568aaf269a6106d8f6ed5bcf0b25
+EBUILD vzctl-9999.ebuild 1905 SHA256 bbcf734cadaa6af96855db6cd4b520d6b770fb15b0e37c05460f1bfdab268ebe SHA512 1e90abbb1cc337d724c16564d15645af3a060cbb136a4585de648eb63ed520215b7257a8ace5c1d400872b99f51533150b473d5553dbdef1e831d1ef116cf810 WHIRLPOOL e610bf3738324bccd76bbcb20229e5b277fd446f16f64304b22db269e8c7d37007ed52c040ab0c183b0fa04a1560c074cb71c33191c13ca07c003d8a41655727
+MISC ChangeLog 20298 SHA256 be60704e1ef29c8a2424ecb76219e3aa6335ace317c0e91bd56163f21d950d16 SHA512 bd86b426c3866e53b1002f01d77f90aa86ad680540862e4d6afcd7db5ebcadedb9fd41f64633865dda2add3518d318f6e4871afe94586cbcb200bb8287b88ce1 WHIRLPOOL 394f992b383134d8536547635537283b08b2a08119a3817373109cfd0a9b3f7ac6773a34c476a49ed2e2285ec0e1ffad2bcd62bd8e8eba95560e6b90a6e32ad3
MISC metadata.xml 663 SHA256 33959534b64f468d5067d847dc4366a984a7ce9c6bcf701f7cfa44c3f639aa0b SHA512 61aec027e85c81be42306a604252316e92f5e2dd8bfbbd6955c10a6df0b02ccbb54397717fd2d598070c380c712c79b4a2cbfa0ae73ef0673ab8479decda3d3b WHIRLPOOL aa36244bf8ce2dc51fa094a5a38be250d6ba97d03611f3be2495c4095f81f24e54cf539b7bb9f1301abb416f717301e48e1f6c3bf9c39ef30646305628d4cacf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlDHeM4ACgkQ2ugaI38ACPBsxAD/RPJt2paGAb1TTQdyOf7CPnns
-L27i+i1mb5udodY0rjsA/3pq0LKmaqIIeXA4RIwH9vq0dYG6SdQk/GgXRmQhh8r8
-=ST3s
------END PGP SIGNATURE-----
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() {