gentoo resync : 02.01.2018

13 files changed, 26 insertions, 386 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d931cc242514..42d2c743de3e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 22a426dba5c2..7c9eb589bb2a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,9 +1,7 @@
-DIST containerd-0.2.9_p20170605.tar.gz 1229549 BLAKE2B 9dd68595694b5b624007ecd8a8a6546abeacbd45c6f4bd79754c275a2148938f17f7313f59567a7095d3d292807bf0eda9b79a5c9129a36f05eaa2478b97fde5 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
-EBUILD containerd-0.2.9_p20170605.ebuild 1000 BLAKE2B 16ffbe24d43a2a8a46023a1a2d454e06141ceeab94f559986960fc285f31d954a166f609c11b021d44d6d36d7d4198b84ea70768a30aa2c16d9a044e17f78fac SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04
-EBUILD containerd-0.2.9_p20170917.ebuild 1001 BLAKE2B 3cd479b76dc812f5dec2b85e40bb52d4ce856bcada67d42cb1816cd4cd0a6afdc39cd0ac373f44453d5776911e1ca292608aed81cddcedb92877f8729cacd7f8 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f
+EBUILD containerd-0.2.9_p20170917.ebuild 1000 BLAKE2B e207ebb992d1c1e47a13c5ebae2004a6e8bb887ab605d9aaf7ac053762aecb58224b0d21cf13cc59fd1d9bc508fc6c0be5d3f7c4fd6a22136059a1a12b0df072 SHA512 c258fd617c1006ccc09506c1ff28d2edfe2e15966cacc62ea4e1194f3cdf96d74a60db5bf1f009a05b97f84bac44c23cef33e73e77ba272b8861244be7dbbe36
 EBUILD containerd-1.0.0.ebuild 1239 BLAKE2B 93aeb4bb834e6d79835d9eee995d0e8ec82d042d344eb2082366c71e56dc3f9376f3621a57b050f88478f5f9874c6cfd458a3c04a4866d3e583ed925bd49726f SHA512 b68d0bf59a5bdcbb98a8d480e5db49b182fcedf16962a6d9570dfeef22670d84215b8dd2b1c372108f92e6dd3b0f6c0b5478b1ce2c61ab2a2f4063820fcce97e
 EBUILD containerd-1.0.0_beta2_p20171019.ebuild 1250 BLAKE2B f0f6b831f90be916ef5841d4da3a5f14ea9569c978fbb250cd47df39020badc540eec2fa1a165e9b4e93d705bbcdd40d83317eac6db113c80ce66ff1ad1cfa00 SHA512 31eaa813c4ed0cf942d9b5b8d6b42acb33838b606d74706d02affe7eca3393f1f45644e496b7353b517a051c982111b872ea58a12c6644664d88ba023e2de185
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
deleted file mode 100644
index e574004b67ee..000000000000
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened +seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170706
-	seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin bin/containerd* bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
index 90c87cf44750..25e1ed88476f 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 2f6af893dbf4..10c6df8bd6ce 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,6 +1,6 @@
 DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 BLAKE2B a752ad0170cab2aebe2d5e826db22f5e21135a8fbfa835f62804c303be9f136fee941942e7d07e82e19033a62d51f37a41e9c36b48df48947d2885c351584f4f SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
 EBUILD docker-proxy-0.8.0_p20161111.ebuild 811 BLAKE2B 52fea3672054a214e08d3bf0f5392ec40620eb21c90e2b1535ce2ae327f544b6c852df93eb799217f42d4baaed927df7a266e12946d8efee84c5871471795d00 SHA512 f9fbd5faa13fc3f32fa8b23188dc242b11a8e7933a382552e80d0cc17dae3c2c2302ff42a0502acf55fd660bdbd4cb6e82f60ad977b0ed31873509ffb3a18462
