Version bump, drop old wrt #548884

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

3 files changed, 29 insertions, 25 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 4817fa5db980..8e9de6aeb99a 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2015/05/04 12:05:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.45 2015/05/08 17:26:21 xarthisius Exp $
+
+*docker-1.6.1 (08 May 2015)
+
+  08 May 2015; Kacper Kowalik <xarthisius@gentoo.org> +docker-1.6.1.ebuild,
+  -docker-1.6.0.ebuild:
+  Version bump, drop old wrt #548884
 
   04 May 2015; Justin Lecher <jlec@gentoo.org> docker-1.6.0.ebuild:
   Add missing dependency on aufs4, thanks jbergstroem for the report
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 4e1317cb81c2..172482ab8e7b 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850c4391ebd59df0b4 SHA512 5838270ff9ce7b9a562b2449ba5f4ad72db956dd03f6a1b006c8019ff43fea1c4ae1e2a4818fb092b6096cff6bd9ce539b05b7940412c55b3bb3e30c356da944 WHIRLPOOL a8e3759b6c86855afa7e784d50a7926fc888d50ec03dc2d9dcd70c3f2dd11caf6670196d91f383cab1d603f32a968bed4b3a0668ec1a38d41dc1142ec92235cc
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 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
+DIST docker-1.6.1.tar.gz 5713944 SHA256 aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e SHA512 d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2 WHIRLPOOL e12c799ef63a0646f7393b00b6c1e200f350f7089445c58819ae5b53d66d18d985cb9f8fde1cd3ecfa55c2f0186064fc7080b7ebba132404aa15502029881602
 EBUILD docker-1.5.0.ebuild 6822 SHA256 19f5e21476163342094b3de4571c6cb04e9cb5a6759cbcf7fa5b69055a34e977 SHA512 5629aa2ae6402a75fcd94278e1e107c6ce529db7764d8bfd3e9f4f656b0e59f3901769b9ca4126e2ce822d9b3b73cf217a39c7bd302b3b7f21288804525e611e WHIRLPOOL ddb1cdaff5c6393434b129df788e4df9062e43a22904dea89dfa72a68af889ec9071b062c97ae7bd758e111774afca181418e5e7c306b07efb1d6ba872cf115c
