Drop ~CFS_BANDWIDTH as it's not yet used by 1.6.0, add warning message for CONFIG_MEMCG_SWAP_ENABLED. Thanks to Thomas Capricelli for the report

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

3 files changed, 23 insertions, 19 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 273c4393aed7..ba5ac05f3080 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.42 2015/04/28 20:50:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.43 2015/04/29 18:15:28 xarthisius Exp $
+
+  29 Apr 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.6.0.ebuild:
+  Drop ~CFS_BANDWIDTH as it's not yet used by 1.6.0, add warning message for
+  CONFIG_MEMCG_SWAP_ENABLED. Thanks to Thomas Capricelli for the report
 
 *docker-1.6.0 (28 Apr 2015)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 23e896b2bfd6..15e8e047f574 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -7,23 +7,23 @@ AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6
 DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
 DIST docker-1.6.0.tar.gz 5711975 SHA256 8ba01d3ae2c6db8532fef56dbbe16719baf4d08d66fa0f35550e98db6784df0e SHA512 c544818f61454c61e3459cec26363bd297b6852e7df0860417d68d64269820aa3a880a10f779e0ae5c541e4a59387aa54b0556e9b9c46d367061905c9532d10b WHIRLPOOL ae1b09b9f2c6034c860018ed5cc015606744e13790f563f4513631e83c13b9d300d8c11df213f3b3f792e956dd03b81d9445117dd0baf74380ab95b61e337c96
 EBUILD docker-1.5.0.ebuild 6822 SHA256 19f5e21476163342094b3de4571c6cb04e9cb5a6759cbcf7fa5b69055a34e977 SHA512 5629aa2ae6402a75fcd94278e1e107c6ce529db7764d8bfd3e9f4f656b0e59f3901769b9ca4126e2ce822d9b3b73cf217a39c7bd302b3b7f21288804525e611e WHIRLPOOL ddb1cdaff5c6393434b129df788e4df9062e43a22904dea89dfa72a68af889ec9071b062c97ae7bd758e111774afca181418e5e7c306b07efb1d6ba872cf115c