-EBUILD docker-proxy-0.8.0_p20170917.ebuild 845 BLAKE2B c0ccb3363493ceffdbd2bfdae9bdb4a6eee9568f66df1d3c0b46f8fd6f2849fc46f38ad2d6443838a88b8ca6540c8698411dd0ab871451717188f939bb4a7302 SHA512 bf5d6aa116d1b6a59d33bb9168baf3a24b20bc34706a65ee6ef02378399d73843cd16580118287201310ec13657cd35dcee16e08fe8fa26f747368c818027d57
+EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79
 EBUILD docker-proxy-9999.ebuild 767 BLAKE2B f78b475830edd0e33139d9f46a75629b9375ca1c2efc0e5e6c78447fd2bded0f2d1face48e8a0a8da92f6ea724eec843d2d96eb8e94a6881615926ceab6811df SHA512 07c829f9d6e5a2c64512fba2c6cef66bf33e15818d905f9b9fb3e412a98d651ac32c2fb9c07da57c7f8de963c4919f621021929375adf72afa485da9a69051ed
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
index 0235cd99b405..5a4839ae1018 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index 8488726e6e81..895a006b4864 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,7 +1,7 @@
-DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 BLAKE2B b0d5d3788cdbaf17af23fe102a3b5ebba9324505d2389e2acd3300680cfdff682dc170b214e1a000d081e791943c160c7d797acb90173f4549caa554493c86e5 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 BLAKE2B fed7b3cb3bbf214c61f9bc84752f143de9f18aa1ad1720c80df171eaa82f545cdafdbd58f64ee21e05db67f7fcfa139622fc8356aa7584db87b72d46e3285907 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d
 DIST docker-runc-1.0.0_rc4_p20170926.tar.gz 1188421 BLAKE2B ba21aaed4c434358876e9a1656a0592e5df90e16ebd52b69a2ddd3344aba2db5e335de1c88aeed27101ec5441174da148d0da02ade0b517d36d45e0aff53ca9e SHA512 bad4643ce37dbba168cc3b0820cf7dc8166ff2d7970de519f86ca09123b59999174dd98b7bc550b714dc8235732923e0090031c789deb603f310e042a39f1d76
-EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 BLAKE2B caf99dfd6f7168ff3973cee36512fdf06cf75c7ac2351a5bd6b78bd465bb5d2fe0882fdfd095b8111457470b6db716d985314bc953f0a37ece2afd2dc30b0950 SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c
-EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 BLAKE2B 2ba72209d0db389e3f80f07e4bab4e217148ccbc7f5caebadc4e093cd15cdda827477e3f3d5a88d3935f253d996f626ec60823fbe6c97bb3d056fce4df398c13 SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133
+DIST docker-runc-1.0.0_rc4_p20171108.tar.gz 1189298 BLAKE2B e213955ef59e7d5a43f1567c67d72b99d7de503340ed8c777a43a70c4f2b1dbfce2905377c912958f736cf31247334d1c2ab29fae203a297561c26ad43a4e4c1 SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695
+EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1385 BLAKE2B 03aab7b27952ff4dc2e1e84c6e3edb599b03df34dc1a82c7b7cbff6a3f36324cd191e723f4700c58761f221b395f443ba84a09ed5310af15d35a3bbbc43ed7a8 SHA512 466f519c03e8df4d71bf9b95149d9e4e15ed0858b999840f7d80d8ad9ccb7339b25a726451d9f08e4820ed09a6cd873e1d21a1de6e041d23202290a7da3e98cc
 EBUILD docker-runc-1.0.0_rc4_p20170926.ebuild 1385 BLAKE2B 90e1005077667c7f2f4b1e77543d50d266cd0fcddb020dc3a349c7071beacf2a9d5ae2ebdd88a79870684700fb843860e2c9c2257dd08928b28f84a62c10092b SHA512 91b1981d8660f91d376662ffbc87ef7afa77e00adeae8a87b8014093e930669f5d7da38710a41c227619ff30b22fb6e5bdd8fd8128366ebd07f4883dba4be88d
+EBUILD docker-runc-1.0.0_rc4_p20171108.ebuild 1385 BLAKE2B 02cd7e8361f69cb4e37bc97f81c1069e2ef9928ce335bcddc1755a32e0a67a77f236e03fe6126db4870122a0d9798b925b463e6616ff29c719d05674e8de3ab7 SHA512 fddf7cb0b5df213c14d5d832c683e8b5721c54c5f787688b08ff106561724d1e5cd4223b266ef71e1419ab248eddbfeb5d96909139105c4f83c39192e6fe0e32
 MISC metadata.xml 627 BLAKE2B af677935e5cb5c43d3b0e4d8a204bcfb14f4b77dc386fd2a756923457ae88cdc33fd85a84879b7908662c3c1b20ce0ba5598ae708d764bd36a071e32d9beb2c8 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
index 8ea1d028f5b3..680647433350 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ else
 	EGIT_COMMIT="3f2f8b84a77f73d38244dd690525642a72156c64"
 	RUNC_COMMIT="3f2f8b84" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
index 930d6d1ff44e..f8b7a5ec0385 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,10 @@ if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
 	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
-	RUNC_COMMIT="810190" # Change this when you update the ebuild
+	EGIT_COMMIT="b2567b37d7b75eb4cf325b77297b140ea686ce8f"
+	RUNC_COMMIT="b2567b3" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 57d14dcbf110..0175fc0261ca 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,10 +1,8 @@
-DIST docker-17.06.2.tar.gz 9684548 BLAKE2B bfe36c5fbc98bb2b1e8534cb59b54aef9b371fd46f7585c99c16c46d391356302fe9e3e064c7561cde617b8a5b97a07f994eb2452452a61a4c6ed38c434d9665 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b
-DIST docker-17.09.0.tar.gz 10132253 BLAKE2B 2964f20fd0badbea7961ccc4026fa107edbb42e92a63bfba18aed456c474990d76d118baec423c6d3cb6a89215a802b822b245222b73552569f03f0f30684819 SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638
 DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
 DIST docker-17.11.0.tar.gz 10649392 BLAKE2B fff44885f535020bfd8cd6ab9c347df12610779de90290330e1315a2570c1e85a8d0c497320528f44187389b61c3f177f8032c3edc236347900034dfe3eaf764 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e