-EBUILD docker-1.6.0.ebuild 7055 SHA256 128f7f633c4351334ca62924ba703baa3e9b16436c46dee585c090183fba4ae3 SHA512 acc9d2de2cc12c2daa9bb1b4cb0b106664936be6b44dbe894e22334b94d505121af28355275a10a9180afa5857c0db8cc05269ce7c1ad33f93c944b776d93070 WHIRLPOOL 8ea26246cf538aa1b3917eabcb9ba9b3d50e4432da68c57b03ba37e1ee3efb6b4f1feeecab39b0c435cdfa353093ac4326ad2983be9ad70fe14461cd0c291d6c
-MISC ChangeLog 7313 SHA256 82cbaca43756149716d3f33bf649296dd32bc6bda3643a1274ff4ecdd9f6ab5a SHA512 e106b644711e0b0357a42b6ba368f580e556a4c7746aa0398cf4f12be7406503711835b7a7ff7eb89251950c135b2defeaeaa783ea63ae6b347f901676867594 WHIRLPOOL f425d5557c5273a58b3e27432d67f99e6025f624c25bb94186b65db17e457e29f7b2729c4d4501ff8f5ce8b89d5fe846e2128ed398249e15b9a8d32002c531c4
+EBUILD docker-1.6.1.ebuild 7037 SHA256 30ec6658d6e919af06245eb246ce78ff705864276ee13e27c7575ddca5919f74 SHA512 1f9b2e51ab3e0f324caedce55a91ba10d1fb0b966b17d12db088d96fe7db911de21029cdc59870c95c4a8e3c4d43378b26be485604f38ae31bf3545e30a2fde1 WHIRLPOOL 1d1675fa48cf8eeed05e862bf606ce544bd71f618233be559028c1dac8abb7fb6558d336466ac7ca0784d65ff3b96c7188d19a93c6e53abee948e6c8d2f15a55
+MISC ChangeLog 7486 SHA256 c8be44c98407802b7b70a67bb092a46bf4e2bac21dfe7cd526da34bfc3599036 SHA512 8eff26f305b635055bdc516a473743b6e483560d653eeec4a82c8ae35f8c3ec9e75e286140dd8d90c6c869ad878e53829378999f2fa5ce54375c577b469e093a WHIRLPOOL cfaa11803666e21f8a1a59611739d6641f5335a24ec5aee7d82b6a539ed8f8fb0b94e2f101fed307bf93e1b251336ca1d7a1ecb25f300ea1623402c600fffc3d
 MISC metadata.xml 1404 SHA256 47b10fac828cc7c80f752c786452104d924bee553c0e6f95e8de5de585ef832d SHA512 e88b6183842f53cec880671f2c9785b1690917f4214f13f521747cc968f6be9cad0a5b09ca36705b69a168b8c4db4271f754c345f4042f5baccbd249e80eaed1 WHIRLPOOL 8c9dc0c496e788fed2fcffb826cbadbd8d4646fcfff5e807dc0946b360b15a833fbdb4d2bf45cd54e771d783ddd747f4ded575ee2e3e99998da774505e39e596
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVR2B6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1yoQAI2nzpfIGhANCJSgNA7QTOlu
-14PuZoXugFMc2oGwL+d1J9eLgFFFmePr3sPm9kYMRJ3XpqBoO/8T2PJSA1/0E40a
-qiIg9ExNIfIhhnMsmetm1/BsutdoQ9zesjKZ9XZDDd4zFrGZRSlhSUdmDLTn3Wx7
-V7bZpFSGBdeSWUmvQU8nOhAAQMq6skODF+W0bu5rJQ6Tx/RbaOTYlYSZlNDDMmMi
-2LbNEZYyi0bZBX2fqKSJEw+tAwrdysUZI7eZAXvcdqy7dvnnl0/FQiEi5dFsRHWr
-I4sMDJ4sbx2ZPIjxwBv+u+CPAGTaPapt2bdV0gGfkF8WPuTR+VyEHj+s+UV+sAsj
-4ZO+C4ANJQmwU3f+k8JOAygR455CgTdAOO7GZzrQXLB3laYHolYswI6S8IatLkr6
-qEBLkghPs+sFKdEAqSx8sOABS5le+OJ33uBk8Vz+iCfi3at+PNlqm5K4jF9QwVYz
-LCpPvdH3vrrKZ4f+Slkxts/CG+rkkQybiHWtWbwyFGWD9meVriA1j/wixADgwHar
-hksk6AEFeGIFahQ/eMl9oIVnTna5EcRrIpl4TTOwaoiwJsta2JZd/ZTHQf9h9vAy
-Q23D2BtUI1NLMBewUpY4kbimoUUJH/CBy8zZERANn9sQN3VQzU62ktefl60R04ES
-JN9fmU51WGSv3UrRjzec
-=B1uU
+iQIcBAEBCAAGBQJVTPHCAAoJEF0huFKJUZL5eJwP/0Al1rGoXEq1noym4JPcfmiR
+LRTddx0OWm8neKGVafOKiQ7xD2Yk7eX5/GtBJm1hGh+hVBk+KmuukKRf/6IC/iau
+dn88dgC06WBJ1L36613jE7JJRgFObhwyKO19m1B98sLkWya3SeM92EtThvQXhmCT
+D+XSbtaBuucb3qFGrC12ZLv4/CX7DitfnsH7anPZ3JzJrSO5O7mAGqCQ8n1QGNBm
+agv9KHr22V1677ewX0V/pFw1AfgJDwl+jG3sHlBFNElHztqL2EgXXj50ZnJvUPnH
+DsSm9GHgY92xfxWSk7NEroNZUgxVQDKty0NiRWS8zuFSekzHaHfzniHdaYnOt1jl
+rTbqmt32vUs5x4AReJqw7pzpFYlayNVLb8pZxmLDfIsrJPTuSopZz3SPWB8GjXil
+MT9yEHeb1ky3LrfDRdmuhY40Tuv89B8xmCrZuOuI1APvAGSunbrvEhz1SWTpRvDx
+kNlyVOeOyoKNzoUCgiOpjykn+NxW9WmpJQscPxfDOv6ugMDN9hOfHIQl2sOUXtnK
+pdPMR80o45PyazF7MJLJAOrKX7Z2Y0KrO7d9E1L6nlxiuMn1/SOserMq00+Te4Fq
+XV1SiRf42xzEfj8g7EQvAxZ2bsXdmzQdGFpbffd7BfE6TLl75MTWCRju2cMCw3eH
+vH1YJMim8AzpjMm7YA1G
+=T+S7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.6.0.ebuild b/app-emulation/docker/docker-1.6.1.ebuild
index c7adde000dca..5cb9905c4fd0 100644
--- a/app-emulation/docker/docker-1.6.0.ebuild
+++ b/app-emulation/docker/docker-1.6.1.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.3 2015/05/04 12:05:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.6.1.ebuild,v 1.1 2015/05/08 17:26:21 xarthisius Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	DOCKER_GITCOMMIT="4749651"
+	DOCKER_GITCOMMIT="97cd073"
 	KEYWORDS="~amd64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 fi
@@ -85,13 +85,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