-EBUILD docker-1.6.0.ebuild 7021 SHA256 ca2393df19d65434fd9abe81494ed91e52d6358afae6d2155261d6ff4b006206 SHA512 4488a7e15f1bbe2188d8f55879d8eae6ff6284f1ce92b0bf402ac8d2fe8b478dd7762c066cd94c241ac4068f028def34419f104838e418cc34f7be5a90b043dc WHIRLPOOL f125682fd949888dbcd9ed234a5e5799440fae4a60c8e49a2702feb0c930ab18b77a1dbfa4039b5a60c58bccf288e2e7fc5cf5a1273a4f9e0adf6ac95c304e36
-MISC ChangeLog 6956 SHA256 ba6bfff749cf67fc20f182a64db314814a9883d039c320a47173a3848521a903 SHA512 a82b8a5ce9c154eae93131cce9e3759d967928eab44a7075637ede094db96d5700c6f4146c6398675ef3c70a47b8d5e895e26874521fa9d501b68ee5a00cbba9 WHIRLPOOL 95df0350db34c95fff473c8e73a4893de759abe04406cbe76ce770342b01cc43ff84dcb3691f9b479b24954f1f0585d5184c101277118adb275715322fc1aeaf
+EBUILD docker-1.6.0.ebuild 7045 SHA256 dd35be64f79ee3c7186a4694e55a1ec07241526e6b4cd14b89ea6fd044673077 SHA512 4d3ac1102af2eef810e2ed2f20aade8a6ffef04b5360a7a681f64c48d46561593fffd9f8a023d149136bfc9bc98becb6a9d095a6236ed0f24b86eb03b4093cd7 WHIRLPOOL d367f5b739685307bfdab680e8bfebfb97ef6f40c191c21076be46943047ef00f2e562782d21f7abbfce19b674dabd8511614c95c477fd1117a4b30cda6a3f65
+MISC ChangeLog 7181 SHA256 3532614afa09644ce10c62bf5812e75a602df145729ac4097f951df43b1d87e2 SHA512 77b1b03b27f23ecbb80b103dd88ef6565af9b75df2c99a1c0b984eef9e4c015921b39c28115cee08892422eb2890052d151f23edfbf592ee64141d944c9a460f WHIRLPOOL dd0a28e558c51608ba9d66fd5b2590332f6f2b8833cbc4492706c396782ff33e62aa5477a1cbee427985a86785b9370db8a06e0e6b3256be97b3564807c23e9b
 MISC metadata.xml 1404 SHA256 47b10fac828cc7c80f752c786452104d924bee553c0e6f95e8de5de585ef832d SHA512 e88b6183842f53cec880671f2c9785b1690917f4214f13f521747cc968f6be9cad0a5b09ca36705b69a168b8c4db4271f754c345f4042f5baccbd249e80eaed1 WHIRLPOOL 8c9dc0c496e788fed2fcffb826cbadbd8d4646fcfff5e807dc0946b360b15a833fbdb4d2bf45cd54e771d783ddd747f4ded575ee2e3e99998da774505e39e596
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVP/J+AAoJEF0huFKJUZL5ngYQAJHcFginjxYj4oPJAanv17N5
-BeA882bS0Ib/T96ps4HbMXjlsMJXXk5lgpBPa9UHoL10A8RBTvOzMdvE3MNZt8rB
-/FoLyqGz2cqMn6/iV70raxVo1mQWEFtb6Di30TdYUjNqiVry/g9jV2ymMh6exdM0
-2ZLjPxj24CU/tvE25zA4U187C8EVsz/n4VoDlr3BUrAWzz2qnFSr0IHCGhhsg/Sm
-SZagrEpcojwN7BQLpuIMk1BfZFAGcA2w2RNsx2Ba98l/fjoBauNEiIYcBZgjDhsd
-0wQ8sc2eo2IFQgZ6dhUW/SfIxeKML+O4RDnwOVwbpC+H0zgJT6kdrdZoidlikBy9
-Zx9fHBEsNDZ5tHNBiur/zvddATO8sB22V3YHTfaEVpTeTbG49NuGkHtpcA91F8JG
-6amBncVEJ1PhB/MM6JyfL0kA/UnqN589zT3kN/jApJUI4LdkRebxwx9oxJn+8Qku
-rDj0kgyUx4S4pjaiUeY9iT31Rb108qURAxMsMAkic2HyXVGlGt3fcKHT5G6PgTGX
-OmaX9cK4qRGJNDKnGkRQjrX5y6qGfawwnJvqCYEWSRaufzSgqmtj1YK184Et3voe
-Euu/gX79jKZJ796js9EhNU8oR2DD6hWloOgUB50Ht5GSpkatIfsBKTUhXm+lHscp
-zRJ4/adhYnnfeqeYolpo
-=uT9f
+iQIcBAEBCAAGBQJVQR/FAAoJEF0huFKJUZL5hcgP/AoZHbMS9X28Uu4SFz1uIPJl
+BrgmDbkDu3oZNeVlRwQgqX6gnmxFwlQPlL9fGRKqWlO/JorhjTmOeVASouW4Gznm
+uPxRFbOgySQVEnPiKSSk6cLKoX7Bft0YYhV9Jsart84+1JwbHg5hI6nsTrVfmJUO
+88GJ+p9c8hR3MWIwoKzvhKtkArppU+SeOBUMqI88fsTrDaCScTafOvIskQ47rtBI
+r0rq983Y/2hWTiERkVb7apIHXEfUfpzw50m3h0B8/c2a21zJJREtgpUjrxq/BD+N
+iWHj2TNo4fuulMrfccxC0hyM+UtbvpWCRSq+KDmckdv/jmx69rSIECSXXGHsGNGL
++1YjkC9ecfMxTs5n+4Y96lsnjGa4IcJly/kQcOup0/dw4tXbaraL9yPFfT9h6Koi
+paSdTnLB8mFHbXTFXzZP4VRmRXt7287qQGCAcnJCMjFV/oVfYDgiBUJQxF54Gx7r
+jZH2wodpa2j+UJ9jBgCoZ/gPM3jfpVxE/fOxNjWVIWz6ZpIYCDquIyK8wXm5KSai
+wE2ryX/gaL5FGM4ZVaZ0RQb+652kEibmXIDcQ0RZKL/FP41oZBo7RD1YOd4UgZTG
+x/XIvSG3JzELEMwrh47RlHdg2HsYQTvGa2nvFNrDNVAeHz+7vAnCbXJl2csAFBVa
+R9Rs/3a2GxdA5wekm8VD
+=1aiU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.6.0.ebuild b/app-emulation/docker/docker-1.6.0.ebuild
index 9948b891e36e..51fac88ccef4 100644
--- a/app-emulation/docker/docker-1.6.0.ebuild
+++ b/app-emulation/docker/docker-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.6.0.ebuild,v 1.1 2015/04/28 20:50:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.6.0.ebuild,v 1.2 2015/04/29 18:15:28 xarthisius Exp $
 
 EAPI=5
 
@@ -84,13 +84,13 @@ CONFIG_CHECK="
 	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 	~RESOURCE_COUNTERS
 	~CGROUP_PERF
-	~CFS_BANDWIDTH
 "
 
 ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_MEMCG_SWAP_ENABLED="CONFIG_MEMCG_SWAP_ENABLED: you need to enable memcg_swap in order to 
+	  limit swap usage of containers"
 ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
 ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
 
 pkg_setup() {
 	if kernel_is lt 3 8; then