-EBUILD docker-17.06.2.ebuild 8711 BLAKE2B da8da6b779f54d9058191cd3888c79c523122bd729baa66e82c9a68226ab0b9cb46d8e22cbe2bd0be05f0494b8731349a55b8e44c65abc482a1da102c0668154 SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4
-EBUILD docker-17.09.0.ebuild 8767 BLAKE2B 5c23044a93abb2728b9955158ba0475ca2c0f6e70d4e3d2ec10aae72f5831f08b19c5b99a4d7288f859c3d0807c2802b3fb0b95a3c2516f665c457636ee65c3c SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f
-EBUILD docker-17.09.1.ebuild 8767 BLAKE2B deddd036ff353e11809f7a84b453be4f9b15331749a3aa7263f0ff3768c75c79288b9b1c9551b3ff164cd922cbe30527c4c682d60386f071b69db16cd14099f8 SHA512 6dd4d987080d778a3bd5bdb2bde8086a4fbf5a07036b0e08e74d8afa070a214a5e78e3623677c8a466816d3a7ca445a7625106c3dd936ac8cb645d10fe7fff1f
+DIST docker-17.12.0.tar.gz 11011208 BLAKE2B aee4a1b8af69b2418c62b0f5fc8cf6b1a0945ccbc870572e5835ec23bd9b6d5919fe9e8170b9d3c20eea479fec05aa97f380e1229b09cccbdbca9ed2baaa9f0b SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67
+EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
 EBUILD docker-17.11.0.ebuild 8772 BLAKE2B b912ef908bd41857144ef72076da4a14ada29edafb26662b8f5c2ae3e377e10f35d8e6113d7ced3a4bdfd29273f1f9a94e92313b8e844423dfea9cf85bd5536f SHA512 a7617ac4beef9492a918d0e7379c3a1b3ba38970a079ba96492851cec05346a629e2fe84a9bfed487c49442c257b14db5f60fed22c9546ea267f4a9aff0014ab
+EBUILD docker-17.12.0.ebuild 8773 BLAKE2B d5e28d1f014748b80561f6434869f745b1baaf96e879880adbc2e50f167daf75ee25d346fffe3dfbfc314473cc09cbc75af82209143a39c50f11ce6394e4cefe SHA512 bd36e73b7e389fad7eb52fb9462bcab4620dcb44b4b92fd06d8dc2d2e0ffb2e0f5e6f209a58916fcf70ee0e06260c7c5e9a4cb6e951900e2813f8917fa572ffa
 EBUILD docker-9999.ebuild 8077 BLAKE2B c6ee72c20ec0275500268b0c50af3609f164058ee69fd4dbd855c13d3fdeace8fb556750530e3517f769d5b24002ef6f457d3ea02041ec62d1069dfa06a45a4f SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-17.06.2.ebuild b/app-emulation/docker/docker-17.06.2.ebuild
deleted file mode 100644
index 8d869dab470f..000000000000
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="cec0b72"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170605
-	~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.15.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: 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"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
diff --git a/app-emulation/docker/docker-17.09.1.ebuild b/app-emulation/docker/docker-17.09.1.ebuild
index 10c65a98732e..bae5865672df 100644
--- a/app-emulation/docker/docker-17.09.1.ebuild
+++ b/app-emulation/docker/docker-17.09.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="19e2cf6"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/docker/docker-17.09.0.ebuild b/app-emulation/docker/docker-17.12.0.ebuild
index 4f2669f8f5a1..0a2445ceb541 100644
--- a/app-emulation/docker/docker-17.09.0.ebuild
+++ b/app-emulation/docker/docker-17.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="afdb6d4"
+	DOCKER_GITCOMMIT="1caf76c"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -60,9 +60,9 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170917
-	~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?]
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.0
+	~app-emulation/docker-runc-1.0.0_rc4_p20171108[apparmor?,seccomp?]
 	>=app-emulation/docker-proxy-0.8.0_p20170917
 	container-init? ( >=sys-process/tini-0.16.1[static] )
 "
@@ -254,7 +254,7 @@ src_compile() {
 	./gen-manpages --root . --target ./man/man1 || die
 	./man/md2man-all.sh -q || die
 	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
 
 	popd || die # components/cli
 }